From 4d1405b680cb3166acfd431fe505e86341f8778c36e3cd14dc74c4c2e024f51e Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 8 Mar 2014 18:55:50 +0000 Subject: [PATCH 1/3] Accepting request 225178 from home:sumski:branches:X11:Wayland Update to new upstream release 0.4.0 OBS-URL: https://build.opensuse.org/request/show/225178 OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/libxkbcommon?expand=0&rev=5 --- baselibs.conf | 3 +++ libxkbcommon-0.3.0.tar.xz | 3 --- libxkbcommon-0.4.0.tar.xz | 3 +++ libxkbcommon.changes | 28 +++++++++++++++++++- libxkbcommon.spec | 56 ++++++++++++++++++++++++++++++++++++--- 5 files changed, 86 insertions(+), 7 deletions(-) delete mode 100644 libxkbcommon-0.3.0.tar.xz create mode 100644 libxkbcommon-0.4.0.tar.xz diff --git a/baselibs.conf b/baselibs.conf index fcdc2c0..773caf2 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,4 +1,7 @@ libxkbcommon0 +libxkbcommon-x11-0 libxkbcommon-devel requires -libxkbcommon- requires "libxkbcommon0- = " +libxkbcommon-x11-devel + requires "libxkbcommon-x11-0- = " diff --git a/libxkbcommon-0.3.0.tar.xz b/libxkbcommon-0.3.0.tar.xz deleted file mode 100644 index 69672a3..0000000 --- a/libxkbcommon-0.3.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:866c0df88f806dff8fc859b6f082cf9f8b6c3b549f0a367541e12b1ca28a5d65 -size 618696 diff --git a/libxkbcommon-0.4.0.tar.xz b/libxkbcommon-0.4.0.tar.xz new file mode 100644 index 0000000..9ccd3e6 --- /dev/null +++ b/libxkbcommon-0.4.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2dc018e830d1befaf4822615204138318da3fff0112f78f3a7c638fa617375b8 +size 546180 diff --git a/libxkbcommon.changes b/libxkbcommon.changes index 1d523d0..0a3ccff 100644 --- a/libxkbcommon.changes +++ b/libxkbcommon.changes @@ -1,3 +1,29 @@ +------------------------------------------------------------------- +Sat Mar 8 17:47:54 UTC 2014 - hrvoje.senjan@gmail.com + +- Update to new upstream release 0.4.0 +* Add a new add-on library, xkbcommon-x11, to support creating + keymaps with the XKB X11 protocol, by querying the X server + directly. See the xkbcommon/xkbcommon-x11.h header file for + more details. This library requires libxcb-xkb >= 1.10, and + is enabled by default. It can be disabled with the --disable-x11 + configure switch. Distributions are encouraged to split the + necessary files for this library (libxkbcommon-x11.so, + xkbcommon-x11.pc, xkbcommon/xkbcommon-x11.h) to a separate + package, such that the main package does not depend on + X11 libraries. +* Fix the keysym <-> name lookup table to not require huge + amounts of relocations. +* Fix a bug in the keysym <-> name lookup, whereby lookup + might fail in some rare cases. +* Reduce memory usage during keymap compilation. +* New API: + New keysyms from xproto 7.0.25 (German T3 layout keysyms). + XKB_MOD_NAME_NUM for the usual NumLock modifier. + xkb_x11_* types and functions, XKB_X11_* constants. +- Add and build new libxkbcommon-x11-0 and libxkbcommon-x11-devel + packages for openSUSE 13.2 and newer + ------------------------------------------------------------------- Wed Apr 17 05:49:07 UTC 2013 - jengelh@inai.de @@ -16,7 +42,7 @@ Tue Oct 23 21:00:18 UTC 2012 - jengelh@inai.de ------------------------------------------------------------------- Tue Sep 25 06:57:19 UTC 2012 - sndirsch@suse.com -- specfile cleanup +- specfile cleanup ------------------------------------------------------------------- Thu Nov 11 21:41:58 UTC 2010 - jengelh@medozas.de diff --git a/libxkbcommon.spec b/libxkbcommon.spec index a4122d2..b2c2aeb 100644 --- a/libxkbcommon.spec +++ b/libxkbcommon.spec @@ -1,7 +1,7 @@ # # spec file for package libxkbcommon # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ Name: libxkbcommon %define lname libxkbcommon0 -Version: 0.3.0 +Version: 0.4.0 Release: 0 Summary: Library for handling xkb descriptions License: MIT @@ -39,6 +39,9 @@ BuildRequires: xz BuildRequires: pkgconfig(xkeyboard-config) BuildRequires: pkgconfig(xorg-macros) >= 1.8 BuildRequires: pkgconfig(xproto) +%if 0%{?suse_version} >= 1320 +BuildRequires: pkgconfig(xcb-xkb) >= 1.10 +%endif %description xkbcommon is a keymap handling library, which can parse XKB @@ -62,6 +65,15 @@ should be perfectly usable for client toolkits, as well as alternative windowing systems, compositors and system-level clients such as Wayland and kmscon. +%package -n %name-x11-0 +Summary: Library for handling xkb descriptions +Group: System/Libraries + +%description -n %name-x11-0 +xkbcommon is a keymap handling library, which can parse XKB +descriptions (e.g. from xkeyboard-config), and use this to help its +users make sense of their keyboard input. + %package devel Summary: Development files for the libxkbcommon library Group: Development/Libraries/C and C++ @@ -79,6 +91,19 @@ Wayland and kmscon. This package contains the development headers for the library found in %lname. +%package x11-devel +Summary: Development files for the libxkbcommon library +Group: Development/Libraries/C and C++ +Requires: %name-x11-0 = %version + +%description x11-devel +xkbcommon is a keymap handling library, which can parse XKB +descriptions (e.g. from xkeyboard-config), and use this to help its +users make sense of their keyboard input. + +This package contains the development headers for the library found +in %name-x11-0. + %prep %setup -q @@ -86,8 +111,13 @@ in %lname. if [ ! -e configure ]; then NOCONFIGURE=1 ./autogen.sh; fi; +%if 0%{?suse_version} >= 1320 +extra_opts=--enable-x11 +%else +extra_opts=--disable-x11 +%endif # Ensure people will use pkgconfig to locate headers. -%configure --disable-static --includedir="%_includedir/pkg/%name" +%configure --disable-static --includedir="%_includedir/pkg/%name" $extra_opts make %{?_smp_mflags} V=1; %install @@ -97,6 +127,11 @@ rm -f "%buildroot/%_libdir"/*.la; %post -n %lname -p /sbin/ldconfig %postun -n %lname -p /sbin/ldconfig +%if 0%{?suse_version} >= 1320 +%post -n %name-x11-0 -p /sbin/ldconfig +%postun -n %name-x11-0 -p /sbin/ldconfig +%endif + %files -n %lname %defattr(-,root,root) %_libdir/libxkbcommon.so.0* @@ -104,7 +139,22 @@ rm -f "%buildroot/%_libdir"/*.la; %files devel %defattr(-,root,root) %_includedir/pkg/ +%if 0%{?suse_version} >= 1320 +%exclude %_includedir/pkg/%name/xkbcommon/xkbcommon-x11.h +%endif %_libdir/libxkbcommon.so %_libdir/pkgconfig/xkbcommon.pc +%if 0%{?suse_version} >= 1320 +%files -n %name-x11-0 +%defattr(-,root,root) +%_libdir/libxkbcommon-x11.so.* + +%files x11-devel +%defattr(-,root,root) +%_includedir/pkg/%name/xkbcommon/xkbcommon-x11.h +%_libdir/libxkbcommon-x11.so +%_libdir/pkgconfig/xkbcommon-x11.pc +%endif + %changelog From d7e0047fcb8ae6f1ad50c96c423b432b87b1e95dc28d7b72464a8f76b921825a Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 8 Mar 2014 19:04:36 +0000 Subject: [PATCH 2/3] Kill %lname when there is more than one library. Give the libxkbcommon-x11 subpackages a better description. %post does not need to be guarded. OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/libxkbcommon?expand=0&rev=6 --- libxkbcommon.spec | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/libxkbcommon.spec b/libxkbcommon.spec index b2c2aeb..23cca4b 100644 --- a/libxkbcommon.spec +++ b/libxkbcommon.spec @@ -17,7 +17,6 @@ Name: libxkbcommon -%define lname libxkbcommon0 Version: 0.4.0 Release: 0 Summary: Library for handling xkb descriptions @@ -52,11 +51,11 @@ should be perfectly usable for client toolkits, as well as alternative windowing systems, compositors and system-level clients such as Wayland and kmscon. -%package -n %lname +%package -n libxkbcommon0 Summary: Library for handling xkb descriptions Group: System/Libraries -%description -n %lname +%description -n libxkbcommon0 xkbcommon is a keymap handling library, which can parse XKB descriptions (e.g. from xkeyboard-config), and use this to help its users make sense of their keyboard input. Unfortunately, X11's @@ -65,19 +64,18 @@ should be perfectly usable for client toolkits, as well as alternative windowing systems, compositors and system-level clients such as Wayland and kmscon. -%package -n %name-x11-0 -Summary: Library for handling xkb descriptions +%package -n libxkbcommon-x11-0 +Summary: Library for handling xkb descriptions using XKB-X11 Group: System/Libraries -%description -n %name-x11-0 -xkbcommon is a keymap handling library, which can parse XKB -descriptions (e.g. from xkeyboard-config), and use this to help its -users make sense of their keyboard input. +%description -n libxkbcommon-x11-0 +An addon library that supports creating keymaps with the XKB X11 +protocol by querying the X server directly. %package devel Summary: Development files for the libxkbcommon library Group: Development/Libraries/C and C++ -Requires: %lname = %version +Requires: libxkbcommon0 = %version-%release %description devel xkbcommon is a keymap handling library, which can parse XKB @@ -89,12 +87,12 @@ windowing systems, compositors and system-level clients such as Wayland and kmscon. This package contains the development headers for the library found -in %lname. +in libxkbcommon. %package x11-devel -Summary: Development files for the libxkbcommon library +Summary: Development files for the libxkbcommon-x11 library Group: Development/Libraries/C and C++ -Requires: %name-x11-0 = %version +Requires: libxkbcommon-x11-0 = %version-%release %description x11-devel xkbcommon is a keymap handling library, which can parse XKB @@ -124,15 +122,12 @@ make %{?_smp_mflags} V=1; make install DESTDIR="%buildroot"; rm -f "%buildroot/%_libdir"/*.la; -%post -n %lname -p /sbin/ldconfig -%postun -n %lname -p /sbin/ldconfig +%post -n libxkbcommon0 -p /sbin/ldconfig +%postun -n libxkbcommon0 -p /sbin/ldconfig +%post -n libxkbcommon-x11-0 -p /sbin/ldconfig +%postun -n libxkbcommon-x11-0 -p /sbin/ldconfig -%if 0%{?suse_version} >= 1320 -%post -n %name-x11-0 -p /sbin/ldconfig -%postun -n %name-x11-0 -p /sbin/ldconfig -%endif - -%files -n %lname +%files -n libxkbcommon0 %defattr(-,root,root) %_libdir/libxkbcommon.so.0* @@ -146,12 +141,17 @@ rm -f "%buildroot/%_libdir"/*.la; %_libdir/pkgconfig/xkbcommon.pc %if 0%{?suse_version} >= 1320 -%files -n %name-x11-0 +%files -n libxkbcommon-x11-0 %defattr(-,root,root) %_libdir/libxkbcommon-x11.so.* +%endif +%if 0%{?suse_version} >= 1320 %files x11-devel %defattr(-,root,root) +%dir %_includedir/pkg +%dir %_includedir/pkg/%name +%dir %_includedir/pkg/%name/xkbcommon %_includedir/pkg/%name/xkbcommon/xkbcommon-x11.h %_libdir/libxkbcommon-x11.so %_libdir/pkgconfig/xkbcommon-x11.pc From af1bed736ffd293bda4dd1e202a3b549c068d735eee7957d9c5c207296b9b0d5 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 8 Mar 2014 19:05:09 +0000 Subject: [PATCH 3/3] Add missing line to baselibs.conf OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/libxkbcommon?expand=0&rev=7 --- baselibs.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/baselibs.conf b/baselibs.conf index 773caf2..18a151d 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -4,4 +4,5 @@ libxkbcommon-devel requires -libxkbcommon- requires "libxkbcommon0- = " libxkbcommon-x11-devel + requires -libxkbcommon-x11- requires "libxkbcommon-x11-0- = "