Update to 5.3
- Drop flags.patch and catch-more-xerrors.patch: applied upstream
This commit is contained in:
parent
26efaf9a7f
commit
76ebcffd82
1
.gitignore
vendored
1
.gitignore
vendored
@ -2,3 +2,4 @@ libxklavier-5.0.tar.bz2
|
|||||||
/libxklavier-5.1.tar.bz2
|
/libxklavier-5.1.tar.bz2
|
||||||
/libxklavier-5.2.tar.xz
|
/libxklavier-5.2.tar.xz
|
||||||
/libxklavier-5.2.1.tar.xz
|
/libxklavier-5.2.1.tar.xz
|
||||||
|
/libxklavier-5.3.tar.xz
|
||||||
|
@ -1,11 +0,0 @@
|
|||||||
diff -up libxklavier-4.0/libxklavier/xklavier_evt.c.xerrors libxklavier-4.0/libxklavier/xklavier_evt.c
|
|
||||||
--- libxklavier-4.0/libxklavier/xklavier_evt.c.xerrors 2009-12-10 00:50:24.786868859 -0500
|
|
||||||
+++ libxklavier-4.0/libxklavier/xklavier_evt.c 2009-12-10 00:51:23.563118385 -0500
|
|
||||||
@@ -508,6 +508,7 @@ xkl_process_error(Display * dpy, XErrorE
|
|
||||||
case BadAccess:
|
|
||||||
case BadDrawable:
|
|
||||||
case BadWindow:
|
|
||||||
+ case BadMatch:
|
|
||||||
{
|
|
||||||
XGetErrorText(evt->display, evt->error_code, buf,
|
|
||||||
sizeof(buf));
|
|
12
flags.patch
12
flags.patch
@ -1,12 +0,0 @@
|
|||||||
diff -up libxklavier-5.0/libxklavier/xkl_engine.h.flags libxklavier-5.0/libxklavier/xkl_engine.h
|
|
||||||
--- libxklavier-5.0/libxklavier/xkl_engine.h.flags 2010-01-16 22:13:38.250606995 -0500
|
|
||||||
+++ libxklavier-5.0/libxklavier/xkl_engine.h 2010-01-16 22:13:49.852829286 -0500
|
|
||||||
@@ -59,7 +59,7 @@ extern "C" {
|
|
||||||
* xkl_start_listen(engine,XKLL_MANAGE_LAYOUTS);
|
|
||||||
* @XKLF_DEVICE_DISCOVERY: Backend supports device discovery, can notify
|
|
||||||
*/
|
|
||||||
- typedef enum {
|
|
||||||
+ typedef enum { /*< flags >*/
|
|
||||||
XKLF_CAN_TOGGLE_INDICATORS = 1 << 0,
|
|
||||||
XKLF_CAN_OUTPUT_CONFIG_AS_ASCII = 1 << 1,
|
|
||||||
XKLF_CAN_OUTPUT_CONFIG_AS_BINARY = 1 << 2,
|
|
@ -1,7 +1,7 @@
|
|||||||
Summary: High-level API for X Keyboard Extension
|
Summary: High-level API for X Keyboard Extension
|
||||||
Name: libxklavier
|
Name: libxklavier
|
||||||
Version: 5.2.1
|
Version: 5.3
|
||||||
Release: 3%{?dist}
|
Release: 1%{?dist}
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
URL: http://www.freedesktop.org/wiki/Software/LibXklavier
|
URL: http://www.freedesktop.org/wiki/Software/LibXklavier
|
||||||
@ -14,10 +14,7 @@ BuildRequires: glib2-devel >= 2.6.0
|
|||||||
BuildRequires: iso-codes-devel
|
BuildRequires: iso-codes-devel
|
||||||
BuildRequires: gobject-introspection-devel
|
BuildRequires: gobject-introspection-devel
|
||||||
Requires: iso-codes
|
Requires: iso-codes
|
||||||
Source: http://download.gnome.org/sources/libxklavier/5.2/%{name}-%{version}.tar.xz
|
Source: http://download.gnome.org/sources/libxklavier/5.3/%{name}-%{version}.tar.xz
|
||||||
# http://bugs.freedesktop.org/show_bug.cgi?id=22687
|
|
||||||
Patch0: flags.patch
|
|
||||||
Patch2: catch-more-xerrors.patch
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
libxklavier is a library providing a high-level API for the X Keyboard
|
libxklavier is a library providing a high-level API for the X Keyboard
|
||||||
@ -37,11 +34,8 @@ needed to develop libxklavier applications.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch0 -p1 -b .flags
|
|
||||||
%patch2 -p1 -b .catch-more-xerrors
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
|
||||||
%configure \
|
%configure \
|
||||||
--disable-static \
|
--disable-static \
|
||||||
--with-xkb-base='%{_datadir}/X11/xkb' \
|
--with-xkb-base='%{_datadir}/X11/xkb' \
|
||||||
@ -60,16 +54,12 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la}
|
|||||||
%postun -p /sbin/ldconfig
|
%postun -p /sbin/ldconfig
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%defattr(-, root, root)
|
|
||||||
|
|
||||||
%doc AUTHORS NEWS README COPYING.LIB
|
%doc AUTHORS NEWS README COPYING.LIB
|
||||||
%{_libdir}/libxklavier.so.16*
|
%{_libdir}/libxklavier.so.16*
|
||||||
%dir %{_libdir}/girepository-1.0
|
%dir %{_libdir}/girepository-1.0
|
||||||
%{_libdir}/girepository-1.0/Xkl-1.0.typelib
|
%{_libdir}/girepository-1.0/Xkl-1.0.typelib
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
%defattr(-, root, root)
|
|
||||||
|
|
||||||
%{_libdir}/pkgconfig/libxklavier.pc
|
%{_libdir}/pkgconfig/libxklavier.pc
|
||||||
%{_libdir}/libxklavier.so
|
%{_libdir}/libxklavier.so
|
||||||
%{_includedir}/libxklavier/
|
%{_includedir}/libxklavier/
|
||||||
@ -78,6 +68,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la}
|
|||||||
%{_datadir}/gir-1.0/Xkl-1.0.gir
|
%{_datadir}/gir-1.0/Xkl-1.0.gir
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sun Sep 23 2012 Kalev Lember <kalevlember@gmail.com> - 5.3-1
|
||||||
|
- Update to 5.3
|
||||||
|
- Drop flags.patch and catch-more-xerrors.patch: applied upstream
|
||||||
|
|
||||||
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.2.1-3
|
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.2.1-3
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user