diff --git a/srcpkgs/kf6-kitemviews/patches/cross-designer.patch b/srcpkgs/kf6-kitemviews/patches/cross-designer.patch new file mode 100644 index 00000000000..6044242323d --- /dev/null +++ b/srcpkgs/kf6-kitemviews/patches/cross-designer.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -33,7 +33,7 @@ set(EXCLUDE_DEPRECATED_BEFORE_AND_AT 0 C + option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)" OFF) + add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)") + +-cmake_dependent_option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" ON "NOT CMAKE_CROSSCOMPILING" OFF) ++option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" ON) + add_feature_info(DESIGNERPLUGIN ${BUILD_DESIGNERPLUGIN} "Build plugin for Qt Designer") + + set(kitemviews_version_header "${CMAKE_CURRENT_BINARY_DIR}/src/kitemviews_version.h") diff --git a/srcpkgs/kf6-kitemviews/template b/srcpkgs/kf6-kitemviews/template index 184a3fe842b..7ad7198f2d9 100644 --- a/srcpkgs/kf6-kitemviews/template +++ b/srcpkgs/kf6-kitemviews/template @@ -1,11 +1,11 @@ # Template file for 'kf6-kitemviews' pkgname=kf6-kitemviews version=6.14.0 -revision=1 +revision=2 build_style=cmake -configure_args="$(vopt_bool designerplugin BUILD_DESIGNERPLUGIN)" +configure_args="-DBUILD_DESIGNERPLUGIN=ON -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins" hostmakedepends="extra-cmake-modules qt6-tools qt6-base" -makedepends="qt6-base-devel" +makedepends="qt6-base-devel qt6-tools-devel" short_desc="Set of item views extending the Qt model-view framework" maintainer="John " license="LGPL-2.1-or-later" @@ -13,17 +13,6 @@ homepage="https://invent.kde.org/frameworks/kitemviews" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.xz" checksum=997167402dbaa7885ae2aaa4cf8b5f409f57d50bce06a3b56c577e93a975ba4a -build_options="designerplugin" - -if [ -z "$CROSS_BUILD" ]; then - build_options_default="designerplugin" -fi - -if [ "$build_option_designerplugin" ]; then - makedepends+=" qt6-tools-devel" - nocross="yes" -fi - kf6-kitemviews-devel_package() { depends="$makedepends ${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" @@ -31,8 +20,6 @@ kf6-kitemviews-devel_package() { vmove usr/include vmove usr/lib/cmake vmove "usr/lib/*.so" - if [ "$build_option_designerplugin" ]; then - vmove usr/lib/qt6/plugins/designer - fi + vmove usr/lib/qt6/plugins/designer } }