Hello community, here is the log from the commit of package x11-input-wacom for openSUSE:Factory checked in at Fri Jan 9 02:08:24 CET 2009. -------- --- x11-input-wacom/x11-input-wacom.changes 2008-11-03 17:24:27.000000000 +0100 +++ /mounts/work_src_done/STABLE/x11-input-wacom/x11-input-wacom.changes 2009-01-06 20:59:56.813122382 +0100 @@ -1,0 +2,7 @@ +Tue Jan 6 20:58:49 CET 2009 - sndirsch@suse.de + +- bug463512.diff + * fixes Xserver crash with Intuos tablet when terminating + Xserver regularly (bnc #463512) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- bug463512.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ x11-input-wacom.spec ++++++ --- /var/tmp/diff_new_pack.J21154/_old 2009-01-09 02:08:12.000000000 +0100 +++ /var/tmp/diff_new_pack.J21154/_new 2009-01-09 02:08:12.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package x11-input-wacom (Version 0.8.1) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 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 @@ -28,13 +28,14 @@ Url: http://linuxwacom.sourceforge.net/ Group: System/X11/Utilities Version: 0.8.1 -Release: 36 +Release: 37 Summary: X11 input module for wacom tablet Provides: xorg-x11-server:/usr/X11R6/%{_lib}/modules/input/wacom_drv.o Source: linuxwacom-%{version}-%{revision}.tar.bz2 #Source: linuxwacom-%{version}.tar.bz2 Source1: 65-wacom.rules Patch0: linuxwacom-20080901-fix-find_devices.diff +Patch1: bug463512.diff #BuildRoot: %{_tmppath}/%{name}-%{version}-%{revision}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build ExcludeArch: s390 s390x @@ -90,6 +91,9 @@ %setup -n linuxwacom-%{version}-%{revision} #%setup -n linuxwacom-%{version} %patch0 -p1 +pushd src/xdrv/ +%patch1 -p0 +popd %build export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" @@ -169,6 +173,10 @@ /usr/%_lib/libwacomcfg.so %changelog +* Tue Jan 06 2009 sndirsch@suse.de +- bug463512.diff + * fixes Xserver crash with Intuos tablet when terminating + Xserver regularly (bnc #463512) * Mon Nov 03 2008 sndirsch@suse.de - don't build on s390/s390x * Mon Sep 01 2008 dkukawka@suse.de @@ -182,7 +190,7 @@ - added new 65-wacom.rules which should setup the needed by-id links for the stylus and the touchscreen. We go better this way than patching the whole udev package. -* Mon Sep 01 2008 dkukawka@suse.de +* Sun Aug 31 2008 dkukawka@suse.de - updated to latest version 0.8.1-4: - Support Xorg 7.3 or newer in wacomcpl - Modified wacom_sys.c according to Bartosz Fabianowski's @@ -247,7 +255,7 @@ - fixed build on s390(x) * Tue Jun 10 2008 sndirsch@suse.de - fixed linuxwacom-fix-xsetwacom_find_devices.diff (bnc #399016) -* Sat May 17 2008 sndirsch@suse.de +* Fri May 16 2008 sndirsch@suse.de - back to release 0.7.9-4 (bnc #391466) * Thu May 15 2008 sndirsch@suse.de - update to release 0.8.0-2 @@ -442,7 +450,7 @@ * linuxwacom-devel --> x11-input-wacom-devel * Wed May 04 2005 sndirsch@suse.de - fixed build on s390/s390x -* Wed May 04 2005 sndirsch@suse.de +* Tue May 03 2005 sndirsch@suse.de - build wacom Xinput driver as well (was in xorg-x11-server before) * Wed Mar 09 2005 dkukawka@suse.de - fixed bug with /usr/bin/xsetwacom , added needed libs ++++++ bug463512.diff ++++++ --- wcmConfig.c 2008/08/31 20:23:19 1.33 +++ wcmConfig.c 2008/10/08 23:22:20 1.34 @@ -378,7 +378,7 @@ DBG(1, priv->debugLevel, ErrorF("xf86WcmUninit\n")); -#ifndef WCM_UNINIT_CALLED +#ifndef WCM_XORG_XSERVER_1_4 gWacomModule.DevProc(local->dev, DEVICE_OFF); #endif --- xf86Wacom.c 2008/10/23 22:00:49 1.47 +++ xf86Wacom.c 2008/12/02 00:27:48 1.48 @@ -531,8 +532,14 @@ nbaxes = priv->naxes; /* X, Y, Pressure, Tilt-X, Tilt-Y, Wheel */ nbbuttons = priv->nbuttons; /* Use actual number of buttons, if possible */ - nbkeys = nbbuttons; /* Same number of keys since any button may be */ - /* configured as an either mouse button or key */ + nbkeys = nbbuttons; /* Same number of keys since any button may be + * configured as an either mouse button or key */ + + if (!nbbuttons) + nbbuttons = nbkeys = 1; /* Xserver 1.5 or later crashes when + * nbbuttons = 0 while sending a beep + * This is only a workaround. + */ DBG(10, priv->debugLevel, ErrorF("xf86WcmRegisterX11Devices " "(%s) %d buttons, %d keys, %d axes\n", @@ -757,7 +764,7 @@ ErrorF("%s waiting 100 msec (total %dms) for device to become ready\n", local->name, wait); usleep(100*1000); } - ErrorF("%s no synaptics event device found (checked %d nodes, waited %d msec)\n", + ErrorF("%s no Wacom event device found (checked %d nodes, waited %d msec)\n", local->name, i + 1, wait); return FALSE; } --- wcmConfig.c.orig 2009-01-06 20:50:49.500785990 +0100 +++ wcmConfig.c 2009-01-06 20:54:00.313270700 +0100 @@ -387,6 +387,7 @@ xfree(priv->pPressCurve); xfree(priv); + local->private = NULL; xf86DeleteInput(local, 0); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org