diff --git a/srcpkgs/lxqt-qtplugin/patches/qt-plugindir.patch b/srcpkgs/lxqt-qtplugin/patches/qt-plugindir.patch new file mode 100644 index 00000000000..e2d0e4e96af --- /dev/null +++ b/srcpkgs/lxqt-qtplugin/patches/qt-plugindir.patch @@ -0,0 +1,22 @@ +--- a/src/CMakeLists.txt 2024-05-12 11:05:21.807798096 +0200 ++++ b/src/CMakeLists.txt 2024-05-12 11:08:47.625736216 +0200 +@@ -51,10 +51,14 @@ + endif() + + # execute the command "qmake -query QT_INSTALL_PLUGINS" to get the path of plugins dir. +-execute_process(COMMAND ${QT_QMAKE_EXECUTABLE} -query QT_INSTALL_PLUGINS +- OUTPUT_VARIABLE QT_PLUGINS_DIR +- OUTPUT_STRIP_TRAILING_WHITESPACE +-) ++if (NOT QT_PLUGIN_INSTALL_PATH) ++ execute_process(COMMAND ${QT_QMAKE_EXECUTABLE} -query QT_INSTALL_PLUGINS ++ OUTPUT_VARIABLE QT_PLUGINS_DIR ++ OUTPUT_STRIP_TRAILING_WHITESPACE) ++else () ++ set(QT_PLUGINS_DIR ${QT_PLUGIN_INSTALL_PATH}) ++endif() ++ + if(QT_PLUGINS_DIR) + message(STATUS "Qt6 plugin directory:" "${QT_PLUGINS_DIR}") + else() + diff --git a/srcpkgs/lxqt-qtplugin/template b/srcpkgs/lxqt-qtplugin/template index 17fd0571bf4..b95d962e53d 100644 --- a/srcpkgs/lxqt-qtplugin/template +++ b/srcpkgs/lxqt-qtplugin/template @@ -1,13 +1,19 @@ # Template file for 'lxqt-qtplugin' pkgname=lxqt-qtplugin -version=1.4.1 +version=2.0.0 revision=1 build_style=cmake -hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools libfm-devel" -makedepends="liblxqt-devel libdbusmenu-qt5-devel libfm-qt-devel libqtxdg-devel" +hostmakedepends="lxqt-build-tools qt6-base qt6-tools libfm-devel" +makedepends="liblxqt-devel libfm-qt-devel libqtxdg-devel libdbusmenu-lxqt-devel" short_desc="LXQt Qt theme plugin" maintainer="Helmut Pozimski " license="LGPL-2.1-or-later" homepage="https://lxqt-project.org" distfiles="https://github.com/lxqt/lxqt-qtplugin/archive/${version}.tar.gz" -checksum=20768f00a35f0540d69ad47e6ed829a248bd01056ef9c7da3d931a9f5b2afc6c +checksum=1e173aaa7793ea6bdc4cddc35ab0cb25b7fc09e81b28005b46ee21b65ab65dc8 + +case "${XBPS_TARGET_MACHINE}" in + armv6l*|armv7l*) + configure_args=" -DQT_PLUGIN_INSTALL_PATH=/usr/lib/qt6/plugins" +esac +