[arch-commits] Commit in xfce4-xkb-plugin/repos (6 files)
Jan de Groot
jgc at archlinux.org
Mon Oct 12 08:42:27 UTC 2009
Date: Monday, October 12, 2009 @ 04:42:27
Author: jgc
Revision: 55216
Fix conflict
Added:
xfce4-xkb-plugin/repos/extra-i686/xfce4-xkb-plugin-0.5.3.3-libxklavier.patch
(from rev 55215, xfce4-xkb-plugin/trunk/xfce4-xkb-plugin-0.5.3.3-libxklavier.patch)
xfce4-xkb-plugin/repos/extra-x86_64/xfce4-xkb-plugin-0.5.3.3-libxklavier.patch
(from rev 55215, xfce4-xkb-plugin/trunk/xfce4-xkb-plugin-0.5.3.3-libxklavier.patch)
Modified:
xfce4-xkb-plugin/repos/extra-i686/ (properties)
xfce4-xkb-plugin/repos/extra-i686/PKGBUILD
xfce4-xkb-plugin/repos/extra-x86_64/ (properties)
xfce4-xkb-plugin/repos/extra-x86_64/PKGBUILD
---------------------------------------------------------+
extra-i686/PKGBUILD | 15 ++++++----
extra-i686/xfce4-xkb-plugin-0.5.3.3-libxklavier.patch | 21 ++++++++++++++
extra-x86_64/PKGBUILD | 15 ++++++----
extra-x86_64/xfce4-xkb-plugin-0.5.3.3-libxklavier.patch | 21 ++++++++++++++
4 files changed, 60 insertions(+), 12 deletions(-)
Property changes on: xfce4-xkb-plugin/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
- /xfce4-xkb-plugin/trunk:1-26357
+ /xfce4-xkb-plugin/trunk:1-55215
Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2009-10-12 08:41:16 UTC (rev 55215)
+++ extra-i686/PKGBUILD 2009-10-12 08:42:27 UTC (rev 55216)
@@ -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/repos/extra-i686/xfce4-xkb-plugin-0.5.3.3-libxklavier.patch (from rev 55215, xfce4-xkb-plugin/trunk/xfce4-xkb-plugin-0.5.3.3-libxklavier.patch)
===================================================================
--- extra-i686/xfce4-xkb-plugin-0.5.3.3-libxklavier.patch (rev 0)
+++ extra-i686/xfce4-xkb-plugin-0.5.3.3-libxklavier.patch 2009-10-12 08:42:27 UTC (rev 55216)
@@ -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;
+ }
Property changes on: xfce4-xkb-plugin/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
- /xfce4-xkb-plugin/trunk:1-26356
+ /xfce4-xkb-plugin/trunk:1-55215
Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2009-10-12 08:41:16 UTC (rev 55215)
+++ extra-x86_64/PKGBUILD 2009-10-12 08:42:27 UTC (rev 55216)
@@ -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/repos/extra-x86_64/xfce4-xkb-plugin-0.5.3.3-libxklavier.patch (from rev 55215, xfce4-xkb-plugin/trunk/xfce4-xkb-plugin-0.5.3.3-libxklavier.patch)
===================================================================
--- extra-x86_64/xfce4-xkb-plugin-0.5.3.3-libxklavier.patch (rev 0)
+++ extra-x86_64/xfce4-xkb-plugin-0.5.3.3-libxklavier.patch 2009-10-12 08:42:27 UTC (rev 55216)
@@ -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;
+ }
More information about the arch-commits
mailing list