diff --git a/libgnomekbd-2.30.1.tar.bz2 b/libgnomekbd-2.30.1.tar.bz2 deleted file mode 100644 index cddbd90..0000000 --- a/libgnomekbd-2.30.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:828faade8ef36f89cc27ca4f71e83630aa611ccb4745cb6687cdedddd461b293 -size 404828 diff --git a/libgnomekbd-2.31.5.tar.bz2 b/libgnomekbd-2.31.5.tar.bz2 new file mode 100644 index 0000000..21de302 --- /dev/null +++ b/libgnomekbd-2.31.5.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3a93b6af0f98e6754d6348a35f4059baa73067b8e7f87b6ddbc11aec990d04a8 +size 409510 diff --git a/libgnomekbd-default-group-switch.patch b/libgnomekbd-default-group-switch.patch new file mode 100644 index 0000000..29a6cec --- /dev/null +++ b/libgnomekbd-default-group-switch.patch @@ -0,0 +1,13 @@ +Index: libgnomekbd-2.31.5/libgnomekbd/gkbd-keyboard-config.c +=================================================================== +--- libgnomekbd-2.31.5.orig/libgnomekbd/gkbd-keyboard-config.c ++++ libgnomekbd-2.31.5/libgnomekbd/gkbd-keyboard-config.c +@@ -35,7 +35,7 @@ + #define GKBD_KEYBOARD_CONFIG_KEY_PREFIX GKBD_CONFIG_KEY_PREFIX "/kbd" + + #define GROUP_SWITCHERS_GROUP "grp" +-#define DEFAULT_GROUP_SWITCH "grp:shift_caps_toggle" ++#define DEFAULT_GROUP_SWITCH "grp:shifts_toggle" + + const gchar GKBD_KEYBOARD_CONFIG_DIR[] = GKBD_KEYBOARD_CONFIG_KEY_PREFIX; + const gchar GKBD_KEYBOARD_CONFIG_KEY_MODEL[] = diff --git a/libgnomekbd-fix-crash.patch b/libgnomekbd-fix-crash.patch deleted file mode 100644 index 31d14d9..0000000 --- a/libgnomekbd-fix-crash.patch +++ /dev/null @@ -1,45 +0,0 @@ -commit 4f9c7b401e948756fbe76a56a7619052f8acae42 -Author: Sergey V. Udaltsov -Date: Wed May 5 00:36:04 2010 +0100 - - Do not crash on kbd plug in - - There is funny race condition in X - when _XKB_RULES_NAMES is already - loaded from sysconfig while actual XKB config is still not changed (from - user config). This commit should fix - https://bugzilla.gnome.org/show_bug.cgi?id=617643 - -diff --git a/libgnomekbd/gkbd-indicator.c b/libgnomekbd/gkbd-indicator.c -index 5def369..f6064fa 100644 ---- a/libgnomekbd/gkbd-indicator.c -+++ b/libgnomekbd/gkbd-indicator.c -@@ -318,7 +318,7 @@ gkbd_indicator_extract_layout_name (int group, XklEngine * engine, - gchar ** short_group_names, - gchar ** full_group_names) - { -- char *layout_name; -+ char *layout_name = NULL; - if (group < g_strv_length (short_group_names)) { - if (xkl_engine_get_features (engine) & - XKLF_MULTIPLE_LAYOUTS_SUPPORTED) { -@@ -352,7 +352,7 @@ gkbd_indicator_extract_layout_name (int group, XklEngine * engine, - } - - if (layout_name == NULL) -- layout_name = g_strdup ("??"); -+ layout_name = g_strdup (""); - - return layout_name; - } -diff --git a/libgnomekbd/gkbd-status.c b/libgnomekbd/gkbd-status.c -index 90731af..efcad6a 100644 ---- a/libgnomekbd/gkbd-status.c -+++ b/libgnomekbd/gkbd-status.c -@@ -152,6 +152,7 @@ gkbd_status_render_cairo (cairo_t * cr, int group) - cairo_font_options_t *fo; - static GHashTable *ln2cnt_map = NULL; - -+ xkl_debug (160, "Rendering cairo for group %d\n", group); - if (globals.ind_cfg.background_color != NULL && - globals.ind_cfg.background_color[0] != 0) { - if (sscanf diff --git a/libgnomekbd-proper-notification-name.patch b/libgnomekbd-proper-notification-name.patch deleted file mode 100644 index b52a07a..0000000 --- a/libgnomekbd-proper-notification-name.patch +++ /dev/null @@ -1,23 +0,0 @@ -commit 8dbeec103124f9de1ed515ef50ff79eff3ecd52c -Author: Sergey V. Udaltsov -Date: Sun Apr 25 23:59:53 2010 +0100 - - Provide the proper place in NA by using the name - - The name "keyboard" is known to the NA applet - so it positions the icon - properly, on the right side, after all apps - -diff --git a/libgnomekbd/gkbd-status.c b/libgnomekbd/gkbd-status.c -index efcad6a..5e62ae9 100644 ---- a/libgnomekbd/gkbd-status.c -+++ b/libgnomekbd/gkbd-status.c -@@ -632,6 +632,9 @@ gkbd_status_init (GkbdStatus * gki) - - gki->priv = g_new0 (GkbdStatusPrivate, 1); - -+ /* This should give NA a hint about the order */ -+ gtk_status_icon_set_name (GTK_STATUS_ICON(gki), "keyboard"); -+ - xkl_debug (100, "Initiating the widget startup process for %p\n", - gki); - diff --git a/libgnomekbd.changes b/libgnomekbd.changes index 04420cf..35e4967 100644 --- a/libgnomekbd.changes +++ b/libgnomekbd.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Fri Aug 6 03:10:52 CEST 2010 - vuntz@opensuse.org + +- Update to version 2.31.5: + + One crasher fixed + + Rendering improved + + Updated translations. +- Add libgnomekbd-default-group-switch.patch to change the group + switch keybinding to shifts_toggle, since that's what we use in + openSUSE. + +------------------------------------------------------------------- +Wed Jul 14 09:50:00 CEST 2010 - dimstar@opensuse.org + +- Update to version 2.31.2: + + Seriously improved status icon rendering +- Changes from version 2.31.1: + + Several crashers fixed + + Provided API for handling the default group switcher. Changed + the default value to be "grp:shift_caps_toggle" + + Updated translations. +- Drop upstream included patches libgnomekbd-fix-crash.patch and + libgnomekbd-proper-notification-name.patch. + ------------------------------------------------------------------- Thu Jun 17 14:07:08 CEST 2010 - vuntz@opensuse.org diff --git a/libgnomekbd.spec b/libgnomekbd.spec index 15aeecd..b2083a6 100644 --- a/libgnomekbd.spec +++ b/libgnomekbd.spec @@ -1,5 +1,5 @@ # -# spec file for package libgnomekbd (Version 2.30.1) +# spec file for package libgnomekbd (Version 2.31.5) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,17 +18,15 @@ Name: libgnomekbd -Version: 2.30.1 -Release: 2 +Version: 2.31.5 +Release: 1 License: LGPLv2.1+ Summary: GNOME Keyboard Library Url: http://www.gnome.org/ Group: System/GUI/GNOME Source: %{name}-%{version}.tar.bz2 -# PATCH-FIX-UPSTREAM libgnomekbd-fix-crash.patch bgo617643 vuntz@opensuse.org -- Fix a crash that can kill gnome-settings-daemon, taken from git -Patch0: libgnomekbd-fix-crash.patch -# PATCH-FIX-UPSTREAM libgnomekbd-proper-notification-name.patch vuntz@opensuse.org -- Make sure the notification icon is properly sorted -Patch1: libgnomekbd-proper-notification-name.patch +# PATCH-FEATURE-OPENSUSE libgnomekbd-default-group-switch.patch vuntz@opensuse.org -- We use shifts_toggle to switch between groups in openSUSE +Patch0: libgnomekbd-default-group-switch.patch BuildRequires: fdupes BuildRequires: gconf2-devel BuildRequires: gtk2-devel @@ -61,7 +59,6 @@ GNOME keyboard library, utility and applet. %setup -q translation-update-upstream %patch0 -p1 -%patch1 -p1 %build %configure --disable-static --with-pic