upgpkg: ktailctl 0.16.0-1

upstream release

3 files changed, 29 insertions, 68 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 699b028501d4..4e18960e8092 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = ktailctl
 	pkgdesc = GUI to monitor and manage Tailscale
-	pkgver = 0.15.0
+	pkgver = 0.16.0
 	pkgrel = 1
 	url = https://github.com/f-koehler/KTailctl
 	arch = x86_64
@@ -8,25 +8,23 @@ pkgbase = ktailctl
 	license = GPL-3.0-only
 	makedepends = cmake
 	makedepends = extra-cmake-modules
+	makedepends = go
 	depends = gcc-libs
 	depends = glibc
 	depends = hicolor-icon-theme
-	depends = kconfig5
-	depends = kcoreaddons5
-	depends = kguiaddons5
-	depends = ki18n5
-	depends = kirigami-addons5
-	depends = kirigami2
-	depends = knotifications5
+	depends = kconfig
+	depends = kcoreaddons
+	depends = kguiaddons
+	depends = ki18n
+	depends = kirigami
+	depends = kirigami-addons
+	depends = knotifications
 	depends = nlohmann-json
-	depends = qt5-base
-	depends = qt5-declarative
-	depends = qt5-quickcontrols2
-	depends = qt5-svg
+	depends = qt6-base
+	depends = qt6-declarative
+	depends = qt6-svg
 	depends = tailscale
-	source = git+https://github.com/f-koehler/KTailctl.git#tag=v0.15.0
-	source = 0001-use-system-packages.patch
-	sha256sums = SKIP
-	sha256sums = 4a81c8d6a4ffb52f592e942e45307facad6f0bb82da65998942a2578792b043c
+	source = git+https://github.com/f-koehler/KTailctl.git#tag=v0.16.0
+	sha256sums = 17e37f1acabfb2ec90032b8f94eca67a03e322a030a039537b0ce260d65a01de
 
 pkgname = ktailctl
diff --git a/0001-use-system-packages.patch b/0001-use-system-packages.patch
deleted file mode 100644
index f50d08df7b15..000000000000
--- a/0001-use-system-packages.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c0f74eb..119fd41 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -61,12 +61,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
- add_subdirectory(src)
- add_subdirectory(tailwrap)
- 
--if(NOT KTAILCTL_FLATPAK_BUILD)
--    set(JSON_BuildTests OFF CACHE INTERNAL "")
--    add_subdirectory(deps/json)
--    add_subdirectory(deps/kirigami-addons)
--endif()
--
- execute_process(
-     COMMAND ${GIT_EXECUTABLE} describe --tags --dirty --match "v*"
-     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 502f1a0..07adbd6 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -4,9 +4,7 @@
- include(CheckIPOSupported)
- check_ipo_supported(RESULT ipo_supported OUTPUT ipo_output)
- 
--if(KTAILCTL_FLATPAK_BUILD)
--    find_package(nlohmann_json REQUIRED)
--endif()
-+find_package(nlohmann_json REQUIRED)
- 
- add_executable(ktailctl
-     about.cpp
diff --git a/PKGBUILD b/PKGBUILD
index 25626e18c11b..f567d5427d49 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: tarball <bootctl@gmail.com>
 
 pkgname=ktailctl
-pkgver=0.15.0
+pkgver=0.16.0
 pkgrel=1
 arch=(x86_64 aarch64)
 url='https://github.com/f-koehler/KTailctl'
@@ -11,32 +11,27 @@ depends=(
   gcc-libs
   glibc
   hicolor-icon-theme
-  kconfig5
-  kcoreaddons5
-  kguiaddons5
-  ki18n5
-  kirigami-addons5
-  kirigami2
-  knotifications5
+  kconfig
+  kcoreaddons
+  kguiaddons
+  ki18n
+  kirigami
+  kirigami-addons
+  knotifications
   nlohmann-json
-  qt5-base
-  qt5-declarative
-  qt5-quickcontrols2
-  qt5-svg
+  qt6-base
+  qt6-declarative
+  qt6-svg
   tailscale
 )
-makedepends=(cmake extra-cmake-modules)
+makedepends=(cmake extra-cmake-modules go)
 
 # git tag is used by the cmake script to determine app version
-source=(git+$url.git#tag=v$pkgver 0001-use-system-packages.patch)
-sha256sums=('SKIP'
-            '4a81c8d6a4ffb52f592e942e45307facad6f0bb82da65998942a2578792b043c')
+source=(git+$url.git#tag=v$pkgver)
+sha256sums=('17e37f1acabfb2ec90032b8f94eca67a03e322a030a039537b0ce260d65a01de')
 
 prepare() {
-  cd KTailctl
-  patch -p1 <"$srcdir"/0001-use-system-packages.patch
-
-  cd tailwrap
+  cd KTailctl/tailwrap
   go mod vendor
 }