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

[Jan de Groot]

    Date: Monday, October 12, 2009 @ 04:41:16
  Author: jgc
Revision: 55215

Merge gnome-unstable

Added:
  xfce4-xkb-plugin/trunk/xfce4-xkb-plugin-0.5.3.3-libxklavier.patch
    (from rev 55214, xfce4-xkb-plugin/gnome-unstable/xfce4-xkb-plugin-0.5.3.3-libxklavier.patch)
Modified:
  xfce4-xkb-plugin/trunk/PKGBUILD
Deleted:
  xfce4-xkb-plugin/gnome-unstable/

--------------------------------------------+
 PKGBUILD                                   |   15 +++++++++------
 xfce4-xkb-plugin-0.5.3.3-libxklavier.patch |   21 +++++++++++++++++++++
 2 files changed, 30 insertions(+), 6 deletions(-)

Modified: trunk/PKGBUILD
===================================================================
--- trunk/PKGBUILD	2009-10-12 08:40:51 UTC (rev 55214)
+++ trunk/PKGBUILD	2009-10-12 08:41:16 UTC (rev 55215)
@@ -3,24 +3,27 @@
 # Contributor: Tobias Kieslich <tobias (at) archlinux.org>
 
 pkgname=xfce4-xkb-plugin
-pkgver=0.5.3.2
+pkgver=0.5.3.3
 pkgrel=1
 pkgdesc="plugin to switch keyboard layouts for the Xfce4 panel"
 arch=(i686 x86_64)
 license=('custom')
 url="http://xfce-goodies.berlios.de/"
 groups=('xfce4-goodies')
-depends=('xfce4-panel>=4.5.99.1' 'libxklavier' 'librsvg')
+depends=('xfce4-panel>=4.5.99.1' 'libxklavier>=4.0' 'librsvg')
 makedepends=('pkgconfig' 'perlxml' 'intltool')
 options=('!libtool')
-source=(http://goodies.xfce.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('235038face497d92b1b8f540ec2d270c')
+source=(http://goodies.xfce.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz
+        xfce4-xkb-plugin-0.5.3.3-libxklavier.patch)
+sha1sums=('5e83d55cd6f14a62a87ccadd0f11eee070a6f4a7'
+          '82490cc65d589ead5697f0c1bb8eba62a7be92f2')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np1 -i "${srcdir}/xfce4-xkb-plugin-0.5.3.3-libxklavier.patch" || return 1
   ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
-    --localstatedir=/var --disable-static
+    --localstatedir=/var --disable-static || return 1
   make || return 1
   make DESTDIR=${pkgdir} install || return 1
-  install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
+  install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING || return 1
 }

Copied: xfce4-xkb-plugin/trunk/xfce4-xkb-plugin-0.5.3.3-libxklavier.patch (from rev 55214, xfce4-xkb-plugin/gnome-unstable/xfce4-xkb-plugin-0.5.3.3-libxklavier.patch)
===================================================================
--- trunk/xfce4-xkb-plugin-0.5.3.3-libxklavier.patch	                        (rev 0)
+++ trunk/xfce4-xkb-plugin-0.5.3.3-libxklavier.patch	2009-10-12 08:41:16 UTC (rev 55215)
@@ -0,0 +1,21 @@
+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 ();
+ 
+@@ -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;
+ }