Hello community, here is the log from the commit of package libxklavier checked in at Fri Jun 9 23:28:15 CEST 2006. -------- --- GNOME/libxklavier/libxklavier.changes 2006-03-23 19:10:25.000000000 +0100 +++ libxklavier/libxklavier.changes 2006-06-09 14:28:00.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Jun 9 14:26:41 CEST 2006 - danw@suse.de + +- Fix two weird NULL->int casts with a patch from libxklavier HEAD + to fix the beta build. + +------------------------------------------------------------------- New: ---- libxklavier-bad-cast.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libxklavier.spec ++++++ --- /var/tmp/diff_new_pack.7OXmPO/_old 2006-06-09 23:28:10.000000000 +0200 +++ /var/tmp/diff_new_pack.7OXmPO/_new 2006-06-09 23:28:10.000000000 +0200 @@ -16,10 +16,11 @@ Group: Development/Libraries/X11 Autoreqprov: on Version: 2.1 -Release: 9 +Release: 17 Summary: Library with X Keyboard Related Functions Source: %{name}-%{version}.tar.bz2 Patch: %{name}-xerror-trap.patch +Patch1: %{name}-bad-cast.patch URL: http://www.freedesktop.org/Software/LibXklavier BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -51,6 +52,7 @@ %prep %setup -q %patch +%patch1 %build autoreconf --force --install @@ -92,6 +94,9 @@ %{_prefix}/include/* %changelog -n libxklavier +* Fri Jun 09 2006 - danw@suse.de +- Fix two weird NULL->int casts with a patch from libxklavier HEAD + to fix the beta build. * Thu Mar 23 2006 - danw@suse.de - trap X errors when setting the keyboard map, to protect against bad data from callers or other packages (eg, xkeyboard-config, which ++++++ libxklavier-bad-cast.patch ++++++ --- libxklavier/xklavier.c +++ libxklavier/xklavier.c @@ -287,7 +287,7 @@ keycode, keyName, modifiers ); } - if( ( KeyCode ) NULL == keycode ) + if( 0 == keycode ) return False; _xklLastErrorCode = Success; @@ -308,7 +308,7 @@ Bool XklUngrabKey( int keycode, unsigned modifiers ) { - if( ( KeyCode ) NULL == keycode ) + if( 0 == keycode ) return False; return Success == XUngrabKey( _xklDpy, keycode, 0, _xklRootWindow ); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit-help@opensuse.org