Switch Git packages of my projects to use Qt 6

2024-02-28 13:19:37 +01:00 · 2024-02-28 13:19:37 +01:00 · 687936b365
parent 620e255462
commit 687936b365
6 changed files with 46 additions and 34 deletions
--- a/passwordmanager/git/PKGBUILD
+++ b/passwordmanager/git/PKGBUILD
@ -10,14 +10,13 @@ _reponame=passwordmanager
 pkgname=passwordmanager-git
 _name=${pkgname%-git}
 pkgver=300.3a01f2d
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
 pkgdesc='A simple password store using AES-256-CBC encryption via OpenSSL'
 license=('GPL')
-depends=('qt5-base' 'libqtutilities-git.so' 'libpasswordfile-git.so' 'libc++utilities-git.so' 'openssl'
+depends=('qt6-base' 'libqtutilities-git.so' 'libpasswordfile-git.so' 'libc++utilities-git.so' 'openssl'
         'libxkbcommon-x11' 'desktop-file-utils' 'xdg-utils')
-makedepends=('cmake' 'ninja' 'qt5-tools' 'git' 'kirigami2')
-optdepends=('kirigami2: Qt Quick GUI')
+makedepends=('cmake' 'ninja' 'qt6-tools' 'git' 'clang' 'qt6-declarative')
 provides=("${_name}")
 conflicts=("${_name}")
 url="https://github.com/Martchus/${_reponame}"
@ -26,8 +25,9 @@ sha256sums=('SKIP')

 # add further dependencies for the Qt Quick GUI (only kirigami2 is "pluggable")
 if [[ $_quick_gui == ON ]]; then
-    depends+=('qt5-quickcontrols2')
-    optdepends+=('kirigami2: Qt Quick GUI')
+    depends+=('qt6-declarative')
+    optdepends+=('kirigami: Qt Quick GUI')
+    makedepends+=('kirigami')
 fi

 pkgver() {
@ -43,6 +43,8 @@ build() {
    -DCMAKE_INSTALL_PREFIX:PATH='/usr' \
    -DCONFIGURATION_NAME:STRING='git' \
    -DCONFIGURATION_PACKAGE_SUFFIX:STRING='-git' \
+    -DQT_PACKAGE_PREFIX:STRING='Qt6' \
+    -DKF_PACKAGE_PREFIX:STRING='KF6' \
    -DQUICK_GUI="$_quick_gui" \
    -DBUILTIN_TRANSLATIONS:BOOL=ON \
    -DBUILTIN_TRANSLATIONS_OF_QT:BOOL=OFF \
--- a/qtforkawesome/git/PKGBUILD
+++ b/qtforkawesome/git/PKGBUILD
@ -9,16 +9,16 @@ _reponame_forkawesome=Fork-Awesome-$_pkgver_forkawesome
 pkgname=qtforkawesome-git
 _name=${pkgname%-git}
 pkgver=46.1c92ea5
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
 pkgdesc='Library that bundles ForkAwesome for use within Qt applications'
 license=('GPL')
-depends=('qt5-base')
+depends=('qt6-base')
 optdepends=(
-  'qt5-declarative: Qt Quick integration'
+  'qt6-declarative: Qt Quick integration'
  "$_name-doc: API documentation"
 )
-makedepends=('cmake' 'git' 'ninja' 'perl-yaml-libyaml' 'qtutilities-git' 'qt5-declarative')
+makedepends=('cmake' 'git' 'ninja' 'perl-yaml-libyaml' 'qtutilities-git' 'qt6-declarative' 'clang')
 provides=(libqtforkawesome-git.so libqtquickforkawesome-git.so)
 url="https://github.com/Martchus/${_reponame}"
 source=("${_reponame}::${MARTCHUS_GIT_URL_PREFIX:-git+https://github.com/Martchus}/${_reponame}.git"
@ -40,6 +40,8 @@ build() {
    -DCONFIGURATION_NAME:STRING='git' \
    -DCONFIGURATION_PACKAGE_SUFFIX:STRING='-git' \
    -DCONFIGURATION_TARGET_SUFFIX:STRING='git' \
+    -DQT_PACKAGE_PREFIX:STRING='Qt6' \
+    -DKF_PACKAGE_PREFIX:STRING='KF6' \
    -DBUILD_SHARED_LIBS:BOOL=ON \
    -DBUILTIN_TRANSLATIONS:BOOL=ON \
    -DFORK_AWESOME_FONT_FILE="$srcdir/${_reponame_forkawesome}/fonts/forkawesome-webfont.woff2" \
--- a/qtutilities/git/PKGBUILD
+++ b/qtutilities/git/PKGBUILD
@ -7,13 +7,13 @@ _reponame=qtutilities
 pkgname=qtutilities-git
 _name=${pkgname%-git}
 pkgver=421.b5af7fe
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
 pkgdesc='Common Qt related C++ classes and routines used by my applications such as dialogs, widgets and models'
 license=('GPL')
-depends=('libc++utilities-git.so' 'qt5-base' 'libx11')
+depends=('libc++utilities-git.so' 'qt6-base' 'libx11')
 optdepends=("$_name-doc: API documentation")
-makedepends=('cmake' 'git' 'ninja' 'qt5-tools')
+makedepends=('cmake' 'git' 'ninja' 'qt6-tools' 'qt6-declarative' 'clang')
 provides=(libqtutilities-git.so)
 url="https://github.com/Martchus/${_reponame}"
 source=("${_reponame}::${MARTCHUS_GIT_URL_PREFIX:-git+https://github.com/Martchus}/${_reponame}.git")
@ -33,6 +33,8 @@ build() {
    -DCONFIGURATION_NAME:STRING='git' \
    -DCONFIGURATION_PACKAGE_SUFFIX:STRING='-git' \
    -DCONFIGURATION_TARGET_SUFFIX:STRING='git' \
+    -DQT_PACKAGE_PREFIX:STRING='Qt6' \
+    -DKF_PACKAGE_PREFIX:STRING='KF6' \
    -DBUILD_SHARED_LIBS:BOOL=ON \
    -DBUILTIN_TRANSLATIONS:BOOL=ON \
    .
--- a/syncthingtray/git/PKGBUILD
+++ b/syncthingtray/git/PKGBUILD
@ -26,23 +26,23 @@ _reponame=syncthingtray
 pkgname=syncthingtray-git
 _name=${pkgname%-git}
 pkgver=1714.7846301
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
 pkgdesc='Tray application for Syncthing'
 license=('GPL')
 depends=('libqtutilities-git.so' 'libqtforkawesome-git.so' 'libc++utilities-git.so' 'libboost_filesystem.so'
-         'qt5-svg' 'openssl' 'desktop-file-utils' 'xdg-utils')
-[[ $_webview_provider == none ]] && [[ $_js_provider == none ]] && depends+=('qt5-base')
-[[ $_webview_provider == webkit ]] && depends+=('qt5-webkit')
-[[ $_webview_provider == webengine ]] && depends+=('qt5-webengine')
-[[ $_js_provider == script ]] && depends+=('qt5-script')
-[[ $_js_provider == qml ]] && depends+=('qt5-declarative')
-[[ $_enable_kio_plugin ]] && optdepends+=('kio5: KIO plugin for Syncthing actions in Dolphin')
-[[ $_enable_plasmoid ]] && optdepends+=('plasma-workspace: Plasmoid for Plasma 5 desktop')
-makedepends=('cmake' 'ninja' 'qt5-tools' 'git' 'boost')
+         'qt6-svg' 'openssl' 'desktop-file-utils' 'xdg-utils')
+[[ $_webview_provider == none ]] && [[ $_js_provider == none ]] && depends+=('qt6-base')
+[[ $_webview_provider == webkit ]] && depends+=('qt6-webkit')
+[[ $_webview_provider == webengine ]] && depends+=('qt6-webengine')
+[[ $_js_provider == script ]] && depends+=('qt6-script')
+[[ $_js_provider == qml ]] && depends+=('qt6-declarative')
+[[ $_enable_kio_plugin ]] && optdepends+=('kio: KIO plugin for Syncthing actions in Dolphin')
+[[ $_enable_plasmoid ]] && optdepends+=('plasma-workspace: Plasmoid for Plasma 6 desktop')
+makedepends=('cmake' 'ninja' 'qt6-tools' 'qt6-declarative' 'git' 'boost' 'clang')
 checkdepends=('cppunit' 'syncthing' 'iproute2')
-[[ $_enable_kio_plugin ]] && makedepends+=('kio5')
-[[ $_enable_plasmoid ]] && makedepends+=('plasma-framework5' 'extra-cmake-modules')
+[[ $_enable_kio_plugin ]] && makedepends+=('kio')
+[[ $_enable_plasmoid ]] && makedepends+=('libplasma' 'extra-cmake-modules')
 #provides=("${_name}")
 conflicts=("${_name}")
 url="https://github.com/Martchus/${_reponame}"
@ -77,6 +77,8 @@ build() {
    -DLIB_SYNCTHING_MODEL_CONFIGURATION_TARGET_SUFFIX:STRING='git' \
    -DSYNCTHINGPLASMOID_CONFIGURATION_TARGET_SUFFIX:STRING='git' \
    -DSYNCTHINGWIDGETS_CONFIGURATION_TARGET_SUFFIX:STRING='git' \
+    -DQT_PACKAGE_PREFIX:STRING='Qt6' \
+    -DKF_PACKAGE_PREFIX:STRING='KF6' \
    -DBUILD_SHARED_LIBS:BOOL=ON \
    -DWEBVIEW_PROVIDER="${_webview_provider}" \
    -DJS_PROVIDER="${_js_provider}" \
--- a/tageditor/git/PKGBUILD
+++ b/tageditor/git/PKGBUILD
@ -16,17 +16,17 @@ _reponame=tageditor
 pkgname=tageditor-git
 _name=${pkgname%-git}
 pkgver=719.9599560
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
 pkgdesc='A tag editor with Qt GUI and command-line interface supporting MP4/M4A/AAC (iTunes), ID3, Vorbis, Opus, FLAC and Matroska'
 license=('GPL')
 depends=('libqtutilities-git.so' 'libtagparser-git.so' 'libc++utilities-git.so' 'desktop-file-utils' 'xdg-utils')
-[[ $_webview_provider == none ]] && [[ $_js_provider == none ]] && depends+=('qt5-base')
-[[ $_webview_provider == webkit ]] && depends+=('qt5-webkit')
-[[ $_webview_provider == webengine ]] && depends+=('qt5-webengine')
-[[ $_js_provider == script ]] && depends+=('qt5-script')
-[[ $_js_provider == qml ]] && depends+=('qt5-declarative')
-makedepends=('cmake' 'qt5-tools' 'git' 'ninja')
+[[ $_webview_provider == none ]] && [[ $_js_provider == none ]] && depends+=('qt6-base')
+[[ $_webview_provider == webkit ]] && depends+=('qt6-webkit')
+[[ $_webview_provider == webengine ]] && depends+=('qt6-webengine')
+[[ $_js_provider == script ]] && depends+=('qt6-script')
+[[ $_js_provider == qml ]] && depends+=('qt6-declarative')
+makedepends=('cmake' 'qt6-tools' 'git' 'ninja' 'clang' 'qt6-declarative')
 [[ $_json_export == ON ]] && makedepends+=('reflective-rapidjson-git')
 checkdepends=('cppunit' 'jq')
 provides=("${_name}")
@ -48,6 +48,8 @@ build() {
    -DCMAKE_INSTALL_PREFIX:PATH='/usr' \
    -DCONFIGURATION_NAME:STRING='git' \
    -DCONFIGURATION_PACKAGE_SUFFIX:STRING='-git' \
+    -DQT_PACKAGE_PREFIX:STRING='Qt6' \
+    -DKF_PACKAGE_PREFIX:STRING='KF6' \
    -DBUILD_SHARED_LIBS:BOOL=ON \
    -DWEBVIEW_PROVIDER="${_webview_provider}" \
    -DJS_PROVIDER="${_js_provider}" \
--- a/videodownloader/git/PKGBUILD
+++ b/videodownloader/git/PKGBUILD
@ -7,12 +7,12 @@ _reponame=videodownloader
 pkgname=videodownloader-git
 _name=${pkgname%-git}
 pkgver=116.5e42ba0
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
 pkgdesc='A video downloader with Qt GUI (currently only YouTube and Vimeo are maintained)'
 license=('GPL')
 depends=('qtutilities-git' 'openssl' 'desktop-file-utils' 'xdg-utils')
-makedepends=('cmake' 'ninja' 'qt5-tools' 'git')
+makedepends=('cmake' 'ninja' 'qt6-tools' 'git' 'clang' 'qt6-declarative')
 provides=("${_name}")
 conflicts=("${_name}")
 url="https://github.com/Martchus/${_reponame}"
@ -32,6 +32,8 @@ build() {
    -DCMAKE_INSTALL_PREFIX:PATH='/usr' \
    -DCONFIGURATION_NAME:STRING='git' \
    -DCONFIGURATION_PACKAGE_SUFFIX:STRING='-git' \
+    -DQT_PACKAGE_PREFIX:STRING='Qt6' \
+    -DKF_PACKAGE_PREFIX:STRING='KF6' \
    -DBUILD_SHARED_LIBS:BOOL=ON \
    -DBUILTIN_TRANSLATIONS:BOOL=ON \
    -DBUILTIN_TRANSLATIONS_OF_QT:BOOL=OFF \