diff --git a/0001-Don-t-use-different-layouts-per-window.patch b/0001-Don-t-use-different-layouts-per-window.patch new file mode 100644 index 0000000..289df34 --- /dev/null +++ b/0001-Don-t-use-different-layouts-per-window.patch @@ -0,0 +1,34 @@ +From 31c922e6eea3047b784a1f95132d044f3dab58c9 Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +Date: Thu, 3 Feb 2011 14:54:07 +0000 +Subject: [PATCH] Don't use different layouts per window + +Using different layouts per-window is confusing for new users. Both +Windows and MacOS X default to using the same layout globally, and +just like them, we offer a graphical way to change the layout (through +a system icon). + +Once the user gains profiency in switching layouts, we can offer them +a more complicated way, using separate layouts for each window. + +https://bugzilla.gnome.org/show_bug.cgi?id=641351 +--- + ...org.gnome.libgnomekbd.desktop.gschema.xml.in.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/libgnomekbd/org.gnome.libgnomekbd.desktop.gschema.xml.in.in b/libgnomekbd/org.gnome.libgnomekbd.desktop.gschema.xml.in.in +index 7be778d..6f42fd7 100644 +--- a/libgnomekbd/org.gnome.libgnomekbd.desktop.gschema.xml.in.in ++++ b/libgnomekbd/org.gnome.libgnomekbd.desktop.gschema.xml.in.in +@@ -7,7 +7,7 @@ + <_description>Default group, assigned on window creation + + +- true ++ false + <_summary>Keep and manage separate group per window + <_description>Keep and manage separate group per window + +-- +1.7.4 + diff --git a/buildfix.patch b/buildfix.patch deleted file mode 100644 index 0558cd9..0000000 --- a/buildfix.patch +++ /dev/null @@ -1,12 +0,0 @@ -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/dd12792ee893440aa0bc31f3dc8eb2e8996715f5.patch b/dd12792ee893440aa0bc31f3dc8eb2e8996715f5.patch deleted file mode 100644 index a71c83e..0000000 --- a/dd12792ee893440aa0bc31f3dc8eb2e8996715f5.patch +++ /dev/null @@ -1,36 +0,0 @@ -From dd12792ee893440aa0bc31f3dc8eb2e8996715f5 Mon Sep 17 00:00:00 2001 -From: Sergey V. Udaltsov -Date: Tue, 12 Oct 2010 09:54:04 +0000 -Subject: Fixed strv comparison function - -The initial implementation was just bad ---- -diff --git a/libgnomekbd/gkbd-keyboard-config.c b/libgnomekbd/gkbd-keyboard-config.c -index 5c48be9..6ab4885 100644 ---- a/libgnomekbd/gkbd-keyboard-config.c -+++ b/libgnomekbd/gkbd-keyboard-config.c -@@ -56,7 +56,12 @@ g_strv_equal (gchar ** l1, gchar ** l2) - { - if (l1 == l2) - return TRUE; -- while (l1 != NULL && l2 != NULL) { -+ if (l1 == NULL) -+ return g_strv_length (l2) == 0; -+ if (l2 == NULL) -+ return g_strv_length (l1) == 0; -+ -+ while ((*l1 != NULL) && (*l2 != NULL)) { - if (*l1 != *l2) { - if (*l1 && *l2) { - if (g_ascii_strcasecmp (*l1, *l2)) -@@ -68,7 +73,7 @@ g_strv_equal (gchar ** l1, gchar ** l2) - l1++; - l2++; - } -- return (*l1 && *l2); -+ return (*l1 == NULL) && (*l2 == NULL); - } - - gboolean --- -cgit v0.8.3.1 diff --git a/libgnomekbd.spec b/libgnomekbd.spec index 7b0a939..8807c40 100644 --- a/libgnomekbd.spec +++ b/libgnomekbd.spec @@ -1,6 +1,6 @@ Name: libgnomekbd Version: 2.91.5 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A keyboard configuration library Group: System Environment/Libraries @@ -22,6 +22,8 @@ BuildRequires: gobject-introspection-devel Requires(post): GConf2 Patch0: fix-error-at-login-screen.patch +# https://bugzilla.gnome.org/show_bug.cgi?id=641351 +Patch1: 0001-Don-t-use-different-layouts-per-window.patch %description The libgnomekbd package contains a GNOME library which manages @@ -117,6 +119,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || : %changelog +* Thu Feb 03 2011 Bastien Nocera 2.91.5-7 +- Disable separate layouts per window + * Wed Feb 02 2011 Ray Strode 2.91.5-6 - Fix error at login screen diff --git a/pc-fix.patch b/pc-fix.patch deleted file mode 100644 index c7b9471..0000000 --- a/pc-fix.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up libgnomekbd-2.91.1/libgnomekbd.pc.in.pc-fix libgnomekbd-2.91.1/libgnomekbd.pc.in ---- libgnomekbd-2.91.1/libgnomekbd.pc.in.pc-fix 2010-11-02 12:21:28.176147002 -0400 -+++ libgnomekbd-2.91.1/libgnomekbd.pc.in 2010-11-02 12:21:39.486147115 -0400 -@@ -6,6 +6,6 @@ includedir=@includedir@ - Name: libgnomekbd - Description: GNOME keyboard shared library - Version: @VERSION@ --Requires: gmodule-export-2.0 gdk-2.0 >= @GDK_REQUIRED@ libxklavier >= @LIBXKLAVIER_REQUIRED@ -+Requires: gmodule-export-2.0 gdk-3.0 >= @GDK_REQUIRED@ libxklavier >= @LIBXKLAVIER_REQUIRED@ - Libs: -L${libdir} -lgnomekbd - Cflags: -I${includedir}