Source: wkhtmltopdf
Version: 0.12.3.2-3
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap

wkhtmltopdf fails to cross build from source, because it fails to pass
cross flags to qmake. The easiest way of doing so is deferring the whole
task to dh_auto_configure. debhelper nowadays is capable of passing
those flags in addition to the hardening buildflags, so removing the
whole override becomes feasible.

After doing so, wkhtmltopdf still fails to cross build, because #886315.

Please consider applying the attached patch.

Helmut
diff --minimal -Nru wkhtmltopdf-0.12.3.2/debian/changelog 
wkhtmltopdf-0.12.3.2/debian/changelog
--- wkhtmltopdf-0.12.3.2/debian/changelog       2016-09-19 22:29:11.000000000 
+0200
+++ wkhtmltopdf-0.12.3.2/debian/changelog       2018-01-06 14:55:58.000000000 
+0100
@@ -1,3 +1,11 @@
+wkhtmltopdf (0.12.3.2-3.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Let dh_auto_configure run qmake with the right flags. (Closes:
+    #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de>  Sat, 06 Jan 2018 14:55:58 +0100
+
 wkhtmltopdf (0.12.3.2-3) unstable; urgency=medium
 
   * Fix typos in long descriptions. Thanks to Victory for the suggestion.
diff --minimal -Nru wkhtmltopdf-0.12.3.2/debian/rules 
wkhtmltopdf-0.12.3.2/debian/rules
--- wkhtmltopdf-0.12.3.2/debian/rules   2016-03-05 12:57:21.000000000 +0100
+++ wkhtmltopdf-0.12.3.2/debian/rules   2018-01-06 14:55:55.000000000 +0100
@@ -1,13 +1,7 @@
 #!/usr/bin/make -f
 
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
-
-override_dh_auto_configure:
-       /usr/lib/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)/qt5/bin/qmake \
-               -makefile -nocache \
-               QMAKE_CFLAGS_RELEASE="$(CFLAGS) $(CPPFLAGS)" \
-               QMAKE_CXXFLAGS_RELEASE="$(CXXFLAGS) $(CPPFLAGS)" \
-               QMAKE_LFLAGS_RELEASE="$(LDFLAGS)"
+export QT_SELECT=qt5
 
 override_dh_auto_install:
        # skip auto install and build/install manpages separately

Reply via email to