Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=b252d378f2160020cc01e8ff029ca05c81a802ed
commit b252d378f2160020cc01e8ff029ca05c81a802ed Author: Krisztian VASAS <[email protected]> Date: Thu Jan 1 00:42:39 2009 +0100 xf86-input-mouse-1.3.0-1-i686 - added some compile fixes diff --git a/source/x11/xf86-input-mouse/mouse.c.patch1 b/source/x11/xf86-input-mouse/mouse.c.patch1 new file mode 100644 index 0000000..890af35 --- /dev/null +++ b/source/x11/xf86-input-mouse/mouse.c.patch1 @@ -0,0 +1,88 @@ +--- xserver-xorg-input-mouse-1.3.0.orig/src/mouse.c ++++ xserver-xorg-input-mouse-1.3.0/src/mouse.c +@@ -1,5 +1,3 @@ +-/* $XdotOrg: driver/xf86-input-mouse/src/mouse.c,v 1.29 2006/04/21 11:15:23 mhopf Exp $ */ +-/* $XFree86: xc/programs/Xserver/hw/xfree86/input/mouse/mouse.c,v 1.79 2003/11/03 05:11:48 tsi Exp $ */ + /* + * + * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany. +@@ -802,8 +800,8 @@ + pMse->resolution); + } + +- if (mPriv->sensitivity +- = xf86SetRealOption(pInfo->options, "Sensitivity", 1.0)) { ++ if ((mPriv->sensitivity ++ = xf86SetRealOption(pInfo->options, "Sensitivity", 1.0))) { + xf86Msg(X_CONFIG, "%s: Sensitivity: %g\n", pInfo->name, + mPriv->sensitivity); + } +@@ -874,7 +872,7 @@ + } + } + +-const char * ++_X_EXPORT const char * + xf86MouseProtocolIDToName(MouseProtocolID id) + { + return ProtocolIDToName(id); +@@ -1062,7 +1060,7 @@ + if (osInfo->CheckProtocol + && osInfo->CheckProtocol(protocol)) { + if (!xf86CheckStrOption(dev->commonOptions, "Device", NULL) && +- HAVE_FIND_DEVICE && osInfo->FindDevice) { ++ osInfo->FindDevice) { + xf86Msg(X_WARNING, "%s: No Device specified, " + "looking for one...\n", pInfo->name); + if (!osInfo->FindDevice(pInfo, protocol, 0)) { +@@ -1093,7 +1091,7 @@ + } while (!detected); + + if (!xf86CheckStrOption(dev->commonOptions, "Device", NULL) && +- HAVE_FIND_DEVICE && osInfo->FindDevice) { ++ osInfo->FindDevice) { + xf86Msg(X_WARNING, "%s: No Device specified, looking for one...\n", + pInfo->name); + if (!osInfo->FindDevice(pInfo, protocol, 0)) { +@@ -1728,7 +1726,7 @@ + min(pMse->buttons, MSE_MAXBUTTONS), + #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0 + miPointerGetMotionEvents, +-#else ++#elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3 + GetMotionHistory, + #endif + pMse->Ctrl, +@@ -1860,8 +1858,6 @@ + static void + FlushButtons(MouseDevPtr pMse) + { +- int i, blocked; +- + pMse->lastButtons = 0; + pMse->lastMappedButtons = 0; + } +@@ -3217,7 +3213,7 @@ + pInfo->name, name); + } + } +- if (!name && HAVE_GUESS_PROTOCOL && osInfo->GuessProtocol) { ++ if (!name && osInfo->GuessProtocol) { + name = osInfo->GuessProtocol(pInfo, 0); + if (name) + protocolID = ProtocolNameToID(name); +@@ -3781,13 +3777,8 @@ + { + static Bool Initialised = FALSE; + +- if (!Initialised) { ++ if (!Initialised) + Initialised = TRUE; +-#ifndef REMOVE_LOADER_CHECK_MODULE_INFO +- if (xf86LoaderCheckSymbol("xf86AddModuleInfo")) +-#endif +- xf86AddModuleInfo(&MouseInfo, module); +- } + + xf86AddInputDriver(&MOUSE, module, 0); + diff --git a/source/x11/xf86-input-mouse/mouse.h.patch1 b/source/x11/xf86-input-mouse/mouse.h.patch1 new file mode 100644 index 0000000..e5fe04d --- /dev/null +++ b/source/x11/xf86-input-mouse/mouse.h.patch1 @@ -0,0 +1,17 @@ +--- xserver-xorg-input-mouse-1.3.0.orig/src/mouse.h ++++ xserver-xorg-input-mouse-1.3.0/src/mouse.h +@@ -1,5 +1,3 @@ +-/* $XFree86: xc/programs/Xserver/hw/xfree86/input/mouse/mouse.h,v 1.13 2003/11/03 05:11:49 tsi Exp $ */ +- + /* + * Copyright (c) 1997-1999 by The XFree86 Project, Inc. + */ +@@ -9,7 +7,7 @@ + + #include "xf86OSmouse.h" + +-const char * xf86MouseProtocolIDToName(MouseProtocolID id); ++_X_EXPORT const char * xf86MouseProtocolIDToName(MouseProtocolID id); + MouseProtocolID xf86MouseProtocolNameToID(const char *name); + + #endif _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
