From 922deb5380dc1346b83cbd1635c1c73b03cc8338 Mon Sep 17 00:00:00 2001 From: David Spencer Date: Thu, 31 Dec 2015 17:22:49 +0000 Subject: [PATCH] system/wacomtablet: Updated for version 2.1.0. Fixed build failure with cmake-3.4. Signed-off-by: David Spencer --- system/wacomtablet/wacomtablet.SlackBuild | 12 ++++++++++-- system/wacomtablet/wacomtablet.info | 6 +++--- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/system/wacomtablet/wacomtablet.SlackBuild b/system/wacomtablet/wacomtablet.SlackBuild index db50ce909b..bf1f54be30 100644 --- a/system/wacomtablet/wacomtablet.SlackBuild +++ b/system/wacomtablet/wacomtablet.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=wacomtablet -VERSION=${VERSION:-2.0} +VERSION=${VERSION:-2.1.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -62,7 +62,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$SRCVERSION -tar xvf $CWD/114856-$PRGNAM-$SRCVERSION.tar.bz2 +tar xvf $CWD/114856-$PRGNAM-$SRCVERSION.tar.xz cd $PRGNAM-$SRCVERSION chown -R root:root . find -L . \ @@ -71,6 +71,14 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Fixes based on Arch Linux patch (thanks!) +sed -i \ + -e 's/cmake_minimum_required(VERSION 2.6)/cmake_minimum_required(VERSION 3.0.0)/' \ + CMakeLists.txt +sed -i \ + -e 's/XsetWacomAdaptor/XinputWacomAdaptor/' \ + autotests/kded/xinputadaptor/CMakeLists.txt + mkdir build cd build cmake \ diff --git a/system/wacomtablet/wacomtablet.info b/system/wacomtablet/wacomtablet.info index 4c838f598e..e340b65400 100644 --- a/system/wacomtablet/wacomtablet.info +++ b/system/wacomtablet/wacomtablet.info @@ -1,8 +1,8 @@ PRGNAM="wacomtablet" -VERSION="2.0" +VERSION="2.1.0" HOMEPAGE="https://projects.kde.org/projects/extragear/base/wacomtablet" -DOWNLOAD="http://kde-apps.org/CONTENT/content-files/114856-wacomtablet-2.0.tar.bz2" -MD5SUM="23dd14baa3ebac8fc3010ea8a5782073" +DOWNLOAD="http://kde-apps.org/CONTENT/content-files/114856-wacomtablet-2.1.0.tar.xz" +MD5SUM="fb2f3eefa6ac7e3c7b07a42ea4f6624c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES=""