guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

312/321: gnu: Remove wacomtablet.


From: guix-commits
Subject: 312/321: gnu: Remove wacomtablet.
Date: Fri, 10 Jan 2025 23:03:45 -0500 (EST)

z572 pushed a commit to branch kde-team
in repository guix.

commit 94795d2c6d30da05da79efb163f2e071c2e36f08
Author: Zheng Junjie <zhengjunjie@iscas.ac.cn>
AuthorDate: Sat Jan 11 11:06:48 2025 +0800

    gnu: Remove wacomtablet.
    
    * gnu/packages/kde-utils.scm (wacomtablet): Delete variable.
    * gnu/packages/patches/wacomtablet-add-missing-includes.patch: Rmove it.
    * gnu/packages/patches/wacomtablet-qt5.15.patch: Rmove it.
    * gnu/local.mk (dist_patch_DATA): Rmove them.
    
    Change-Id: Ic27bdcd6e931b70dc8d412c39d3232476487a854
---
 gnu/local.mk                                       |  2 -
 gnu/packages/kde-utils.scm                         | 44 ----------------------
 .../patches/wacomtablet-add-missing-includes.patch | 11 ------
 gnu/packages/patches/wacomtablet-qt5.15.patch      | 23 -----------
 4 files changed, 80 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 1d15be886d..7b5aa46609 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2372,8 +2372,6 @@ dist_patch_DATA =                                         
\
   %D%/packages/patches/vtk-7-gcc-11-compat.patch               \
   %D%/packages/patches/vtk-7-hdf5-compat.patch                 \
   %D%/packages/patches/vtk-7-python-compat.patch               \
-  %D%/packages/patches/wacomtablet-add-missing-includes.patch  \
-  %D%/packages/patches/wacomtablet-qt5.15.patch                        \
   %D%/packages/patches/warsow-qfusion-fix-bool-return-type.patch       \
   %D%/packages/patches/waybar-0.11.0-fix-tray-icons.patch      \
   %D%/packages/patches/wcstools-extend-makefiles.patch \
diff --git a/gnu/packages/kde-utils.scm b/gnu/packages/kde-utils.scm
index 7eb5d73f91..f3c97734d1 100644
--- a/gnu/packages/kde-utils.scm
+++ b/gnu/packages/kde-utils.scm
@@ -768,50 +768,6 @@ combinations are distinct enough to be readable and 
accessible.")
 the computer and 3D Printers.")
       (license (list license:lgpl2.1 license:lgpl3)))))
 
-(define-public wacomtablet
-  (package
-    (name "wacomtablet")
-    (version "3.2.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://kde/stable/"
-                                  name "/" version "/"
-                                  name "-" version ".tar.xz"))
-              (patches (search-patches
-                        "wacomtablet-add-missing-includes.patch"
-                        "wacomtablet-qt5.15.patch"))
-              (sha256
-               (base32
-                "197pwpl87gqlnza36bp68jvw8ww25znk08acmi8bpz7n84xfc368"))))
-    (build-system qt-build-system)
-    (arguments
-     (list #:phases #~(modify-phases %standard-phases
-                        (replace 'check
-                          (lambda* (#:key tests? #:allow-other-keys)
-                            (when tests?
-                              (invoke "dbus-launch" "ctest" "-E"
-                                      
"(Test.KDED.DBusTabletService|Test.KDED.TabletHandler|Test.KDED.XInputAdaptor|Test.KDED.XsetWacomAdaptor)")))))))
-    (native-inputs (list dbus extra-cmake-modules kdoctools-5 pkg-config))
-    (inputs (list kcoreaddons-5
-                  ki18n-5
-                  kglobalaccel-5
-                  kconfig-5
-                  kxmlgui-5
-                  kwidgetsaddons-5
-                  kwindowsystem-5
-                  knotifications-5
-                  kdbusaddons-5
-                  qtx11extras
-                  qtdeclarative-5
-                  libwacom
-                  xf86-input-wacom
-                  libxi))
-    (propagated-inputs (list plasma-framework))
-    (home-page "https://invent.kde.org/system/wacomtablet";)
-    (synopsis "KDE GUI for the Wacom Linux Drivers")
-    (description "Provides KDE GUI for the Wacom Linux Drivers.")
-    (license license:gpl2+)))
-
 (define-public kmag
   (package
     (name "kmag")
diff --git a/gnu/packages/patches/wacomtablet-add-missing-includes.patch 
b/gnu/packages/patches/wacomtablet-add-missing-includes.patch
deleted file mode 100644
index cd93938075..0000000000
--- a/gnu/packages/patches/wacomtablet-add-missing-includes.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-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"
diff --git a/gnu/packages/patches/wacomtablet-qt5.15.patch 
b/gnu/packages/patches/wacomtablet-qt5.15.patch
deleted file mode 100644
index 598ac939e8..0000000000
--- a/gnu/packages/patches/wacomtablet-qt5.15.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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: [PATCH] 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>
--- 
-GitLab



reply via email to

[Prev in Thread] Current Thread [Next in Thread]