summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry N <thierryn1 at hispeed dot ch>2009-10-20 09:13:52 +0200
committerThierry N <thierryn1 at hispeed dot ch>2009-10-20 09:13:52 +0200
commit5a55bd4c7ca08524f1bff0ca26ca4225db46f1f5 (patch)
treee6008e92ad9b02d640d67432de7c859807858851
parentb2071fb97deb6f49b89619d9e58448e39437ba44 (diff)
downloadnutyx-pakxe-5a55bd4c7ca08524f1bff0ca26ca4225db46f1f5.tar.gz
nutyx-pakxe-5a55bd4c7ca08524f1bff0ca26ca4225db46f1f5.tar.bz2
nutyx-pakxe-5a55bd4c7ca08524f1bff0ca26ca4225db46f1f5.tar.xz
nutyx-pakxe-5a55bd4c7ca08524f1bff0ca26ca4225db46f1f5.zip
maj xfce4-settings#4.6.1-2
-rw-r--r--xfce/xfce4-settings/.md5sum1
-rwxr-xr-xxfce/xfce4-settings/Pkgfile5
-rw-r--r--xfce/xfce4-settings/xfce4-settings-4.6.1-libklavier-4.0.patch11
3 files changed, 15 insertions, 2 deletions
diff --git a/xfce/xfce4-settings/.md5sum b/xfce/xfce4-settings/.md5sum
index dcf0211ad..9d74c8bdf 100644
--- a/xfce/xfce4-settings/.md5sum
+++ b/xfce/xfce4-settings/.md5sum
@@ -1 +1,2 @@
+0bd901a7146c951987a4ddddc4cf68cb xfce4-settings-4.6.1-libklavier-4.0.patch
dc1c8704471c5b0104fa10c30eb60cb6 xfce4-settings-4.6.1.tar.bz2
diff --git a/xfce/xfce4-settings/Pkgfile b/xfce/xfce4-settings/Pkgfile
index e4f60cc6a..ffb8f05f0 100755
--- a/xfce/xfce4-settings/Pkgfile
+++ b/xfce/xfce4-settings/Pkgfile
@@ -7,10 +7,11 @@
name=xfce4-settings
version=4.6.1
release=2
-source=(http://www.xfce.org/archive/xfce-$version/src/$name-$version.tar.bz2)
-
+source=(http://www.xfce.org/archive/xfce-$version/src/$name-$version.tar.bz2\
+ xfce4-settings-4.6.1-libklavier-4.0.patch)
build() {
cd $name-$version
+ patch -Np1 -i ../xfce4-settings-4.6.1-libklavier-4.0.patch
./configure --prefix=/usr \
--sysconfdir=/etc \
--libexecdir=/usr/lib/xfce4 \
diff --git a/xfce/xfce4-settings/xfce4-settings-4.6.1-libklavier-4.0.patch b/xfce/xfce4-settings/xfce4-settings-4.6.1-libklavier-4.0.patch
new file mode 100644
index 000000000..ff98b8d7d
--- /dev/null
+++ b/xfce/xfce4-settings/xfce4-settings-4.6.1-libklavier-4.0.patch
@@ -0,0 +1,11 @@
+--- xfce4-settings-4.6.1/dialogs/keyboard-settings/xfce-keyboard-settings.c.orig 2009-10-20 07:01:05.000000000 +0000
++++ xfce4-settings-4.6.1/dialogs/keyboard-settings/xfce-keyboard-settings.c 2009-10-20 06:58:30.000000000 +0000
+@@ -378,7 +378,7 @@
+ xkl_config_rec_get_from_server (settings->priv->xkl_rec_config, settings->priv->xkl_engine);
+
+ settings->priv->xkl_registry = xkl_config_registry_get_instance (settings->priv->xkl_engine);
+- xkl_config_registry_load (settings->priv->xkl_registry);
++ xkl_config_registry_load (settings->priv->xkl_registry,FALSE);
+
+ /* Tab */
+ xkb_tab_layout_vbox = glade_xml_get_widget (settings->priv->glade_xml, "xkb_tab_layout_vbox");