[arch-commits] Commit in texlive-bin/repos (6 files)

François Charette francois at archlinux.org
Thu Jan 14 10:57:23 UTC 2010


    Date: Thursday, January 14, 2010 @ 05:57:23
  Author: francois
Revision: 63062

Merged revisions 55236,62879,63060 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/texlive-bin/trunk

........
  r55236 | francois | 2009-10-12 12:06:31 +0200 (Mon, 12 Oct 2009) | 1 line
  
  remove the symlinking for texlua that went astray (but keep the corrected ones)
........
  r62879 | francois | 2010-01-13 17:14:44 +0100 (Wed, 13 Jan 2010) | 7 lines
  
  Update TeX Live sources and luatex (version 0.50).
  Luatex is now built with included xpdf instead of libpoppler.
  Fix a few bugs in PKGBUILD:
  - symlink for texlua
  - symplify creation of links with texlinks
  - htcontext was twice in the list of symlinks to remove
........
  r63060 | francois | 2010-01-14 11:39:01 +0100 (Thu, 14 Jan 2010) | 6 lines
  
  Patch luatex for poppler. Remove outdated patches
  - We build luatex against libpoppler, as before, but we provide 
  a more generic patch, as in the TeXLive version of pdftex.
  - Restore PATH for texlinks (was removed by mistake in previous commit)
........

Added:
  texlive-bin/repos/extra-x86_64/luatex-0.50-poppler.patch
    (from rev 63060, texlive-bin/trunk/luatex-0.50-poppler.patch)
Modified:
  texlive-bin/repos/extra-x86_64/	(properties)
  texlive-bin/repos/extra-x86_64/PKGBUILD
Deleted:
  texlive-bin/repos/extra-x86_64/luatex-libpoppler-0.12.patch
  texlive-bin/repos/extra-x86_64/ubuntu_libpoppler-0.11.patch
  texlive-bin/repos/extra-x86_64/ubuntu_libpoppler-0.12.patch

------------------------------+
 PKGBUILD                     |   53 +++++++++++++++++------------------------
 luatex-0.50-poppler.patch    |   44 ++++++++++++++++++++++++++++++++++
 luatex-libpoppler-0.12.patch |   30 -----------------------
 ubuntu_libpoppler-0.11.patch |   14 ----------
 ubuntu_libpoppler-0.12.patch |   26 --------------------
 5 files changed, 66 insertions(+), 101 deletions(-)


Property changes on: texlive-bin/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /texlive-bin/trunk:1-55189
   + /texlive-bin/trunk:1-63061

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2010-01-14 10:49:31 UTC (rev 63061)
+++ extra-x86_64/PKGBUILD	2010-01-14 10:57:23 UTC (rev 63062)
@@ -1,9 +1,8 @@
-# $Id$
 # Maintainer: francois at archlinux dot org
 
 pkgname=texlive-bin
-pkgver=2009.4
-pkgrel=3
+pkgver=2009.5
+pkgrel=1
 pkgdesc="TeX Live binaries"
 license=('GPL')
 arch=('i686' 'x86_64')
@@ -12,13 +11,11 @@
 options=('!makeflags' '!libtool')
 url='http://tug.org/texlive/'
 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'
+        'ftp://ftp.archlinux.org/other/texlive/texlive-bin-source-20100112.tar.xz'
+        'ftp://ftp.archlinux.org/other/texlive/texlive-bin-texmf-20100112.tar.xz'
+        'http://foundry.supelec.fr/gf/download/frsrelease/364/1424/luatex-beta-0.50.0.tar.bz2'
         'fix-fontforge-encoding.patch'
-        ubuntu_libpoppler-0.11.patch
-        ubuntu_libpoppler-0.12.patch
-        luatex-libpoppler-0.12.patch)
+        'luatex-0.50-poppler.patch')
 backup=(usr/share/texmf/web2c/texmf.cnf \
 	usr/share/texmf-config/web2c/mktex.cnf \
 	usr/share/texmf-config/web2c/updmap.cfg \
@@ -31,13 +28,11 @@
 	usr/share/texmf-config/dvipdfm/config/config \
 	usr/share/texmf-config/xdvi/XDvi)
 md5sums=('04aff1501d9a8418903dd7342b6db87f'
-         '1baf3379a2be374d5793f82134b17f4f'
-         '95bfd32a0176645694935d117271e1db'
-         '2ca3f261191310b62fc93c98791a67e7'
+         'bed5410ff12bb62da1064b306af0baa2'
+         '8c4eb9b70a3abc86339c285b01439e1f'
+         '125a21f67ff54440606660306106d331'
          'bfb9716aa00c86c08cd31e5b32edeb98'
-         'b315cb924632ba1eed0781f8202db437'
-         '8bea4a0e0cbd2f73d57d5de1f61ac5fe'
-         '9da233c460e6c98ca0cd775a45bb77d0')
+         'c5c12aa500e54286b30db0dbb28d4e81')
 build() {
    if [ "${CARCH}" = "x86_64" ]; then
      export CFLAGS="${CFLAGS} -fPIC"
@@ -45,20 +40,18 @@
    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
 
-   ### provisory: we configure and build luatex 0.43 separately, because 
+   ### provisory: we configure and build luatex 0.50 separately, because 
    # it is needed for latest ConTeXT in texlive-core, but it fails to build
    # when integrated in the texlive build tree
-   cd "${srcdir}/luatex-beta-0.43.0"
+   cd luatex-beta-0.50.0 || return 1
    patch -p0 -i ../fix-fontforge-encoding.patch || return 1
-   patch -p1 -i "${srcdir}/luatex-libpoppler-0.12.patch" || return 1
-   mkdir build
-   cd build
+   patch -p1 -i ../luatex-0.50-poppler.patch || return 1
+   mkdir build || return 1
+   cd build || return 1
    ../source/configure --prefix=/usr \
     --enable-cxx-runtime-hack \
     --disable-afm2pl \
@@ -113,6 +106,7 @@
     --disable-xdvipdfmx \
     --without-system-kpathsea \
     --with-system-freetype2 \
+    --with-system-xpdf \
     --with-freetype2-libdir=/usr/lib \
     --with-freetype2-include=/usr/include/freetype2 \
     --with-system-gd \
@@ -120,22 +114,19 @@
     --without-system-teckit \
     --with-system-zlib \
     --with-system-t1lib \
-    --with-system-xpdf \
     --disable-shared \
     --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 texluac || return 1
-   ln -s luatex ${pkgdir}/usr/bin/texlua || return 1
-   ln -s luatexc ${pkgdir}/usr/bin/texluac || return 1
-   cd ../.. 
+   cd $pkgdir/usr/bin
+   /bin/ln -s luatex texlua || return 1
+   cd $srcdir
    ##################################
    # TODO don't forget to remove --disable-luatex below 
    # once luatex is updated in TeXLive...
@@ -213,9 +204,9 @@
 
    # remove symlinks to scripts that are not in texlive-core:
    for s in cachepic ht htcontext htlatex htmex httex httexi htxelatex htxetex mk4ht \
-     htcontext mkgrkindex epspdftk pst2pdf epspdf ulqda ebong makeglossaries \
+     mkgrkindex epspdftk pst2pdf epspdf ulqda ebong makeglossaries \
      pdfannotextractor perltex pdfthumb ppower4 ps4pdf splitindex svn-multi vpe; do
-     rm -f $pkgdir/usr/bin/$s
+     rm $pkgdir/usr/bin/$s
    done
    
    # the mandirs contain Makefiles ...

Copied: texlive-bin/repos/extra-x86_64/luatex-0.50-poppler.patch (from rev 63060, texlive-bin/trunk/luatex-0.50-poppler.patch)
===================================================================
--- extra-x86_64/luatex-0.50-poppler.patch	                        (rev 0)
+++ extra-x86_64/luatex-0.50-poppler.patch	2010-01-14 10:57:23 UTC (rev 63062)
@@ -0,0 +1,44 @@
+--- luatex-beta-0.50.0/source/texk/web2c/luatexdir/image/pdftoepdf.cc.orig	2009-12-24 19:50:48.000000000 +0100
++++ luatex-beta-0.50.0/source/texk/web2c/luatexdir/image/pdftoepdf.cc	2010-01-14 08:53:58.086685489 +0100
+@@ -560,7 +560,12 @@
+     int rotate;
+     char *checksum;
+     PDFRectangle *pagebox;
++#ifdef POPPLER_VERSION
++    int pdf_major_version_found, pdf_minor_version_found;
++    float xsize, ysize, xorig, yorig;
++#else
+     float pdf_version_found, pdf_version_wanted, xsize, ysize, xorig, yorig;
++#endif
+     assert(idict != NULL);
+     assert(img_type(idict) == IMG_TYPE_PDF);
+     assert(readtype == IMG_CLOSEINBETWEEN);     // only this is implemented
+@@ -583,6 +588,20 @@
+     // 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.
++#ifdef POPPLER_VERSION
++    pdf_major_version_found = pdf_doc->doc->getPDFMajorVersion();
++    pdf_minor_version_found = pdf_doc->doc->getPDFMinorVersion();
++    if ((pdf_major_version_found > 1)
++     || (pdf_minor_version_found > minor_pdf_version_wanted)) {
++        const char *msg =
++            "PDF inclusion: found PDF version <%d.%d>, but at most version <1.%d> allowed";
++        if (pdf_inclusion_errorlevel > 0) {
++            pdftex_fail(msg, pdf_major_version_found, pdf_minor_version_found, minor_pdf_version_wanted);
++        } else {
++            pdftex_warn(msg, pdf_major_version_found, pdf_minor_version_found, minor_pdf_version_wanted);
++        }
++    }
++#else
+     pdf_version_found = pdf_doc->doc->getPDFVersion();
+     pdf_version_wanted = 1 + (minor_pdf_version_wanted * 0.1);
+     if (pdf_version_found > pdf_version_wanted + 0.01) {
+@@ -594,6 +613,7 @@
+             pdftex_warn(msg, pdf_version_found, pdf_version_wanted);
+         }
+     }
++#endif
+     img_totalpages(idict) = pdf_doc->doc->getCatalog()->getNumPages();
+     if (img_pagename(idict)) {
+         // get page by name

Deleted: extra-x86_64/luatex-libpoppler-0.12.patch
===================================================================
--- extra-x86_64/luatex-libpoppler-0.12.patch	2010-01-14 10:49:31 UTC (rev 63061)
+++ extra-x86_64/luatex-libpoppler-0.12.patch	2010-01-14 10:57:23 UTC (rev 63062)
@@ -1,30 +0,0 @@
---- 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[] =

Deleted: extra-x86_64/ubuntu_libpoppler-0.11.patch
===================================================================
--- extra-x86_64/ubuntu_libpoppler-0.11.patch	2010-01-14 10:49:31 UTC (rev 63061)
+++ extra-x86_64/ubuntu_libpoppler-0.11.patch	2010-01-14 10:57:23 UTC (rev 63062)
@@ -1,14 +0,0 @@
-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;
-     }
- }

Deleted: extra-x86_64/ubuntu_libpoppler-0.12.patch
===================================================================
--- extra-x86_64/ubuntu_libpoppler-0.12.patch	2010-01-14 10:49:31 UTC (rev 63061)
+++ extra-x86_64/ubuntu_libpoppler-0.12.patch	2010-01-14 10:57:23 UTC (rev 63062)
@@ -1,26 +0,0 @@
-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