Gentoo Archives: gentoo-commits

From: "Samuli Suominen (ssuominen)" <ssuominen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in kde-misc/synaptiks/files: synaptiks-0.1.0-Xi.patch
Date: Fri, 30 Oct 2009 19:42:14
Message-Id: E1N3xMS-0003Am-Dn@stork.gentoo.org
1 ssuominen 09/10/30 19:42:12
2
3 Added: synaptiks-0.1.0-Xi.patch
4 Log:
5 Port to libXi >= 1.3 wrt #291181, thanks to DaggyStyle for reporting.
6 (Portage version: 2.2_rc46/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.1 kde-misc/synaptiks/files/synaptiks-0.1.0-Xi.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-misc/synaptiks/files/synaptiks-0.1.0-Xi.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-misc/synaptiks/files/synaptiks-0.1.0-Xi.patch?rev=1.1&content-type=text/plain
13
14 Index: synaptiks-0.1.0-Xi.patch
15 ===================================================================
16 diff -ur synaptiks-0.1.0.orig/src/qxdevice.cpp synaptiks-0.1.0/src/qxdevice.cpp
17 --- synaptiks-0.1.0.orig/src/qxdevice.cpp 2009-10-24 13:58:16.000000000 +0300
18 +++ synaptiks-0.1.0/src/qxdevice.cpp 2009-10-30 22:38:47.000000000 +0200
19 @@ -30,6 +30,7 @@
20
21 #include "qxdevice.h"
22 #include "qxinput.h"
23 +#include <QtCore/QPair>
24 #include <QtCore/QSharedPointer>
25 #include <QtCore/QtDebug>
26 #include <QtGui/QX11Info>
27 @@ -63,9 +64,10 @@
28 static inline bool haveXInputProperties() {
29 QSharedPointer<XExtensionVersion> version(
30 QX11::GetExtensionVersion("XInputExtension"), XFree);
31 - return version->present &&
32 - (version->major_version >= XI_Add_DeviceProperties_Major) &&
33 - (version->minor_version >= XI_Add_DeviceProperties_Minor);
34 + QPair<int, int> current(version->major_version, version->minor_version);
35 + QPair<int, int> required(XI_Add_DeviceProperties_Major,
36 + XI_Add_DeviceProperties_Minor);
37 + return version->present && (current >= required);
38 }
39
40
41 Only in synaptiks-0.1.0/src: qxdevice.cpp.orig