Fix libxklavier-4 support.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 72 insertions, 6 deletions

diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog
index 86f164520803..84b88d6570fd 100644
--- a/gnome-base/gdm/ChangeLog
+++ b/gnome-base/gdm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/gdm
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.299 2009/06/19 18:36:48 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.300 2009/07/20 23:10:36 eva Exp $
+
+  20 Jul 2009; Gilles Dartiguelongue <eva@gentoo.org> gdm-2.26.1.ebuild,
+  +files/gdm-2.26.1-libxklavier4.patch:
+  Fix libxklavier-4 support.
 
   19 Jun 2009; <nirbheek@gentoo.org> gdm-2.26.1.ebuild:
   Remove gksu dep -- bug 274483
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index 0a752f976087..9524189d1eaa 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 49-keychain 181 RMD160 32ce131e93fc2d8640edee72ad42124537860156 SHA1 b4518f9d8ba65d0cf4d64ded844e59be343088d3 SHA256 d73e07847bfa6ac69938aa309f5c137d4c36248cedf9834db1315ba1b2b87140
 AUX 50-ssh-agent 246 RMD160 0a1d9955b82a5b54af9ef7e61a5fe2f52b8aa217 SHA1 5a418c885a6b4a280d60c501ec9dc3230e9d7b6c SHA256 b8abb694982613258dcf8b327ef878d6ee9738fa53bbd23edfef1de618ff435f
 AUX gdm-2.13.0.1-selinux-remove-attr.patch 908 RMD160 5d766a45d7c5db2453f9bdfaa7cdf02232bc66e5 SHA1 b8c6bda65c8f3f28a601167d8e8b50d4aa1db221 SHA256 40074297200e3424a1baeb483d7fc50d9846a0c74ce46d72845090647d28d14b
@@ -6,6 +9,7 @@ AUX gdm-2.20.10-xinitrc-ssh-agent.patch 704 RMD160 cc84a57a53e0f8ab8688173f96869
 AUX gdm-2.20.2-gksu.patch 544 RMD160 044068ec9c0fac089dcfa8b62597741d6bf6a4ac SHA1 7672aa94ea512cf50740466c6bc072fa236c7d01 SHA256 3c7dabba9904d1ae382989099e03938c47eb2ce882f50d8fae9164a573bddb4d
 AUX gdm-2.20.3-logging.patch 646 RMD160 d7494ad8f39d82f72673d59466cc29b8b5c26bfc SHA1 7c00f8c4501d13368f4a25cf34422108356f8761 SHA256 8266a532731609401915a605866e071ba8cbdf25e6425a0a2701427d15f532ce
 AUX gdm-2.20.9-parallel-make.patch 1499 RMD160 aaca98cd72b464aec043b2aeb51973f9ab3c9a33 SHA1 1718004f16455a3f3c957b40b2391c563988681e SHA256 c8d04d1cae1c2bac16bf3f41fd481eacf5f4a3962f661996f93da39d4161bb0d
+AUX gdm-2.26.1-libxklavier4.patch 1842 RMD160 cae9308944ff4118bd06e411b11e1df6b97fdf99 SHA1 0fbb97f83b980c9bfaab1e95108d9462640c9134 SHA256 7978417318e80628939cdbf62d59ba56cb15242748cb89b5a8b6c02b5265173a
 DIST gdm-2.20.10.tar.bz2 3940077 RMD160 4bb50375d30638143b47b7884405e9999e304da5 SHA1 42e9e52184393352f005f1735843a30f764aef18 SHA256 5d4a2e5973a778871c9bfb91d76580747a4ef40771fd4368169a5868bb2db127
 DIST gdm-2.20.3.tar.bz2 3891861 RMD160 b6aace3153a9ba7adf4ed968ede9da19c3d706cb SHA1 de66323b890f2e65a33bb72c5937d1c95ee5bd89 SHA256 0d1c8e76fbebb2ba2b71c3adac3e7f6193971f75739978f81447e4127b898500
 DIST gdm-2.20.9-gentoo-files-r1.tar.bz2 3494 RMD160 9d8f9954bd0d8b657a2faf2516b4548b9f1556d3 SHA1 28ceedb42440fdb50dffa7e69b18f213b00e3935 SHA256 666c0bf1ba28ccc257bf1235b5286e1eb9e15230c0036413ab428e09c54238f9
@@ -18,6 +22,13 @@ EBUILD gdm-2.20.10-r1.ebuild 6520 RMD160 bec05c9d8cab66c48376aa52f22c5a4d0d9e0f4
 EBUILD gdm-2.20.10.ebuild 6743 RMD160 03ab61f6293f77ef228cc83e5b5d45843681dcd8 SHA1 2c662bb64b4201b4e7d20ba8061a9062d9b7044c SHA256 4b40a13054ee52ccd8361a9b0ae5e4d74001aea7c5d66d3d470217ba8c024d0e
 EBUILD gdm-2.20.3.ebuild 5462 RMD160 01aaa98ab94e130959e550282e4353727d972caa SHA1 7dbff1038ee6f984f2fbf705bf810a73561ea09b SHA256 1ad90379beebf205f16d2d5cc449e60a968e0854c438cd84413175a836accd87
 EBUILD gdm-2.20.9-r1.ebuild 6363 RMD160 3b4160a5ae31f902f8d13afab3ad7d00e19ef1ca SHA1 d5170509fdadb527f1e5001cdc7e8f8067ec5aad SHA256 0c761ebb646018875b2a326d578f1895cc48477bbb900b55034751478b236ec4
-EBUILD gdm-2.26.1.ebuild 5652 RMD160 d91ba2870b63daa11b9891119d7156ff28e80b24 SHA1 f0856934d0cf4626ed3c4a5663f5fde76919d654 SHA256 d1d9b14a2f4b3eb2051e993c9e7beb059b6d5d6f0e9aaf5319623197871a7e69
-MISC ChangeLog 40730 RMD160 bbebcc9336bbcf2a3b4498483216a6b4ea04cb83 SHA1 86335d2b4a18278511ec948465ff4690a671f3ba SHA256 88c2d7fd141c1bf7d2489a8020abed3abe43fe955ce7335280bd7c182495f1a3
+EBUILD gdm-2.26.1.ebuild 5658 RMD160 af5494ccebe8a176f12d59f201eda2df97bbe152 SHA1 34d31f15cb2ebcf374234918554db028424dd715 SHA256 b226d4231faee7063773054bb53c45d44ce0fdad1e3da893bae7e70eb6d41ca4
+MISC ChangeLog 40868 RMD160 fd6c771fa21aef28fdb45cdeb4c2507e47715f3b SHA1 89e2d03d1b75767662cd5163662c262256a8857f SHA256 fc9c2ae9e2729fad0bb192a61dc7a44594eba813089d033733d244b6e7053ebd
 MISC metadata.xml 536 RMD160 53b21d3083b79fe916434c4031a06d108130185c SHA1 b1e22aa4ac145b16471c105709861ffff6585795 SHA256 9d8a22879d6e19a12a8f47ed551cdf440fec0d7057ff0a12feec1c5752c9ce2d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkpk+XMACgkQ1fmVwcYIWAZuBQCfQig80wsek4RPPZp8/K6mCVyt
+q1YAnifDc2vcodclBNNWmYHLFVg5ikE/
+=Aghl
+-----END PGP SIGNATURE-----
diff --git a/gnome-base/gdm/files/gdm-2.26.1-libxklavier4.patch b/gnome-base/gdm/files/gdm-2.26.1-libxklavier4.patch
new file mode 100644
index 000000000000..6f665b7660cc
--- /dev/null
+++ b/gnome-base/gdm/files/gdm-2.26.1-libxklavier4.patch
@@ -0,0 +1,50 @@
+From 90267c7f7afc73b27193632ec4af2c5360fab85a Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Tue, 21 Jul 2009 00:56:37 +0200
+Subject: [PATCH] Add support for libxklavier-4
+
+---
+ configure.ac                     |   10 +++++++---
+ gui/simple-greeter/gdm-layouts.c |    4 ++++
+ 2 files changed, 11 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index d4a44d5..068e45c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -114,9 +114,13 @@ AC_ARG_ENABLE([libxklavier],
+ have_libxklavier=no
+ if test "x$enable_libxklavier" = "xyes"; then
+    PKG_CHECK_MODULES(LIBXKLAVIER,
+-	  libxklavier >= $LIBXKLAVIER_REQUIRED_VERSION,
+-          have_libxklavier=yes,
+-          have_libxklavier=no)
++	  libxklavier >= 4,
++	  [AC_DEFINE(HAVE_XKL_4, [1], [lixklavier-4 support])
++	   have_libxklavier=yes],
++	  [PKG_CHECK_MODULES(LIBXKLAVIER,
++		libxklavier >= $LIBXKLAVIER_REQUIRED_VERSION,
++		have_libxklavier=yes,
++		have_libxklavier=no)])
+    if test "x$have_libxklavier" = "xyes" ; then
+       AC_DEFINE(HAVE_LIBXKLAVIER, [], [Define if we have libxklavier])
+    fi
+diff --git a/gui/simple-greeter/gdm-layouts.c b/gui/simple-greeter/gdm-layouts.c
+index dc35094..97e1e08 100644
+--- a/gui/simple-greeter/gdm-layouts.c
++++ b/gui/simple-greeter/gdm-layouts.c
+@@ -52,7 +52,11 @@ init_xkl (void)
+                 engine = xkl_engine_get_instance (GDK_DISPLAY ());
+                 xkl_engine_backup_names_prop (engine);
+                 config_registry = xkl_config_registry_get_instance (engine);
++#if HAVE_XKL_4
++                xkl_config_registry_load (config_registry, FALSE);
++#else
+                 xkl_config_registry_load (config_registry);
++#endif
+ 
+                 initial_config = xkl_config_rec_new ();
+                 if (!xkl_config_rec_get_from_backup (initial_config, engine)) {
+-- 
+1.6.3.3
+
diff --git a/gnome-base/gdm/gdm-2.26.1.ebuild b/gnome-base/gdm/gdm-2.26.1.ebuild
index af7120021f39..8156033810f6 100644
--- a/gnome-base/gdm/gdm-2.26.1.ebuild
+++ b/gnome-base/gdm/gdm-2.26.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.26.1.ebuild,v 1.3 2009/06/19 18:36:48 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.26.1.ebuild,v 1.4 2009/07/20 23:10:36 eva Exp $
 
 EAPI="2"
 
@@ -114,9 +114,10 @@ src_prepare() {
 	# Fix libxklavier automagic support
 	epatch "${WORKDIR}/${PN}-2.26.1-automagic-libxklavier-support.patch"
 
-	# Fix intltoolize broken file, see upstream #577133
-	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die "sed 2 failed"
+	# Fix libxklavier-4 support
+	epatch "${FILESDIR}/${PN}-2.26.1-libxklavier4.patch"
 
+	intltoolize --force --copy --automake || die "intltoolize failed"
 	eautoreconf
 }