[Reproducible-commits] [texlive-bin] 07/32: libpng16 in unstable - switch to all system libs

[Alexis Bienvenüe]

This is an automated email from the git hooks/post-receive script.

jboulix-guest pushed a commit to branch pu/reproducible_builds
in repository texlive-bin.

commit 61c66d10cca37fc92b015ad81633847923558e4c
Author: Norbert Preining <preining at debian.org>
Date:   Sat Apr 9 16:50:03 2016 +0900

    libpng16 in unstable - switch to all system libs
---
 debian/control       |  4 ++++
 debian/make-orig-tar | 11 +++++------
 debian/rules         | 16 +++++++---------
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/debian/control b/debian/control
index e49b80d..6d57af2 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,10 @@ Build-Depends:
   debhelper (>= 9),
   dh-autoreconf,
   flex,
+  libcairo2-dev,
   libfontconfig1-dev,
+  libfreetype6-dev,
+  libgd-dev,
   libgmp-dev,
   libgraphite2-dev,
   libgs-dev,
@@ -20,6 +23,7 @@ Build-Depends:
   libncurses5-dev | libncurses-dev,
   libpaper-dev,
   libpixman-1-dev (>= 0.32.4),
+  libpng-dev,
   libpoppler-private-dev (>= 0.38),
   libpotrace-dev (>= 1.11),
   libteckit-dev,
diff --git a/debian/make-orig-tar b/debian/make-orig-tar
index 93b90ad..a5d6532 100644
--- a/debian/make-orig-tar
+++ b/debian/make-orig-tar
@@ -52,12 +52,7 @@ rm -rf $verstr/utils/ps2eps
 rm -rf $verstr/utils/t1utils
 #
 # remove system libraries, keep only teckit and lua52 and libpng
-# teckit: not in Debian
-# lua52: system usage not supported in TeX Live
-# libpng >= 1.4 is not available in Debian/unstable
-# and depending libs are not compiled against it, 
-# as bad as it is, we have to keep 
-#	cairo freetype2 gd libpng
+# teckit: for now only in experimental
 # poppler is currently too old in Debian, keep it
 #	poppler
 
@@ -73,6 +68,10 @@ for i in \
 	xpdf		\
 	zlib		\
 	zziplib		\
+	cairo		\
+	freetype2	\
+	libpng		\
+	gd		\
 	; do
   rm -rf $verstr/libs/$i
 done
diff --git a/debian/rules b/debian/rules
index 06591ff..12a6b33 100755
--- a/debian/rules
+++ b/debian/rules
@@ -67,15 +67,6 @@ override_dh_autoreconf:
 	dh_autoreconf --as-needed
 
 #
-# we need libpng >= 1.4 which is not available in unstable and
-# seems not to arrive anytime soon. We have to rebuild also
-# the following depending libs with new libpng: gd freetype2 cairo
-#	--with-system-freetype2			\
-	--with-freetype2-include=/usr/include/freetype2 \
-#	--with-system-libpng			\
-#	--with-system-gd			\
-#	--with-system-cairo 			\
-#
 # poppler is used two times in TeX Live:
 # once for pdftex/xetex
 # once for luatex
@@ -88,6 +79,8 @@ override_dh_autoreconf:
 # so that as much as possible is built from system libs.
 #
 # 20160222: retry with current poppler (Debian 0.38)
+# 20160409: libpng16 has entered unstable, try to build everything
+#	    with system libraries
 #
 
 # disable-largefile seems to break omegafonts, as they core dump
@@ -121,6 +114,11 @@ override_dh_auto_configure:
 	--with-system-poppler			\
 	--with-system-teckit			\
 	--with-system-xpdf			\
+	--with-system-freetype2			\
+	--with-freetype2-include=/usr/include/freetype2 \
+	--with-system-libpng			\
+	--with-system-gd			\
+	--with-system-cairo 			\
 	--with-x				\
 	--with-mf-x-toolkit			\
 	--with-xdvi-x-toolkit=xaw		\

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/texlive-bin.git