[arch-commits] Commit in xfce4-xkb-plugin/trunk (3 files)

[Eric Bélanger]

    Date: Tuesday, January 31, 2012 @ 23:55:45
  Author: eric
Revision: 148449

upgpkg: xfce4-xkb-plugin 0.5.4.3-1

Upstream update, Remove old patches

Modified:
  xfce4-xkb-plugin/trunk/PKGBUILD
Deleted:
  xfce4-xkb-plugin/trunk/crashfix.diff
  xfce4-xkb-plugin/trunk/xfce4-xkb-plugin-0.5.3.3-libxklavier.patch

--------------------------------------------+
 PKGBUILD                                   |   16 ++++++------
 crashfix.diff                              |   34 ---------------------------
 xfce4-xkb-plugin-0.5.3.3-libxklavier.patch |   30 -----------------------
 3 files changed, 8 insertions(+), 72 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-02-01 04:14:47 UTC (rev 148448)
+++ PKGBUILD	2012-02-01 04:55:45 UTC (rev 148449)
@@ -3,9 +3,9 @@
 # Contributor: Tobias Kieslich <tobias (at) archlinux.org>
 
 pkgname=xfce4-xkb-plugin
-pkgver=0.5.4.2
+pkgver=0.5.4.3
 pkgrel=1
-pkgdesc="plugin to switch keyboard layouts for the Xfce4 panel"
+pkgdesc="Plugin to switch keyboard layouts for the Xfce4 panel"
 arch=('i686' 'x86_64')
 license=('custom')
 url="http://goodies.xfce.org/projects/panel-plugins/xfce4-xkb-plugin"
@@ -13,11 +13,11 @@
 depends=('xfce4-panel' 'libxklavier>=5.0' 'librsvg')
 makedepends=('intltool')
 options=('!libtool')
-source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/0.5/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('b79f7c65f8155cb77d99dcf9716bb38b')
+source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/${pkgver%.*.*}/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('4dc42f96dc16a3bd78f86454ea3a931464e18497')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr \
 	--sysconfdir=/etc \
 	--libexecdir=/usr/lib \
@@ -28,7 +28,7 @@
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-  install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
 }

Deleted: crashfix.diff
===================================================================
--- crashfix.diff	2012-02-01 04:14:47 UTC (rev 148448)
+++ crashfix.diff	2012-02-01 04:55:45 UTC (rev 148449)
@@ -1,34 +0,0 @@
-From 52dc725bf5e44a0ab0064daebffe7ff139da0f78 Mon Sep 17 00:00:00 2001
-From: Lionel Le Folgoc <mrpouit at 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
-

Deleted: xfce4-xkb-plugin-0.5.3.3-libxklavier.patch
===================================================================
--- xfce4-xkb-plugin-0.5.3.3-libxklavier.patch	2012-02-01 04:14:47 UTC (rev 148448)
+++ xfce4-xkb-plugin-0.5.3.3-libxklavier.patch	2012-02-01 04:55:45 UTC (rev 148449)
@@ -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;
- }