Hello community, here is the log from the commit of package xfce4-panel-plugin-xkb for openSUSE:Factory checked in at Thu Mar 17 12:15:26 CET 2011.
-------- New Changes file: --- /dev/null 2010-08-26 16:28:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/xfce4-panel-plugin-xkb/xfce4-panel-plugin-xkb.changes 2011-03-09 22:49:58.000000000 +0100 @@ -0,0 +1,5 @@ +------------------------------------------------------------------- +Wed Mar 9 11:00:00 UTC 2011 - [email protected] + +- new package (split off from xfce4-panel-plugins) + calling whatdependson for head-i586 New: ---- xfce4-panel-plugin-xkb-0.5.3.3-check-retval.patch xfce4-panel-plugin-xkb-0.5.3.3-do-not-free-stack-memory.patch xfce4-panel-plugin-xkb-0.5.3.3-fix-array-size.patch xfce4-panel-plugin-xkb-0.5.3.3-libxklavier-0.4-api-changes.patch xfce4-panel-plugin-xkb-0.5.3.3-libxklavier-0.5-api-changes.patch xfce4-panel-plugin-xkb.changes xfce4-panel-plugin-xkb.spec xfce4-xkb-plugin-0.5.3.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfce4-panel-plugin-xkb.spec ++++++ # # spec file for package xfce4-panel-plugin-xkb # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # %define panel_version 4.8.0 %define plugin_name xfce4-xkb-plugin Name: xfce4-panel-plugin-xkb License: GPLv2+ Version: 0.5.3.3 Release: 19 Summary: XKB layout switcher plugin for the Xfce panel Url: http://goodies.xfce.org/projects/panel-plugins/xfce4-xkb-plugin Source0: xfce4-xkb-plugin-0.5.3.3.tar.bz2 # PATCH-FIX-UPSTREAM xfce4-panel-plugin-xkb-0.5.3.3-libxklavier-0.4-api-changes.patch bxo#6944 [email protected] -- Adapt to libxklavier 0.4 API changes Patch0: xfce4-panel-plugin-xkb-0.5.3.3-libxklavier-0.4-api-changes.patch # PATCH-FIX-UPSTREAM xfce4-panel-plugin-xkb-0.5.3.3-libxklavier-0.5-api-changes.patch bxo#6944 [email protected] -- Adapt to libxklavier 0.5 API changes Patch1: xfce4-panel-plugin-xkb-0.5.3.3-libxklavier-0.5-api-changes.patch # PATCH-FIX-UPSTREAM xfce4-panel-plugin-xkb-0.5.3.3-check-retval.patch bxo#6477 [email protected] -- Fixes a crash due to not checking the return value of gtk_combo_box_get_active_iter Patch2: xfce4-panel-plugin-xkb-0.5.3.3-check-retval.patch # PATCH-FIX-UPSTREAM xfce4-panel-plugin-xkb-0.5.3.3-do-not-free-stack-memory.patch bxo#6945 [email protected] -- Allocate variable and prevents freeing stack memory Patch3: xfce4-panel-plugin-xkb-0.5.3.3-do-not-free-stack-memory.patch # PATCH-FIX-UPSTREAM xfce4-panel-plugin-xkb-0.5.3.3-fix-array-size.patch [email protected] -- Fixes overflowing array (fix backported from upstream git) Patch4: xfce4-panel-plugin-xkb-0.5.3.3-fix-array-size.patch Group: System/GUI/XFCE BuildRequires: intltool BuildRequires: fdupes BuildRequires: pkgconfig(libxfce4panel-1.0) BuildRequires: pkgconfig(libxklavier) BuildRequires: pkgconfig(librsvg-2.0) BuildRequires: pkgconfig(libwnck-1.0) Requires: xfce4-panel >= 4.8.0 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description The XKB plugin allows to setup and switch between multiple XKB keyboard layouts. %prep %setup -q -n %{plugin_name}-%{version} %if 0%{?suse_version} >= 1120 %patch0 -p1 %endif %if 0%{?suse_version} >= 1130 %patch1 -p1 %endif %patch2 -p1 %patch3 -p1 %patch4 -p1 %build %configure --disable-static make %{_smp_mflags} V=1 %install %make_install rm -rf %{buildroot}%{_datadir}/locale/{ast,kk,tl_PH,ur_PK} %find_lang %{plugin_name} %{name}.lang %fdupes %{buildroot}%{_datadir} %clean rm -rf %{buildroot} %files -f %{name}.lang %defattr(-,root,root) %{_libexecdir}/xfce4/panel-plugins/xfce4-xkb-plugin %{_datadir}/xfce4/panel-plugins/xkb-plugin.desktop %dir %{_datadir}/xfce4/xkb %{_datadir}/xfce4/xkb/* %changelog ++++++ xfce4-panel-plugin-xkb-0.5.3.3-check-retval.patch ++++++ diff -ur xfce4-xkb-plugin-0.5.3.3.orig/panel-plugin/xkb-settings-dialog.c xfce4-xkb-plugin-0.5.3.3/panel-plugin/xkb-settings-dialog.c --- xfce4-xkb-plugin-0.5.3.3.orig/panel-plugin/xkb-settings-dialog.c 2009-03-06 14:16:03.000000000 +0100 +++ xfce4-xkb-plugin-0.5.3.3/panel-plugin/xkb-settings-dialog.c 2011-01-01 01:15:41.000000000 +0100 @@ -831,9 +831,11 @@ 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)) ++++++ xfce4-panel-plugin-xkb-0.5.3.3-do-not-free-stack-memory.patch ++++++ diff -ur 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 2011-01-01 01:14:16.000000000 +0100 +++ xfce4-xkb-plugin-0.5.3.3/panel-plugin/xkb-config.c 2011-01-01 01:18:16.000000000 +0100 @@ -290,7 +290,7 @@ 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) @@ -312,11 +312,11 @@ { 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); } ++++++ xfce4-panel-plugin-xkb-0.5.3.3-fix-array-size.patch ++++++ diff -ur xfce4-xkb-plugin-0.5.3.3.orig/panel-plugin/xkb-settings-dialog.c xfce4-xkb-plugin-0.5.3.3/panel-plugin/xkb-settings-dialog.c --- xfce4-xkb-plugin-0.5.3.3.orig/panel-plugin/xkb-settings-dialog.c 2011-01-01 01:15:41.000000000 +0100 +++ xfce4-xkb-plugin-0.5.3.3/panel-plugin/xkb-settings-dialog.c 2011-01-01 01:19:07.000000000 +0100 @@ -678,7 +678,7 @@ xfce_xkb_about (XfcePanelPlugin *plugin) { GtkWidget *about; - const gchar* authors[2] = { + const gchar* authors[3] = { "Alexander Iliev <[email protected]>", "Gauvain Pocentek <[email protected]>", NULL ++++++ xfce4-panel-plugin-xkb-0.5.3.3-libxklavier-0.4-api-changes.patch ++++++ Index: xfce4-xkb-plugin-0.5.3.3/panel-plugin/xkb-config.c =================================================================== --- xfce4-xkb-plugin-0.5.3.3/panel-plugin/xkb-config.c.orig +++ xfce4-xkb-plugin-0.5.3.3/panel-plugin/xkb-config.c @@ -150,7 +150,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 (); @@ -547,7 +547,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; } ++++++ xfce4-panel-plugin-xkb-0.5.3.3-libxklavier-0.5-api-changes.patch ++++++ Index: xfce4-xkb-plugin-0.5.3.3/panel-plugin/xkb-config.c =================================================================== --- xfce4-xkb-plugin-0.5.3.3/panel-plugin/xkb-config.c.orig +++ xfce4-xkb-plugin-0.5.3.3/panel-plugin/xkb-config.c @@ -214,7 +214,7 @@ xkb_config_finalize () 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 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
