Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=5c9461847fc2cd45c4f8599411f7dc0fdbeb79c7
commit 5c9461847fc2cd45c4f8599411f7dc0fdbeb79c7
Author: bouleetbil <bouleet...@frogdev.info>
Date: Fri Apr 2 12:14:23 2010 +0200
xfce4-settings-4.6.1-5-x86_64
*rebuild with libxklavier>=5.0
*added patch for libxklavier
diff --git a/source/xfce4/xfce4-settings/FrugalBuild
b/source/xfce4/xfce4-settings/FrugalBuild
index c4b685a..1ea08bb 100644
--- a/source/xfce4/xfce4-settings/FrugalBuild
+++ b/source/xfce4/xfce4-settings/FrugalBuild
@@ -3,22 +3,23 @@
pkgname=xfce4-settings
pkgver=4.6.1
-pkgrel=4
+pkgrel=5
pkgdesc="Xfce4 Settings Frontend"
makedepends=('intltool')
depends=('libxfcegui4>=4.6.1-3' 'libxfce4util>=4.6.1' 'libexo>=0.3.101-2' \
'libglade>=2.6.4-2' 'xfconf>=4.6.1-2' 'dbus-glib>=0.80' 'libxi>=1.2.1'
'libxrandr>=1.3.0' \
- 'libxcursor>=1.1.9-2' 'libnotify>=0.4.5-2' 'libwnck>=2.26.1-2'
'libxklavier>=3.9-1')
+ 'libxcursor>=1.1.9-2' 'libnotify>=0.4.5-2' 'libwnck>=2.26.1-2'
'libxklavier>=5.0-1')
groups=('xfce4' 'xfce4-core')
rodepends=('xrdb')
conflicts=('xfce-mcs-manager' 'xfce-mcs-plugins')
replaces=('xfce-mcs-manager' 'xfce-mcs-plugins')
archs=('i686' 'x86_64' 'ppc')
Finclude xfce4
-source=(${sour...@]} ${pkgname}_frugalware.patch $pkgname-xkl-4.0.patch)
+source=(${sour...@]} ${pkgname}_frugalware.patch xfce4-settings-xkl-4.0.patch
libxklavier-0.5.diff)
sha1sums=('ab117c3923571e2437095fd165ac4bf392e658e0' \
'ca270db0583778d8a1f74ecec83fc3fbc46f7988' \
- 'c680c6deb682b00b0c915c7fa1b8091577296fa6')
+ 'c680c6deb682b00b0c915c7fa1b8091577296fa6' \
+ '074883b1a019d1daa2b5aa7d03c5036f24396b20')
# optimization OK
diff --git a/source/xfce4/xfce4-settings/libxklavier-0.5.diff
b/source/xfce4/xfce4-settings/libxklavier-0.5.diff
new file mode 100644
index 0000000..395bd78
--- /dev/null
+++ b/source/xfce4/xfce4-settings/libxklavier-0.5.diff
@@ -0,0 +1,11 @@
+---
xfce4-settings-4.6.1/dialogs/keyboard-settings/xfce-keyboard-settings.c.old
2010-04-02 11:23:10.000000000 +0000
++++ xfce4-settings-4.6.1/dialogs/keyboard-settings/xfce-keyboard-settings.c
2010-04-02 12:16:31.000000000 +0000
+@@ -453,7 +453,7 @@
+
+ #ifdef HAVE_LIBXKLAVIER
+ /* Stop xklavier engine */
+- xkl_engine_stop_listen (settings->priv->xkl_engine);
++ xkl_engine_stop_listen (settings->priv->xkl_engine,
XKLL_TRACK_KEYBOARD_STATE);
+ #endif /* HAVE_LIBXKLAVIER */
+
+ g_object_unref (settings->priv->provider);
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
