Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=eeb9eb866d1f01bae96cf811a7a25730c06d14e4
commit eeb9eb866d1f01bae96cf811a7a25730c06d14e4
Author: Devil505 <devil505li...@gmail.com>
Date: Sun Apr 17 21:50:03 2011 +0200
xfce4-xkb-plugin-0.5.4.0-1-i686
* version bump
* removed useless patches
diff --git a/source/xfce4/xfce4-xkb-plugin/FrugalBuild
b/source/xfce4/xfce4-xkb-plugin/FrugalBuild
index dccc95e..67d4ee3 100644
--- a/source/xfce4/xfce4-xkb-plugin/FrugalBuild
+++ b/source/xfce4/xfce4-xkb-plugin/FrugalBuild
@@ -2,22 +2,17 @@
# Maintainer: Priyank Gosalia <priyan...@gmail.com>
pkgname=xfce4-xkb-plugin
-pkgver=0.5.3.3
-pkgrel=3
+pkgver=0.5.4.0
+pkgrel=1
pkgdesc="A keyboard layout plugin for the Xfce4 panel."
makedepends=('intltool')
depends=('xfce4-panel>=4.8.0' 'libxfcegui4>=4.8.0' 'librsvg' 'libxklavier' \
'libwnck2')
groups=('xfce4' 'xfce4-goodies')
archs=('i686' 'x86_64' 'ppc')
-_F_xfce_goodies_ext=".tar.gz"
_F_xfce_category="panel-plugins"
_F_gnome_iconcache="y"
Finclude xfce4 gnome-scriptlet
-source=(http://archive.xfce.org/src/panel-plugins/$pkgname/0.5/$pkgname-$pkgver.tar.gz
\
- xfce4-xkb-plugin-0.5.3.3-libxklavier.patch crashfix.diff)
-sha1sums=('5e83d55cd6f14a62a87ccadd0f11eee070a6f4a7' \
- '44691bd348e33ea17afe45869675c0f7c03ed32f' \
- '03c7926f3dfb43b55b033db359f48a17b8bde561')
+sha1sums=('ed341dc3ff42b791a04962397c8414a3be061877')
# optimization OK
diff --git a/source/xfce4/xfce4-xkb-plugin/crashfix.diff
b/source/xfce4/xfce4-xkb-plugin/crashfix.diff
deleted file mode 100644
index 5ccfbaa..0000000
--- a/source/xfce4/xfce4-xkb-plugin/crashfix.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-From 52dc725bf5e44a0ab0064daebffe7ff139da0f78 Mon Sep 17 00:00:00 2001
-From: Lionel Le Folgoc <mrpo...@gmail.com>
-Date: Fri, 24 Sep 2010 21:28:49 +0200
-Subject: Handle cases when the keyboard model is empty
-
-gtk_combo_box_get_active_iter () does not set the iter, and a call to
-gtk_tree_model_get () using this iter will crash. Thus, check the return value
-of gtk_combo_box_get_active_iter () before using the iter.
----
- panel-plugin/xkb-settings-dialog.c | 8 +++++---
- 1 files changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/panel-plugin/xkb-settings-dialog.c
b/panel-plugin/xkb-settings-dialog.c
-index 178ec5f..37a0a9a 100644
---- a/panel-plugin/xkb-settings-dialog.c
-+++ b/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))
---
-1.7.1
-
diff --git
a/source/xfce4/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.3.3-libxklavier.patch
b/source/xfce4/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.3.3-libxklavier.patch
deleted file mode 100644
index 5b9dc54..0000000
--- a/source/xfce4/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.3.3-libxklavier.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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 2009-03-06
15:16:03.000000000 +0200
-+++ xfce4-xkb-plugin-0.5.3.3/panel-plugin/xkb-config.c 2009-07-20
18:40:34.000000000 +0300
-@@ -150,7 +150,7 @@
- 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 ();
-
-@@ -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
-@@ -547,7 +547,7 @@
- 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;
- }
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
