wacomtablet: Update to v6.0.1 for Plasma 6

Release blog available [here](https://kde.org/announcements/megarelease/6/) Full Release Notes: - [5.27.80](https://kde.org/announcements/changelogs/plasma/5.27.9-5.27.80/) - [5.90.0](https://kde.org/announcements/changelogs/plasma/5.27.80-5.90.0/) - [5.91.0](https://kde.org/announcements/changelogs/plasma/5.90.0-5.91.0/) - [5.92.0](https://kde.org/announcements/changelogs/plasma/5.91.0-5.92.0/) - [5.93.0](https://kde.org/announcements/changelogs/plasma/5.92.0-5.93.0/) - [6.0.0](https://kde.org/announcements/changelogs/plasma/6/6.0.0-6.0.1/) Signed-off-by: Reilly Brogan <reilly@reillybrogan.com>
getsolus · Mar 14, 2024 · 0848aab · 0848aab
1 parent 2b7fe43
commit 0848aab
Show file tree

Hide file tree

Showing 9 changed files with 850 additions and 882 deletions.
diff --git a/packages/w/wacomtablet/abi_libs b/packages/w/wacomtablet/abi_libs
@@ -1,4 +1,3 @@
 kcm_wacomtablet.so
-kde_wacom_tabletfinder
 plasma_engine_wacomtablet.so
 wacomtablet.so
diff --git a/packages/w/wacomtablet/abi_symbols b/packages/w/wacomtablet/abi_symbols
@@ -1,12 +1,6 @@
 kcm_wacomtablet.so:qt_plugin_instance
-kcm_wacomtablet.so:qt_plugin_query_metadata
-kde_wacom_tabletfinder:_IO_stdin_used
-kde_wacom_tabletfinder:__bss_start
-kde_wacom_tabletfinder:__data_start
-kde_wacom_tabletfinder:_edata
-kde_wacom_tabletfinder:_end
-kde_wacom_tabletfinder:_start
+kcm_wacomtablet.so:qt_plugin_query_metadata_v2
 plasma_engine_wacomtablet.so:qt_plugin_instance
-plasma_engine_wacomtablet.so:qt_plugin_query_metadata
+plasma_engine_wacomtablet.so:qt_plugin_query_metadata_v2
 wacomtablet.so:qt_plugin_instance
-wacomtablet.so:qt_plugin_query_metadata
+wacomtablet.so:qt_plugin_query_metadata_v2
diff --git a/packages/w/wacomtablet/abi_used_libs b/packages/w/wacomtablet/abi_used_libs
@@ -1,19 +1,21 @@
-libKF5ConfigCore.so.5
-libKF5ConfigWidgets.so.5
-libKF5CoreAddons.so.5
-libKF5DBusAddons.so.5
-libKF5GlobalAccel.so.5
-libKF5I18n.so.5
-libKF5Notifications.so.5
-libKF5Plasma.so.5
-libKF5WidgetsAddons.so.5
-libKF5WindowSystem.so.5
-libKF5XmlGui.so.5
-libQt5Core.so.5
-libQt5DBus.so.5
-libQt5Gui.so.5
-libQt5Widgets.so.5
-libQt5X11Extras.so.5
+libKF6ConfigCore.so.6
+libKF6CoreAddons.so.6
+libKF6DBusAddons.so.6
+libKF6GlobalAccel.so.6
+libKF6I18n.so.6
+libKF6KCMUtils.so.6
+libKF6KCMUtilsCore.so.6
+libKF6KIOGui.so.6
+libKF6Notifications.so.6
+libKF6Service.so.6
+libKF6WidgetsAddons.so.6
+libKF6WindowSystem.so.6
+libKF6XmlGui.so.6
+libPlasma5Support.so.6
+libQt6Core.so.6
+libQt6DBus.so.6
+libQt6Gui.so.6
+libQt6Widgets.so.6
 libXi.so.6
 libc.so.6
 libstdc++.so.6

diff --git a/packages/w/wacomtablet/abi_used_symbols b/packages/w/wacomtablet/abi_used_symbols
diff --git a/packages/w/wacomtablet/files/add_missing_includes.diff b/packages/w/wacomtablet/files/add_missing_includes.diff
diff --git a/packages/w/wacomtablet/files/fix-build.patch b/packages/w/wacomtablet/files/fix-build.patch
diff --git a/packages/w/wacomtablet/files/qt5.15.patch b/packages/w/wacomtablet/files/qt5.15.patch
diff --git a/packages/w/wacomtablet/package.yml b/packages/w/wacomtablet/package.yml
@@ -1,45 +1,45 @@
 name       : wacomtablet
-version    : 3.2.0
-release    : 9
+version    : 6.0.1
+release    : 14
 source     :
-    - https://origin.download.kde.org/stable/wacomtablet/3.2.0/wacomtablet-3.2.0.tar.xz : c80ce63a41f6fcbb50ac4c2130ed2f8273c4b744e62e33d4b714bf83e8e5f7a4
+    - https://cdn.download.kde.org/stable/plasma/6.0.1/wacomtablet-6.0.1.tar.xz : 9b82c2b18dd80a504de8e00cd6a4f9ca9076bd98fa6fa111782223de945dce3e
 homepage   : https://invent.kde.org/system/wacomtablet
 license    : GPL-2.0-or-later
 component  : desktop.kde
-summary    : Wacomtablet is a collection of tools for setting up graphical tablet
-    in KDE
+summary    : Wacomtablet is a collection of tools for setting up graphical tablet in KDE
 description: |
     This module implements a GUI for the Wacom Linux Drivers and extends it with profile support to handle different button / pen layouts per profile.
 builddeps  :
+    - pkgconfig(Qt6Qml)
     - pkgconfig(libwacom)
-    - pkgconfig(Qt5QuickControls2)
-    - pkgconfig(Qt5X11Extras)
     - pkgconfig(xi)
     - pkgconfig(xorg-wacom)
-    - extra-cmake-modules
-    - kcoreaddons-devel
-    - kdbusaddons-devel
-    - kdoctools-devel
-    - kglobalaccel-devel
-    - ki18n-devel
-    - knotifications-devel
-    - kwidgetsaddons-devel
-    - kwindowsystem-devel
-    - kxmlgui-devel
-    - plasma-framework-devel
+    - kf6-kcmutils-devel
+    - kf6-kdbusaddons-devel
+    - kf6-kdoctools-devel
+    - kf6-kglobalaccel-devel
+    - kf6-ki18n-devel
+    - kf6-kio-devel
+    - kf6-knotifications-devel
+    - kf6-kwidgetsaddons-devel
+    - kf6-kxmlgui-devel
+    - libplasma-devel
+    - plasma5support-devel
+checkdeps  :
     - xorg-server-xvfb
 rundeps    :
     - xorg-driver-input-wacom
+clang      : yes
+optimize   :
+    - speed
+    - thin-lto
 setup      : |
-    %patch -p1 -i $pkgfiles/add_missing_includes.diff
-    %patch -p1 -i $pkgfiles/qt5.15.patch
-    %patch -p1 -i $pkgfiles/fix-build.patch
-    %cmake_ninja -DBUILD_TESTING=ON -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
+    %cmake_kf6 -DBUILD_TESTING=ON -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
 build      : |
     %ninja_build
 install    : |
     %ninja_install
-    %qml_cache
+    %qml6_cache
 check      : |
     pushd solusBuildDir
     # dbus test fails (solbuild doesn't support dbus yet)

diff --git a/packages/w/wacomtablet/pspec_x86_64.xml b/packages/w/wacomtablet/pspec_x86_64.xml
@@ -3,8 +3,8 @@
         <Name>wacomtablet</Name>
         <Homepage>https://invent.kde.org/system/wacomtablet</Homepage>
         <Packager>
-            <Name>Muhammad Alfi Syahrin</Name>
-            <Email>ems1000.syahrin@gmail.com</Email>
+            <Name>Reilly Brogan</Name>
+            <Email>solus@reillybrogan.com</Email>
         </Packager>
         <License>GPL-2.0-or-later</License>
         <PartOf>desktop.kde</PartOf>
@@ -20,11 +20,11 @@
 </Description>
         <PartOf>desktop.kde</PartOf>
         <Files>
-            <Path fileType="config">/etc/xdg/wacomtablet.categories</Path>
             <Path fileType="executable">/usr/bin/kde_wacom_tabletfinder</Path>
-            <Path fileType="library">/usr/lib64/qt5/plugins/kcm_wacomtablet.so</Path>
-            <Path fileType="library">/usr/lib64/qt5/plugins/kf5/kded/wacomtablet.so</Path>
-            <Path fileType="library">/usr/lib64/qt5/plugins/plasma/dataengine/plasma_engine_wacomtablet.so</Path>
+            <Path fileType="library">/usr/lib64/qt6/plugins/kf6/kded/wacomtablet.so</Path>
+            <Path fileType="library">/usr/lib64/qt6/plugins/plasma/kcms/systemsettings_qwidgets/kcm_wacomtablet.so</Path>
+            <Path fileType="library">/usr/lib64/qt6/plugins/plasma5support/dataengine/plasma_engine_wacomtablet.so</Path>
+            <Path fileType="data">/usr/share/applications/kcm_wacomtablet.desktop</Path>
             <Path fileType="data">/usr/share/applications/kde_wacom_tabletfinder.desktop</Path>
             <Path fileType="data">/usr/share/dbus-1/interfaces/org.kde.Wacom.xml</Path>
             <Path fileType="doc">/usr/share/doc/HTML/ca/kcontrol/wacomtablet/index.cache.bz2</Path>
@@ -39,6 +39,8 @@
             <Path fileType="doc">/usr/share/doc/HTML/es/kcontrol/wacomtablet/index.docbook</Path>
             <Path fileType="doc">/usr/share/doc/HTML/it/kcontrol/wacomtablet/index.cache.bz2</Path>
             <Path fileType="doc">/usr/share/doc/HTML/it/kcontrol/wacomtablet/index.docbook</Path>
+            <Path fileType="doc">/usr/share/doc/HTML/ko/kcontrol/wacomtablet/index.cache.bz2</Path>
+            <Path fileType="doc">/usr/share/doc/HTML/ko/kcontrol/wacomtablet/index.docbook</Path>
             <Path fileType="doc">/usr/share/doc/HTML/nl/kcontrol/wacomtablet/index.cache.bz2</Path>
             <Path fileType="doc">/usr/share/doc/HTML/nl/kcontrol/wacomtablet/index.docbook</Path>
             <Path fileType="doc">/usr/share/doc/HTML/pt/kcontrol/wacomtablet/index.cache.bz2</Path>
@@ -49,14 +51,14 @@
             <Path fileType="doc">/usr/share/doc/HTML/sv/kcontrol/wacomtablet/index.docbook</Path>
             <Path fileType="doc">/usr/share/doc/HTML/uk/kcontrol/wacomtablet/index.cache.bz2</Path>
             <Path fileType="doc">/usr/share/doc/HTML/uk/kcontrol/wacomtablet/index.docbook</Path>
-            <Path fileType="data">/usr/share/knotifications5/wacomtablet.notifyrc</Path>
-            <Path fileType="data">/usr/share/kservices5/kcm_wacomtablet.desktop</Path>
-            <Path fileType="data">/usr/share/kservices5/plasma-applet-org.kde.plasma.wacomtablet.desktop</Path>
-            <Path fileType="data">/usr/share/kservices5/plasma-dataengine-wacomtablet.desktop</Path>
+            <Path fileType="doc">/usr/share/doc/HTML/uk/kcontrol/wacomtablet/presscurve.png</Path>
+            <Path fileType="doc">/usr/share/doc/HTML/uk/kcontrol/wacomtablet/tabletarea.png</Path>
+            <Path fileType="doc">/usr/share/doc/HTML/zh_CN/kcontrol/wacomtablet/index.cache.bz2</Path>
+            <Path fileType="doc">/usr/share/doc/HTML/zh_CN/kcontrol/wacomtablet/index.docbook</Path>
+            <Path fileType="data">/usr/share/knotifications6/wacomtablet.notifyrc</Path>
             <Path fileType="localedata">/usr/share/locale/ar/LC_MESSAGES/plasma_applet_org.kde.plasma.wacomtablet.mo</Path>
             <Path fileType="localedata">/usr/share/locale/ar/LC_MESSAGES/wacomtablet.mo</Path>
-            <Path fileType="localedata">/usr/share/locale/ast/LC_MESSAGES/plasma_applet_org.kde.plasma.wacomtablet.mo</Path>
-            <Path fileType="localedata">/usr/share/locale/ast/LC_MESSAGES/wacomtablet.mo</Path>
+            <Path fileType="localedata">/usr/share/locale/bg/LC_MESSAGES/plasma_applet_org.kde.plasma.wacomtablet.mo</Path>
             <Path fileType="localedata">/usr/share/locale/bg/LC_MESSAGES/wacomtablet.mo</Path>
             <Path fileType="localedata">/usr/share/locale/bs/LC_MESSAGES/plasma_applet_org.kde.plasma.wacomtablet.mo</Path>
             <Path fileType="localedata">/usr/share/locale/bs/LC_MESSAGES/wacomtablet.mo</Path>
@@ -74,18 +76,22 @@
             <Path fileType="localedata">/usr/share/locale/el/LC_MESSAGES/wacomtablet.mo</Path>
             <Path fileType="localedata">/usr/share/locale/en_GB/LC_MESSAGES/plasma_applet_org.kde.plasma.wacomtablet.mo</Path>
             <Path fileType="localedata">/usr/share/locale/en_GB/LC_MESSAGES/wacomtablet.mo</Path>
+            <Path fileType="localedata">/usr/share/locale/eo/LC_MESSAGES/plasma_applet_org.kde.plasma.wacomtablet.mo</Path>
             <Path fileType="localedata">/usr/share/locale/eo/LC_MESSAGES/wacomtablet.mo</Path>
             <Path fileType="localedata">/usr/share/locale/es/LC_MESSAGES/plasma_applet_org.kde.plasma.wacomtablet.mo</Path>
             <Path fileType="localedata">/usr/share/locale/es/LC_MESSAGES/wacomtablet.mo</Path>
             <Path fileType="localedata">/usr/share/locale/et/LC_MESSAGES/plasma_applet_org.kde.plasma.wacomtablet.mo</Path>
             <Path fileType="localedata">/usr/share/locale/et/LC_MESSAGES/wacomtablet.mo</Path>
+            <Path fileType="localedata">/usr/share/locale/eu/LC_MESSAGES/plasma_applet_org.kde.plasma.wacomtablet.mo</Path>
+            <Path fileType="localedata">/usr/share/locale/eu/LC_MESSAGES/wacomtablet.mo</Path>
             <Path fileType="localedata">/usr/share/locale/fi/LC_MESSAGES/plasma_applet_org.kde.plasma.wacomtablet.mo</Path>
             <Path fileType="localedata">/usr/share/locale/fi/LC_MESSAGES/wacomtablet.mo</Path>
             <Path fileType="localedata">/usr/share/locale/fr/LC_MESSAGES/plasma_applet_org.kde.plasma.wacomtablet.mo</Path>
             <Path fileType="localedata">/usr/share/locale/fr/LC_MESSAGES/wacomtablet.mo</Path>
             <Path fileType="localedata">/usr/share/locale/ga/LC_MESSAGES/wacomtablet.mo</Path>
             <Path fileType="localedata">/usr/share/locale/gl/LC_MESSAGES/plasma_applet_org.kde.plasma.wacomtablet.mo</Path>
             <Path fileType="localedata">/usr/share/locale/gl/LC_MESSAGES/wacomtablet.mo</Path>
+            <Path fileType="localedata">/usr/share/locale/hu/LC_MESSAGES/plasma_applet_org.kde.plasma.wacomtablet.mo</Path>
             <Path fileType="localedata">/usr/share/locale/hu/LC_MESSAGES/wacomtablet.mo</Path>
             <Path fileType="localedata">/usr/share/locale/ia/LC_MESSAGES/plasma_applet_org.kde.plasma.wacomtablet.mo</Path>
             <Path fileType="localedata">/usr/share/locale/ia/LC_MESSAGES/wacomtablet.mo</Path>
@@ -94,6 +100,8 @@
             <Path fileType="localedata">/usr/share/locale/it/LC_MESSAGES/wacomtablet.mo</Path>
             <Path fileType="localedata">/usr/share/locale/ja/LC_MESSAGES/plasma_applet_org.kde.plasma.wacomtablet.mo</Path>
             <Path fileType="localedata">/usr/share/locale/ja/LC_MESSAGES/wacomtablet.mo</Path>
+            <Path fileType="localedata">/usr/share/locale/ka/LC_MESSAGES/plasma_applet_org.kde.plasma.wacomtablet.mo</Path>
+            <Path fileType="localedata">/usr/share/locale/ka/LC_MESSAGES/wacomtablet.mo</Path>
             <Path fileType="localedata">/usr/share/locale/kk/LC_MESSAGES/wacomtablet.mo</Path>
             <Path fileType="localedata">/usr/share/locale/km/LC_MESSAGES/wacomtablet.mo</Path>
             <Path fileType="localedata">/usr/share/locale/ko/LC_MESSAGES/plasma_applet_org.kde.plasma.wacomtablet.mo</Path>
@@ -117,6 +125,7 @@
             <Path fileType="localedata">/usr/share/locale/pt/LC_MESSAGES/wacomtablet.mo</Path>
             <Path fileType="localedata">/usr/share/locale/pt_BR/LC_MESSAGES/plasma_applet_org.kde.plasma.wacomtablet.mo</Path>
             <Path fileType="localedata">/usr/share/locale/pt_BR/LC_MESSAGES/wacomtablet.mo</Path>
+            <Path fileType="localedata">/usr/share/locale/ro/LC_MESSAGES/plasma_applet_org.kde.plasma.wacomtablet.mo</Path>
             <Path fileType="localedata">/usr/share/locale/ro/LC_MESSAGES/wacomtablet.mo</Path>
             <Path fileType="localedata">/usr/share/locale/ru/LC_MESSAGES/plasma_applet_org.kde.plasma.wacomtablet.mo</Path>
             <Path fileType="localedata">/usr/share/locale/ru/LC_MESSAGES/wacomtablet.mo</Path>
@@ -143,9 +152,9 @@
             <Path fileType="data">/usr/share/plasma/plasmoids/org.kde.plasma.wacomtablet/contents/ui/RotationButton.qmlc</Path>
             <Path fileType="data">/usr/share/plasma/plasmoids/org.kde.plasma.wacomtablet/contents/ui/main.qml</Path>
             <Path fileType="data">/usr/share/plasma/plasmoids/org.kde.plasma.wacomtablet/contents/ui/main.qmlc</Path>
-            <Path fileType="data">/usr/share/plasma/plasmoids/org.kde.plasma.wacomtablet/metadata.desktop</Path>
             <Path fileType="data">/usr/share/plasma/plasmoids/org.kde.plasma.wacomtablet/metadata.json</Path>
-            <Path fileType="data">/usr/share/plasma/services/wacomtablet.operations</Path>
+            <Path fileType="data">/usr/share/plasma5support/services/wacomtablet.operations</Path>
+            <Path fileType="data">/usr/share/qlogging-categories6/wacomtablet.categories</Path>
             <Path fileType="data">/usr/share/wacomtablet/data/aiptek_devicelist</Path>
             <Path fileType="data">/usr/share/wacomtablet/data/companylist</Path>
             <Path fileType="data">/usr/share/wacomtablet/data/default_devicelist</Path>
@@ -165,16 +174,17 @@
             <Path fileType="data">/usr/share/wacomtablet/images/bl_7.png</Path>
             <Path fileType="data">/usr/share/wacomtablet/images/bl_8.png</Path>
             <Path fileType="data">/usr/share/wacomtablet/images/bl_9.png</Path>
+            <Path fileType="data">/usr/share/wacomtablet/images/ek-remote.png</Path>
             <Path fileType="data">/usr/share/wacomtablet/images/pen.png</Path>
         </Files>
     </Package>
     <History>
-        <Update release="9">
-            <Date>2023-10-30</Date>
-            <Version>3.2.0</Version>
+        <Update release="14">
+            <Date>2024-03-14</Date>
+            <Version>6.0.1</Version>
             <Comment>Packaging update</Comment>
-            <Name>Muhammad Alfi Syahrin</Name>
-            <Email>ems1000.syahrin@gmail.com</Email>
+            <Name>Reilly Brogan</Name>
+            <Email>solus@reillybrogan.com</Email>
         </Update>
     </History>
 </PISI>