From a94329d0b2b5a0ff7533583a1506aa2cda381a2cd139150b570767558721d09d Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 3 Nov 2014 17:22:05 +0000 Subject: [PATCH 1/2] Accepting request 259539 from home:sumski:hazard:to:your:stereo Update to version 0.5.0 OBS-URL: https://build.opensuse.org/request/show/259539 OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/libxkbcommon?expand=0&rev=24 --- baselibs.conf | 8 ++++---- libxkbcommon-0.4.3.tar.xz | 3 --- libxkbcommon-0.5.0.tar.xz | 3 +++ libxkbcommon.changes | 35 +++++++++++++++++++++++++++++++++++ libxkbcommon.spec | 38 ++++++++++++++++---------------------- 5 files changed, 58 insertions(+), 29 deletions(-) delete mode 100644 libxkbcommon-0.4.3.tar.xz create mode 100644 libxkbcommon-0.5.0.tar.xz diff --git a/baselibs.conf b/baselibs.conf index bfec0e0..18a151d 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,8 +1,8 @@ -libxkbcommon-0_4_3 -libxkbcommon-x11-0_4_3 +libxkbcommon0 +libxkbcommon-x11-0 libxkbcommon-devel requires -libxkbcommon- - requires "libxkbcommon-0_4_3- = " + requires "libxkbcommon0- = " libxkbcommon-x11-devel requires -libxkbcommon-x11- - requires "libxkbcommon-x11-0_4_3- = " + requires "libxkbcommon-x11-0- = " diff --git a/libxkbcommon-0.4.3.tar.xz b/libxkbcommon-0.4.3.tar.xz deleted file mode 100644 index 79a2404..0000000 --- a/libxkbcommon-0.4.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9a52d5d0419e76c49c0ece86208c205ffacb1cf0ff8ffbaba98d3d4dd40c4e41 -size 556628 diff --git a/libxkbcommon-0.5.0.tar.xz b/libxkbcommon-0.5.0.tar.xz new file mode 100644 index 0000000..e21f263 --- /dev/null +++ b/libxkbcommon-0.5.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:90bd7824742b9a6f52a6cf80e2cadd6f5349cf600a358d08260772615b89d19c +size 615504 diff --git a/libxkbcommon.changes b/libxkbcommon.changes index 363e88e..995b60e 100644 --- a/libxkbcommon.changes +++ b/libxkbcommon.changes @@ -1,3 +1,38 @@ +------------------------------------------------------------------- +Mon Nov 3 16:40:03 UTC 2014 - hrvoje.senjan@gmail.com + +- Update to version 0.5.0: +* Added support for Compose/dead keys in a new module (included in + libxkbcommon). See the documentation or the + xkbcommon/xkbcommon-compose.h header file for more details. +* Improved and reordered some sections of the documentation. +* The doxygen HTML pages were made nicer to read. +* Most tests now run also on non-linux platforms. +* A warning is emitted by default about RMLVO values which are not + used during keymap compilation, which are most often a user + misconfiguration. For example, "terminate:ctrl_alt_backspace" + instead of "terminate:ctrl_alt_bksp". +* Added symbol versioning for libxkbcommon and libxkbcommon-x11. + Note: binaries compiled against this and future versions will not + be able to link against the previous versions of the library. +* Removed several compatablity symbols from the binary (the API + isn't affected). This affects binaries which: + 1. Were compiled against a pre-stable (<0.2.0) version of + libxkbcommon, and + 2. Are linked against the this or later version of libxkbcommon. + Such a scenario is likely to fail already. +* If Xvfb is not available, the x11comp test is now correctly + skipped instead of hanging. +* Benchmarks were moved to a separate bench/ directory. +* Build fixes from OpenBSD. +* Fixed a bug where key type entries such as "map[None] = Level2;" + were ignored. +* New API: + XKB_COMPOSE_* + xkb_compose_* +- Drop openSUSE incompatibilities in form of fake soversions, due + to upstream adition of symbol versioning + ------------------------------------------------------------------- Thu Sep 11 18:33:56 UTC 2014 - jengelh@inai.de diff --git a/libxkbcommon.spec b/libxkbcommon.spec index 1f04866..7ee6872 100644 --- a/libxkbcommon.spec +++ b/libxkbcommon.spec @@ -17,9 +17,8 @@ Name: libxkbcommon -Version: 0.4.3 +Version: 0.5.0 Release: 0 -%define lver 0_4_3 Summary: Library for handling xkb descriptions License: MIT Group: Development/Libraries/C and C++ @@ -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 libxkbcommon-%lver +%package -n libxkbcommon0 Summary: Library for handling xkb descriptions Group: System/Libraries -%description -n libxkbcommon-%lver +%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,18 +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 libxkbcommon-x11-%lver +%package -n libxkbcommon-x11-0 Summary: Library for handling xkb descriptions using XKB-X11 Group: System/Libraries -%description -n libxkbcommon-x11-%lver +%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: libxkbcommon-%lver = %version-%release +Requires: libxkbcommon0 = %version-%release %description devel xkbcommon is a keymap handling library, which can parse XKB @@ -93,7 +92,7 @@ in libxkbcommon. %package x11-devel Summary: Development files for the libxkbcommon-x11 library Group: Development/Libraries/C and C++ -Requires: libxkbcommon-x11-%lver = %version-%release +Requires: libxkbcommon-x11-0 = %version-%release %description x11-devel xkbcommon is a keymap handling library, which can parse XKB @@ -117,26 +116,21 @@ extra_opts=--disable-x11 %endif # Ensure people will use pkgconfig to locate headers. %configure --disable-static --includedir="%_includedir/pkg/%name" $extra_opts -# libxkbcommon has had changing symbols (for example between 0.2.0..0.4.2 -# and 0.4.3..0.5.0) without maintenance of the SO version; therefore, force -# a unique name for the openSUSE package. -# The next release (libxkbcommon-0.5.0) will have proper symbol versions, -# and we can drop this. -make %{?_smp_mflags} V=1 AM_LDFLAGS="-release %version" +make %{?_smp_mflags} V=1 %install make install DESTDIR="%buildroot"; rm -f "%buildroot/%_libdir"/*.la; -%post -n libxkbcommon-%lver -p /sbin/ldconfig -%postun -n libxkbcommon-%lver -p /sbin/ldconfig -%post -n libxkbcommon-x11-%lver -p /sbin/ldconfig -%postun -n libxkbcommon-x11-%lver -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 -%files -n libxkbcommon-%lver +%files -n libxkbcommon0 %defattr(-,root,root) %doc COPYING NEWS -%_libdir/libxkbcommon-%version.so +%_libdir/libxkbcommon.so.* %files devel %defattr(-,root,root) @@ -149,10 +143,10 @@ rm -f "%buildroot/%_libdir"/*.la; %_libdir/pkgconfig/xkbcommon.pc %if 0%{?suse_version} >= 1315 -%files -n libxkbcommon-x11-%lver +%files -n libxkbcommon-x11-0 %defattr(-,root,root) %doc COPYING NEWS -%_libdir/libxkbcommon-x11-%version.so +%_libdir/libxkbcommon-x11.so.* %endif %if 0%{?suse_version} >= 1315 From 525326f3d0ae018b5e0b32abd06949e2b250ae9568d4f8561eef05dec6d8476b Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 3 Nov 2014 17:24:10 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/libxkbcommon?expand=0&rev=25 --- libxkbcommon.changes | 2 -- 1 file changed, 2 deletions(-) diff --git a/libxkbcommon.changes b/libxkbcommon.changes index 995b60e..a21b6ac 100644 --- a/libxkbcommon.changes +++ b/libxkbcommon.changes @@ -30,8 +30,6 @@ Mon Nov 3 16:40:03 UTC 2014 - hrvoje.senjan@gmail.com * New API: XKB_COMPOSE_* xkb_compose_* -- Drop openSUSE incompatibilities in form of fake soversions, due - to upstream adition of symbol versioning ------------------------------------------------------------------- Thu Sep 11 18:33:56 UTC 2014 - jengelh@inai.de