[gentoo-commits] repo/gentoo:master commit in: kde-misc/wacomtablet/, kde-misc/wacomtablet/files/

[gentoo-commits] repo/gentoo:master commit in: kde-misc/wacomtablet/, kde-misc/wacomtablet/files/

[Michael Palimaka]

commit:     826ac109f05a9c2589d24019262ab52ea367cbdf
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 12 09:01:18 2018 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Jan 12 09:01:34 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=826ac109

kde-misc/wacomtablet: remove 3.0.0_beta1

Package-Manager: Portage-2.3.14, Repoman-2.3.6

 kde-misc/wacomtablet/Manifest                      |  1 -
 .../files/wacomtablet-3.0.0_beta1-ecm.patch        | 11 -----
 .../wacomtablet/wacomtablet-3.0.0_beta1.ebuild     | 56 ----------------------
 3 files changed, 68 deletions(-)

diff --git a/kde-misc/wacomtablet/Manifest b/kde-misc/wacomtablet/Manifest
index a0e226edf94..239f0878439 100644
--- a/kde-misc/wacomtablet/Manifest
+++ b/kde-misc/wacomtablet/Manifest
@@ -1,2 +1 @@
-DIST 114856-wacomtablet-3.0.0~beta1.tar.xz 655684 BLAKE2B 666d1e60c7caa763a3e884936f800c122ea0e6151dea89bd44b5d50b203444b3429dac8b0376c5129f29b3103ff2d82ae353eaae7324c422e590c5a8dee88806 SHA512 cf95cbd8f3489bf0d18acfec72ca964685060ae7c7a554b118f5086a46a1e97be67f674f1bf1db6ce15638fcdcfca5043e7438af09ced8acd9fb601c44f433fb
 DIST wacomtablet-2.9.82.tar.xz 708508 BLAKE2B f9f10354f5db42e9acc43b05d00c168bd6f5200ea7d7f7fb4c7f0f3042ab2327d78145f6388e1c607528e14c6e6bd6a33929f952943dba330e02d761634ca37c SHA512 ba1b8d15ed4ce52c14ca0ac494cfb9200b9c891c6ac19ee5a306496e1c04f6abc8b83290bc31199a634ed8b4b4469dc185a967be183f1ed6b53956bc19038904

diff --git a/kde-misc/wacomtablet/files/wacomtablet-3.0.0_beta1-ecm.patch b/kde-misc/wacomtablet/files/wacomtablet-3.0.0_beta1-ecm.patch
deleted file mode 100644
index dabb9037019..00000000000
--- a/kde-misc/wacomtablet/files/wacomtablet-3.0.0_beta1-ecm.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ruN wacomtablet-3.0.0~beta1.orig/CMakeLists.txt wacomtablet-3.0.0~beta1/CMakeLists.txt
---- wacomtablet-3.0.0~beta1.orig/CMakeLists.txt	2015-10-28 18:53:01.000000000 +0100
-+++ wacomtablet-3.0.0~beta1/CMakeLists.txt	2016-04-20 17:41:06.087315610 +0200
-@@ -66,5 +66,5 @@
- 
- feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
- 
--include(MacroOptionalAddSubdirectory)
--macro_optional_add_subdirectory( po )
-+include(ECMOptionalAddSubdirectory)
-+ecm_optional_add_subdirectory( po )

diff --git a/kde-misc/wacomtablet/wacomtablet-3.0.0_beta1.ebuild b/kde-misc/wacomtablet/wacomtablet-3.0.0_beta1.ebuild
deleted file mode 100644
index 68e289eca04..00000000000
--- a/kde-misc/wacomtablet/wacomtablet-3.0.0_beta1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-#EGIT_BRANCH="releng3.0"
-KDE_HANDBOOK="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="KControl module for Wacom tablets"
-HOMEPAGE="http://kde-apps.org/content/show.php?action=content&content=114856"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-MY_PV=${PV/_/\~}
-MY_P=${PN}-${MY_PV}
-SRC_URI="http://kde-apps.org/CONTENT/content-files/114856-${MY_P}.tar.xz"
-
-S=${WORKDIR}/${MY_P}
-
-CDEPEND="
-	$(add_frameworks_dep extra-cmake-modules)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep plasma)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	>=x11-drivers/xf86-input-wacom-0.20.0
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libxcb
-"
-DEPEND="${CDEPEND}
-	sys-devel/gettext
-	x11-proto/xproto
-"
-RDEPEND="${CDEPEND}
-	!kde-misc/wacomtablet:4
-"
-
-PATCHES=( "${FILESDIR}/${P}-ecm.patch" )

[gentoo-commits] repo/gentoo:master commit in: kde-misc/wacomtablet/, kde-misc/wacomtablet/files/

[Andreas Sturmlechner]

commit:     5bdf8bf176785809e41ff686a6a90b3a5a7e8037
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  7 09:45:41 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jun  7 09:45:41 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bdf8bf1

kde-misc/wacomtablet: Fix build with Qt 5.15

Reported-by: Daniel Rammelt <d.rammelt <AT> icloud.com>
Closes: https://bugs.gentoo.org/727408
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/wacomtablet-3.2.0-qt-5.15.patch          | 24 ++++++++++++++++++++++
 kde-misc/wacomtablet/wacomtablet-3.2.0.ebuild      |  2 ++
 2 files changed, 26 insertions(+)

diff --git a/kde-misc/wacomtablet/files/wacomtablet-3.2.0-qt-5.15.patch b/kde-misc/wacomtablet/files/wacomtablet-3.2.0-qt-5.15.patch
new file mode 100644
index 00000000000..572450b0b11
--- /dev/null
+++ b/kde-misc/wacomtablet/files/wacomtablet-3.2.0-qt-5.15.patch
@@ -0,0 +1,24 @@
+From 4f73ff02b3efd5e8728b18fcf1067eca166704ee Mon Sep 17 00:00:00 2001
+From: Christophe Giboudeaux <christophe@krop.fr>
+Date: Thu, 4 Jun 2020 16:00:38 +0200
+Subject: Fix build with Qt 5.15
+
+---
+ src/kcmodule/pressurecurvewidget.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/kcmodule/pressurecurvewidget.cpp b/src/kcmodule/pressurecurvewidget.cpp
+index 0c943b3..f047a6c 100644
+--- a/src/kcmodule/pressurecurvewidget.cpp
++++ b/src/kcmodule/pressurecurvewidget.cpp
+@@ -22,6 +22,7 @@
+ //Qt includes
+ #include <QDebug>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QMouseEvent>
+ #include <QResizeEvent>
+ #include <QTabletEvent>
+-- 
+cgit v1.1
+

diff --git a/kde-misc/wacomtablet/wacomtablet-3.2.0.ebuild b/kde-misc/wacomtablet/wacomtablet-3.2.0.ebuild
index fb00967bfb2..9f284009c8c 100644
--- a/kde-misc/wacomtablet/wacomtablet-3.2.0.ebuild
+++ b/kde-misc/wacomtablet/wacomtablet-3.2.0.ebuild
@@ -45,6 +45,8 @@ DEPEND="${RDEPEND}
 	x11-libs/libX11
 "
 
+PATCHES=( "${FILESDIR}/${P}-qt-5.15.patch" )
+
 src_test() {
 	# test needs DBus, bug 675548
 	local myctestargs=(