[arch-commits] Commit in kcm-wacomtablet/repos/community-x86_64 (3 files)

[Lukas Jirkovsky]

    Date: Tuesday, July 10, 2018 @ 15:48:07
  Author: stativ
Revision: 356232

archrelease: copy trunk to community-x86_64

Added:
  kcm-wacomtablet/repos/community-x86_64/PKGBUILD
    (from rev 356230, kcm-wacomtablet/trunk/PKGBUILD)
  kcm-wacomtablet/repos/community-x86_64/add_missing_includes.diff
    (from rev 356230, kcm-wacomtablet/trunk/add_missing_includes.diff)
Deleted:
  kcm-wacomtablet/repos/community-x86_64/PKGBUILD

---------------------------+
 PKGBUILD                  |   81 ++++++++++++++++++++++----------------------
 add_missing_includes.diff |   11 +++++
 2 files changed, 53 insertions(+), 39 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-07-10 15:48:05 UTC (rev 356231)
+++ PKGBUILD	2018-07-10 15:48:07 UTC (rev 356232)
@@ -1,39 +0,0 @@
-# $Id$
-# Maintainer: Lukas Jirkovsky <l.jirkovsky at gmail.com>
-# Contributor: BlackEagle < ike DOT devolder AT gmail DOT com >
-# Contributor: Dany Martineau <dany.luc.martineau at gmail.com>
-# Contributor: Dylon Edwards <deltaecho at archlinux.us>
-pkgname=kcm-wacomtablet
-pkgver=3.0.0
-pkgrel=1
-epoch=1
-pkgdesc="KDE GUI for the Wacom Linux Drivers"
-arch=('i686' 'x86_64')
-url="https://www.linux-apps.com/p/1127862/"
-license=('GPL')
-depends=('plasma-framework' 'xf86-input-wacom')
-makedepends=('git' 'cmake' 'extra-cmake-modules' 'kdoctools')
-source=(https://download.kde.org/stable/wacomtablet/$pkgver/wacomtablet-$pkgver.tar.xz{,.sig})
-sha256sums=('1c9380f65782b4926da5de70bf99c6be5afd166981a51831dabaf7753b4b5c17'
-            'SKIP')
-validpgpkeys=('E6E4C916590026E45836A12EA8896AFDFEF5DF53') # Valeriy Malov
-
-prepare() {
-  cd "$srcdir/wacomtablet-$pkgver"
-}
-
-build() {
-  cd "$srcdir/wacomtablet-$pkgver"
-
-  cmake . \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release
-  make
-}
-
-package() {
-  cd "$srcdir/wacomtablet-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-}
-

Copied: kcm-wacomtablet/repos/community-x86_64/PKGBUILD (from rev 356230, kcm-wacomtablet/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-07-10 15:48:07 UTC (rev 356232)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer: Lukas Jirkovsky <l.jirkovsky at gmail.com>
+# Contributor: BlackEagle < ike DOT devolder AT gmail DOT com >
+# Contributor: Dany Martineau <dany.luc.martineau at gmail.com>
+# Contributor: Dylon Edwards <deltaecho at archlinux.us>
+pkgname=kcm-wacomtablet
+pkgver=3.1.0
+pkgrel=1
+epoch=1
+pkgdesc="KDE GUI for the Wacom Linux Drivers"
+arch=('i686' 'x86_64')
+url="https://cgit.kde.org/wacomtablet.git"
+license=('GPL')
+depends=('plasma-framework' 'xf86-input-wacom')
+makedepends=('git' 'cmake' 'extra-cmake-modules' 'kdoctools')
+source=("https://download.kde.org/stable/wacomtablet/$pkgver/wacomtablet-$pkgver.tar.xz"{,.sig}
+        "add_missing_includes.diff")
+sha256sums=('ac953f69aa5899b837ae46a8248b5ac18bfe79871c239485b6753e99e2776454'
+            'SKIP'
+            '143b2e81e5152c2f1db6e03089b32d9b9fdf1e61739743179b0efb299eb5b44d')
+validpgpkeys=('E6E4C916590026E45836A12EA8896AFDFEF5DF53') # Valeriy Malov
+
+prepare() {
+  cd "$srcdir/wacomtablet-$pkgver"
+  patch -Np1 < "$srcdir/add_missing_includes.diff"
+}
+
+build() {
+  cd "$srcdir/wacomtablet-$pkgver"
+
+  cmake . \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release
+  make
+}
+
+package() {
+  cd "$srcdir/wacomtablet-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+}
+

Copied: kcm-wacomtablet/repos/community-x86_64/add_missing_includes.diff (from rev 356230, kcm-wacomtablet/trunk/add_missing_includes.diff)
===================================================================
--- add_missing_includes.diff	                        (rev 0)
+++ add_missing_includes.diff	2018-07-10 15:48:07 UTC (rev 356232)
@@ -0,0 +1,11 @@
+diff -rup wacomtablet-3.1.0/src/kcmodule/styluspagewidget.cpp wacomtablet-3.1.0.new/src/kcmodule/styluspagewidget.cpp
+--- wacomtablet-3.1.0/src/kcmodule/styluspagewidget.cpp	2018-06-22 15:07:58.000000000 +0200
++++ wacomtablet-3.1.0.new/src/kcmodule/styluspagewidget.cpp	2018-07-10 17:38:09.239242847 +0200
+@@ -25,6 +25,7 @@
+ #include "profilemanagement.h"
+ 
+ // common includes
++#include "logging.h"
+ #include "property.h"
+ #include "deviceprofile.h"
+ #include "dbustabletinterface.h"