[arch-commits] Commit in texlive-bin (5 files)
Jan de Groot
jgc at archlinux.org
Mon Oct 12 08:30:10 UTC 2009
Date: Monday, October 12, 2009 @ 04:30:10
Author: jgc
Revision: 55188
Merge gnome-unstable
Added:
texlive-bin/trunk/luatex-libpoppler-0.12.patch
(from rev 55187, texlive-bin/gnome-unstable/luatex-libpoppler-0.12.patch)
texlive-bin/trunk/ubuntu_libpoppler-0.11.patch
(from rev 55187, texlive-bin/gnome-unstable/ubuntu_libpoppler-0.11.patch)
texlive-bin/trunk/ubuntu_libpoppler-0.12.patch
(from rev 55187, texlive-bin/gnome-unstable/ubuntu_libpoppler-0.12.patch)
Modified:
texlive-bin/trunk/PKGBUILD
Deleted:
texlive-bin/gnome-unstable/
------------------------------+
PKGBUILD | 30 +++++++++++++++++++++---------
luatex-libpoppler-0.12.patch | 30 ++++++++++++++++++++++++++++++
ubuntu_libpoppler-0.11.patch | 14 ++++++++++++++
ubuntu_libpoppler-0.12.patch | 26 ++++++++++++++++++++++++++
4 files changed, 91 insertions(+), 9 deletions(-)
Modified: trunk/PKGBUILD
===================================================================
--- trunk/PKGBUILD 2009-10-12 08:29:01 UTC (rev 55187)
+++ trunk/PKGBUILD 2009-10-12 08:30:10 UTC (rev 55188)
@@ -1,3 +1,4 @@
+# $Id$
# Maintainer: francois at archlinux dot org
pkgname=texlive-bin
@@ -2,3 +3,3 @@
pkgver=2009.4
-pkgrel=2
+pkgrel=3
pkgdesc="TeX Live binaries"
@@ -13,8 +14,11 @@
source=('texmf.cnf'
'ftp://ftp.archlinux.org/other/texlive/texlive-bin-source-20090930.tar.xz'
'ftp://ftp.archlinux.org/other/texlive/texlive-bin-texmf-20090930.tar.xz'
- 'http://foundry.supelec.fr/gf/download/frsrelease/353/1363/luatex-beta-0.43.0.tar.bz2'
- 'fix-fontforge-encoding.patch')
+ 'http://foundry.supelec.fr/gf/download/frsrelease/353/1363/luatex-beta-0.43.0.tar.bz2'
+ 'fix-fontforge-encoding.patch'
+ ubuntu_libpoppler-0.11.patch
+ ubuntu_libpoppler-0.12.patch
+ luatex-libpoppler-0.12.patch)
backup=(usr/share/texmf/web2c/texmf.cnf \
usr/share/texmf-config/web2c/mktex.cnf \
usr/share/texmf-config/web2c/updmap.cfg \
@@ -30,7 +34,10 @@
'1baf3379a2be374d5793f82134b17f4f'
'95bfd32a0176645694935d117271e1db'
'2ca3f261191310b62fc93c98791a67e7'
- 'bfb9716aa00c86c08cd31e5b32edeb98')
+ 'bfb9716aa00c86c08cd31e5b32edeb98'
+ 'b315cb924632ba1eed0781f8202db437'
+ '8bea4a0e0cbd2f73d57d5de1f61ac5fe'
+ '9da233c460e6c98ca0cd775a45bb77d0')
build() {
if [ "${CARCH}" = "x86_64" ]; then
export CFLAGS="${CFLAGS} -fPIC"
@@ -38,6 +45,8 @@
fi
cd $srcdir
+ patch -Np2 -i "${srcdir}/ubuntu_libpoppler-0.11.patch" || return 1
+ patch -Np2 -i "${srcdir}/ubuntu_libpoppler-0.12.patch" || return 1
install -m755 -d $pkgdir/usr/share || return 1
cp -r texmf $pkgdir/usr/share/ || return 1
@@ -45,8 +54,9 @@
### provisory: we configure and build luatex 0.43 separately, because
# it is needed for latest ConTeXT in texlive-core, but it fails to build
# when integrated in the texlive build tree
- cd luatex-beta-0.43.0
+ cd "${srcdir}/luatex-beta-0.43.0"
patch -p0 -i ../fix-fontforge-encoding.patch || return 1
+ patch -p1 -i "${srcdir}/luatex-libpoppler-0.12.patch" || return 1
mkdir build
cd build
../source/configure --prefix=/usr \
@@ -115,14 +125,16 @@
--disable-largefile \
--disable-ipc \
--without-mf-x-toolkit \
- --without-x || return 1
+ --without-x || return 1
make || return 1
## install luatex binary
install -d -m755 $pkgdir/usr/bin || return 1
install -m755 texk/web2c/luatex $pkgdir/usr/bin/ || return 1
/bin/ln -s $pkgdir/usr/bin/luatex texlua || return 1
- /bin/ln -s $pkgdir/usr/bin/luatexc texlua || return 1
+ /bin/ln -s $pkgdir/usr/bin/luatexc texluac || return 1
+ ln -s luatex ${pkgdir}/usr/bin/texlua || return 1
+ ln -s luatexc ${pkgdir}/usr/bin/texluac || return 1
cd ../..
##################################
# TODO don't forget to remove --disable-luatex below
@@ -189,7 +201,7 @@
## create symlinks for formats
echo "--> Create symlinks for TeX formats ..."
- $pkgdir/usr/bin/texlinks -f $pkgdir/usr/share/texmf/web2c/fmtutil.cnf $pkgdir/usr/bin/ || return 1
+ PATH="$PATH:${pkgdir}/usr/bin" texlinks -f $pkgdir/usr/share/texmf/web2c/fmtutil.cnf $pkgdir/usr/bin/ || return 1
#############################################################
## CLEAN UP...
@@ -203,7 +215,7 @@
for s in cachepic ht htcontext htlatex htmex httex httexi htxelatex htxetex mk4ht \
htcontext mkgrkindex epspdftk pst2pdf epspdf ulqda ebong makeglossaries \
pdfannotextractor perltex pdfthumb ppower4 ps4pdf splitindex svn-multi vpe; do
- rm $pkgdir/usr/bin/$s
+ rm -f $pkgdir/usr/bin/$s
done
# the mandirs contain Makefiles ...
Copied: texlive-bin/trunk/luatex-libpoppler-0.12.patch (from rev 55187, texlive-bin/gnome-unstable/luatex-libpoppler-0.12.patch)
===================================================================
--- trunk/luatex-libpoppler-0.12.patch (rev 0)
+++ trunk/luatex-libpoppler-0.12.patch 2009-10-12 08:30:10 UTC (rev 55188)
@@ -0,0 +1,30 @@
+--- luatex-beta-0.43.0/source/texk/web2c/luatexdir/image/pdftoepdf.cc.orig 2009-10-10 23:33:01.000000000 +0200
++++ luatex-beta-0.43.0/source/texk/web2c/luatexdir/image/pdftoepdf.cc 2009-10-10 23:34:23.000000000 +0200
+@@ -672,7 +672,7 @@
+ }
+ for (r = encodingList; r != NULL; r = n) {
+ n = r->next;
+- delete r->font;
++ //delete r->font;
+ delete r;
+ }
+ }
+@@ -712,6 +712,7 @@
+ Page *page;
+ int rotate;
+ PDFRectangle *pagebox;
++ int minor_pdf_version_found, major_pdf_version_found;
+ float pdf_version_found, pdf_version_wanted, xsize, ysize, xorig, yorig;
+ assert(idict != NULL);
+ assert(img_type(idict) == IMG_TYPE_PDF);
+@@ -727,7 +728,9 @@
+ // this works only for PDF 1.x -- but since any versions of PDF newer
+ // than 1.x will not be backwards compatible to PDF 1.x, pdfTeX will
+ // then have to changed drastically anyway.
+- pdf_version_found = pdf_doc->doc->getPDFVersion();
++ minor_pdf_version_found = pdf_doc->doc->getPDFMinorVersion();
++ major_pdf_version_found = pdf_doc->doc->getPDFMajorVersion();
++ pdf_version_found = major_pdf_version_found + (minor_pdf_version_found * 0.1);
+ pdf_version_wanted = 1 + (minor_pdf_version_wanted * 0.1);
+ if (pdf_version_found > pdf_version_wanted + 0.01) {
+ char msg[] =
Copied: texlive-bin/trunk/ubuntu_libpoppler-0.11.patch (from rev 55187, texlive-bin/gnome-unstable/ubuntu_libpoppler-0.11.patch)
===================================================================
--- trunk/ubuntu_libpoppler-0.11.patch (rev 0)
+++ trunk/ubuntu_libpoppler-0.11.patch 2009-10-12 08:30:10 UTC (rev 55188)
@@ -0,0 +1,14 @@
+Fix a FTBFS with libpoppler 0.11: the destructor of GfxFont is virtual, and it doesn't make sense to call it.
+Index: texlive-bin-2007.dfsg.2/build/source/texk/web2c/pdftexdir/pdftoepdf.cc
+===================================================================
+--- texlive-bin-2007.dfsg.2.orig/build/source/texk/web2c/pdftexdir/pdftoepdf.cc 2009-09-28 08:44:25.000000000 +0000
++++ texlive-bin-2007.dfsg.2/build/source/texk/web2c/pdftexdir/pdftoepdf.cc 2009-09-28 09:25:56.000000000 +0000
+@@ -633,7 +633,7 @@
+ }
+ for (r = encodingList; r != 0; r = n) {
+ n = r->next;
+- delete r->font;
++// delete r->font;
+ delete r;
+ }
+ }
Copied: texlive-bin/trunk/ubuntu_libpoppler-0.12.patch (from rev 55187, texlive-bin/gnome-unstable/ubuntu_libpoppler-0.12.patch)
===================================================================
--- trunk/ubuntu_libpoppler-0.12.patch (rev 0)
+++ trunk/ubuntu_libpoppler-0.12.patch 2009-10-12 08:30:10 UTC (rev 55188)
@@ -0,0 +1,26 @@
+Fix a FTBFS with libpoppler 0.12: use getPDFMinorVersion instead of getPDFVersion
+Index: texlive-bin-2007.dfsg.2/build/source/texk/web2c/pdftexdir/pdftoepdf.cc
+===================================================================
+--- texlive-bin-2007.dfsg.2.orig/build/source/texk/web2c/pdftexdir/pdftoepdf.cc 2009-09-28 10:25:18.000000000 +0000
++++ texlive-bin-2007.dfsg.2/build/source/texk/web2c/pdftexdir/pdftoepdf.cc 2009-09-28 10:59:33.000000000 +0000
+@@ -673,6 +673,7 @@
+ Page *page;
+ int rotate;
+ PDFRectangle *pagebox;
++ int minor_pdf_version_found, major_pdf_version_found;
+ float pdf_version_found, pdf_version_wanted;
+ // initialize
+ if (!isInit) {
+@@ -688,8 +689,11 @@
+ // this works only for PDF 1.x -- but since any versions of PDF newer
+ // than 1.x will not be backwards compatible to PDF 1.x, pdfTeX will
+ // then have to changed drastically anyway.
+- pdf_version_found = pdf_doc->doc->getPDFVersion();
++ minor_pdf_version_found = pdf_doc->doc->getPDFMinorVersion();
++ major_pdf_version_found = pdf_doc->doc->getPDFMajorVersion();
++ pdf_version_found = major_pdf_version_found + (minor_pdf_version_found * 0.1);
+ pdf_version_wanted = 1 + (minor_pdf_version_wanted * 0.1);
++
+ if (pdf_version_found > pdf_version_wanted) {
+ char msg[] =
+ "PDF inclusion: found PDF version <%.1f>, but at most version <%.1f> allowed";
More information about the arch-commits
mailing list