Bug#1057297: knewstuff FTCBFS: skips building the designer plugin
Source: knewstuff
Version: 5.107.0-1
Tags: patch
User: debian-cross@lists.debian.org
Usertags: ftcbfs
knewstuff fails to cross build from source, because it skips building
the designer plugin, but the packaging expects the designer plugin to be
built. Consider applying the attached patch.
Helmut
diff --minimal -Nru knewstuff-5.107.0/debian/changelog knewstuff-5.107.0/debian/changelog
--- knewstuff-5.107.0/debian/changelog 2023-06-18 16:08:45.000000000 +0200
+++ knewstuff-5.107.0/debian/changelog 2023-12-02 12:46:35.000000000 +0100
@@ -1,3 +1,10 @@
+knewstuff (5.107.0-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTCFBS: Always build the designer plugin. (Closes: #-1)
+
+ -- Helmut Grohne <helmut@subdivi.de> Sat, 02 Dec 2023 12:46:35 +0100
+
knewstuff (5.107.0-1) unstable; urgency=medium
[ Aurélien COUDERC ]
diff --minimal -Nru knewstuff-5.107.0/debian/patches/cross.patch knewstuff-5.107.0/debian/patches/cross.patch
--- knewstuff-5.107.0/debian/patches/cross.patch 1970-01-01 01:00:00.000000000 +0100
+++ knewstuff-5.107.0/debian/patches/cross.patch 2023-12-02 12:46:35.000000000 +0100
@@ -0,0 +1,17 @@
+--- knewstuff-5.107.0.orig/CMakeLists.txt
++++ knewstuff-5.107.0/CMakeLists.txt
+@@ -69,8 +69,12 @@
+
+ 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)
++if (CMAKE_CROSSCOMPILING)
++ set(BUILD_DESIGNERPLUGIN_DEFAULT OFF)
++else()
++ set(BUILD_DESIGNERPLUGIN_DEFAULT ON)
++endif()
++option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" ${BUILD_DESIGNERPLUGIN_DEFAULT})
+ add_feature_info(DESIGNERPLUGIN ${BUILD_DESIGNERPLUGIN} "Build plugin for Qt Designer")
+
+ set(EXCLUDE_DEPRECATED_BEFORE_AND_AT 0 CACHE STRING "Control the range of deprecated API excluded from the build [default=0].")
diff --minimal -Nru knewstuff-5.107.0/debian/patches/series knewstuff-5.107.0/debian/patches/series
--- knewstuff-5.107.0/debian/patches/series 2023-03-16 22:42:02.000000000 +0100
+++ knewstuff-5.107.0/debian/patches/series 2023-12-02 12:46:35.000000000 +0100
@@ -1 +1,2 @@
remove-executable-flag-from-desktop-files
+cross.patch
diff --minimal -Nru knewstuff-5.107.0/debian/rules knewstuff-5.107.0/debian/rules
--- knewstuff-5.107.0/debian/rules 2023-03-16 22:42:02.000000000 +0100
+++ knewstuff-5.107.0/debian/rules 2023-12-02 12:46:35.000000000 +0100
@@ -11,7 +11,7 @@
dh $@ --with pkgkde_symbolshelper
override_dh_auto_configure:
- dh_auto_configure -- -DBUILD_QCH=ON
+ dh_auto_configure -- -DBUILD_QCH=ON -DBUILD_DESIGNERPLUGIN=ON
override_dh_auto_test:
xvfb-run -a dh_auto_test
Reply to: