Bug#1024420: kplotting FTCBFS: does not build the designer plugin
Source: kplotting
Version: 5.98.0-1
Tags: patch
User: debian-cross@lists.debian.org
Usertags: ftcbfs
kplotting fails to cross build from source, because dh_install misses
the designer plugin. The option to build it should be available during
cross builds and should be set by the packaging. Given feedback on
earlier patches, I've now made the default computation work properly in
an upstreamable way.
Helmut
diff --minimal -Nru kplotting-5.98.0/debian/changelog kplotting-5.98.0/debian/changelog
--- kplotting-5.98.0/debian/changelog 2022-09-18 23:11:36.000000000 +0200
+++ kplotting-5.98.0/debian/changelog 2022-11-18 21:04:21.000000000 +0100
@@ -1,3 +1,10 @@
+kplotting (5.98.0-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTCBFS: Build designer plugin. (Closes: #-1)
+
+ -- Helmut Grohne <helmut@subdivi.de> Fri, 18 Nov 2022 21:04:21 +0100
+
kplotting (5.98.0-1) unstable; urgency=medium
[ Aurélien COUDERC ]
diff --minimal -Nru kplotting-5.98.0/debian/patches/cross.patch kplotting-5.98.0/debian/patches/cross.patch
--- kplotting-5.98.0/debian/patches/cross.patch 1970-01-01 01:00:00.000000000 +0100
+++ kplotting-5.98.0/debian/patches/cross.patch 2022-11-18 21:04:21.000000000 +0100
@@ -0,0 +1,16 @@
+--- kplotting-5.98.0.orig/CMakeLists.txt
++++ kplotting-5.98.0/CMakeLists.txt
+@@ -30,7 +30,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")
+
+ ecm_setup_version(PROJECT VARIABLE_PREFIX KPLOTTING
diff --minimal -Nru kplotting-5.98.0/debian/patches/series kplotting-5.98.0/debian/patches/series
--- kplotting-5.98.0/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ kplotting-5.98.0/debian/patches/series 2022-11-18 21:01:36.000000000 +0100
@@ -0,0 +1 @@
+cross.patch
diff --minimal -Nru kplotting-5.98.0/debian/rules kplotting-5.98.0/debian/rules
--- kplotting-5.98.0/debian/rules 2022-07-28 00:30:37.000000000 +0200
+++ kplotting-5.98.0/debian/rules 2022-11-18 21:04:21.000000000 +0100
@@ -7,7 +7,7 @@
dh $@ --with kf5,pkgkde_symbolshelper --buildsystem kf5 --without build_stamp
override_dh_auto_configure:
- dh_auto_configure -- -DBUILD_QCH=ON
+ dh_auto_configure -- -DBUILD_QCH=ON -DBUILD_DESIGNERPLUGIN=ON
override_dh_auto_test:
# Disable auto_tests at build time
:
Reply to: