[SCM] Debian packaging of luatex) branch, master, updated. debian/0.72.0-2-9-ga10c0ff
The following commit has been merged in the master branch:
commit a10c0ff864a2b6905a92922cd52f04aa59a8a954
Author: Norbert Preining <preining@debian.org>
Date: Mon Mar 4 18:14:07 2013 +0900
refactor patches, disable system-poppler, does not work
diff --git a/debian/patches/build-script b/debian/patches/build-script
index 775a979..f345261 100644
--- a/debian/patches/build-script
+++ b/debian/patches/build-script
@@ -1,8 +1,8 @@
patch the build script to use system libraries and
build without X
---
- build.sh | 21 +++++++++++++--------
- 1 file changed, 13 insertions(+), 8 deletions(-)
+ build.sh | 20 ++++++++++++--------
+ 1 file changed, 12 insertions(+), 8 deletions(-)
--- luatex.orig/build.sh
+++ luatex/build.sh
@@ -19,7 +19,7 @@ build without X
--disable-largefile \
--disable-ptex \
--disable-ipc \
-@@ -161,14 +163,17 @@
+@@ -161,14 +163,16 @@
--enable-luatex \
--without-system-ptexenc \
--without-system-kpathsea \
@@ -29,7 +29,6 @@ build without X
- --without-system-freetype2 \
- --without-system-gd \
- --without-system-libpng \
-+ --with-system-poppler \
+ --with-system-xpdf \
+ --with-system-freetype \
+ --with-system-freetype2 \
diff --git a/debian/patches/not_build_libs.diff b/debian/patches/not_build_libs.diff
index 4deed1a..87874d2 100644
--- a/debian/patches/not_build_libs.diff
+++ b/debian/patches/not_build_libs.diff
@@ -1,19 +1,17 @@
---
- build.sh | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
+ build.sh | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
--- luatex.orig/build.sh
+++ luatex/build.sh
-@@ -190,9 +190,9 @@
+@@ -189,8 +189,8 @@
# (perhaps more files needed to be copied from TL?)
(cd libs/zziplib; $MAKE all )
-(cd libs/zlib; $MAKE all )
-(cd libs/libpng; $MAKE all )
--(cd libs/poppler; $MAKE all )
+#(cd libs/zlib; $MAKE all )
+#(cd libs/libpng; $MAKE all )
-+#(cd libs/poppler; $MAKE all )
+ (cd libs/poppler; $MAKE all )
(cd texk/kpathsea; $MAKE )
- (cd texk/web2c; $MAKE $LUATEXEXE )
diff --git a/debian/patches/series b/debian/patches/series
index 39674ec..da2c602 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ relax-zlib-version-check
no_static_link.patch
not_build_libs.diff
no-cxx-runtime-hack
+#system-poppler
diff --git a/debian/patches/system-poppler b/debian/patches/system-poppler
new file mode 100644
index 0000000..b12cd86
--- /dev/null
+++ b/debian/patches/system-poppler
@@ -0,0 +1,23 @@
+---
+ build.sh | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- luatex.orig/build.sh
++++ luatex/build.sh
+@@ -162,6 +162,7 @@
+ --enable-luatex \
+ --without-system-ptexenc \
+ --without-system-kpathsea \
++ --with-system-poppler \
+ --with-system-xpdf \
+ --with-system-freetype \
+ --with-system-freetype2 \
+@@ -190,7 +191,7 @@
+ (cd libs/zziplib; $MAKE all )
+ #(cd libs/zlib; $MAKE all )
+ #(cd libs/libpng; $MAKE all )
+-(cd libs/poppler; $MAKE all )
++#(cd libs/poppler; $MAKE all )
+
+ (cd texk/kpathsea; $MAKE )
+ (cd texk/web2c; $MAKE $LUATEXEXE )
--
Debian packaging of luatex)
Reply to: