Bug#919772: sonnet FTCBFS: skips building parsetrigrams
Source: sonnet
Version: 5.54.0-1
Tags: patch
User: helmutg@debian.org
Usertags: rebootstrap
When cross building sonnet, the build system kindly skips the data
directory. Unfortunately, the packaging fails installing stuff from that
directory then. For building the data directory, one needs a native
parsetrigrams. I propose building it, when the user supplies a
parsetrigrams. I updated the packaging to do just that.
Helmut
diff --minimal -Nru sonnet-5.54.0/debian/changelog sonnet-5.54.0/debian/changelog
--- sonnet-5.54.0/debian/changelog 2019-01-17 23:27:42.000000000 +0100
+++ sonnet-5.54.0/debian/changelog 2019-01-19 09:26:32.000000000 +0100
@@ -1,3 +1,13 @@
+sonnet (5.54.0-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTCBFS: (Closes: #-1)
+ + cross.patch: Allow cross building the data directory.
+ + Tell cmake where to find a native parsetrigrams.
+ + Add libkf5sonnet-dev-bin to cross Build-Depends for parsetrigrams.
+
+ -- Helmut Grohne <helmut@subdivi.de> Sat, 19 Jan 2019 09:26:32 +0100
+
sonnet (5.54.0-1) unstable; urgency=medium
* New upstream release (5.52.0).
diff --minimal -Nru sonnet-5.54.0/debian/control sonnet-5.54.0/debian/control
--- sonnet-5.54.0/debian/control 2019-01-17 23:27:42.000000000 +0100
+++ sonnet-5.54.0/debian/control 2019-01-19 09:26:32.000000000 +0100
@@ -12,6 +12,7 @@
hspell,
libaspell-dev,
libhunspell-dev,
+ libkf5sonnet-dev-bin <cross>,
libqt5sql5-sqlite,
libvoikko-dev,
pkg-config,
diff --minimal -Nru sonnet-5.54.0/debian/patches/cross.patch sonnet-5.54.0/debian/patches/cross.patch
--- sonnet-5.54.0/debian/patches/cross.patch 1970-01-01 01:00:00.000000000 +0100
+++ sonnet-5.54.0/debian/patches/cross.patch 2019-01-19 09:26:32.000000000 +0100
@@ -0,0 +1,11 @@
+--- sonnet-5.54.0.orig/CMakeLists.txt
++++ sonnet-5.54.0/CMakeLists.txt
+@@ -49,7 +49,7 @@
+ if (BUILD_TESTING)
+ add_subdirectory(autotests)
+ endif()
+-if (NOT CMAKE_CROSSCOMPILING)
++if (PARSETRIGRAMS_EXECUTABLE OR NOT CMAKE_CROSSCOMPILING)
+ add_subdirectory(data)
+ endif()
+
diff --minimal -Nru sonnet-5.54.0/debian/patches/series sonnet-5.54.0/debian/patches/series
--- sonnet-5.54.0/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ sonnet-5.54.0/debian/patches/series 2019-01-19 09:26:19.000000000 +0100
@@ -0,0 +1 @@
+cross.patch
diff --minimal -Nru sonnet-5.54.0/debian/rules sonnet-5.54.0/debian/rules
--- sonnet-5.54.0/debian/rules 2019-01-17 23:27:42.000000000 +0100
+++ sonnet-5.54.0/debian/rules 2019-01-19 09:26:32.000000000 +0100
@@ -6,7 +6,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 -DPARSETRIGRAMS_EXECUTABLE=parsetrigrams
override_dh_auto_test:
export XDG_RUNTIME_DIR="$$(mktemp -d)"; \
Reply to: