diff options
| -rw-r--r-- | .SRCINFO | 19 | ||||
| -rw-r--r-- | PKGBUILD | 20 | ||||
| -rw-r--r-- | set_cmake_min_req.patch | 35 |
3 files changed, 21 insertions, 53 deletions
@@ -1,19 +1,22 @@ +# Generated by mksrcinfo v8 +# Mon Mar 7 18:51:39 UTC 2016 pkgbase = kcm-wacomtablet pkgdesc = KDE GUI for the Wacom Linux Drivers - pkgver = 2.1.0 - pkgrel = 2 + pkgver = 3.0.0~beta1 + pkgrel = 1 url = http://kde-apps.org/content/show.php/wacom+tablet?content=114856 arch = i686 arch = x86_64 license = GPL2 + makedepends = git makedepends = cmake - makedepends = automoc4 - depends = kdebase-workspace + makedepends = extra-cmake-modules + makedepends = kdoctools + makedepends = kdelibs4support + depends = plasma-framework depends = xf86-input-wacom - source = http://kde-apps.org/CONTENT/content-files/114856-wacomtablet-2.1.0.tar.xz - source = set_cmake_min_req.patch - md5sums = fb2f3eefa6ac7e3c7b07a42ea4f6624c - md5sums = 74f33a2c84571709b6a2c703826ab493 + source = http://kde-apps.org/CONTENT/content-files/114856-wacomtablet-3.0.0~beta1.tar.xz + md5sums = 95d1d29063d6de2ab0881c33e8eacb05 pkgname = kcm-wacomtablet @@ -3,23 +3,22 @@ # Contributor: Dany Martineau <dany.luc.martineau at gmail.com> # Contributor: Dylon Edwards <deltaecho@archlinux.us> pkgname=kcm-wacomtablet -pkgver=2.1.0 -pkgrel=2 +pkgver=3.0.0~beta1 +pkgrel=1 pkgdesc="KDE GUI for the Wacom Linux Drivers" arch=('i686' 'x86_64') url="http://kde-apps.org/content/show.php/wacom+tablet?content=114856" license=('GPL2') -depends=('kdebase-workspace' 'xf86-input-wacom') -makedepends=('cmake' 'automoc4') -source=("http://kde-apps.org/CONTENT/content-files/114856-wacomtablet-${pkgver}.tar.xz" \ - "set_cmake_min_req.patch") -md5sums=('fb2f3eefa6ac7e3c7b07a42ea4f6624c' - '74f33a2c84571709b6a2c703826ab493') +depends=('plasma-framework' 'xf86-input-wacom') +makedepends=('git' 'cmake' 'extra-cmake-modules' 'kdoctools' 'kdelibs4support') +source=("http://kde-apps.org/CONTENT/content-files/114856-wacomtablet-${pkgver}.tar.xz") +md5sums=('95d1d29063d6de2ab0881c33e8eacb05') prepare() { cd "$srcdir/wacomtablet-$pkgver" - patch -Np1 < "$srcdir/set_cmake_min_req.patch" + sed -i "s|(MacroOptionalAddSubdirectory)|(ECMOptionalAddSubdirectory)|" CMakeLists.txt + sed -i "s|macro_optional_add_subdirectory|ECM_OPTIONAL_ADD_SUBDIRECTORY|" CMakeLists.txt } build() { @@ -27,7 +26,8 @@ build() { cmake . \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release + -DCMAKE_BUILD_TYPE=Release \ + -DKDE_INSTALL_USE_QT_SYS_PATHS=ON make } diff --git a/set_cmake_min_req.patch b/set_cmake_min_req.patch deleted file mode 100644 index 7e6fa141822a..000000000000 --- a/set_cmake_min_req.patch +++ /dev/null @@ -1,35 +0,0 @@ -From: David Faure <faure@kde.org> -Date: Mon, 27 Jul 2015 20:09:38 +0000 -Subject: set cmake_min_req to enable newer policies; fix duplicated target name -X-Git-Url: http://quickgit.kde.org/?p=wacomtablet.git&a=commitdiff&h=9b641e5526b8bb5e089d344f4993f1ff77a0a4fe ---- -set cmake_min_req to enable newer policies; fix duplicated target name ---- - - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 2.6) -+cmake_minimum_required(VERSION 2.8.9) - - project(wacomtablet) - - ---- a/autotests/kded/xinputadaptor/CMakeLists.txt -+++ b/autotests/kded/xinputadaptor/CMakeLists.txt -@@ -1,11 +1,11 @@ - - --kde4_add_unit_test(KDED.XsetWacomAdaptor -+kde4_add_unit_test(KDED.XinputWacomAdaptor - testxinputadaptor.cpp - ../tabletdependenttest.cpp - ) - --target_link_libraries(KDED.XsetWacomAdaptor -+target_link_libraries(KDED.XinputWacomAdaptor - - # include static libs - wacom_common - |