Source: diffpdf
Version: 2.1.3-1.2
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap

diffpdf fails to cross build from source. It runs the host architecture
qmake through dh_auto_configure and then runs the build architecture
qmake through override_dh_auto_build. The latter fails and is entirely
unnecessary. The it calls lrelease without depending on
qt5-qmake:native. The attached patch fixes both and makes diffpdf cross
buildable. Please consider applying it.

Helmut
diff --minimal -Nru diffpdf-2.1.3/debian/changelog 
diffpdf-2.1.3/debian/changelog
--- diffpdf-2.1.3/debian/changelog      2018-01-18 12:42:45.000000000 +0100
+++ diffpdf-2.1.3/debian/changelog      2018-06-10 20:00:02.000000000 +0200
@@ -1,3 +1,12 @@
+diffpdf (2.1.3-1.3) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: (Closes: #-1)
+    + Don't call qmake twice (dh_auto_configure and explicitly).
+    + Build-Depends: qt5-qmake:native for using lrelease.
+
+ -- Helmut Grohne <hel...@subdivi.de>  Sun, 10 Jun 2018 20:00:02 +0200
+
 diffpdf (2.1.3-1.2) unstable; urgency=medium
 
   * Non-maintainer upload.
diff --minimal -Nru diffpdf-2.1.3/debian/control diffpdf-2.1.3/debian/control
--- diffpdf-2.1.3/debian/control        2017-11-26 00:24:14.000000000 +0100
+++ diffpdf-2.1.3/debian/control        2018-06-10 20:00:02.000000000 +0200
@@ -5,6 +5,7 @@
 Build-Depends:
  debhelper (>= 9~)
  , qt5-qmake
+ , qt5-qmake:native,
  , libpoppler-qt5-dev
  , qtbase5-dev,
  , qttools5-dev,
diff --minimal -Nru diffpdf-2.1.3/debian/rules diffpdf-2.1.3/debian/rules
--- diffpdf-2.1.3/debian/rules  2017-11-26 00:28:22.000000000 +0100
+++ diffpdf-2.1.3/debian/rules  2018-06-10 19:59:58.000000000 +0200
@@ -8,7 +8,6 @@
 export QT_SELECT=5
 
 override_dh_auto_build:
-       qmake diffpdf.pro
        for i in *.ts; do \
                lrelease $$i; \
        done

Reply via email to