From 2ffd97fd117f19937a42816b8774be9f2958df58 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 16 Nov 2024 19:29:58 +0100
Subject: [PATCH] lxqt-qtplugin: update to 2.1.0.

---
 .../lxqt-qtplugin/patches/qt-plugindir.patch  | 30 +++++++------------
 srcpkgs/lxqt-qtplugin/template                |  6 ++--
 2 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/srcpkgs/lxqt-qtplugin/patches/qt-plugindir.patch b/srcpkgs/lxqt-qtplugin/patches/qt-plugindir.patch
index e2d0e4e96af..788b1355d99 100644
--- a/srcpkgs/lxqt-qtplugin/patches/qt-plugindir.patch
+++ b/srcpkgs/lxqt-qtplugin/patches/qt-plugindir.patch
@@ -1,22 +1,14 @@
---- 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()
+--- a/src/CMakeLists.txt	2024-11-17 09:49:24.950405832 +0100
++++ b/src/CMakeLists.txt	2024-11-17 09:50:09.911456731 +0100
+@@ -39,7 +39,9 @@
+     Qt6XdgIconLoader
+ )
  
- # 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})
+-lxqt_query_qt(_QT_PLUGINS_DIR QT_INSTALL_PLUGINS)
++if (NOT _QT_PLUGINS_DIR)
++    lxqt_query_qt(_QT_PLUGINS_DIR QT_INSTALL_PLUGINS)
 +endif()
-+
- if(QT_PLUGINS_DIR)
-     message(STATUS "Qt6 plugin directory:" "${QT_PLUGINS_DIR}")
- else()
+ 
+ if (NOT _QT_PLUGINS_DIR)
+     message(FATAL_ERROR "Qt6 plugin directory cannot be detected.")
 
diff --git a/srcpkgs/lxqt-qtplugin/template b/srcpkgs/lxqt-qtplugin/template
index b95d962e53d..8eefe44458e 100644
--- a/srcpkgs/lxqt-qtplugin/template
+++ b/srcpkgs/lxqt-qtplugin/template
@@ -1,6 +1,6 @@
 # Template file for 'lxqt-qtplugin'
 pkgname=lxqt-qtplugin
-version=2.0.0
+version=2.1.0
 revision=1
 build_style=cmake
 hostmakedepends="lxqt-build-tools qt6-base qt6-tools libfm-devel"
@@ -10,10 +10,10 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://lxqt-project.org"
 distfiles="https://github.com/lxqt/lxqt-qtplugin/archive/${version}.tar.gz"
-checksum=1e173aaa7793ea6bdc4cddc35ab0cb25b7fc09e81b28005b46ee21b65ab65dc8
+checksum=eec583014590acc6e431420cbb0e67c01e7113eac82b287da5f9a39916e3164c
 
 case "${XBPS_TARGET_MACHINE}" in
 	armv6l*|armv7l*)
-		configure_args=" -DQT_PLUGIN_INSTALL_PATH=/usr/lib/qt6/plugins"
+		configure_args=" -D_QT_PLUGINS_DIR=/usr/lib/qt6/plugins"
 esac