[SCM] Debian packaging of texlive-bin) branch, master, updated. debian/2013.20130522.30620-1-8-gaa73df8
The following commit has been merged in the master branch:
commit fd5bd5c9a82e6ecd513c72770b9c040460ba346f
Author: Norbert Preining <preining@logic.at>
Date: Thu May 23 00:35:56 2013 +0900
rename disable patch now that also freetype is disabled
diff --git a/debian/patches/disable-t1lib-gd-dvipng b/debian/patches/disable-t1lib-gd-dvipng-freetype
similarity index 65%
rename from debian/patches/disable-t1lib-gd-dvipng
rename to debian/patches/disable-t1lib-gd-dvipng-freetype
index 37143bc..929c27b 100644
--- a/debian/patches/disable-t1lib-gd-dvipng
+++ b/debian/patches/disable-t1lib-gd-dvipng-freetype
@@ -7,25 +7,29 @@ configure step.
Thanks Ondřej!
---
- aclocal.m4 | 2 --
- libs/aclocal.m4 | 2 --
- m4/kpse-gd-flags.m4 | 31 -------------------------------
- m4/kpse-pkgs.m4 | 5 -----
- m4/kpse-t1lib-flags.m4 | 29 -----------------------------
- utils/aclocal.m4 | 2 --
- 6 files changed, 71 deletions(-)
+ aclocal.m4 | 3 ---
+ libs/aclocal.m4 | 3 ---
+ m4/kpse-freetype-flags.m4 | 29 -----------------------------
+ m4/kpse-gd-flags.m4 | 31 -------------------------------
+ m4/kpse-pkgs.m4 | 6 ------
+ m4/kpse-t1lib-flags.m4 | 29 -----------------------------
+ texk/aclocal.m4 | 1 -
+ utils/aclocal.m4 | 3 ---
+ 8 files changed, 105 deletions(-)
--- texlive-bin.orig/aclocal.m4
+++ texlive-bin/aclocal.m4
-@@ -1040,7 +1040,6 @@
+@@ -1038,9 +1038,7 @@
+ m4_include([m4/kpse-cairo-flags.m4])
+ m4_include([m4/kpse-common.m4])
m4_include([m4/kpse-cxx-hack.m4])
- m4_include([m4/kpse-freetype-flags.m4])
+-m4_include([m4/kpse-freetype-flags.m4])
m4_include([m4/kpse-freetype2-flags.m4])
-m4_include([m4/kpse-gd-flags.m4])
m4_include([m4/kpse-graphite2-flags.m4])
m4_include([m4/kpse-harfbuzz-flags.m4])
m4_include([m4/kpse-icu-flags.m4])
-@@ -1054,7 +1053,6 @@
+@@ -1054,7 +1052,6 @@
m4_include([m4/kpse-poppler-flags.m4])
m4_include([m4/kpse-ptexenc-flags.m4])
m4_include([m4/kpse-setup.m4])
@@ -35,15 +39,17 @@ Thanks Ondřej!
m4_include([m4/kpse-web2c.m4])
--- texlive-bin.orig/libs/aclocal.m4
+++ texlive-bin/libs/aclocal.m4
-@@ -1040,7 +1040,6 @@
+@@ -1038,9 +1038,7 @@
+ m4_include([../m4/kpse-cairo-flags.m4])
+ m4_include([../m4/kpse-common.m4])
m4_include([../m4/kpse-cxx-hack.m4])
- m4_include([../m4/kpse-freetype-flags.m4])
+-m4_include([../m4/kpse-freetype-flags.m4])
m4_include([../m4/kpse-freetype2-flags.m4])
-m4_include([../m4/kpse-gd-flags.m4])
m4_include([../m4/kpse-graphite2-flags.m4])
m4_include([../m4/kpse-harfbuzz-flags.m4])
m4_include([../m4/kpse-icu-flags.m4])
-@@ -1054,7 +1053,6 @@
+@@ -1054,7 +1052,6 @@
m4_include([../m4/kpse-poppler-flags.m4])
m4_include([../m4/kpse-ptexenc-flags.m4])
m4_include([../m4/kpse-setup.m4])
@@ -87,18 +93,18 @@ Thanks Ondřej!
-AC_DEFUN([KPSE_GD_SYSTEM_FLAGS], [_KPSE_LIB_FLAGS_SYSTEM([gd], [gd])])
--- texlive-bin.orig/m4/kpse-pkgs.m4
+++ texlive-bin/m4/kpse-pkgs.m4
-@@ -33,10 +33,8 @@
+@@ -33,10 +33,7 @@
poppler
cairo
pixman
-gd
freetype2
- freetype
+-freetype
-t1lib
libpng
zlib
])[]dnl
-@@ -56,10 +54,8 @@
+@@ -56,10 +53,8 @@
AC_REQUIRE([KPSE_PTEXENC_SYSTEM_FLAGS])[]dnl
AC_REQUIRE([KPSE_ZLIB_SYSTEM_FLAGS])[]dnl
AC_REQUIRE([KPSE_LIBPNG_SYSTEM_FLAGS])[]dnl
@@ -109,7 +115,7 @@ Thanks Ondřej!
AC_REQUIRE([KPSE_PIXMAN_SYSTEM_FLAGS])[]dnl
AC_REQUIRE([KPSE_CAIRO_SYSTEM_FLAGS])[]dnl
AC_REQUIRE([KPSE_XPDF_SYSTEM_FLAGS])[]dnl
-@@ -107,7 +103,6 @@
+@@ -107,7 +102,6 @@
dvidvi
dviljk
dvipdfmx
@@ -151,15 +157,17 @@ Thanks Ondřej!
-AC_DEFUN([KPSE_T1LIB_SYSTEM_FLAGS], [_KPSE_LIB_FLAGS_SYSTEM([t1lib], [t1])])
--- texlive-bin.orig/utils/aclocal.m4
+++ texlive-bin/utils/aclocal.m4
-@@ -1040,7 +1040,6 @@
+@@ -1038,9 +1038,7 @@
+ m4_include([../m4/kpse-cairo-flags.m4])
+ m4_include([../m4/kpse-common.m4])
m4_include([../m4/kpse-cxx-hack.m4])
- m4_include([../m4/kpse-freetype-flags.m4])
+-m4_include([../m4/kpse-freetype-flags.m4])
m4_include([../m4/kpse-freetype2-flags.m4])
-m4_include([../m4/kpse-gd-flags.m4])
m4_include([../m4/kpse-graphite2-flags.m4])
m4_include([../m4/kpse-harfbuzz-flags.m4])
m4_include([../m4/kpse-icu-flags.m4])
-@@ -1054,7 +1053,6 @@
+@@ -1054,7 +1052,6 @@
m4_include([../m4/kpse-poppler-flags.m4])
m4_include([../m4/kpse-ptexenc-flags.m4])
m4_include([../m4/kpse-setup.m4])
@@ -167,3 +175,45 @@ Thanks Ondřej!
m4_include([../m4/kpse-teckit-flags.m4])
m4_include([../m4/kpse-warnings.m4])
m4_include([../m4/kpse-web2c.m4])
+--- texlive-bin.orig/m4/kpse-freetype-flags.m4
++++ /dev/null
+@@ -1,29 +0,0 @@
+-# Public macros for the TeX Live (TL) tree.
+-# Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+-#
+-# This file is free software; the copyright holder
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
+-
+-# serial 0
+-
+-# KPSE_FREETYPE_FLAGS
+-# -------------------
+-# Provide the configure options '--with-system-freetype' (if in the TL tree),
+-# '--with-freetype-includes', and '--with-freetype-libdir'.
+-#
+-# Set the make variables FREETYPE_INCLUDES and FREETYPE_LIBS to the CPPFLAGS and
+-# LIBS required for the `-lttf' library in libs/freetype/ of the TL tree.
+-AC_DEFUN([KPSE_FREETYPE_FLAGS],
+-[_KPSE_LIB_FLAGS([freetype], [ttf], [],
+- [-IBLD/libs/freetype/freetype], [BLD/libs/freetype/libttf.a], [],
+- [], [${top_builddir}/../../libs/freetype/freetype/freetype.h])[]dnl
+-]) # KPSE_FREETYPE_FLAGS
+-
+-# KPSE_FREETYPE_OPTIONS([WITH-SYSTEM])
+-# ------------------------------------
+-AC_DEFUN([KPSE_FREETYPE_OPTIONS], [_KPSE_LIB_OPTIONS([freetype], [$1])])
+-
+-# KPSE_FREETYPE_SYSTEM_FLAGS
+-# --------------------------
+-AC_DEFUN([KPSE_FREETYPE_SYSTEM_FLAGS], [_KPSE_LIB_FLAGS_SYSTEM([freetype], [ttf])])
+--- texlive-bin.orig/texk/aclocal.m4
++++ texlive-bin/texk/aclocal.m4
+@@ -1038,7 +1038,6 @@
+ m4_include([../m4/kpse-cairo-flags.m4])
+ m4_include([../m4/kpse-common.m4])
+ m4_include([../m4/kpse-cxx-hack.m4])
+-m4_include([../m4/kpse-freetype-flags.m4])
+ m4_include([../m4/kpse-freetype2-flags.m4])
+ m4_include([../m4/kpse-gd-flags.m4])
+ m4_include([../m4/kpse-graphite2-flags.m4])
diff --git a/debian/patches/series b/debian/patches/series
index c4551f6..deacfdd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,6 +3,6 @@ debian-builtin-searchpath
debian-no-linked-scripts
60_unneeded_linking
61_path_max.diff
-disable-t1lib-gd-dvipng
+disable-t1lib-gd-dvipng-freetype
pmpost-20130522
mpost-fix-svg-size
--
Debian packaging of texlive-bin)
Reply to: