diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2009-10-30 19:42:12 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2009-10-30 19:42:12 +0000 |
commit | 5e09acd92a1129d9a6cef3fe01e88992aa57948d (patch) | |
tree | 2b275d69aa844eb95fbfc3ebc7a91b11f3cb3b8c /kde-misc/synaptiks/files | |
parent | amd64/x86 stable, bug #290804 (diff) | |
download | gentoo-2-5e09acd92a1129d9a6cef3fe01e88992aa57948d.tar.gz gentoo-2-5e09acd92a1129d9a6cef3fe01e88992aa57948d.tar.bz2 gentoo-2-5e09acd92a1129d9a6cef3fe01e88992aa57948d.zip |
Port to libXi >= 1.3 wrt #291181, thanks to DaggyStyle for reporting.
(Portage version: 2.2_rc46/cvs/Linux x86_64)
Diffstat (limited to 'kde-misc/synaptiks/files')
-rw-r--r-- | kde-misc/synaptiks/files/synaptiks-0.1.0-Xi.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/kde-misc/synaptiks/files/synaptiks-0.1.0-Xi.patch b/kde-misc/synaptiks/files/synaptiks-0.1.0-Xi.patch new file mode 100644 index 000000000000..c7c8438ecaa9 --- /dev/null +++ b/kde-misc/synaptiks/files/synaptiks-0.1.0-Xi.patch @@ -0,0 +1,26 @@ +diff -ur synaptiks-0.1.0.orig/src/qxdevice.cpp synaptiks-0.1.0/src/qxdevice.cpp +--- synaptiks-0.1.0.orig/src/qxdevice.cpp 2009-10-24 13:58:16.000000000 +0300 ++++ synaptiks-0.1.0/src/qxdevice.cpp 2009-10-30 22:38:47.000000000 +0200 +@@ -30,6 +30,7 @@ + + #include "qxdevice.h" + #include "qxinput.h" ++#include <QtCore/QPair> + #include <QtCore/QSharedPointer> + #include <QtCore/QtDebug> + #include <QtGui/QX11Info> +@@ -63,9 +64,10 @@ + static inline bool haveXInputProperties() { + QSharedPointer<XExtensionVersion> version( + QX11::GetExtensionVersion("XInputExtension"), XFree); +- return version->present && +- (version->major_version >= XI_Add_DeviceProperties_Major) && +- (version->minor_version >= XI_Add_DeviceProperties_Minor); ++ QPair<int, int> current(version->major_version, version->minor_version); ++ QPair<int, int> required(XI_Add_DeviceProperties_Major, ++ XI_Add_DeviceProperties_Minor); ++ return version->present && (current >= required); + } + + +Only in synaptiks-0.1.0/src: qxdevice.cpp.orig |