ktouch: port to kf6

mingw-w64-ktouch/PKGBUILD

@@ -1,14 +1,13 @@
 # Maintainer: Konstantin Podsvirov <konstantin@podsvirov.su>
 
-_variant=-${KF5_VARIANT:-shared}
-source "$(dirname ${BASH_SOURCE[0]})"/../mingw-w64-PKGBUILD-common/kde-frameworks5
+source "$(dirname ${BASH_SOURCE[0]})"/../mingw-w64-PKGBUILD-common/kde-frameworks
 _realname=ktouch
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 pkgver=25.08.0
 pkgrel=1
 arch=('any')
-mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
+mingw_arch=('ucrt64' 'clang64' 'clangarm64')
 msys2_references=(
   'archlinux: ktouch'
 )
@@ -18,17 +17,34 @@ license=('GPL' 'LGPL' 'FDL')
 pkgdesc="Touch Typing Tutor (mingw-w64)"
 groups=("${MINGW_PACKAGE_PREFIX}-kde-applications"
         "${MINGW_PACKAGE_PREFIX}-kde-education")
-depends=("${MINGW_PACKAGE_PREFIX}-kqtquickcharts"
-         "${MINGW_PACKAGE_PREFIX}-kcmutils-qt5"
-         "${MINGW_PACKAGE_PREFIX}-hicolor-icon-theme"
-         "${MINGW_PACKAGE_PREFIX}-qt5-quickcontrols2"
-         "${MINGW_PACKAGE_PREFIX}-qt5-graphicaleffects"
-         "${MINGW_PACKAGE_PREFIX}-qt5-xmlpatterns")
-makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
-             "${MINGW_PACKAGE_PREFIX}-cmake"
-             "${MINGW_PACKAGE_PREFIX}-ninja"
-             "${MINGW_PACKAGE_PREFIX}-extra-cmake-modules"
-             "${MINGW_PACKAGE_PREFIX}-kdoctools-qt5${_namesuff}")
+depends=(
+  "${MINGW_PACKAGE_PREFIX}-kcmutils"
+  "${MINGW_PACKAGE_PREFIX}-kcolorscheme"
+  "${MINGW_PACKAGE_PREFIX}-kcompletion"
+  "${MINGW_PACKAGE_PREFIX}-kconfig"
+  "${MINGW_PACKAGE_PREFIX}-kconfigwidgets"
+  "${MINGW_PACKAGE_PREFIX}-kcoreaddons"
+  "${MINGW_PACKAGE_PREFIX}-ki18n"
+  "${MINGW_PACKAGE_PREFIX}-kirigami"
+  "${MINGW_PACKAGE_PREFIX}-kitemviews"
+  "${MINGW_PACKAGE_PREFIX}-kqtquickcharts"
+  "${MINGW_PACKAGE_PREFIX}-ktextwidgets"
+  "${MINGW_PACKAGE_PREFIX}-kwidgetsaddons"
+  "${MINGW_PACKAGE_PREFIX}-kwindowsystem"
+  "${MINGW_PACKAGE_PREFIX}-kxmlgui"
+  "${MINGW_PACKAGE_PREFIX}-libxml2"
+  "${MINGW_PACKAGE_PREFIX}-qt6-5compat"
+  "${MINGW_PACKAGE_PREFIX}-qt6-base"
+  "${MINGW_PACKAGE_PREFIX}-qt6-declarative"
+)
+makedepends=(
+  "${MINGW_PACKAGE_PREFIX}-cc"
+  "${MINGW_PACKAGE_PREFIX}-cmake"
+  "${MINGW_PACKAGE_PREFIX}-extra-cmake-modules"
+  "${MINGW_PACKAGE_PREFIX}-icoutils"
+  "${MINGW_PACKAGE_PREFIX}-kdoctools"
+  "${MINGW_PACKAGE_PREFIX}-ninja"
+)
 optdepends=("${MINGW_PACKAGE_PREFIX}-breeze-icons: application icon theme")
 source=("https://download.kde.org/stable/release-service/${pkgver}/src/${_realname}-${pkgver}.tar.xz"{,.sig})
 sha256sums=('d1ca5bf8760d19bfa0412875bcda5cdb9b4c0db9bbb39c43f1d7a4042b2d91d3'
@@ -38,29 +54,27 @@ validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid <aac
               D81C0CB38EB725EF6691C385BB463350D6EF31EF) # Heiko Becker <heiko.becker@kde.org>
 
 build() {
-  mkdir -p "${srcdir}/build-${MSYSTEM}${_variant}" && cd "${srcdir}/build-${MSYSTEM}${_variant}"
-
-  local -a extra_config
-
-  if [ "${_variant}" = "-static" ]; then
-    extra_config+=( -DBUILD_SHARED_LIBS=NO )
+  declare -a _extra_config
+  if check_option "debug" "n"; then
+    _extra_config+=("-DCMAKE_BUILD_TYPE=Release")
+  else
+    _extra_config+=("-DCMAKE_BUILD_TYPE=Debug")
   fi
 
-  _kde_f5_build_env
-  ${MINGW_PREFIX}/bin/cmake.exe \
-    -G"Ninja" \
-    -DCMAKE_BUILD_TYPE=$(_kde_f5_CMAKE_BUILD_TYPE) \
-    "${_kde_f5_KDE_INSTALL_DIRS[@]}" \
-    -DBUILD_TESTING=OFF \
-    -DECM_DIR=${MINGW_PREFIX}/share/ECM \
-    "${extra_config[@]}" \
-    ../${_realname}-${pkgver}
+  _kde_build_env
+  MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
+    "${MINGW_PREFIX}"/bin/cmake.exe \
+      -GNinja \
+      -DCMAKE_INSTALL_PREFIX="${MINGW_PREFIX}" \
+      "${_KDE_INSTALL_DIRS[@]}" \
+      -DBUILD_TESTING=OFF \
+      "${_extra_config[@]}" \
+      -S "${_realname}-${pkgver}" \
+      -B "build-${MSYSTEM}"
 
-  ${MINGW_PREFIX}/bin/cmake.exe --build .
+  "${MINGW_PREFIX}"/bin/cmake.exe --build "build-${MSYSTEM}"
 }
 
 package() {
-  cd "${srcdir}/build-${MSYSTEM}${_variant}"
-
-  DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --install .
+  DESTDIR="${pkgdir}" "${MINGW_PREFIX}"/bin/cmake.exe --install "build-${MSYSTEM}"
 }