make temporary fix for FTBFS on arm64
This commit is contained in:
parent
278444a5f0
commit
aa428f7ffd
8
debian/changelog
vendored
8
debian/changelog
vendored
@ -1,3 +1,11 @@
|
||||
lxqt-qtplugin (2.0.0-0ubuntu2) UNRELEASED; urgency=medium
|
||||
|
||||
* Temporary fix for FTBFS on arm64.
|
||||
- d/patches: Add set-qt-plugin-dir-via-configure.patch.
|
||||
- d/rules: Pass QT_PLUGINS_DIR to configure.
|
||||
|
||||
-- Rik Mills <rikmills@kde.org> Wed, 28 Aug 2024 14:06:13 +0100
|
||||
|
||||
lxqt-qtplugin (2.0.0-0ubuntu1) oracular; urgency=medium
|
||||
|
||||
* New upstream release.
|
||||
|
1
debian/patches/series
vendored
Normal file
1
debian/patches/series
vendored
Normal file
@ -0,0 +1 @@
|
||||
set-qt-plugins-dir-via-configure.patch
|
17
debian/patches/set-qt-plugins-dir-via-configure.patch
vendored
Normal file
17
debian/patches/set-qt-plugins-dir-via-configure.patch
vendored
Normal file
@ -0,0 +1,17 @@
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -51,10 +51,10 @@
|
||||
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
|
||||
-)
|
||||
+#execute_process(COMMAND ${QT_QMAKE_EXECUTABLE} -query QT_INSTALL_PLUGINS
|
||||
+# OUTPUT_VARIABLE QT_PLUGINS_DIR
|
||||
+# OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||
+#)
|
||||
if(QT_PLUGINS_DIR)
|
||||
message(STATUS "Qt6 plugin directory:" "${QT_PLUGINS_DIR}")
|
||||
else()
|
3
debian/rules
vendored
3
debian/rules
vendored
@ -9,4 +9,5 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
|
||||
|
||||
override_dh_auto_configure:
|
||||
dh_auto_configure --\
|
||||
-DCMAKE_BUILD_TYPE=RelWithDebInfo
|
||||
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
|
||||
-DQT_PLUGINS_DIR=/usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins
|
||||
|
Loading…
x
Reference in New Issue
Block a user