From 6b2ec767d27698f4b67df889535bafd2dbdf0ea6 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Mon, 13 May 2024 02:12:05 -0400 Subject: [PATCH] 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 7a0a1a46cfb..7c9d0190d74 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 } }