diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-02-15 13:10:38 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-02-15 13:10:38 +0000 |
| commit | 55cfd74cf5f0a48a4102a71bccc0a8070044d390 (patch) | |
| tree | 59a2d64e6ee32111f2605d08e75a34cb12306bc0 /xfce-extra | |
| parent | added missing ~x86-interix keywords (diff) | |
| download | historical-55cfd74cf5f0a48a4102a71bccc0a8070044d390.tar.gz historical-55cfd74cf5f0a48a4102a71bccc0a8070044d390.tar.bz2 historical-55cfd74cf5f0a48a4102a71bccc0a8070044d390.zip | |
Port xfce4-xkb-plugin to libxklavier-5.0 API.
Package-Manager: portage-2.2_rc62/cvs/Linux x86_64
Diffstat (limited to 'xfce-extra')
4 files changed, 46 insertions, 5 deletions
diff --git a/xfce-extra/xfce4-xkb-plugin/ChangeLog b/xfce-extra/xfce4-xkb-plugin/ChangeLog index e2e274b567be..d21fb932d8b2 100644 --- a/xfce-extra/xfce4-xkb-plugin/ChangeLog +++ b/xfce-extra/xfce4-xkb-plugin/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for xfce-extra/xfce4-xkb-plugin # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-xkb-plugin/ChangeLog,v 1.18 2010/01/18 00:34:55 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-xkb-plugin/ChangeLog,v 1.19 2010/02/15 13:10:37 ssuominen Exp $ + + 15 Feb 2010; Samuli Suominen <ssuominen@gentoo.org> + xfce4-xkb-plugin-0.5.3.3-r1.ebuild, + +files/xfce4-xkb-plugin-0.5.3.3-libxklavier-5.patch: + Port xfce4-xkb-plugin to libxklavier-5.0 API. 18 Jan 2010; Jeroen Roovers <jer@gentoo.org> xfce4-xkb-plugin-0.5.3.3-r1.ebuild: diff --git a/xfce-extra/xfce4-xkb-plugin/Manifest b/xfce-extra/xfce4-xkb-plugin/Manifest index f48b0057beb1..53300955fd8c 100644 --- a/xfce-extra/xfce4-xkb-plugin/Manifest +++ b/xfce-extra/xfce4-xkb-plugin/Manifest @@ -1,5 +1,6 @@ +AUX xfce4-xkb-plugin-0.5.3.3-libxklavier-5.patch 1072 RMD160 c2f2f4742c0096fa4e95884d521f48bc3567d0e2 SHA1 bef99ec230a9bc0d05ce63ca6ffc896360427988 SHA256 3e0df3416fd3fdc727194d1b4a97ac176a1e1d63acdb41e505147e0fac46d899 AUX xfce4-xkb-plugin-0.5.3.3-libxklavier.patch 843 RMD160 32c11dbbec33df267185f4b2f48855ec42b880ea SHA1 82490cc65d589ead5697f0c1bb8eba62a7be92f2 SHA256 d35deb49f42e081700542dd7bac180b8b17c58eb83a2b0f5682d54c07e96de7d DIST xfce4-xkb-plugin-0.5.3.3.tar.gz 768414 RMD160 c4f691f0712c105ca37e4af4b311b066cceb3eec SHA1 5e83d55cd6f14a62a87ccadd0f11eee070a6f4a7 SHA256 97b257ae15feefb9a32ef1d34d696797e2555862e19cc46bc31d84379c531379 -EBUILD xfce4-xkb-plugin-0.5.3.3-r1.ebuild 1051 RMD160 245a9f7b6c4b500ad0cc1a36d2fe3ad408fd5807 SHA1 664f2de56de07971d32c0e7919b41bdfcf06627c SHA256 1d328e921e60274a293f5e42d989af2e6beed7240f58fbe6cd9a642de120ceb0 -MISC ChangeLog 2435 RMD160 562b742860f5effd33aced0802bad38b9dc032b6 SHA1 7bb73bb79fb2673288415ed8ca162d2f01ca80a6 SHA256 84e8c3a7e331b82f2cb650b7b5ee0ba43e3dec1a460510eb9c973cc623806e47 +EBUILD xfce4-xkb-plugin-0.5.3.3-r1.ebuild 1171 RMD160 41a420541e038dc846ff8df6b1a85940ef9c485f SHA1 a2e15cd1a9511379590eb451c0942dcfde683707 SHA256 efd4118da562c680effe8f2844e7f771412d091fb3da4764967e6f0e9114148f +MISC ChangeLog 2637 RMD160 4d3fdf41d5fff3b9d0d39ea77d0423c552f2db21 SHA1 72eab8c9f722ef97dcb028efbfae956ab6b1d25c SHA256 9b1dd2759fbe1bced213fc6bef285492172154e22d1b152ff64e8d40276c65d6 MISC metadata.xml 159 RMD160 43722935bd7b4db7fe8db681054f2e53c4a5f7ce SHA1 15958ad72e234ba572c9534533c21532eb6bc0fd SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 diff --git a/xfce-extra/xfce4-xkb-plugin/files/xfce4-xkb-plugin-0.5.3.3-libxklavier-5.patch b/xfce-extra/xfce4-xkb-plugin/files/xfce4-xkb-plugin-0.5.3.3-libxklavier-5.patch new file mode 100644 index 000000000000..521f55d82f40 --- /dev/null +++ b/xfce-extra/xfce4-xkb-plugin/files/xfce4-xkb-plugin-0.5.3.3-libxklavier-5.patch @@ -0,0 +1,30 @@ +diff -ur xfce4-xkb-plugin-0.5.3.3.orig/panel-plugin/xkb-config.c xfce4-xkb-plugin-0.5.3.3/panel-plugin/xkb-config.c +--- xfce4-xkb-plugin-0.5.3.3.orig/panel-plugin/xkb-config.c 2009-03-06 15:16:03.000000000 +0200 ++++ xfce4-xkb-plugin-0.5.3.3/panel-plugin/xkb-config.c 2010-02-15 15:15:21.000000000 +0200 +@@ -150,7 +150,7 @@ + config->application_map = g_hash_table_new (g_direct_hash, NULL); + + registry = xkl_config_registry_get_instance (config->engine); +- xkl_config_registry_load (registry); ++ xkl_config_registry_load (registry, FALSE); + + config_item = xkl_config_item_new (); + +@@ -214,7 +214,7 @@ + + gdk_window_remove_filter (NULL, (GdkFilterFunc) handle_xevent, NULL); + +- xkl_engine_stop_listen (config->engine); ++ xkl_engine_stop_listen (config->engine, XKLL_TRACK_KEYBOARD_STATE); + } + + gint +@@ -547,7 +547,7 @@ + if (!config) return NULL; + + registry = xkl_config_registry_get_instance (config->engine); +- xkl_config_registry_load (registry); ++ xkl_config_registry_load (registry, FALSE); + + return registry; + } diff --git a/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.3.3-r1.ebuild b/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.3.3-r1.ebuild index 780f1f319bab..7aeec207379f 100644 --- a/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.3.3-r1.ebuild +++ b/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.3.3-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.3.3-r1.ebuild,v 1.10 2010/01/18 00:34:55 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.3.3-r1.ebuild,v 1.11 2010/02/15 13:10:37 ssuominen Exp $ EAPI=2 inherit xfconf @@ -30,5 +30,10 @@ pkg_setup() { DOCS="AUTHORS ChangeLog README" XFCONF="--disable-dependency-tracking $(use_enable debug)" - PATCHES=( "${FILESDIR}/${P}-libxklavier.patch" ) + + if has_version ">=x11-libs/libxklavier-5"; then + PATCHES=( "${FILESDIR}/${P}-libxklavier-5.patch" ) + else + PATCHES=( "${FILESDIR}/${P}-libxklavier.patch" ) + fi } |