Apply upstream patches to stop relying on deprecated stuff, also drop .la files.

(Portage version: 2.1.10.28/cvs/Linux x86_64)

5 files changed, 388 insertions, 1 deletions

diff --git a/gnome-base/libgnomekbd/ChangeLog b/gnome-base/libgnomekbd/ChangeLog
index f5cac50e778e..6046a8b9cc4f 100644
--- a/gnome-base/libgnomekbd/ChangeLog
+++ b/gnome-base/libgnomekbd/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for gnome-base/libgnomekbd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/ChangeLog,v 1.92 2011/08/14 14:58:21 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/ChangeLog,v 1.93 2011/10/17 20:46:58 pacho Exp $
+
+*libgnomekbd-2.32.0-r1 (17 Oct 2011)
+
+  17 Oct 2011; Pacho Ramos <pacho@gentoo.org> +libgnomekbd-2.32.0-r1.ebuild,
+  +files/libgnomekbd-2.32.0-gdkdisplay-usage.patch,
+  +files/libgnomekbd-2.32.0-gdkkeyname-replace.patch,
+  +files/libgnomekbd-2.32.0-unneeded-casts.patch:
+  Apply upstream patches to stop relying on deprecated stuff, also drop .la
+  files.
 
 *libgnomekbd-3.0.0.1 (14 Aug 2011)
 
diff --git a/gnome-base/libgnomekbd/files/libgnomekbd-2.32.0-gdkdisplay-usage.patch b/gnome-base/libgnomekbd/files/libgnomekbd-2.32.0-gdkdisplay-usage.patch
new file mode 100644
index 000000000000..43b8b1a65e59
--- /dev/null
+++ b/gnome-base/libgnomekbd/files/libgnomekbd-2.32.0-gdkdisplay-usage.patch
@@ -0,0 +1,61 @@
+From 8b62e545aa61111d8dd522ff62445b2827da3f25 Mon Sep 17 00:00:00 2001
+From: William Jon McCann <jmccann@redhat.com>
+Date: Thu, 30 Sep 2010 00:50:44 +0000
+Subject: Remove GDK_DISPLAY() usage
+
+https://bugzilla.gnome.org/show_bug.cgi?id=630974
+---
+diff --git a/capplet/gkbd-indicator-plugins-capplet.c b/capplet/gkbd-indicator-plugins-capplet.c
+index c232c98..752d28c 100644
+--- a/capplet/gkbd-indicator-plugins-capplet.c
++++ b/capplet/gkbd-indicator-plugins-capplet.c
+@@ -376,7 +376,7 @@ main (int argc, char **argv)
+ 	}
+ 	gconf_error = NULL;
+ 	/*GkbdIndicatorInstallGlibLogAppender(  ); */
+-	gipc.engine = xkl_engine_get_instance (GDK_DISPLAY ());
++	gipc.engine = xkl_engine_get_instance (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()));
+ 	gipc.config_registry =
+ 	    xkl_config_registry_get_instance (gipc.engine);
+ 
+diff --git a/libgnomekbd/gkbd-indicator.c b/libgnomekbd/gkbd-indicator.c
+index cb2ed56..4fd42d8 100644
+--- a/libgnomekbd/gkbd-indicator.c
++++ b/libgnomekbd/gkbd-indicator.c
+@@ -817,7 +817,7 @@ gkbd_indicator_global_init (void)
+ 	GConfClient *gconf_client;
+ 	XklConfigRec *xklrec = xkl_config_rec_new ();
+ 
+-	globals.engine = xkl_engine_get_instance (GDK_DISPLAY ());
++	globals.engine = xkl_engine_get_instance (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()));
+ 	if (globals.engine == NULL) {
+ 		xkl_debug (0, "Libxklavier initialization error");
+ 		return;
+diff --git a/libgnomekbd/gkbd-keyboard-drawing.c b/libgnomekbd/gkbd-keyboard-drawing.c
+index 7e3c3e8..e31dc94 100644
+--- a/libgnomekbd/gkbd-keyboard-drawing.c
++++ b/libgnomekbd/gkbd-keyboard-drawing.c
+@@ -2524,7 +2524,7 @@ gkbd_keyboard_drawing_new_dialog (gint group, gchar * group_name)
+ 	GdkRectangle *rect;
+ 	GError *error = NULL;
+ 	char title[128] = "";
+-	XklEngine *engine = xkl_engine_get_instance (GDK_DISPLAY ());
++	XklEngine *engine = xkl_engine_get_instance (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()));
+ 
+ 	builder = gtk_builder_new ();
+ 	gtk_builder_add_from_file (builder, UIDIR "/show-layout.ui",
+diff --git a/libgnomekbd/gkbd-status.c b/libgnomekbd/gkbd-status.c
+index 83a5d47..c6ac2d6 100644
+--- a/libgnomekbd/gkbd-status.c
++++ b/libgnomekbd/gkbd-status.c
+@@ -771,7 +771,7 @@ gkbd_status_global_init (void)
+ 	GConfClient *gconf_client;
+ 	XklConfigRec *xklrec = xkl_config_rec_new ();
+ 
+-	globals.engine = xkl_engine_get_instance (GDK_DISPLAY ());
++	globals.engine = xkl_engine_get_instance (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()));
+ 	if (globals.engine == NULL) {
+ 		xkl_debug (0, "Libxklavier initialization error");
+ 		return;
+--
+cgit v0.9.0.2
diff --git a/gnome-base/libgnomekbd/files/libgnomekbd-2.32.0-gdkkeyname-replace.patch b/gnome-base/libgnomekbd/files/libgnomekbd-2.32.0-gdkkeyname-replace.patch
new file mode 100644
index 000000000000..3a9070ade1b4
--- /dev/null
+++ b/gnome-base/libgnomekbd/files/libgnomekbd-2.32.0-gdkkeyname-replace.patch
@@ -0,0 +1,231 @@
+From f05774eace6d681b0fc59b2abee650b847fff8a1 Mon Sep 17 00:00:00 2001
+From: William Jon McCann <jmccann@redhat.com>
+Date: Thu, 30 Sep 2010 00:46:20 +0000
+Subject: Replace GDK_keyname with GDK_KEY_keyname
+
+https://bugzilla.gnome.org/show_bug.cgi?id=630974
+---
+diff --git a/libgnomekbd/gkbd-indicator.c b/libgnomekbd/gkbd-indicator.c
+index 4fd42d8..89ed92a 100644
+--- a/libgnomekbd/gkbd-indicator.c
++++ b/libgnomekbd/gkbd-indicator.c
+@@ -233,12 +233,12 @@ gkbd_indicator_key_pressed (GtkWidget *
+ 			    GkbdIndicator * gki)
+ {
+ 	switch (event->keyval) {
+-	case GDK_KP_Enter:
+-	case GDK_ISO_Enter:
+-	case GDK_3270_Enter:
+-	case GDK_Return:
+-	case GDK_space:
+-	case GDK_KP_Space:
++	case GDK_KEY_KP_Enter:
++	case GDK_KEY_ISO_Enter:
++	case GDK_KEY_3270_Enter:
++	case GDK_KEY_Return:
++	case GDK_KEY_space:
++	case GDK_KEY_KP_Space:
+ 		gkbd_desktop_config_lock_next_group (&globals.cfg);
+ 		return TRUE;
+ 	default:
+diff --git a/libgnomekbd/gkbd-keyboard-drawing.c b/libgnomekbd/gkbd-keyboard-drawing.c
+index e31dc94..3de2125 100644
+--- a/libgnomekbd/gkbd-keyboard-drawing.c
++++ b/libgnomekbd/gkbd-keyboard-drawing.c
+@@ -620,147 +620,147 @@ set_key_label_in_layout (GkbdKeyboardDrawingRenderContext * context,
+ 	PangoLayout *layout = context->layout;
+ 
+ 	switch (keyval) {
+-	case GDK_Scroll_Lock:
++	case GDK_KEY_Scroll_Lock:
+ 		pango_layout_set_text (layout, "Scroll\nLock", -1);
+ 		break;
+ 
+-	case GDK_space:
++	case GDK_KEY_space:
+ 		pango_layout_set_text (layout, "", -1);
+ 		break;
+ 
+-	case GDK_Sys_Req:
++	case GDK_KEY_Sys_Req:
+ 		pango_layout_set_text (layout, "Sys Rq", -1);
+ 		break;
+ 
+-	case GDK_Page_Up:
++	case GDK_KEY_Page_Up:
+ 		pango_layout_set_text (layout, "Page\nUp", -1);
+ 		break;
+ 
+-	case GDK_Page_Down:
++	case GDK_KEY_Page_Down:
+ 		pango_layout_set_text (layout, "Page\nDown", -1);
+ 		break;
+ 
+-	case GDK_Num_Lock:
++	case GDK_KEY_Num_Lock:
+ 		pango_layout_set_text (layout, "Num\nLock", -1);
+ 		break;
+ 
+-	case GDK_KP_Page_Up:
++	case GDK_KEY_KP_Page_Up:
+ 		pango_layout_set_text (layout, "Pg Up", -1);
+ 		break;
+ 
+-	case GDK_KP_Page_Down:
++	case GDK_KEY_KP_Page_Down:
+ 		pango_layout_set_text (layout, "Pg Dn", -1);
+ 		break;
+ 
+-	case GDK_KP_Home:
++	case GDK_KEY_KP_Home:
+ 		pango_layout_set_text (layout, "Home", -1);
+ 		break;
+ 
+-	case GDK_KP_Left:
++	case GDK_KEY_KP_Left:
+ 		pango_layout_set_text (layout, "Left", -1);
+ 		break;
+ 
+-	case GDK_KP_End:
++	case GDK_KEY_KP_End:
+ 		pango_layout_set_text (layout, "End", -1);
+ 		break;
+ 
+-	case GDK_KP_Up:
++	case GDK_KEY_KP_Up:
+ 		pango_layout_set_text (layout, "Up", -1);
+ 		break;
+ 
+-	case GDK_KP_Begin:
++	case GDK_KEY_KP_Begin:
+ 		pango_layout_set_text (layout, "Begin", -1);
+ 		break;
+ 
+-	case GDK_KP_Right:
++	case GDK_KEY_KP_Right:
+ 		pango_layout_set_text (layout, "Right", -1);
+ 		break;
+ 
+-	case GDK_KP_Enter:
++	case GDK_KEY_KP_Enter:
+ 		pango_layout_set_text (layout, "Enter", -1);
+ 		break;
+ 
+-	case GDK_KP_Down:
++	case GDK_KEY_KP_Down:
+ 		pango_layout_set_text (layout, "Down", -1);
+ 		break;
+ 
+-	case GDK_KP_Insert:
++	case GDK_KEY_KP_Insert:
+ 		pango_layout_set_text (layout, "Ins", -1);
+ 		break;
+ 
+-	case GDK_KP_Delete:
++	case GDK_KEY_KP_Delete:
+ 		pango_layout_set_text (layout, "Del", -1);
+ 		break;
+ 
+-	case GDK_dead_grave:
++	case GDK_KEY_dead_grave:
+ 		pango_layout_set_text (layout, "ˋ", -1);
+ 		break;
+ 
+-	case GDK_dead_acute:
++	case GDK_KEY_dead_acute:
+ 		pango_layout_set_text (layout, "ˊ", -1);
+ 		break;
+ 
+-	case GDK_dead_circumflex:
++	case GDK_KEY_dead_circumflex:
+ 		pango_layout_set_text (layout, "ˆ", -1);
+ 		break;
+ 
+-	case GDK_dead_tilde:
++	case GDK_KEY_dead_tilde:
+ 		pango_layout_set_text (layout, "~", -1);
+ 		break;
+ 
+-	case GDK_dead_macron:
++	case GDK_KEY_dead_macron:
+ 		pango_layout_set_text (layout, "ˉ", -1);
+ 		break;
+ 
+-	case GDK_dead_breve:
++	case GDK_KEY_dead_breve:
+ 		pango_layout_set_text (layout, "˘", -1);
+ 		break;
+ 
+-	case GDK_dead_abovedot:
++	case GDK_KEY_dead_abovedot:
+ 		pango_layout_set_text (layout, "˙", -1);
+ 		break;
+ 
+-	case GDK_dead_diaeresis:
++	case GDK_KEY_dead_diaeresis:
+ 		pango_layout_set_text (layout, "¨", -1);
+ 		break;
+ 
+-	case GDK_dead_abovering:
++	case GDK_KEY_dead_abovering:
+ 		pango_layout_set_text (layout, "˚", -1);
+ 		break;
+ 
+-	case GDK_dead_doubleacute:
++	case GDK_KEY_dead_doubleacute:
+ 		pango_layout_set_text (layout, "˝", -1);
+ 		break;
+ 
+-	case GDK_dead_caron:
++	case GDK_KEY_dead_caron:
+ 		pango_layout_set_text (layout, "ˇ", -1);
+ 		break;
+ 
+-	case GDK_dead_cedilla:
++	case GDK_KEY_dead_cedilla:
+ 		pango_layout_set_text (layout, "¸", -1);
+ 		break;
+ 
+-	case GDK_dead_ogonek:
++	case GDK_KEY_dead_ogonek:
+ 		pango_layout_set_text (layout, "˛", -1);
+ 		break;
+ 
+-		/* case GDK_dead_iota:
+-		 * case GDK_dead_voiced_sound:
+-		 * case GDK_dead_semivoiced_sound: */
++		/* case GDK_KEY_dead_iota:
++		 * case GDK_KEY_dead_voiced_sound:
++		 * case GDK_KEY_dead_semivoiced_sound: */
+ 
+-	case GDK_dead_belowdot:
++	case GDK_KEY_dead_belowdot:
+ 		pango_layout_set_text (layout, " ̣", -1);
+ 		break;
+ 
+-	case GDK_horizconnector:
++	case GDK_KEY_horizconnector:
+ 		pango_layout_set_text (layout, "horiz\nconn", -1);
+ 		break;
+ 
+-	case GDK_Mode_switch:
++	case GDK_KEY_Mode_switch:
+ 		pango_layout_set_text (layout, "AltGr", -1);
+ 		break;
+ 
+-	case GDK_Multi_key:
++	case GDK_KEY_Multi_key:
+ 		pango_layout_set_text (layout, "Compose", -1);
+ 		break;
+ 
+@@ -2037,7 +2037,7 @@ gkbd_keyboard_drawing_init (GkbdKeyboardDrawing * drawing)
+ 
+ 	XkbGetNames (drawing->display, XkbAllNamesMask, drawing->xkb);
+ 	drawing->l3mod = XkbKeysymToModifiers (drawing->display,
+-					       GDK_ISO_Level3_Shift);
++					       GDK_KEY_ISO_Level3_Shift);
+ 
+ 	drawing->xkbOnDisplay = TRUE;
+ 
+--
+cgit v0.9.0.2
diff --git a/gnome-base/libgnomekbd/files/libgnomekbd-2.32.0-unneeded-casts.patch b/gnome-base/libgnomekbd/files/libgnomekbd-2.32.0-unneeded-casts.patch
new file mode 100644
index 000000000000..44bc3a972bd1
--- /dev/null
+++ b/gnome-base/libgnomekbd/files/libgnomekbd-2.32.0-unneeded-casts.patch
@@ -0,0 +1,41 @@
+From b1079544e9585ee01b31b6e882afceb4aac938da Mon Sep 17 00:00:00 2001
+From: Sergey V. Udaltsov <svu@gnome.org>
+Date: Thu, 30 Sep 2010 07:21:27 +0000
+Subject: Unneeded casts removed
+
+---
+diff --git a/capplet/gkbd-indicator-plugins-capplet.c b/capplet/gkbd-indicator-plugins-capplet.c
+index 9058fbc..c232c98 100644
+--- a/capplet/gkbd-indicator-plugins-capplet.c
++++ b/capplet/gkbd-indicator-plugins-capplet.c
+@@ -305,13 +305,13 @@ CappletSetup (GkbdIndicatorPluginsCapplet * gipc)
+ 	gtk_builder_connect_signals (builder, NULL);
+ 
+ 	g_object_set_data (G_OBJECT (capplet), "uiData", builder);
+-	g_signal_connect_swapped (GTK_OBJECT (capplet),
++	g_signal_connect_swapped (capplet,
+ 				  "destroy", G_CALLBACK (g_object_unref),
+ 				  builder);
+ 	g_signal_connect_swapped (G_OBJECT (capplet), "unrealize",
+ 				  G_CALLBACK (g_main_loop_quit), loop);
+ 
+-	g_signal_connect (GTK_OBJECT (capplet),
++	g_signal_connect (capplet,
+ 			  "response", G_CALLBACK (CappletResponse), NULL);
+ 
+ 	button = GTK_WIDGET (gtk_builder_get_object (builder, "btnUp"));
+diff --git a/libgnomekbd/gkbd-keyboard-drawing.c b/libgnomekbd/gkbd-keyboard-drawing.c
+index 909930b..7e3c3e8 100644
+--- a/libgnomekbd/gkbd-keyboard-drawing.c
++++ b/libgnomekbd/gkbd-keyboard-drawing.c
+@@ -2614,7 +2614,7 @@ gkbd_keyboard_drawing_new_dialog (gint group, gchar * group_name)
+ 
+ 	g_object_set_data (G_OBJECT (dialog), "kbdraw", kbdraw);
+ 
+-	g_signal_connect_swapped (GTK_OBJECT (dialog), "destroy",
++	g_signal_connect_swapped (dialog, "destroy",
+ 				  G_CALLBACK (g_object_unref),
+ 				  g_object_get_data (G_OBJECT (dialog),
+ 						     "builderData"));
+--
+cgit v0.9.0.2
diff --git a/gnome-base/libgnomekbd/libgnomekbd-2.32.0-r1.ebuild b/gnome-base/libgnomekbd/libgnomekbd-2.32.0-r1.ebuild
new file mode 100644
index 000000000000..6e3301b1ab6a
--- /dev/null
+++ b/gnome-base/libgnomekbd/libgnomekbd-2.32.0-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/libgnomekbd-2.32.0-r1.ebuild,v 1.1 2011/10/17 20:46:58 pacho Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+GNOME_TARBALL_SUFFIX="bz2"
+
+inherit gnome2
+
+DESCRIPTION="Gnome keyboard configuration library"
+HOMEPAGE="http://www.gnome.org"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="test"
+
+# gtk+-2.20 needed for tests
+RDEPEND=">=dev-libs/glib-2.18:2
+	>=gnome-base/gconf-2.14:2
+	>=x11-libs/gtk+-2.20:2
+	>=x11-libs/libxklavier-5.0"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.35
+	>=dev-util/pkgconfig-0.19"
+
+pkg_setup() {
+	G2CONF="${G2CONF} $(use_enable test tests) --disable-static"
+	DOCS="AUTHORS ChangeLog NEWS README"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Unneeded casts removed
+	epatch "${FILESDIR}/${P}-unneeded-casts.patch"
+
+	# Remove GDK_DISPLAY() usage
+	epatch "${FILESDIR}/${P}-gdkdisplay-usage.patch"
+
+	# Replace GDK_keyname with GDK_KEY_keyname
+	epatch "${FILESDIR}/${P}-gdkkeyname-replace.patch"
+}