From 0e1344d7aac523687de5b3b989b258e357a30709 Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Oct 15 2012 15:30:02 +0000 Subject: Update to 0.5.4.3 (#742744, #768737, #828307) --- diff --git a/.gitignore b/.gitignore index 96ee3a4..13d45c5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ xfce4-xkb-plugin-0.5.3.3.tar.gz /xfce4-xkb-plugin-0.5.4.1.tar.gz /xfce4-xkb-plugin-0.5.4.1.tar.bz2 +/xfce4-xkb-plugin-0.5.4.3.tar.bz2 diff --git a/sources b/sources index fa3adb8..a05faf6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8512c0b180004e1150d8c05255c202d8 xfce4-xkb-plugin-0.5.4.1.tar.bz2 +b31144bd50875ec73f0b3101456c97fd xfce4-xkb-plugin-0.5.4.3.tar.bz2 diff --git a/xfce4-xkb-plugin-0.5.2-xklavier-api.patch b/xfce4-xkb-plugin-0.5.2-xklavier-api.patch deleted file mode 100644 index 373a5fc..0000000 --- a/xfce4-xkb-plugin-0.5.2-xklavier-api.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up xfce4-xkb-plugin-0.5.2/panel-plugin/xkb-config.c.jx xfce4-xkb-plugin-0.5.2/panel-plugin/xkb-config.c ---- xfce4-xkb-plugin-0.5.2/panel-plugin/xkb-config.c.jx 2008-11-10 04:06:31.000000000 -0500 -+++ xfce4-xkb-plugin-0.5.2/panel-plugin/xkb-config.c 2009-07-07 15:42:40.000000000 -0400 -@@ -153,7 +153,7 @@ xkb_config_initialize_xkb_options (t_xkb - config->application_map = g_hash_table_new (g_direct_hash, NULL); - - registry = xkl_config_registry_get_instance (config->engine); -- xkl_config_registry_load (registry); -+ xkl_config_registry_load (registry, FALSE); - - config_item = xkl_config_item_new (); - -@@ -529,7 +529,7 @@ xkb_config_get_xkl_registry () - if (!config) return NULL; - - registry = xkl_config_registry_get_instance (config->engine); -- xkl_config_registry_load (registry); -+ xkl_config_registry_load (registry, FALSE); - - return registry; - } diff --git a/xfce4-xkb-plugin-0.5.3.3-fix-segfault-in-kb-selector.patch b/xfce4-xkb-plugin-0.5.3.3-fix-segfault-in-kb-selector.patch deleted file mode 100644 index eaaec54..0000000 --- a/xfce4-xkb-plugin-0.5.3.3-fix-segfault-in-kb-selector.patch +++ /dev/null @@ -1,20 +0,0 @@ -@@ -, +, @@ - panel-plugin/xkb-settings-dialog.c | 8 +++++--- - 1 files changed, 5 insertions(+), 3 deletions(-) ---- a/panel-plugin/xkb-settings-dialog.c -+++ a/panel-plugin/xkb-settings-dialog.c -@@ -831,9 +831,11 @@ xkb_settings_update_from_ui (t_xkb *xkb) - gint i = 0; - - model = GTK_TREE_MODEL (xkb->combo_store); -- gtk_combo_box_get_active_iter (GTK_COMBO_BOX (xkb->kbd_model_combo), &iter); -- gtk_tree_model_get (model, &iter, NOM, &kbdmodel, -1); -- kbd_config->model = kbdmodel; -+ if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (xkb->kbd_model_combo), &iter)) -+ { -+ gtk_tree_model_get (model, &iter, NOM, &kbdmodel, -1); -+ kbd_config->model = kbdmodel; -+ } - - model = GTK_TREE_MODEL (xkb->toggle_options_store); - if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (xkb->toggle_options_combo), &iter)) diff --git a/xfce4-xkb-plugin-0.5.3.3-fix-various-segfaults.patch b/xfce4-xkb-plugin-0.5.3.3-fix-various-segfaults.patch deleted file mode 100644 index c28b7bf..0000000 --- a/xfce4-xkb-plugin-0.5.3.3-fix-various-segfaults.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 2856ccfd12b7d9844538ea43a34e9f7af9e945a6 Mon Sep 17 00:00:00 2001 -From: Lionel Le Folgoc -Date: Mon, 8 Feb 2010 20:05:12 +0100 -Subject: [PATCH 1/2] Use g_strdup("") for options, instead of "", because it is later free'd (thus segfaults). - ---- - panel-plugin/xkb-config.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/panel-plugin/xkb-config.c b/panel-plugin/xkb-config.c -index bff77dd..020e915 100644 ---- a/panel-plugin/xkb-config.c -+++ b/panel-plugin/xkb-config.c -@@ -290,7 +290,7 @@ xkb_config_update_settings (t_xkb_settings *settings) - if (settings->kbd_config->toggle_option - && strlen (settings->kbd_config->toggle_option) > 0) - options = g_strdup (settings->kbd_config->toggle_option); -- else options = ""; -+ else options = g_strdup (""); - - if (settings->kbd_config->compose_key_position - && strlen (settings->kbd_config->compose_key_position) > 0) --- -1.6.3.3 - - -From 04022389eee43503381f88f4f14ea76ec4941464 Mon Sep 17 00:00:00 2001 -From: Lionel Le Folgoc -Date: Mon, 8 Feb 2010 20:28:37 +0100 -Subject: [PATCH 2/2] Fix another segfault. - ---- - panel-plugin/xkb-config.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/panel-plugin/xkb-config.c b/panel-plugin/xkb-config.c -index 020e915..8546b31 100644 ---- a/panel-plugin/xkb-config.c -+++ b/panel-plugin/xkb-config.c -@@ -312,11 +312,11 @@ xkb_config_update_settings (t_xkb_settings *settings) - { - prefix = g_strsplit(*opt, ":", 2); - if (settings->kbd_config->toggle_option == NULL -- && prefix && strcmp(*prefix, "grp") == 0) -+ && prefix && *prefix && strcmp(*prefix, "grp") == 0) - { - settings->kbd_config->toggle_option = g_strdup (*opt); - } -- else if (prefix && strcmp(*prefix, "compose") == 0) -+ else if (prefix && *prefix && strcmp(*prefix, "compose") == 0) - { - settings->kbd_config->compose_key_position = g_strdup (*opt); - } --- -1.6.3.3 - diff --git a/xfce4-xkb-plugin-0.5.3.3-libxklavier5.patch b/xfce4-xkb-plugin-0.5.3.3-libxklavier5.patch deleted file mode 100644 index 4f5863a..0000000 --- a/xfce4-xkb-plugin-0.5.3.3-libxklavier5.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru xfce4-xkb-plugin-0.5.3.3.orig/panel-plugin/xkb-config.c xfce4-xkb-plugin-0.5.3.3/panel-plugin/xkb-config.c ---- xfce4-xkb-plugin-0.5.3.3.orig/panel-plugin/xkb-config.c 2010-01-23 15:16:47.000000000 +0000 -+++ xfce4-xkb-plugin-0.5.3.3/panel-plugin/xkb-config.c 2010-01-23 15:17:10.000000000 +0000 -@@ -214,7 +214,7 @@ - - gdk_window_remove_filter (NULL, (GdkFilterFunc) handle_xevent, NULL); - -- xkl_engine_stop_listen (config->engine); -+ xkl_engine_stop_listen (config->engine, XKLL_TRACK_KEYBOARD_STATE); - } - - gint diff --git a/xfce4-xkb-plugin.spec b/xfce4-xkb-plugin.spec index 226a78d..fd7ca34 100644 --- a/xfce4-xkb-plugin.spec +++ b/xfce4-xkb-plugin.spec @@ -3,8 +3,8 @@ %global minor_version 0.5 Name: xfce4-xkb-plugin -Version: 0.5.4.1 -Release: 6%{?dist} +Version: 0.5.4.3 +Release: 1%{?dist} Summary: XKB layout switcher for the Xfce panel Group: User Interface/Desktops @@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/xfce4/xkb/flags/*.svg %changelog +* Mon Oct 15 2012 Christoph Wickert - 0.5.4.3-1 +- Update to 0.5.4.3 (#742744, #768737, #828307) + * Sun Jul 22 2012 Fedora Release Engineering - 0.5.4.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild