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

(Portage version: 2.2_rc46/cvs/Linux x86_64)

4 files changed, 57 insertions, 3 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/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"