Source: mupdf
Version: 1.14.0+ds1-2
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap

Thank you for applying my previous patch #903319. There I wrote that I
have no idea how to fix cmapdump. It seems that this issue is absent
now. The headers in source/pdf/cmaps/ are now in the source tarball and
not rebuilt. I suggest removing them during clean to ensure that
everything is built from source. Additionally, there now is cmapdump.py,
a python implementation of the same thing and that's much better for
cross compilation. If you want to run it, you need to add python to
Build-Depends, which will break cross compilation again. So annotate
your python dependency with ":any".

Still there are two new issues:
 * The build system uses ${LD} -r -b binary -o $out $in to embed font
   files into the binary. Unfortunately, dh_auto_build does not supply
   LD. So we need to do that.
 * While dh_auto_build passes cross tools, dh_auto_install doesn't.
   Thus, HAVE_X11 bekomes false during make install and mupdf-x11 isn't
   installed.

The attached patch fixes both and this time, it makes mupdf cross
buildable. Please consider applying this patch as well.

Helmut
diff --minimal -Nru mupdf-1.14.0+ds1/debian/changelog 
mupdf-1.14.0+ds1/debian/changelog
--- mupdf-1.14.0+ds1/debian/changelog   2018-11-04 01:13:26.000000000 +0100
+++ mupdf-1.14.0+ds1/debian/changelog   2018-11-11 19:58:22.000000000 +0100
@@ -1,3 +1,10 @@
+mupdf (1.14.0+ds1-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: (Closes: #-1)
+    + Supply a cross LD for wrapping fonts.
+    + Supply PKG_CONFIG to all make targets.
+
+ -- Helmut Grohne <hel...@subdivi.de>  Sun, 11 Nov 2018 19:58:22 +0100
+
 mupdf (1.14.0+ds1-2) unstable; urgency=medium
 
   * Fix FTBFS on mips64el
diff --minimal -Nru mupdf-1.14.0+ds1/debian/rules mupdf-1.14.0+ds1/debian/rules
--- mupdf-1.14.0+ds1/debian/rules       2018-11-04 01:07:11.000000000 +0100
+++ mupdf-1.14.0+ds1/debian/rules       2018-11-11 19:58:22.000000000 +0100
@@ -15,6 +15,7 @@
 
 # Set CC for crossbuild
 export CC_FOR_BUILD ?= cc
+export PKG_CONFIG ?= $(DEB_HOST_GNU_TYPE)-pkg-config
 
 # The build system doesn't use CPPFLAGS, pass them to CFLAGS to enable the
 # missing (hardening) flags.
@@ -28,6 +29,7 @@
 BUILD_FLAGS += USE_SYSTEM_LIBS=yes
 # Force using system lcms2 (was not included in default system library set)
 BUILD_FLAGS += USE_SYSTEM_LCMS2=yes
+BUILD_FLAGS += LD=$(DEB_HOST_GNU_TYPE)-ld
 
 
 ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))

Reply via email to