Port to libXi >= 1.3 wrt #291181, thanks to DaggyStyle for reporting.

Package-Manager: portage-2.2_rc46/cvs/Linux x86_64

5 files changed, 61 insertions, 5 deletions

diff --git a/kde-misc/synaptiks/ChangeLog b/kde-misc/synaptiks/ChangeLog
index 26ec9e8e215d..8479e9d6d4a2 100644
--- a/kde-misc/synaptiks/ChangeLog
+++ b/kde-misc/synaptiks/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-misc/synaptiks
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/synaptiks/ChangeLog,v 1.1 2009/10/28 09:05:22 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/synaptiks/ChangeLog,v 1.2 2009/10/30 19:42:10 ssuominen Exp $
+
+*synaptiks-0.1.0-r1 (30 Oct 2009)
+
+  30 Oct 2009; Samuli Suominen <ssuominen@gentoo.org>
+  +synaptiks-0.1.0-r1.ebuild, +files/synaptiks-0.1.0-Xi.patch:
+  Port to libXi >= 1.3 wrt #291181, thanks to DaggyStyle for reporting.
 
 *synaptiks-0.1.0 (28 Oct 2009)
 
diff --git a/kde-misc/synaptiks/Manifest b/kde-misc/synaptiks/Manifest
index 85fccbbd028f..32485a0ed410 100644
--- a/kde-misc/synaptiks/Manifest
+++ b/kde-misc/synaptiks/Manifest
@@ -1,4 +1,6 @@
+AUX synaptiks-0.1.0-Xi.patch 1064 RMD160 b3291a51311bce93913b10b00c052d780beb728e SHA1 1d20574a30c6d91ff450c703c9c3ca0e9137cc80 SHA256 f55f72de82c14c64fea4eb22fd35705653c707537e2b87f694ef8cde894a019c
 DIST synaptiks-0.1.0.tar.bz2 146791 RMD160 8bd7c30f4beb50e5f3496766ff9ed6900e8fbbb9 SHA1 f4a0e839893d7ca5156e5f3a96c583d625c83cb4 SHA256 94793ea9e5a0a617d221b34229f77f9dee6cd9a9cbea22a39491e1ad56743cca
-EBUILD synaptiks-0.1.0.ebuild 578 RMD160 53380f11dae46adc32f626df56e0111a154b51e7 SHA1 3537a93de827808238d7b2074a1539acbc7e5644 SHA256 da262ea67f1d6c20b0e6cf9d29f403c67216c7d0383cab0bf7c6983a240351c6
-MISC ChangeLog 381 RMD160 4382c702ec9fff1002a478e0a08ec1369ecd3f50 SHA1 08793eea87fa2e806fd23b7ef45ee080c9380d88 SHA256 867fb356eb3a649fa2f16ef6a6da2d611fa43bded95990277de5f6433fec31d4
+EBUILD synaptiks-0.1.0-r1.ebuild 628 RMD160 995d6b470cf5e2ee8daeb8072c8f013aed2a4ffc SHA1 7e418565720bc54adee070af815e76ec28188681 SHA256 fafd8421ce699fddcbaa4c0c92a8346327cb4516fe1e7bf560fd3968a6c08544
+EBUILD synaptiks-0.1.0.ebuild 583 RMD160 4fd85efbdec8fef34ebcdc5fad7b624e05baf689 SHA1 50ca6c95c8110b59c41594db4553ce95684086b1 SHA256 af636de82ddb69df53c34e413883f2cace8a4b94a78996dfe072592d7fa56f17
+MISC ChangeLog 606 RMD160 32191adfac6c8c5f165c597363962a1316d2bd44 SHA1 39ee20c360ca94ec6bc73fc7ced400b0f3f26662 SHA256 a405bafb656f0172c68f83c3f4f81dc5801387a2b355ba52be6d7e088594631b
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
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
diff --git a/kde-misc/synaptiks/synaptiks-0.1.0-r1.ebuild b/kde-misc/synaptiks/synaptiks-0.1.0-r1.ebuild
new file mode 100644
index 000000000000..17990db02ed3
--- /dev/null
+++ b/kde-misc/synaptiks/synaptiks-0.1.0-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/synaptiks/synaptiks-0.1.0-r1.ebuild,v 1.1 2009/10/30 19:42:10 ssuominen Exp $
+
+EAPI=2
+KDE_LINGUAS="de en_GB"
+inherit kde4-base
+
+DESCRIPTION="a touchpad management tool for KDE"
+HOMEPAGE="http://www.kde-apps.org/content/show.php/synaptiks?content=114270"
+SRC_URI="http://bitbucket.org/lunar/${PN}/downloads/${P}.tar.bz2"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+DEPEND=">=x11-libs/libXi-1.3"
+
+PATCHES=( "${FILESDIR}/${P}-Xi.patch" )
+
+DOCS="CHANGES README"
diff --git a/kde-misc/synaptiks/synaptiks-0.1.0.ebuild b/kde-misc/synaptiks/synaptiks-0.1.0.ebuild
index d1f689f18124..fd380419748a 100644
--- a/kde-misc/synaptiks/synaptiks-0.1.0.ebuild
+++ b/kde-misc/synaptiks/synaptiks-0.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/synaptiks/synaptiks-0.1.0.ebuild,v 1.1 2009/10/28 09:05:22 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/synaptiks/synaptiks-0.1.0.ebuild,v 1.2 2009/10/30 19:42:10 ssuominen Exp $
 
 EAPI=2
 KDE_LINGUAS="de en_GB"
@@ -15,6 +15,6 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
-DEPEND="x11-libs/libXi"
+DEPEND="<x11-libs/libXi-1.3"
 
 DOCS="CHANGES README"