Update version

5 files changed, 8 insertions, 121 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fc748e117d0d..2a9f0fac0e35 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = syncthingtray-qt6
 	pkgdesc = Tray application for Syncthing (using Qt 6)
-	pkgver = 1.4.9
-	pkgrel = 3
+	pkgver = 1.4.10
+	pkgrel = 1
 	url = https://github.com/Martchus/syncthingtray
 	arch = i686
 	arch = x86_64
@@ -28,13 +28,7 @@ pkgbase = syncthingtray-qt6
 	depends = xdg-utils
 	depends = qt6-webengine
 	depends = qt6-declarative
-	source = syncthingtray-1.4.9.tar.gz::https://github.com/Martchus/syncthingtray/archive/v1.4.9.tar.gz
-	source = 0001-Fix-install-path-of-KIO-plugin.patch
-	source = 0001-Mention-PLASMA_ENABLE_QML_DEBUG-in-the-Plasmoid-test.patch
-	source = 0001-Fix-building-Plasmoid-after-Plasma-6-beta-release.patch
-	sha256sums = f9003bbe185d355f9cac18862077fa2cc4e809f7f416d9b1dd5ef6474c926742
-	sha256sums = SKIP
-	sha256sums = SKIP
-	sha256sums = SKIP
+	source = syncthingtray-1.4.10.tar.gz::https://github.com/Martchus/syncthingtray/archive/v1.4.10.tar.gz
+	sha256sums = b22445eda35deb8889749ee576bb657906c59d158f8fd1fbf79bbb027ac84533
 
 pkgname = syncthingtray-qt6
diff --git a/0001-Fix-building-Plasmoid-after-Plasma-6-beta-release.patch b/0001-Fix-building-Plasmoid-after-Plasma-6-beta-release.patch
deleted file mode 100644
index ed8562471ec1..000000000000
--- a/0001-Fix-building-Plasmoid-after-Plasma-6-beta-release.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From ddbd6f309b3a353c9c40c71cd0877f6db6b680c6 Mon Sep 17 00:00:00 2001
-From: Martchus <martchus@gmx.net>
-Date: Thu, 30 Nov 2023 19:55:32 +0100
-Subject: [PATCH] Fix building Plasmoid after Plasma 6 beta release
-
----
- plasmoid/CMakeLists.txt     | 2 +-
- plasmoid/lib/CMakeLists.txt | 4 +++-
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/plasmoid/CMakeLists.txt b/plasmoid/CMakeLists.txt
-index e1eeaa4..18196ed 100644
---- a/plasmoid/CMakeLists.txt
-+++ b/plasmoid/CMakeLists.txt
-@@ -12,7 +12,7 @@ set(META_QT5_VERSION 5.8)
- set(META_SRCDIR_REFS "${CMAKE_CURRENT_SOURCE_DIR}\n${CMAKE_CURRENT_SOURCE_DIR}/../syncthingconnector")
- 
- # find Plasma and its dependencies (which are not pulled-in automatically as of Plasma 6)
--find_package(${KF_PACKAGE_PREFIX}Plasma REQUIRED)
-+find_package(Plasma REQUIRED)
- if (KF_MAJOR_VERSION GREATER_EQUAL 6)
-     find_package(${QT_PACKAGE_PREFIX}Qml REQUIRED)
-     find_package(${KF_PACKAGE_PREFIX}Config REQUIRED)
-diff --git a/plasmoid/lib/CMakeLists.txt b/plasmoid/lib/CMakeLists.txt
-index 1c6654a..a757cc4 100644
---- a/plasmoid/lib/CMakeLists.txt
-+++ b/plasmoid/lib/CMakeLists.txt
-@@ -40,8 +40,10 @@ list(APPEND ADDITIONAL_QT_MODULES Network Qml)
- if (KF_MAJOR_VERSION GREATER_EQUAL 6)
-     set(Config_MODULE_TARGETS ${KF_PACKAGE_PREFIX}::ConfigCore)
-     list(APPEND ADDITIONAL_KF_MODULES Config)
-+    use_package(TARGET_NAME Plasma::Plasma PACKAGE_NAME Plasma PACKAGE_ARGS REQUIRED)
-+else ()
-+    list(APPEND ADDITIONAL_KF_MODULES Plasma)
- endif ()
--list(APPEND ADDITIONAL_KF_MODULES Plasma)
- 
- include(BasicConfig)
- include(QtGuiConfig)
--- 
-2.43.0
-
diff --git a/0001-Fix-install-path-of-KIO-plugin.patch b/0001-Fix-install-path-of-KIO-plugin.patch
deleted file mode 100644
index f9ef383282b8..000000000000
--- a/0001-Fix-install-path-of-KIO-plugin.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From d1a1c80ed5e2f5ab6a822b07ef3e9e4fd79a5a7d Mon Sep 17 00:00:00 2001
-From: Martchus <martchus@gmx.net>
-Date: Wed, 22 Nov 2023 00:39:46 +0100
-Subject: [PATCH] Fix install path of KIO plugin
-
----
- fileitemactionplugin/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/fileitemactionplugin/CMakeLists.txt b/fileitemactionplugin/CMakeLists.txt
-index a154430..60af659 100644
---- a/fileitemactionplugin/CMakeLists.txt
-+++ b/fileitemactionplugin/CMakeLists.txt
-@@ -38,7 +38,7 @@ set(KIO_MODULE_TARGETS "${KF_PACKAGE_PREFIX}::KIOCore" "${KF_PACKAGE_PREFIX}::KI
-                        "${KF_PACKAGE_PREFIX}::KIOWidgets")
- if (KF_MAJOR_VERSION GREATER_EQUAL 6)
-     list(APPEND KIO_MODULE_TARGETS)
--    set(META_PLUGIN_CATEGORY kf${KF_VERSION}/kfileitemaction)
-+    set(META_PLUGIN_CATEGORY kf${KF_MAJOR_VERSION}/kfileitemaction)
- else ()
-     list(APPEND KIO_MODULE_TARGETS "${KF_PACKAGE_PREFIX}::KIONTLM")
- endif ()
--- 
-2.43.0
-
diff --git a/0001-Mention-PLASMA_ENABLE_QML_DEBUG-in-the-Plasmoid-test.patch b/0001-Mention-PLASMA_ENABLE_QML_DEBUG-in-the-Plasmoid-test.patch
deleted file mode 100644
index 9fb0ce7702d8..000000000000
--- a/0001-Mention-PLASMA_ENABLE_QML_DEBUG-in-the-Plasmoid-test.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From eaf8d6d1647a55fea2f76185544799b891aa16a5 Mon Sep 17 00:00:00 2001
-From: Martchus <martchus@gmx.net>
-Date: Sun, 26 Nov 2023 17:06:06 +0100
-Subject: [PATCH] Mention PLASMA_ENABLE_QML_DEBUG in the Plasmoid testing docs
-
-This variable might be useful and now seems to be supported by
-`plasmawindowed`, see
-https://invent.kde.org/plasma/plasma-workspace/-/merge_requests/3237.
----
- plasmoid/testing.md | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/plasmoid/testing.md b/plasmoid/testing.md
-index f80aa66..361e31d 100644
---- a/plasmoid/testing.md
-+++ b/plasmoid/testing.md
-@@ -48,6 +48,9 @@ It works quite well within a Plasma session when both shells are placed on diffe
- edges.
- 
- ## Enable QML debugging
-+It is not clear whether the following instructions are still valid for Plasma 6.
-+It seems that QML debugging can be enabled under Plasma 6 by setting the environment variable
-+`PLASMA_ENABLE_QML_DEBUG` but this has not been tested yet.
- 
- To enable QML debugging, it is required to rebuild `plasmoidviewer` with QML debugging
- enabled.
--- 
-2.43.0
-
diff --git a/PKGBUILD b/PKGBUILD
index 6521250951ee..25dc221d490e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -26,8 +26,8 @@ _reponame=syncthingtray
 _cfg=qt6
 pkgname=syncthingtray-$_cfg
 _name=${pkgname%-$_cfg}
-pkgver=1.4.9
-pkgrel=3
+pkgver=1.4.10
+pkgrel=1
 arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
 pkgdesc='Tray application for Syncthing (using Qt 6)'
 license=('GPL')
@@ -45,24 +45,13 @@ checkdepends=('cppunit' 'syncthing' 'iproute2')
 [[ $_enable_kio_plugin ]] && makedepends+=('kio')
 [[ $_enable_plasmoid ]] && makedepends+=('libplasma' 'extra-cmake-modules')
 url="https://github.com/Martchus/${_reponame}"
-source=("${_name}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz"
-        0001-Fix-install-path-of-KIO-plugin.patch
-        0001-Mention-PLASMA_ENABLE_QML_DEBUG-in-the-Plasmoid-test.patch
-        0001-Fix-building-Plasmoid-after-Plasma-6-beta-release.patch)
-sha256sums=('f9003bbe185d355f9cac18862077fa2cc4e809f7f416d9b1dd5ef6474c926742'
-            SKIP SKIP SKIP)
+source=("${_name}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
+sha256sums=('b22445eda35deb8889749ee576bb657906c59d158f8fd1fbf79bbb027ac84533')
 
 ephemeral_port() {
   comm -23 <(seq 49152 65535) <(ss -tan | awk '{print $4}' | cut -d':' -f2 | grep "[0-9]\{1,5\}" | sort | uniq) | shuf | head -n 1
 }
 
-prepare() {
-  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
-  patch -p1 -i ../0001-Fix-install-path-of-KIO-plugin.patch
-  patch -p1 -i ../0001-Mention-PLASMA_ENABLE_QML_DEBUG-in-the-Plasmoid-test.patch
-  patch -p1 -i ../0001-Fix-building-Plasmoid-after-Plasma-6-beta-release.patch
-}
-
 build() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"