diff options
author | Christian Hesse | 2018-05-09 23:49:12 +0200 |
---|---|---|
committer | Christian Hesse | 2018-05-09 23:49:12 +0200 |
commit | c47c349a54a3305e25126adfc345dd3ad92ab27b (patch) | |
tree | c40bde9f012984a024f05580f5562ecebe8c7238 | |
parent | dfea1b749579341b6a96f38c79b97c25c7b9d34b (diff) | |
download | aur-c47c349a54a3305e25126adfc345dd3ad92ab27b.tar.gz |
commit touchegg-qt5 1.1.1-3
-rw-r--r-- | .SRCINFO | 8 | ||||
-rw-r--r-- | 0001-qt5.patch | 36 | ||||
-rw-r--r-- | 0002-gcc-6.patch | 28 | ||||
-rw-r--r-- | PKGBUILD | 6 |
4 files changed, 70 insertions, 8 deletions
@@ -1,9 +1,7 @@ -# Generated by mksrcinfo v8 -# Mon Oct 10 07:55:11 UTC 2016 pkgbase = touchegg-qt5 pkgdesc = Multitouch gesture recognizer (built with qt5) pkgver = 1.1.1 - pkgrel = 2 + pkgrel = 3 url = https://github.com/JoseExposito/touchegg arch = i686 arch = x86_64 @@ -14,8 +12,8 @@ pkgbase = touchegg-qt5 provides = touchegg conflicts = touchegg source = touchegg-1.1.1.tar.gz::https://github.com/JoseExposito/touchegg/archive/1.1.1.tar.gz - source = 0001-qt5.patch::https://github.com/chrmod/touchegg/commit/e60ff96afe5ffb893803e26c598e7bc11d1e0c33.patch - source = 0002-gcc-6.patch::https://github.com/JoseExposito/touchegg/commit/0c7221a85b445e1bcbe8f1a4ab20c78c696924c6.patch + source = 0001-qt5.patch + source = 0002-gcc-6.patch sha256sums = daeca6063eeb9d3ee95803699665ce0b6f101bb3ce8421df2676744556c0b8c8 sha256sums = e8561682a4b64fea5a5e923788ae14ec7f8ad5b0ea03d053da27479f8a435de3 sha256sums = 9532341ce46d7ff241ea62ea9ce26317f5133cb0fc5ed618e3b78e4015a54d13 diff --git a/0001-qt5.patch b/0001-qt5.patch new file mode 100644 index 00000000000..5fa54b12107 --- /dev/null +++ b/0001-qt5.patch @@ -0,0 +1,36 @@ +From e60ff96afe5ffb893803e26c598e7bc11d1e0c33 Mon Sep 17 00:00:00 2001 +From: chrmod <krzysztof.modras@gmail.com> +Date: Sun, 31 Jan 2016 14:20:41 +0100 +Subject: [PATCH] Updating dependencies for QT 5.1 to compile on Ubuntu 15.10 + +--- + src/touchegg/util/Include.h | 3 ++- + touchegg.pro | 2 +- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/src/touchegg/util/Include.h b/src/touchegg/util/Include.h +index 4fb27d5..c0de1d5 100644 +--- a/src/touchegg/util/Include.h ++++ b/src/touchegg/util/Include.h +@@ -23,7 +23,8 @@ + // Qt + #include <QtCore> + #include <QtGui> +- #include <QtGui/QX11Info> ++ #include <QtWidgets> ++ #include <QX11Info> + #include <QtXml> + + // Xlib +diff --git a/touchegg.pro b/touchegg.pro +index 696ea1a..4565083 100644 +--- a/touchegg.pro ++++ b/touchegg.pro +@@ -1,6 +1,6 @@ + TEMPLATE = app + TARGET = touchegg +-QT += gui core xml ++QT += gui core xml widgets x11extras + LIBS += -lgeis -lX11 -lXtst -lXext + //DEFINES = QT_NO_DEBUG_OUTPUT + diff --git a/0002-gcc-6.patch b/0002-gcc-6.patch new file mode 100644 index 00000000000..0eab8d4bec7 --- /dev/null +++ b/0002-gcc-6.patch @@ -0,0 +1,28 @@ +From 0c7221a85b445e1bcbe8f1a4ab20c78c696924c6 Mon Sep 17 00:00:00 2001 +From: Christian Hesse <mail@eworm.de> +Date: Sat, 8 Oct 2016 00:25:31 +0200 +Subject: [PATCH] explicitly include cmath +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This fixes a compilation issue with gcc 6.x: + +error: call of overloaded ‘abs(float&)’ is ambiguous +--- + src/touchegg/gestures/factory/GestureFactory.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/touchegg/gestures/factory/GestureFactory.cpp b/src/touchegg/gestures/factory/GestureFactory.cpp +index 25f4df3..49a0573 100644 +--- a/src/touchegg/gestures/factory/GestureFactory.cpp ++++ b/src/touchegg/gestures/factory/GestureFactory.cpp +@@ -18,6 +18,8 @@ + * @author José Expósito <jose.exposito89@gmail.com> (C) 2011 - 2012 + * @class GestureFactory + */ ++ ++#include "cmath" + #include "GestureFactory.h" + + // ****************************************************************************************************************** // @@ -3,7 +3,7 @@ _pkgname=touchegg pkgname=${_pkgname}-qt5 pkgver=1.1.1 -pkgrel=2 +pkgrel=3 pkgdesc='Multitouch gesture recognizer (built with qt5)' arch=('i686' 'x86_64') provides=('touchegg') @@ -12,8 +12,8 @@ url='https://github.com/JoseExposito/touchegg' license=(GPL) depends=('qt5-x11extras' 'libxtst' 'geis') source=("${_pkgname}-${pkgver}.tar.gz::https://github.com/JoseExposito/${_pkgname}/archive/${pkgver}.tar.gz" - '0001-qt5.patch::https://github.com/chrmod/touchegg/commit/e60ff96afe5ffb893803e26c598e7bc11d1e0c33.patch' - '0002-gcc-6.patch::https://github.com/JoseExposito/touchegg/commit/0c7221a85b445e1bcbe8f1a4ab20c78c696924c6.patch') + '0001-qt5.patch' + '0002-gcc-6.patch') sha256sums=('daeca6063eeb9d3ee95803699665ce0b6f101bb3ce8421df2676744556c0b8c8' 'e8561682a4b64fea5a5e923788ae14ec7f8ad5b0ea03d053da27479f8a435de3' '9532341ce46d7ff241ea62ea9ce26317f5133cb0fc5ed618e3b78e4015a54d13') |