1
0
forked from pool/libxkbcommon

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
This commit is contained in:
Jan Engelhardt 2014-03-08 18:55:50 +00:00 committed by Git OBS Bridge
parent eb238aa032
commit 4d1405b680
5 changed files with 86 additions and 7 deletions

View File

@ -1,4 +1,7 @@
libxkbcommon0
libxkbcommon-x11-0
libxkbcommon-devel
requires -libxkbcommon-<targettype>
requires "libxkbcommon0-<targettype> = <version>"
libxkbcommon-x11-devel
requires "libxkbcommon-x11-0-<targettype> = <version>"

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:866c0df88f806dff8fc859b6f082cf9f8b6c3b549f0a367541e12b1ca28a5d65
size 618696

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2dc018e830d1befaf4822615204138318da3fff0112f78f3a7c638fa617375b8
size 546180

View File

@ -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

View File

@ -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