gammaray: update to 3.3.0

mingw-w64-gammaray/PKGBUILD

@@ -3,22 +3,20 @@
 _realname=gammaray
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=3.2.2
+pkgver=3.3.0
 pkgrel=1
+pkgdesc="A tool for examining the internals of a Qt application and to some extent also manipulate it (mingw-64)"
 arch=('any')
-mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
+mingw_arch=('ucrt64' 'clang64' 'clangarm64')
-pkgdesc="A tool for examining the internals of a Qt application and to some extent also manipulate it"
 url="https://www.kdab.com/gammaray/"
 msys2_repository_url="https://github.com/KDAB/GammaRay"
 msys2_references=(
   'archlinux: gammaray'
 )
 license=('spdx:GPL-2.0-or-later')
-provides=("${MINGW_PACKAGE_PREFIX}-${_realname}-qt5")
-replaces=("${MINGW_PACKAGE_PREFIX}-${_realname}-qt5")
-conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}-qt5")
 depends=("${MINGW_PACKAGE_PREFIX}-qt6-base"
-         "${MINGW_PACKAGE_PREFIX}-dlfcn")
+         "${MINGW_PACKAGE_PREFIX}-dlfcn"
+         "${MINGW_PACKAGE_PREFIX}-syntax-highlighting")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-ninja"
@@ -33,20 +31,9 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-qt6-shadertools"
              "${MINGW_PACKAGE_PREFIX}-qt6-svg"
              "${MINGW_PACKAGE_PREFIX}-qt6-tools"
-             "${MINGW_PACKAGE_PREFIX}-kcoreaddons-qt5"
-             "${MINGW_PACKAGE_PREFIX}-kdstatemachineeditor-qt5"
-             "${MINGW_PACKAGE_PREFIX}-qt5-3d"
-             "${MINGW_PACKAGE_PREFIX}-qt5-connectivity"
-             "${MINGW_PACKAGE_PREFIX}-qt5-declarative"
-             "${MINGW_PACKAGE_PREFIX}-qt5-gamepad"
-             "${MINGW_PACKAGE_PREFIX}-qt5-location"
-             "${MINGW_PACKAGE_PREFIX}-qt5-script"
-             "${MINGW_PACKAGE_PREFIX}-qt5-scxml"
-             "${MINGW_PACKAGE_PREFIX}-qt5-svg"
-             "${MINGW_PACKAGE_PREFIX}-qt5-tools"
-             "${MINGW_PACKAGE_PREFIX}-syntax-highlighting-qt5"
              "${MINGW_PACKAGE_PREFIX}-doxygen"
-             "${MINGW_PACKAGE_PREFIX}-glslang")
+             "${MINGW_PACKAGE_PREFIX}-glslang"
+             "${MINGW_PACKAGE_PREFIX}-kcoreaddons")
 optdepends=("${MINGW_PACKAGE_PREFIX}-qt6-3d: 3D plugins"
             "${MINGW_PACKAGE_PREFIX}-qt6-declarative: Quick/Qml and positioning plugins"
             "${MINGW_PACKAGE_PREFIX}-qt6-scxml: state machine viewer plugin"
@@ -54,22 +41,12 @@ optdepends=("${MINGW_PACKAGE_PREFIX}-qt6-3d: 3D plugins"
             "${MINGW_PACKAGE_PREFIX}-qt5-positioning: positioning plugin"
             "${MINGW_PACKAGE_PREFIX}-qt6-svg: Widget Export actions plugin"
             "${MINGW_PACKAGE_PREFIX}-qt6-tools: Widget Export actions plugin"
-            "${MINGW_PACKAGE_PREFIX}-qt5-3d: Qt5 3D plugins"
+            "${MINGW_PACKAGE_PREFIX}-kcoreaddons")
-            "${MINGW_PACKAGE_PREFIX}-qt5-base: Qt5 applications support"
-            "${MINGW_PACKAGE_PREFIX}-qt5-declarative: Qt5 Quick/Qml and positioning plugins"
-            "${MINGW_PACKAGE_PREFIX}-qt5-scxml: Qt5 state machine viewer plugin"
-            "${MINGW_PACKAGE_PREFIX}-qt5-connectivity: Qt5 bluetooth plugin"
-            "${MINGW_PACKAGE_PREFIX}-qt5-script: Qt5 script engine debugger plugin"
-            "${MINGW_PACKAGE_PREFIX}-qt5-location: Qt5 positioning plugin"
-            "${MINGW_PACKAGE_PREFIX}-qt5-svg: Qt5 Widget Export actions plugin"
-            "${MINGW_PACKAGE_PREFIX}-qt5-tools: Qt5 Widget Export actions plugin"
-            "${MINGW_PACKAGE_PREFIX}-kcoreaddons-qt5: KJob tracker plugin"
-            "${MINGW_PACKAGE_PREFIX}-kdstatemachineeditor-qt5: ")
 source=(${msys2_repository_url}/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz
         003-win32-not-elf.patch
         004-files-layout.patch
         005-fix-dll-naming.patch)
-sha256sums=('18830a83ca8ba8e6e07d78a88d933c2666eda4b26d3cbdc97e06914f5e92388c'
+sha256sums=('03fda338025d31b6a2794550f090d538996bbb6f4888eab3acb39db5a17127a8'
             'b13e2caa213d0b83a37c72e57bb5dc6e1d7e3d06d3f3031ad8931df3059cd9c0'
             '5c7e44e3fa6e914e369c2149fe9ca4b9e133f6753c7c6539cef66c9aeac5da21'
             '1d4ebacca418f8f1c9df0c4c438742e63d5d372d37d1605ecf9b478b098155eb')
@@ -105,38 +82,30 @@ build() {
     _extra_config+=("-DSTACK_DETAILS_BFD=OFF")
   fi
 
-  for _qt_ver in 5 6; do
+  MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=;-DECM_MKSPECS_INSTALL_DIR=;-DPLUGIN_INSTALL_DIR=;" \
-    if [[ ${_qt_ver} == 5 ]]; then
+  ${MINGW_PREFIX}/bin/cmake.exe \
-      _include_dir=include
+    -G "Ninja" \
-    else
+    -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
-      _include_dir=include/qt6
+    -DCMAKE_INSTALL_OLDINCLUDEDIR=${MINGW_PREFIX}/include/qt6 \
-    fi
+    -DTRANSLATION_INSTALL_DIR=${MINGW_PREFIX}/share/qt6/translations \
-    MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=;-DECM_MKSPECS_INSTALL_DIR=;-DPLUGIN_INSTALL_DIR=;" \
+    -DPLUGIN_INSTALL_DIR=${MINGW_PREFIX}/share/qt6/plugins/gammaray \
-    ${MINGW_PREFIX}/bin/cmake.exe \
+    -DECM_MKSPECS_INSTALL_DIR=${MINGW_PREFIX}/share/qt6/mkspecs/modules \
-      -G "Ninja" \
+    -DGAMMARAY_INSTALL_QT_LAYOUT=ON \
-      -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
+    -DGAMMARAY_MULTI_BUILD=FALSE \
-      -DCMAKE_INSTALL_OLDINCLUDEDIR=${MINGW_PREFIX}/${_include_dir} \
+    -DGAMMARAY_WITH_KDSME=OFF \
-      -DTRANSLATION_INSTALL_DIR=${MINGW_PREFIX}/share/qt${_qt_ver}/translations \
+    -DSTACK_DETAILS_AUTO_DETECT=OFF \
-      -DPLUGIN_INSTALL_DIR=${MINGW_PREFIX}/share/qt${_qt_ver}/plugins/gammaray \
+    -DMINGW_MSVCR_LIBRARY="" \
-      -DECM_MKSPECS_INSTALL_DIR=${MINGW_PREFIX}/share/qt${_qt_ver}/mkspecs/modules \
+    -DQT_VERSION_MAJOR=6 \
-      -DGAMMARAY_INSTALL_QT_LAYOUT=ON \
+    "${_extra_config[@]}" \
-      -DGAMMARAY_MULTI_BUILD=FALSE \
+    -S ${_realname}-${pkgver} \
-      -DGAMMARAY_WITH_KDSME=OFF \
+    -B build-${MSYSTEM}
-      -DSTACK_DETAILS_AUTO_DETECT=OFF \
-      -DMINGW_MSVCR_LIBRARY="" \
-      -DQT_VERSION_MAJOR=${_qt_ver} \
-      "${_extra_config[@]}" \
-      -S ${_realname}-${pkgver} \
-      -B build-${MSYSTEM}-qt${_qt_ver}
 
-    ${MINGW_PREFIX}/bin/cmake.exe --build build-${MSYSTEM}-qt${_qt_ver}
+  ${MINGW_PREFIX}/bin/cmake.exe --build build-${MSYSTEM}
-  done
 }
 
 package() {
-  for _qt_ver in 5 6; do
+  DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --install build-${MSYSTEM}
-    DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --install build-${MSYSTEM}-qt${_qt_ver}
-  done
 
-  install -Dm644 "${srcdir}"/${_realname}-${pkgver}/LICENSE.txt "${pkgdir}"${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE
+  install -Dm644 "${srcdir}"/${_realname}-${pkgver}/LICENSE.txt \
+    "${pkgdir}"${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE
 }