kate: update to 24.02.2

mingw-w64-PKGBUILD-common/kde-frameworks

@@ -1,4 +1,5 @@
 _kde_build_env() {
+  export MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=;-DECM_MKSPECS_INSTALL_DIR="
   export _KDE_INSTALL_DIRS=(
     -DCMAKE_INSTALL_PREFIX="${MINGW_PREFIX}"
     -DKDE_INSTALL_LIBDIR=lib

mingw-w64-kate/PKGBUILD

@@ -1,11 +1,11 @@
 # Maintainer (MSYS2): Michael Hansen <zrax0111@gmail.com>
 
-_variant=-${KF5_VARIANT:-shared}
-source "$(dirname ${BASH_SOURCE[0]})"/../mingw-w64-PKGBUILD-common/kde-frameworks5
+_variant=-${KF6_VARIANT:-shared}
+source "$(dirname ${BASH_SOURCE[0]})"/../mingw-w64-PKGBUILD-common/kde-frameworks
 _realname=kate
 pkgbase=mingw-w64-${_realname}
-pkgname="${MINGW_PACKAGE_PREFIX}-kate"
-pkgver=23.08.5
+pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
+pkgver=24.02.2
 pkgrel=1
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
@@ -22,25 +22,37 @@ groups=("${MINGW_PACKAGE_PREFIX}-kde-applications"
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-extra-cmake-modules"
              "${MINGW_PACKAGE_PREFIX}-icoutils"
-             "${MINGW_PACKAGE_PREFIX}-kdoctools-qt5${_namesuff}"
+             "${MINGW_PACKAGE_PREFIX}-kdoctools${_namesuff}"
              "${MINGW_PACKAGE_PREFIX}-ninja")
-depends=("${MINGW_PACKAGE_PREFIX}-knewstuff-qt5${_namesuff}"
-         "${MINGW_PACKAGE_PREFIX}-ktexteditor-qt5${_namesuff}"
-         "${MINGW_PACKAGE_PREFIX}-threadweaver-qt5${_namesuff}"
-         "${MINGW_PACKAGE_PREFIX}-kitemmodels-qt5${_namesuff}"
-         "${MINGW_PACKAGE_PREFIX}-kactivities-qt5${_namesuff}"
+depends=("${MINGW_PACKAGE_PREFIX}-knewstuff${_namesuff}"
+         "${MINGW_PACKAGE_PREFIX}-ktexteditor${_namesuff}"
+         "${MINGW_PACKAGE_PREFIX}-threadweaver${_namesuff}"
+         "${MINGW_PACKAGE_PREFIX}-kitemmodels${_namesuff}"
          "${MINGW_PACKAGE_PREFIX}-hicolor-icon-theme")
-optdepends=("${MINGW_PACKAGE_PREFIX}-breeze-icons-qt5${_namesuff}: application icon theme"
-            "${MINGW_PACKAGE_PREFIX}-kinit-qt5${_namesuff}: file system browser plugin")
-source=(https://download.kde.org/stable/release-service/${pkgver}/src/${_realname}-${pkgver}.tar.xz{,.sig})
-sha256sums=('683c49d9c4b2abd4b4660b607b65249a2adfdc48418b0d18ab90810d1a8f4e37'
-            'SKIP')
+optdepends=("${MINGW_PACKAGE_PREFIX}-breeze-icons${_namesuff}: application icon theme"
+            "${MINGW_PACKAGE_PREFIX}-kinit${_namesuff}: file system browser plugin")
+source=(https://download.kde.org/stable/release-service/${pkgver}/src/${_realname}-${pkgver}.tar.xz{,.sig}
+        "kate-24.02.2.diff")
+sha256sums=('1ddacb0939831a43e2b9c1abd8d7e5afefe76789842333263655370e99f5434d'
+            'SKIP' 'SKIP')
 validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid <aacid@kde.org>
               F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87  # Christoph Feck <cfeck@kde.org>
               D81C0CB38EB725EF6691C385BB463350D6EF31EF) # Heiko Becker <heiko.becker@kde.org>
 
+apply_patch_with_msg() {
+  for _fname in "$@"
+  do
+    msg2 "Applying ${_fname}"
+    patch -Nbp1 -i "${srcdir}"/${_fname}
+  done
+}
+
 prepare() {
   mkdir -p build-${MSYSTEM}${_variant}
+
+  cd ${_realname}-${pkgver}
+  apply_patch_with_msg \
+    kate-24.02.2.diff
 }
 
 build() {
@@ -50,10 +62,10 @@ build() {
     extra_config+=( -DBUILD_SHARED_LIBS=NO )
   fi
 
-  _kde_f5_build_env
+  _kde_build_env
   ${MINGW_PREFIX}/bin/cmake.exe \
-    -DCMAKE_BUILD_TYPE=$(_kde_f5_CMAKE_BUILD_TYPE) \
-    "${_kde_f5_KDE_INSTALL_DIRS[@]}" \
+    -DCMAKE_BUILD_TYPE=Release \
+    "${_KDE_INSTALL_DIRS[@]}" \
     -DBUILD_QCH=OFF \
     -DBUILD_TESTING=OFF \
     -DECM_DIR=${MINGW_PREFIX}/share/ECM \

mingw-w64-kate/kate-24.02.2.diff

@@ -0,0 +1,26 @@
+diff --git a/apps/kwrite/main.cpp b/apps/kwrite/main.cpp
+index 9af10e521..aef4b84f0 100644
+--- a/apps/kwrite/main.cpp
++++ b/apps/kwrite/main.cpp
+@@ -17,7 +17,7 @@
+ #include <QIcon>
+ #include <QStandardPaths>
+
+-extern "C" Q_DECL_EXPORT int main(int argc, char **argv)
++int main(int argc, char **argv)
+ {
+     /**
+      * Do all needed pre-application init steps, shared between Kate and KWrite
+diff --git a/apps/lib/kateapp.cpp b/apps/lib/kateapp.cpp
+index a3c90b6fa..d7179a955 100644
+--- a/apps/lib/kateapp.cpp
++++ b/apps/lib/kateapp.cpp
+@@ -79,7 +79,7 @@
+ #include <unistd.h>
+ #endif
+
+-#if HAVE_DAEMON
++#ifdef HAVE_DAEMON
+ #include <unistd.h>
+ #endif
+