Control: tag -1 + pending
Hi Keith,
given your silence on these bugs. I prepared and uploaded a NMU to
delayed/15. You can find my changes in the attached debdiff. Please
speak up if I should defer it any longer.
Helmut
diff --minimal -Nru fontconfig-2.11.0/debian/changelog
fontconfig-2.11.0/debian/changelog
--- fontconfig-2.11.0/debian/changelog 2014-11-23 18:24:26.000000000 +0100
+++ fontconfig-2.11.0/debian/changelog 2016-03-12 19:01:15.000000000 +0100
@@ -1,3 +1,12 @@
+fontconfig (2.11.0-6.4) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Drop versioned Build-Depends: binutils which is satisfied even in
+ oldstable (Closes: #779460).
+ * Compile build-tool edit-sgml with CC_FOR_BUILD. (Closes: #779461)
+
+ -- Helmut Grohne <hel...@subdivi.de> Sat, 12 Mar 2016 19:00:45 +0100
+
fontconfig (2.11.0-6.3) unstable; urgency=medium
* Non-maintainer upload.
diff --minimal -Nru fontconfig-2.11.0/debian/control
fontconfig-2.11.0/debian/control
--- fontconfig-2.11.0/debian/control 2014-11-10 20:28:42.000000000 +0100
+++ fontconfig-2.11.0/debian/control 2016-03-12 18:54:56.000000000 +0100
@@ -8,7 +8,6 @@
debhelper (>= 9),
libfreetype6-dev (>= 2.1.7),
libexpat1-dev,
- binutils (>= 2.12.90.0.9),
pkg-config,
gperf,
po-debconf
diff --minimal -Nru fontconfig-2.11.0/debian/patches/06_cross.patch
fontconfig-2.11.0/debian/patches/06_cross.patch
--- fontconfig-2.11.0/debian/patches/06_cross.patch 1970-01-01
01:00:00.000000000 +0100
+++ fontconfig-2.11.0/debian/patches/06_cross.patch 2016-03-12
19:00:33.000000000 +0100
@@ -0,0 +1,25 @@
+Description: fix cross compilation
+Author: Helmut Grohne <hel...@subdivi.de>
+Last-Update: 2015-02-28
+Bug-Debian: https://bugs.debian.org/779461
+
+Even though fontconfig's build system tries to build edit-sgml with the build
+arch compiler, it gets the runes wrong and actually builds it with the host
+arch compiler. This patch makes it use the right compiler.
+
+Index: fontconfig-2.11.0/doc/Makefile.am
+===================================================================
+--- fontconfig-2.11.0.orig/doc/Makefile.am
++++ fontconfig-2.11.0/doc/Makefile.am
+@@ -121,7 +121,10 @@
+ edit_sgml_SOURCES = \
+ edit-sgml.c \
+ $(NULL)
+-edit_sgml_CC = $(CC_FOR_BUILD)
++$(edit_sgml_OBJECTS) : CC=$(CC_FOR_BUILD)
++$(edit_sgml_OBJECTS) : CFLAGS=$(CFLAGS_FOR_BUILD)
++$(edit_sgml_OBJECTS) : CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
++edit_sgml_LINK = $(CC_FOR_BUILD) -o $@
+ #
+ check_SCRIPTS = \
+ check-missing-doc \
diff --minimal -Nru fontconfig-2.11.0/debian/patches/series
fontconfig-2.11.0/debian/patches/series
--- fontconfig-2.11.0/debian/patches/series 2014-03-09 22:08:07.000000000
+0100
+++ fontconfig-2.11.0/debian/patches/series 2016-03-12 18:56:21.000000000
+0100
@@ -3,3 +3,4 @@
03_locale_c.utf8.patch
04_mgopen_fonts.patch
05_doc_files.patch
+06_cross.patch
