From 4131869fa0b331077b629ad0034e2e36934b22d3 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 1 Nov 2010 16:12:13 -0400 Subject: [PATCH] fix build with recent gtk --- buildfix.patch | 12 ++++++++++++ libgnomekbd.spec | 3 +++ 2 files changed, 15 insertions(+) create mode 100644 buildfix.patch diff --git a/buildfix.patch b/buildfix.patch new file mode 100644 index 0000000..0558cd9 --- /dev/null +++ b/buildfix.patch @@ -0,0 +1,12 @@ +diff -up libgnomekbd-2.91.1/capplet/gkbd-indicator-plugins-add.c.buildfix libgnomekbd-2.91.1/capplet/gkbd-indicator-plugins-add.c +--- libgnomekbd-2.91.1/capplet/gkbd-indicator-plugins-add.c.buildfix 2010-10-03 11:33:51.000000000 -0400 ++++ libgnomekbd-2.91.1/capplet/gkbd-indicator-plugins-add.c 2010-11-01 16:11:27.657410004 -0400 +@@ -201,7 +201,7 @@ CappletEnablePlugin (GtkWidget * btnAdd, + NULL); + g_object_set_data (G_OBJECT (gipc->capplet), + "gkbd_indicator_plugins_add.btnOK", NULL); +- gtk_widget_hide_all (popup); ++ gtk_widget_hide (popup); + if (response == GTK_RESPONSE_OK) { + char *fullPath = + CappletGetSelectedPluginPath (GTK_TREE_VIEW diff --git a/libgnomekbd.spec b/libgnomekbd.spec index 5861969..5f5e0ca 100644 --- a/libgnomekbd.spec +++ b/libgnomekbd.spec @@ -9,6 +9,8 @@ URL: http://gswitchit.sourceforge.net # VCS: git:git://git.gnome.org/libgnomekbd Source0: http://download.gnome.org/sources/libgnomekbd/2.32/libgnomekbd-%{version}.tar.bz2 Patch1: dd12792ee893440aa0bc31f3dc8eb2e8996715f5.patch +# upstream fix +Patch2: buildfix.patch BuildRequires: gtk3-devel > 2.90.0 BuildRequires: cairo-devel @@ -52,6 +54,7 @@ of the keyboard indicator applet. %prep %setup -q %patch1 -p1 +%patch2 -p1 -b .buildfix %build %configure --disable-static --enable-compile-warnings=no