Author: megabajt Date: Sat Sep 26 13:54:15 2009 GMT Module: packages Tag: HEAD ---- Log message: - merged from DEVEL
---- Files affected: packages/libxklavier: libxklavier.spec (1.48 -> 1.49) , libxklavier-enumeration.patch (1.1 -> 1.2) ---- Diffs: ================================================================ Index: packages/libxklavier/libxklavier.spec diff -u packages/libxklavier/libxklavier.spec:1.48 packages/libxklavier/libxklavier.spec:1.49 --- packages/libxklavier/libxklavier.spec:1.48 Wed Jun 17 21:33:03 2009 +++ packages/libxklavier/libxklavier.spec Sat Sep 26 15:54:09 2009 @@ -6,12 +6,13 @@ Summary: libxklavier library Summary(pl.UTF-8): Biblioteka libxklavier Name: libxklavier -Version: 3.9 +Version: 4.0 Release: 2 License: LGPL v2+ Group: X11/Libraries -Source0: http://ftp.gnome.org/pub/GNOME/sources/libxklavier/3.9/%{name}-%{version}.tar.bz2 -# Source0-md5: c8ff3ba6daf899be7ec2a626894852b9 +Source0: http://ftp.gnome.org/pub/GNOME/sources/libxklavier/4.0/%{name}-%{version}.tar.bz2 +# Source0-md5: 1b714ba04835fb49511f9e1444a5ea4c +Patch0: %{name}-enumeration.patch URL: http://www.freedesktop.org/Software/LibXklavier BuildRequires: autoconf >= 2.59 BuildRequires: automake >= 1:1.10 @@ -72,6 +73,7 @@ %prep %setup -q +%patch0 -p0 %build %{__libtoolize} @@ -104,7 +106,7 @@ %defattr(644,root,root,755) %doc AUTHORS CREDITS ChangeLog NEWS README %attr(755,root,root) %{_libdir}/libxklavier.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libxklavier.so.12 +%attr(755,root,root) %ghost %{_libdir}/libxklavier.so.15 %files devel %defattr(644,root,root,755) @@ -129,6 +131,16 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.49 2009/09/26 13:54:09 megabajt +- merged from DEVEL + +Revision 1.48.2.2 2009/08/20 10:42:38 patrys +- fix enumeration not to crash gdm +- rel 2 + +Revision 1.48.2.1 2009/06/29 20:38:24 patrys +- 0.4 + Revision 1.48 2009/06/17 19:33:03 hawk - release 2 ================================================================ Index: packages/libxklavier/libxklavier-enumeration.patch diff -u /dev/null packages/libxklavier/libxklavier-enumeration.patch:1.2 --- /dev/null Sat Sep 26 15:54:15 2009 +++ packages/libxklavier/libxklavier-enumeration.patch Sat Sep 26 15:54:10 2009 @@ -0,0 +1,22 @@ +--- libxklavier/xkl_engine.h 2009/06/28 21:41:15 1.8 ++++ libxklavier/xkl_engine.h 2009/07/02 21:07:46 1.9 +@@ -60,12 +60,12 @@ + * @XKLF_DEVICE_DISCOVERY: Backend supports device discovery, can notify + */ + typedef enum { +- XKLF_CAN_TOGGLE_INDICATORS = 0x01, +- XKLF_CAN_OUTPUT_CONFIG_AS_ASCII = 0x02, +- XKLF_CAN_OUTPUT_CONFIG_AS_BINARY = 0x04, +- XKLF_MULTIPLE_LAYOUTS_SUPPORTED = 0x08, +- XKLF_REQUIRES_MANUAL_LAYOUT_MANAGEMENT = 0x10, +- XKLF_DEVICE_DISCOVERY = 0x20 ++ XKLF_CAN_TOGGLE_INDICATORS = 1 << 0, ++ XKLF_CAN_OUTPUT_CONFIG_AS_ASCII = 1 << 1, ++ XKLF_CAN_OUTPUT_CONFIG_AS_BINARY = 1 << 2, ++ XKLF_MULTIPLE_LAYOUTS_SUPPORTED = 1 << 3, ++ XKLF_REQUIRES_MANUAL_LAYOUT_MANAGEMENT = 1 << 4, ++ XKLF_DEVICE_DISCOVERY = 1 << 5 + } XklEngineFeatures; + + /** + ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libxklavier/libxklavier.spec?r1=1.48&r2=1.49&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libxklavier/libxklavier-enumeration.patch?r1=1.1&r2=1.2&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
