From aa428f7ffdd3ffbabb4396da5ed40d7fafdbbcfe Mon Sep 17 00:00:00 2001 From: Rik Mills Date: Thu, 29 Aug 2024 06:38:43 +0100 Subject: [PATCH] make temporary fix for FTBFS on arm64 --- debian/changelog | 8 ++++++++ debian/patches/series | 1 + .../set-qt-plugins-dir-via-configure.patch | 17 +++++++++++++++++ debian/rules | 3 ++- 4 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 debian/patches/series create mode 100644 debian/patches/set-qt-plugins-dir-via-configure.patch diff --git a/debian/changelog b/debian/changelog index 60c43c4..cab07be 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 Wed, 28 Aug 2024 14:06:13 +0100 + lxqt-qtplugin (2.0.0-0ubuntu1) oracular; urgency=medium * New upstream release. diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..23fdf8e --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +set-qt-plugins-dir-via-configure.patch diff --git a/debian/patches/set-qt-plugins-dir-via-configure.patch b/debian/patches/set-qt-plugins-dir-via-configure.patch new file mode 100644 index 0000000..39e0c6b --- /dev/null +++ b/debian/patches/set-qt-plugins-dir-via-configure.patch @@ -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() diff --git a/debian/rules b/debian/rules index eb09d04..0e1f1d6 100755 --- a/debian/rules +++ b/debian/rules @@ -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