! Please note that this is a snapshot of our old Bugzilla server, which is read only since May 29, 2020. Please go to gitlab.xfce.org for our new server !
Fix build with libxklavier 5.0 new api
Status:
RESOLVED: FIXED
Product:
Xfce4-xkb-plugin
Component:
General

Comments

Description Lionel Le Folgoc 2010-02-10 09:53:09 CET
Created attachment 2842 
Proposed patch

Hi,

A new parameter has been added to xkl_engine_stop_listen(), making xfce4-xkb-plugin fail to build against libxklavier 5.0.

The fix is rather simple, see attached patch.

Thanks.
Comment 1 Fabian Nowak editbugs 2010-03-28 11:26:47 CEST
gcc -DHAVE_CONFIG_H -I. -I..   -DNDEBUG -D_REENTRANT -I/usr/local/include/xfce4/ -I/usr/include/xfce4 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/directfb -I/usr/include/libpng12 -I/usr/include/atk-1.0 -D_REENTRANT -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/directfb -I/usr/include/libpng12 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -D_REENTRANT -I/usr/include/xfce4 -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/directfb -I/usr/include/libpng12 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/atk-1.0 -I/usr/include/xfce4 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2 -D_REENTRANT -I/usr/include/librsvg-2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/gtk-2.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/directfb -I/usr/include/libpng12 -D_REENTRANT -I/usr/include/libwnck-1.0 -I/usr/include/pango-1.0 -I/usr/include/cairo -I/usr/include/startup-notification-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/gtk-2.0 -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/directfb -I/usr/include/libpng12 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -DPACKAGE_LOCALE_DIR=\"/usr/local/share/locale\" -DFLAGSDIR=\"/usr/local/share/xfce4/xkb/flags\" -DWNCK_I_KNOW_THIS_IS_UNSTABLE -g -O2 -MT xfce4_xkb_plugin-xkb-config.o -MD -MP -MF .deps/xfce4_xkb_plugin-xkb-config.Tpo -c -o xfce4_xkb_plugin-xkb-config.o `test -f 'xkb-config.c' || echo './'`xkb-config.c
xkb-config.c: In function ‘xkb_config_initialize_xkb_options’:
xkb-config.c:153: error: too few arguments to function ‘xkl_config_registry_load’
xkb-config.c: In function ‘xkb_config_get_xkl_registry’:
xkb-config.c:550: error: too few arguments to function ‘xkl_config_registry_load’
make[2]: *** [xfce4_xkb_plugin-xkb-config.o] Fehler 1
make[2]: Leaving directory `/home/tim/install/xfce/goodies/xfce4-xkb-plugin/panel-plugin'
make[1]: *** [all-recursive] Fehler 1
make[1]: Leaving directory `/home/tim/install/xfce/goodies/xfce4-xkb-plugin'
make: *** [all] Fehler 2
Comment 2 Samuli Suominen 2010-03-28 11:37:27 CEST
The above failure is libxklavier-4 failure, there's a different bug open for that...
Comment 3 Samuli Suominen 2010-03-28 11:38:41 CEST
Created attachment 2909 
Fixes for both libxklavier-4 and 5 for clarity

Includes both fixes... for easy applying.
Comment 4 Bojan Popovic 2010-10-05 13:43:05 CEST
It seems libxklavier is happy with any additional qualifier in the second parameter of xkl_engine_stop_listen fixup.

Libgnomekbd also uses XKLL_TRACK_KEYBOARD_STATE, so I suppose that would be the right choice. But can't keep wondering if someone tried other options.
Comment 5 Azamat H. Hackimov editbugs 2011-02-26 00:11:35 CET
Commited in
http://git.xfce.org/panel-plugins/xfce4-xkb-plugin/commit/?id=856114644ea975b7c6a68337ce46083c47efa863
Thank you for patch!
Comment 6 Azamat H. Hackimov editbugs 2011-02-26 00:14:23 CET
*** Bug 6028 has been marked as a duplicate of this bug. ***
Comment 7 Azamat H. Hackimov editbugs 2011-02-26 00:15:29 CET
*** Bug 6944 has been marked as a duplicate of this bug. ***
Comment 8 Azamat H. Hackimov editbugs 2011-02-26 00:16:31 CET
*** Bug 6850 has been marked as a duplicate of this bug. ***

Bug #6221

Reported by:
Lionel Le Folgoc
Reported on: 2010-02-10
Last modified on: 2011-02-26
Duplicates (3):
  • 6028 [Patch]libxklavier-4.0 API
  • 6850 Failed to build under Ubuntu 10.10. because of libxklavier 5.0 API compatibility broken
  • 6944 update libxklavier calls to the new API

People

Assignee:
Alexander Iliev
CC List:
8 users

Version

Version:
unspecified

Attachments

Proposed patch (718 bytes, patch)
2010-02-10 09:53 CET , Lionel Le Folgoc
no flags
Fixes for both libxklavier-4 and 5 for clarity (1.05 KB, patch)
2010-03-28 11:38 CEST , Samuli Suominen
no flags

Additional information