Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bd1d76fa902e068ced3051a26df392196c36bc46

commit bd1d76fa902e068ced3051a26df392196c36bc46
Author: James Buren <r...@frugalware.org>
Date:   Tue Nov 17 15:40:38 2009 -0600

xfce4-settings-4.6.1-4-i686
* add patch to fix build against new xkl library

diff --git a/source/xfce4/xfce4-settings/FrugalBuild 
b/source/xfce4/xfce4-settings/FrugalBuild
index ff93267..c4b685a 100644
--- a/source/xfce4/xfce4-settings/FrugalBuild
+++ b/source/xfce4/xfce4-settings/FrugalBuild
@@ -15,9 +15,10 @@ 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)
+source=(${sour...@]} ${pkgname}_frugalware.patch $pkgname-xkl-4.0.patch)
sha1sums=('ab117c3923571e2437095fd165ac4bf392e658e0' \
-          'ca270db0583778d8a1f74ecec83fc3fbc46f7988')
+          'ca270db0583778d8a1f74ecec83fc3fbc46f7988' \
+          'c680c6deb682b00b0c915c7fa1b8091577296fa6')

# optimization OK

diff --git a/source/xfce4/xfce4-settings/xfce4-settings-xkl-4.0.patch 
b/source/xfce4/xfce4-settings/xfce4-settings-xkl-4.0.patch
new file mode 100644
index 0000000..a8cf95c
--- /dev/null
+++ b/source/xfce4/xfce4-settings/xfce4-settings-xkl-4.0.patch
@@ -0,0 +1,12 @@
+diff -aur 
xfce4-settings-4.6.1/dialogs/keyboard-settings/xfce-keyboard-settings.c 
xfce4-settings-4.6.1-2/dialogs/keyboard-settings/xfce-keyboard-settings.c
+--- xfce4-settings-4.6.1/dialogs/keyboard-settings/xfce-keyboard-settings.c    
2009-03-02 11:48:00.000000000 -0600
++++ xfce4-settings-4.6.1-2/dialogs/keyboard-settings/xfce-keyboard-settings.c  
2009-11-17 15:37:02.000000000 -0600
+@@ -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");
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to