From dce082df21a085081ef44b50e4471667d15b69b1 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Mon, 13 May 2024 02:11:34 -0400 Subject: [PATCH 1/4] qtutilities: qt5 -> qt6 --- srcpkgs/qtutilities/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/qtutilities/template b/srcpkgs/qtutilities/template index c5f8779238a655..4fbc5d6885e805 100644 --- a/srcpkgs/qtutilities/template +++ b/srcpkgs/qtutilities/template @@ -1,17 +1,17 @@ # Template file for 'qtutilities' pkgname=qtutilities version=6.14.0 -revision=1 +revision=2 build_style=cmake -configure_args="-DBUILD_SHARED_LIBS:BOOL=ON" -hostmakedepends="qt5-qmake qt5-host-tools" -makedepends="qt5-tools-devel cpp-utilities-devel" +configure_args="-DBUILD_SHARED_LIBS=ON -DQT_PACKAGE_PREFIX=Qt6" +hostmakedepends="qt6-base qt6-tools" +makedepends="qt6-base-devel cpp-utilities-devel" checkdepends="xvfb-run" short_desc="Qt helper routines, including dialogs, widgets, and models" maintainer="Andrew J. Hesford " license="GPL-2.0-only" homepage="https://github.com/Martchus/qtutilities" -distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz" +distfiles="https://github.com/Martchus/qtutilities/archive/v${version}.tar.gz" checksum=4eab9ef26edf67c1c436596bea42890fcc0206f93c50413939ccce8c94bf7bc0 pre_check() { From 487c81d10ef4830d90a5e7069d8984677d9cca94 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Mon, 13 May 2024 02:11:46 -0400 Subject: [PATCH 2/4] qtforkawesome: qt5 -> qt6 --- srcpkgs/qtforkawesome/template | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/srcpkgs/qtforkawesome/template b/srcpkgs/qtforkawesome/template index b37ed68e4288f8..5da08201e7db85 100644 --- a/srcpkgs/qtforkawesome/template +++ b/srcpkgs/qtforkawesome/template @@ -1,30 +1,32 @@ # Template file for 'qtforkawesome' pkgname=qtforkawesome version=0.2.0 -revision=1 +revision=2 _fork_awesome_version=1.2.0 -create_wrksrc=yes -build_wrksrc="${pkgname}-${version}" build_style=cmake -configure_args="-DBUILD_SHARED_LIBS=ON" -hostmakedepends="qt5-host-tools qt5-qmake perl-YAML" -makedepends="qt5-devel qt5-declarative-devel qtutilities-devel cpp-utilities-devel - qt5-gui qt5-core qt5-quickcontrols" +configure_args="-DBUILD_SHARED_LIBS=ON -DQT_PACKAGE_PREFIX=Qt6" +make_check_target="check" +hostmakedepends="qt6-tools qt6-base perl-YAML" +makedepends="qtutilities-devel cpp-utilities-devel qt6-base-devel qt6-declarative-devel" short_desc="Library that bundles ForkAwesome for use within Qt applications" maintainer="classabbyamp " license="GPL-2.0-or-later, OFL-1.1" homepage="https://github.com/Martchus/qtforkawesome" distfiles="https://github.com/Martchus/qtforkawesome/archive/refs/tags/v${version}.tar.gz - https://github.com/ForkAwesome/Fork-Awesome/archive/refs/tags/${_fork_awesome_version}.tar.gz" + https://github.com/ForkAwesome/Fork-Awesome/archive/refs/tags/${_fork_awesome_version}.tar.gz>Fork-Awesome-${_fork_awesome_version}.tar.gz" checksum="42de641e79b22d4dd44eb179e8818a8a4bf424c3feec1d0d9524bae5fde458cc 23fba5f191f204e0414c547bf4c9b10fd7ca42c151260e8f64698449a75fbdb3" - make_check_pre="env QT_QPA_PLATFORM=offscreen" -make_check_target="check" +skip_extraction="Fork-Awesome-${_fork_awesome_version}.tar.gz" + +post_extract() { + vsrcextract -C Fork-Awesome "Fork-Awesome-${_fork_awesome_version}.tar.gz" +} pre_configure() { - configure_args+=" -DFORK_AWESOME_FONT_FILE=${wrksrc}/Fork-Awesome-${_fork_awesome_version}/fonts/forkawesome-webfont.woff2 - -DFORK_AWESOME_ICON_DEFINITIONS=${wrksrc}/Fork-Awesome-${_fork_awesome_version}/src/icons/icons.yml" + configure_args+=" + -DFORK_AWESOME_FONT_FILE=${wrksrc}/Fork-Awesome/fonts/forkawesome-webfont.woff2 + -DFORK_AWESOME_ICON_DEFINITIONS=${wrksrc}/Fork-Awesome/src/icons/icons.yml" } qtforkawesome-devel_package() { From 18f3338dff7a03e57062d2deb416837a02d9fc4f Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Mon, 13 May 2024 02:11:56 -0400 Subject: [PATCH 3/4] tageditor: qt5 -> qt6 clean up build options --- srcpkgs/tageditor/template | 72 +++----------------------------------- 1 file changed, 5 insertions(+), 67 deletions(-) diff --git a/srcpkgs/tageditor/template b/srcpkgs/tageditor/template index 36eb7dec137ea5..d8c36871fa8857 100644 --- a/srcpkgs/tageditor/template +++ b/srcpkgs/tageditor/template @@ -1,77 +1,15 @@ # Template file for 'tageditor' pkgname=tageditor version=3.9.0 -revision=1 +revision=2 build_style=cmake -configure_args="-DBUILD_SHARED_LIBS:BOOL=ON" -hostmakedepends="pkg-config" -makedepends="tagparser-devel cpp-utilities-devel" +configure_args="-DQT_PACKAGE_PREFIX=Qt6" +hostmakedepends="pkg-config qt6-tools qt6-base" +makedepends="tagparser-devel cpp-utilities-devel qtutilities-devel + qt6-base-devel qt6-declarative-devel" short_desc="Tag editor for AAC, ID3, Vorbis, Opus, FLAC and Matroska" maintainer="Andrew J. Hesford " license="GPL-2.0-only" homepage="https://github.com/Martchus/tageditor" distfiles="https://github.com/Martchus/tageditor/archive/v${version}.tar.gz" checksum=ebafac24ab7c3833a018b5848b32d9fa2cfa01cafeff1b1ec1a6e30eb7415b1b - -build_options="qt webengine webkit script" -build_options_default="qt" - -desc_option_webengine="Enable support for qt5-webengine file views (requires qt)" -desc_option_webkit="Enable support for qt5-webkit file views (requires qt)" -desc_option_script="Enable support for qt5-script javascript (requires qt)" - -case "$XBPS_TARGET_MACHINE" in - x86_64*|aarch64*|armv[67]*|ppc64le*) - if [ "$XBPS_WORDSIZE" = "$XBPS_TARGET_WORDSIZE" ]; then - _use_webengine=yes - fi - ;; - *) ;; -esac - -if [ "$_use_webengine" ]; then - build_options_default+=" webengine" -else - build_options_default+=" webkit" -fi - -vopt_conflict webengine webkit - -if [ "$build_option_qt" ]; then - hostmakedepends+=" qt5-host-tools qt5-qmake" - makedepends+=" qtutilities-devel qt5-tools-devel qt5-declarative-devel" - - if [ "$build_option_webengine" ]; then - configure_args+=" -DWEBVIEW_PROVIDER=webengine" - makedepends+=" qt5-location-devel - qt5-webengine-devel qt5-webchannel-devel" - elif [ "$build_option_webkit" ]; then - configure_args+=" -DWEBVIEW_PROVIDER=webkit" - makedepends+=" qt5-webkit-devel" - else - configure_args+=" -DWEBVIEW_PROVIDER=none" - fi - - if [ "$build_option_script" ]; then - configure_args+=" -DJS_PROVIDER=script" - makedepends+=" qt5-script-devel" - else - configure_args+=" -DJS_PROVIDER=qml" - fi -else - configure_args+=" -DWIDGETS_GUI:BOOL=OFF -DQUICK_GUI:BOOL=OFF" -fi - -pre_build() { - if [ -z "$build_option_qt" ]; then - vsed -i application/main.cpp -e "/^using namespace QtUtilities;$/s@^@//@" - fi -} - -post_install() { - if [ -z "$build_option_qt" ]; then - rm -rf "${DESTDIR}/usr/share/metainfo" - rm -rf "${DESTDIR}/usr/share/icons" - rm -rf "${DESTDIR}/usr/share/applications" - fi -} From de7fd6f4558797ea313fa3abc2f40fd4984ec83a Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Mon, 13 May 2024 02:12:05 -0400 Subject: [PATCH 4/4] syncthingtray: qt5 -> qt6 clean up build options --- srcpkgs/syncthingtray/template | 36 +++++++++++----------------------- 1 file changed, 11 insertions(+), 25 deletions(-) diff --git a/srcpkgs/syncthingtray/template b/srcpkgs/syncthingtray/template index 7a0a1a46cfb1cc..7c9d0190d74d15 100644 --- a/srcpkgs/syncthingtray/template +++ b/srcpkgs/syncthingtray/template @@ -1,17 +1,13 @@ # Template file for 'syncthingtray' pkgname=syncthingtray version=1.5.3 -revision=1 +revision=2 build_style=cmake -configure_args="-DJS_PROVIDER=qml -DBUILTIN_TRANSLATIONS=ON -DSYSTEMD_SUPPORT=OFF - -DBUILD_SHARED_LIBS=ON -DWEBVIEW_PROVIDER=$(vopt_if webengine webengine none) - -Wno-dev" -hostmakedepends="pkg-config qt5-host-tools qt5-qmake extra-cmake-modules plasma-framework - kwallet" -makedepends="cpp-utilities-devel qtutilities-devel qtforkawesome-devel - qt5-devel qt5-core qt5-network qt5-gui qt5-widgets qt5-svg qt5-declarative - qt5-quickcontrols qt5-location-devel boost-devel kio-devel plasma-framework-devel - $(vopt_if webengine 'qt5-webengine-devel qt5-webchannel-devel')" +configure_args="-DBUILTIN_TRANSLATIONS=ON -DSYSTEMD_SUPPORT=OFF + -DBUILD_SHARED_LIBS=ON -DQT_PACKAGE_PREFIX=Qt6 -DKF_PACKAGE_PREFIX=KF6" +hostmakedepends="pkg-config qt6-tools qt6-base extra-cmake-modules plasma-framework" +makedepends="cpp-utilities-devel qtutilities-devel qtforkawesome-devel boost-devel + qt6-base-devel qt6-declarative-devel qt6-svg-devel libplasma-devel" depends="syncthing" checkdepends="syncthing iproute2" short_desc="Tray application for Syncthing" @@ -25,16 +21,6 @@ checksum=9a3f0d22b598041403668341282ed9222e0b83bf4eb43b27717b0b253ba7ad9c # https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=syncthingtray#n50 make_check=no -build_options="webengine" -desc_option_webengine="Build with Qt5 WebEngine support" - -# if not enabled, it will fall back to web browser -if [ "$XBPS_TARGET_ENDIAN" = "le" ]; then - if [ "$XBPS_WORDSIZE" = "$XBPS_TARGET_WORDSIZE" ]; then - build_options_default+=" webengine" - fi -fi - syncthingtray-devel_package() { depends="${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" @@ -52,17 +38,17 @@ syncthingtray-plasma_package() { depends="${sourcepkg}>=${version}_${revision} plasma-workspace" short_desc+=" - KDE plasmoid" pkg_install() { - vmove usr/lib/qt5/plugins/plasma + vmove usr/share/metainfo/syncthingplasmoid.appdata.xml + vmove usr/lib/qt6/plugins/plasma vmove usr/share/plasma - vmove usr/share/kservices5/plasma-applet-martchus.syncthingplasmoid.desktop } } syncthingtray-dolphin_package() { - depends="${sourcepkg}>=${version}_${revision} kio" + depends="${sourcepkg}>=${version}_${revision} kf6-kio" short_desc+=" - KDE dolphin integration" pkg_install() { - vmove usr/share/kservices5/syncthingfileitemaction.desktop - vmove "usr/lib/qt5/plugins/*.so" + vmove usr/share/metainfo/syncthingfileitemaction.appdata.xml + vmove usr/lib/qt6/plugins/kf6 } }