From ee32ce64e1f6288b93d10de0fe88482e83a72830 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 18 Aug 2025 22:07:50 +0700 Subject: [PATCH] phonon: always build designer plugins --- srcpkgs/phonon/patches/cross-linguist.patch | 11 +++++++ srcpkgs/phonon/template | 34 ++++++--------------- 2 files changed, 20 insertions(+), 25 deletions(-) create mode 100644 srcpkgs/phonon/patches/cross-linguist.patch diff --git a/srcpkgs/phonon/patches/cross-linguist.patch b/srcpkgs/phonon/patches/cross-linguist.patch new file mode 100644 index 00000000000..878bee782ca --- /dev/null +++ b/srcpkgs/phonon/patches/cross-linguist.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -28,6 +28,8 @@ endif() + if(PHONON_BUILD_QT6) + list(APPEND VERSIONS "6") + set(BUILD_WITH_QT6 ON) # necessary on older ECMs ++ # Avoid looking LinguistTools in target ++ find_package(Qt6 COMPONENTS Linguist) + endif() + + # Not set by ECM (yet) diff --git a/srcpkgs/phonon/template b/srcpkgs/phonon/template index 00eee500d11..e00c08ad5bf 100644 --- a/srcpkgs/phonon/template +++ b/srcpkgs/phonon/template @@ -1,12 +1,13 @@ # Template file for 'phonon' pkgname=phonon version=4.12.0 -revision=2 +revision=3 build_style=cmake -configure_args="$(vopt_bool designerplugin PHONON_BUILD_DESIGNER_PLUGIN)" +configure_args="-DPHONON_BUILD_DESIGNER_PLUGIN=ON" hostmakedepends="extra-cmake-modules qt5-host-tools qt5-devel qt6-base qt6-tools" -makedepends="glib-devel qt5-devel pulseaudio-devel qt6-qt5compat-devel" +makedepends="glib-devel qt5-devel pulseaudio-devel qt6-qt5compat-devel + qt6-tools-devel qt5-tools-devel" depends="phonon-locale" short_desc="Multimedia framework for KDE" maintainer="John " @@ -15,23 +16,10 @@ homepage="https://phonon.kde.org/" distfiles="${KDE_SITE}/${pkgname%-*}/${version}/${pkgname%-*}-${version}.tar.xz" checksum=3287ffe0fbcc2d4aa1363f9e15747302d0b080090fe76e5f211d809ecb43f39a -build_options="designerplugin" - -if [ -z "$CROSS_BUILD" ]; then - build_options_default="designerplugin" -fi - -if [ "$build_option_designerplugin" ]; then - makedepends+=" qt6-tools-devel qt5-tools-devel" - nocross="yes" -fi - post_install() { - if [ "$build_option_designerplugin" ]; then - vmkdir usr/lib/qt6/plugins/designer - mv "${DESTDIR}/usr/lib/qt5/plugins/designer/phonon4qt6widgets.so" \ - "${DESTDIR}/usr/lib/qt6/plugins/designer/phonon4qt6widgets.so" - fi + vmkdir usr/lib/qt6/plugins/designer + mv "${DESTDIR}/usr/lib/qt5/plugins/designer/phonon4qt6widgets.so" \ + "${DESTDIR}/usr/lib/qt6/plugins/designer/phonon4qt6widgets.so" } phonon-locale_package() { @@ -49,9 +37,7 @@ phonon-devel_package() { vmove usr/include/phonon4qt6 vmove usr/lib/pkgconfig/phonon4qt6.pc vmove "usr/lib/libphonon4qt6*.so" - if [ "$build_option_designerplugin" ]; then - vmove usr/lib/qt6/plugins/designer - fi + vmove usr/lib/qt6/plugins/designer } } @@ -64,9 +50,7 @@ phonon-qt5-devel_package() { vmove usr/lib/cmake/phonon4qt5 vmove usr/lib/pkgconfig/phonon4qt5.pc vmove "usr/lib/libphonon4qt5*.so" - if [ "$build_option_designerplugin" ]; then - vmove usr/lib/qt5/plugins/designer - fi + vmove usr/lib/qt5/plugins/designer } }