Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=d2097425e26272ae6669bbf1cc6cf63bcc2d6297
commit d2097425e26272ae6669bbf1cc6cf63bcc2d6297 Author: Krisztian VASAS <[email protected]> Date: Thu Jan 1 19:52:43 2009 +0100 xf86-input-magellan-1.2.0-1-i686 - version bump - added compile fixes diff --git a/source/x11/xf86-input-magellan/01-fix_xinput_abi_version.patch1 b/source/x11/xf86-input-magellan/01-fix_xinput_abi_version.patch1 new file mode 100644 index 0000000..f881397 --- /dev/null +++ b/source/x11/xf86-input-magellan/01-fix_xinput_abi_version.patch1 @@ -0,0 +1,26 @@ +diff --git a/src/magellan.c b/src/magellan.c +index fedb01b..0a84ea7 100644 +--- a/src/magellan.c ++++ b/src/magellan.c +@@ -122,7 +122,9 @@ static const char *reqSymbols[] = { + "xf86CollectInputOptions", + "xf86ErrorFVerb", + "xf86FindOptionValue", ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3 + "xf86GetMotionEvents", ++#endif + "xf86GetVerbosity", + "xf86MotionHistoryAllocate", + "xf86NameCmp", +@@ -366,7 +368,10 @@ DeviceInit (DeviceIntPtr dev) + return !Success; + } + +- if (InitValuatorClassDeviceStruct (dev, 6, xf86GetMotionEvents, ++ if (InitValuatorClassDeviceStruct (dev, 6, ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3 ++ xf86GetMotionEvents, ++#endif + pInfo->history_size, Absolute) == FALSE) + { + ErrorF ("Unable to allocate MAGELLAN ValuatorClassDeviceStruct\n"); diff --git a/source/x11/xf86-input-magellan/02-dont_redefine_need_xf86_types.patch1 b/source/x11/xf86-input-magellan/02-dont_redefine_need_xf86_types.patch1 new file mode 100644 index 0000000..984ed63 --- /dev/null +++ b/source/x11/xf86-input-magellan/02-dont_redefine_need_xf86_types.patch1 @@ -0,0 +1,15 @@ +diff --git a/src/magellan.c b/src/magellan.c +index b27d595..fedb01b 100644 +--- a/src/magellan.c ++++ b/src/magellan.c +@@ -45,7 +45,9 @@ + + #include <misc.h> + #include <xf86.h> +-#define NEED_XF86_TYPES ++#ifndef NEED_XF86_TYPES ++#define NEED_XF86_TYPES 1 ++#endif + #include <xf86_OSproc.h> + #include <xf86Xinput.h> + #include <xisb.h> diff --git a/source/x11/xf86-input-magellan/FrugalBuild b/source/x11/xf86-input-magellan/FrugalBuild index 0d71eff..8564d7e 100644 --- a/source/x11/xf86-input-magellan/FrugalBuild +++ b/source/x11/xf86-input-magellan/FrugalBuild @@ -2,8 +2,13 @@ # Maintainer: Christian Hamar alias krix <[email protected]> pkgname=xf86-input-magellan -pkgver=1.1.1 +pkgver=1.2.0 Finclude xorg -sha1sums=('07ae701187b21798eca2198677a217ae3e8b6489') +source=(${sour...@]} \ + '01-fix_xinput_abi_version.patch1' \ + '02-dont_redefine_need_xf86_types.patch1') +sha1sums=('fa5eb4e02991b7052026ad715452f9f4e374d291' \ + '7157fd661084b832bcb244c0455a793c1ad887ae' \ + '3eb62ef66db43c52ba09bcfa79a6a3046c461d22') # optimization OK _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
