Bug 278379 – xfce-base/xfce4-settings : ABI change in x11-libs/libxklavier-4.0 break the build process

• Status: RESOLVED FIXED
• Product: Gentoo Linux

[Description Gef 2009-07-20 05:59:20 UTC]

=xfce-base/xfce4-settings-4.6.1 (stable) needs a patch to build against =x11-libs/libxklavier-4.0 due to ABI change in xkl_config_registry_load.

Attached patch does it.
Found link in Summary with the same patch.

Reproducible: Always

Steps to Reproduce:
1. emerge -av1 =x11-libs/libxklavier-4.0
2. emerge -av1 =xfce-base/xfce4-settings-4.6.1
3.
Actual Results:  
Build fails

Expected Results:  
=xfce-base/xfce4-settings-4.6.1 builds successfully.

[Comment 1 Gef 2009-07-20 06:00:08 UTC]

Created attachment 198525 [details, diff]
Patch

[Comment 2 Gef 2009-07-20 06:04:43 UTC]

Created attachment 198530 [details, diff]
patch

New patch with correct diff -u arguments order...

[Comment 3 Samuli Suominen (RETIRED) 2009-07-20 09:11:51 UTC]

You had the changed source tree in .orig, so the patch was wrong way around.. plus you were working in dialogs/ directory, and there's no way for ebuild (epatch) to know you were in it, so the patch was false in that sense anymore. But I got it. Applied in -r1.

--- xfce4-settings-4.6.1.orig/dialogs/keyboard-settings/xfce-keyboard-settings.c2009-03-02 19:48:00.000000000 +0200
+++ xfce4-settings-4.6.1/dialogs/keyboard-settings/xfce-keyboard-settings.c	2009-07-20 12:08:28.000000000 +0300
@@ -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");