summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Hesse2016-10-08 00:43:07 +0200
committerChristian Hesse2016-10-08 00:43:07 +0200
commitc4cfb0c489843eaca2ac9dc023b17e4292a8c3a8 (patch)
tree15af9296a608fa15b2d0369c9d0cd4dc7224405b
parent561d4c17807d2dc5121f7ffe713cd79e57e187eb (diff)
downloadaur-c4cfb0c489843eaca2ac9dc023b17e4292a8c3a8.tar.gz
commit touchegg-qt5 1.1.1-2
-rw-r--r--.SRCINFO14
-rw-r--r--PKGBUILD32
2 files changed, 26 insertions, 20 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b5e3b3cae98..edae277f10d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,10 @@
# Generated by mksrcinfo v8
-# Mon Apr 11 14:41:00 UTC 2016
+# Fri Oct 7 22:43:07 UTC 2016
pkgbase = touchegg-qt5
pkgdesc = Multitouch gesture recognizer (built with qt5)
pkgver = 1.1.1
- pkgrel = 1
- url = https://code.google.com/p/touchegg/
+ pkgrel = 2
+ url = https://github.com/JoseExposito/touchegg
arch = i686
arch = x86_64
license = GPL
@@ -13,10 +13,12 @@ pkgbase = touchegg-qt5
depends = geis
provides = touchegg
conflicts = touchegg
- source = http://touchegg.googlecode.com/files/touchegg-1.1.1.tar.gz
- source = qt5.patch
- sha256sums = 95734815c7219d9a71282f3144b3526f2542b4fa270a8e69d644722d024b4038
+ 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/eworm-de/touchegg/commit/0c7221a85b445e1bcbe8f1a4ab20c78c696924c6.patch
+ sha256sums = daeca6063eeb9d3ee95803699665ce0b6f101bb3ce8421df2676744556c0b8c8
sha256sums = e8561682a4b64fea5a5e923788ae14ec7f8ad5b0ea03d053da27479f8a435de3
+ sha256sums = 9532341ce46d7ff241ea62ea9ce26317f5133cb0fc5ed618e3b78e4015a54d13
pkgname = touchegg-qt5
diff --git a/PKGBUILD b/PKGBUILD
index 3dffb4d3375..53ec4b72b8d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,38 +1,42 @@
# Maintainer: Xiao-Long Chen <chenxiaolong@cxl.epac.to>
-pkgname=touchegg-qt5
+_pkgname=touchegg
+pkgname=${_pkgname}-qt5
pkgver=1.1.1
-pkgrel=1
+pkgrel=2
pkgdesc='Multitouch gesture recognizer (built with qt5)'
arch=('i686' 'x86_64')
provides=('touchegg')
conflicts=('touchegg')
-url='https://code.google.com/p/touchegg/'
+url='https://github.com/JoseExposito/touchegg'
license=(GPL)
depends=('qt5-x11extras' 'libxtst' 'geis')
-source=("http://${pkgname%-qt5}.googlecode.com/files/${pkgname%-qt5}-${pkgver}.tar.gz"
- 'qt5.patch')
-sha256sums=('95734815c7219d9a71282f3144b3526f2542b4fa270a8e69d644722d024b4038'
- 'e8561682a4b64fea5a5e923788ae14ec7f8ad5b0ea03d053da27479f8a435de3')
+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/eworm-de/touchegg/commit/0c7221a85b445e1bcbe8f1a4ab20c78c696924c6.patch')
+sha256sums=('daeca6063eeb9d3ee95803699665ce0b6f101bb3ce8421df2676744556c0b8c8'
+ 'e8561682a4b64fea5a5e923788ae14ec7f8ad5b0ea03d053da27479f8a435de3'
+ '9532341ce46d7ff241ea62ea9ce26317f5133cb0fc5ed618e3b78e4015a54d13')
prepare() {
- cd "${pkgname%-qt5}-${pkgver}"
+ cd "${_pkgname}-${pkgver}/${_pkgname}"
- patch -Np1 < "${srcdir}"/qt5.patch
+ # fix compilation against Qt 5.x
+ patch -Np1 < "${srcdir}"/0001-qt5.patch
+
+ # fix compilation with GCC 6.x
+ patch -Np1 < "${srcdir}"/0002-gcc-6.patch
}
build() {
- cd "${pkgname%-qt5}-${pkgver}"
-
- # Cannot build with default compiler/linker flags
- #unset CXXFLAGS CFLAGS LDFLAGS
+ cd "${_pkgname}-${pkgver}/${_pkgname}"
qmake-qt5
make
}
package() {
- cd "${pkgname%-qt5}-${pkgver}"
+ cd "${_pkgname}-${pkgver}/${_pkgname}"
make INSTALL_ROOT="${pkgdir}" install
}