diff --git a/texlive-poppler.patch b/texlive-poppler.patch index d891167..702c057 100644 --- a/texlive-poppler.patch +++ b/texlive-poppler.patch @@ -1,6 +1,6 @@ diff -up texlive-2007/configure.in.poppler texlive-2007/configure.in --- texlive-2007/configure.in.poppler 2007-01-08 20:17:11.000000000 -0500 -+++ texlive-2007/configure.in 2008-11-11 22:18:27.000000000 -0500 ++++ texlive-2007/configure.in 2008-11-11 22:38:31.000000000 -0500 @@ -157,9 +157,9 @@ export needs_zlib # we need libxpdf for pdf[ex]tex, xetex @@ -25,7 +25,7 @@ diff -up texlive-2007/configure.in.poppler texlive-2007/configure.in sinclude(libs/freetype/freetype.ac) diff -up texlive-2007/configure.poppler texlive-2007/configure --- texlive-2007/configure.poppler 2007-01-09 09:16:26.000000000 -0500 -+++ texlive-2007/configure 2008-11-11 22:18:27.000000000 -0500 ++++ texlive-2007/configure 2008-11-11 22:38:31.000000000 -0500 @@ -3442,9 +3442,9 @@ export needs_zlib # we need libxpdf for pdf[ex]tex, xetex @@ -41,7 +41,7 @@ diff -up texlive-2007/configure.poppler texlive-2007/configure diff -up texlive-2007/texk/web2c/pdftexdir/pdftexextra.in.poppler texlive-2007/texk/web2c/pdftexdir/pdftexextra.in --- texlive-2007/texk/web2c/pdftexdir/pdftexextra.in.poppler 2006-12-26 18:37:34.000000000 -0500 -+++ texlive-2007/texk/web2c/pdftexdir/pdftexextra.in 2008-11-11 22:18:27.000000000 -0500 ++++ texlive-2007/texk/web2c/pdftexdir/pdftexextra.in 2008-11-11 22:38:31.000000000 -0500 @@ -26,7 +26,7 @@ $Id: pdftexextra.in,v 1.4 2004/08/26 18: (generated from ../lib/texmfmp.c). */ @@ -53,7 +53,7 @@ diff -up texlive-2007/texk/web2c/pdftexdir/pdftexextra.in.poppler texlive-2007/t #define PROGRAM_HELP PDFTEXHELP diff -up texlive-2007/texk/web2c/pdftexdir/pdftex.mk.poppler texlive-2007/texk/web2c/pdftexdir/pdftex.mk --- texlive-2007/texk/web2c/pdftexdir/pdftex.mk.poppler 2006-12-26 18:37:34.000000000 -0500 -+++ texlive-2007/texk/web2c/pdftexdir/pdftex.mk 2008-11-11 22:18:27.000000000 -0500 ++++ texlive-2007/texk/web2c/pdftexdir/pdftex.mk 2008-11-11 22:38:31.000000000 -0500 @@ -2,6 +2,9 @@ # This fragment contains the parts of the makefile that are most likely to # differ between releases of pdfeTeX. @@ -84,7 +84,7 @@ diff -up texlive-2007/texk/web2c/pdftexdir/pdftex.mk.poppler texlive-2007/texk/w check: pdftosrc-check diff -up texlive-2007/texk/web2c/pdftexdir/pdftoepdf.cc.poppler texlive-2007/texk/web2c/pdftexdir/pdftoepdf.cc --- texlive-2007/texk/web2c/pdftexdir/pdftoepdf.cc.poppler 2006-12-26 18:37:34.000000000 -0500 -+++ texlive-2007/texk/web2c/pdftexdir/pdftoepdf.cc 2008-11-11 22:18:27.000000000 -0500 ++++ texlive-2007/texk/web2c/pdftexdir/pdftoepdf.cc 2008-11-11 22:38:31.000000000 -0500 @@ -26,25 +26,24 @@ $Id: pdftoepdf.cc,v 1.9 2006/09/01 18:06 #include #include @@ -157,7 +157,7 @@ diff -up texlive-2007/texk/web2c/pdftexdir/pdftoepdf.cc.poppler texlive-2007/tex pdftex_fail("PDF inclusion: invalid destination <%s>", page_name); diff -up texlive-2007/texk/web2c/pdftexdir/pdftosrc.cc.poppler texlive-2007/texk/web2c/pdftexdir/pdftosrc.cc --- texlive-2007/texk/web2c/pdftexdir/pdftosrc.cc.poppler 2006-12-26 18:37:34.000000000 -0500 -+++ texlive-2007/texk/web2c/pdftexdir/pdftosrc.cc 2008-11-11 22:21:30.000000000 -0500 ++++ texlive-2007/texk/web2c/pdftexdir/pdftosrc.cc 2008-11-11 22:38:31.000000000 -0500 @@ -25,22 +25,23 @@ $Id: //depot/Build/source.development/Te #include #include @@ -224,7 +224,7 @@ diff -up texlive-2007/texk/web2c/pdftexdir/pdftosrc.cc.poppler texlive-2007/texk if (!doc->isOk()) { diff -up texlive-2007/texk/web2c/pdftexdir/utils.c.poppler texlive-2007/texk/web2c/pdftexdir/utils.c --- texlive-2007/texk/web2c/pdftexdir/utils.c.poppler 2007-01-01 12:20:03.000000000 -0500 -+++ texlive-2007/texk/web2c/pdftexdir/utils.c 2008-11-11 22:20:59.000000000 -0500 ++++ texlive-2007/texk/web2c/pdftexdir/utils.c 2008-11-11 22:38:31.000000000 -0500 @@ -37,7 +37,7 @@ $Id: //depot/Build/source.development/Te #include "zlib.h" #include "ptexlib.h" @@ -248,7 +248,7 @@ diff -up texlive-2007/texk/web2c/pdftexdir/utils.c.poppler texlive-2007/texk/web diff -up texlive-2007/texk/web2c/xetexdir/pdfimage.cpp.poppler texlive-2007/texk/web2c/xetexdir/pdfimage.cpp --- texlive-2007/texk/web2c/xetexdir/pdfimage.cpp.poppler 2006-12-09 05:29:12.000000000 -0500 -+++ texlive-2007/texk/web2c/xetexdir/pdfimage.cpp 2008-11-11 22:18:27.000000000 -0500 ++++ texlive-2007/texk/web2c/xetexdir/pdfimage.cpp 2008-11-11 22:38:31.000000000 -0500 @@ -11,10 +11,24 @@ #include "pdfimage.h" @@ -289,7 +289,7 @@ diff -up texlive-2007/texk/web2c/xetexdir/pdfimage.cpp.poppler texlive-2007/texk if (!doc) { diff -up texlive-2007/texk/web2c/xetexdir/XeTeX_ext.c.poppler texlive-2007/texk/web2c/xetexdir/XeTeX_ext.c --- texlive-2007/texk/web2c/xetexdir/XeTeX_ext.c.poppler 2007-01-15 08:04:36.000000000 -0500 -+++ texlive-2007/texk/web2c/xetexdir/XeTeX_ext.c 2008-11-11 22:18:27.000000000 -0500 ++++ texlive-2007/texk/web2c/xetexdir/XeTeX_ext.c 2008-11-11 22:39:46.000000000 -0500 @@ -33,7 +33,7 @@ authorization from SIL International. */ @@ -304,13 +304,31 @@ diff -up texlive-2007/texk/web2c/xetexdir/XeTeX_ext.c.poppler texlive-2007/texk/ "Compiled with fontconfig version %d.%d.%d; using %d.%d.%d\n" "Compiled with libpng version %s; using %s\n" - "Compiled with xpdf version %s\n" -+ "Compiled with libpoppler version %s\n" ++ "Compiled with libpoppler\n" #endif ; +@@ -205,7 +205,6 @@ void initversionstring(char **versions) + #ifdef XETEX_OTHER + + strlen(PNG_LIBPNG_VER_STRING) + + strlen(png_libpng_ver) +- + strlen(xpdfVersion) + + 6 * 3 /* for fontconfig version #s (won't really need 3 digits per field!) */ + #endif + + 6 * 3; /* for freetype version #s (ditto) */ +@@ -229,8 +228,7 @@ void initversionstring(char **versions) + , + FC_VERSION / 10000, (FC_VERSION % 10000) / 100, FC_VERSION % 100, + fc_version / 10000, (fc_version % 10000) / 100, fc_version % 100, +- PNG_LIBPNG_VER_STRING, png_libpng_ver, +- xpdfVersion ++ PNG_LIBPNG_VER_STRING, png_libpng_ver + #endif + ); + } diff -up texlive-2007/texk/web2c/xetexdir/xetex.mk.poppler texlive-2007/texk/web2c/xetexdir/xetex.mk ---- texlive-2007/texk/web2c/xetexdir/xetex.mk.poppler 2008-11-11 22:18:27.000000000 -0500 -+++ texlive-2007/texk/web2c/xetexdir/xetex.mk 2008-11-11 22:18:27.000000000 -0500 +--- texlive-2007/texk/web2c/xetexdir/xetex.mk.poppler 2008-11-11 22:38:31.000000000 -0500 ++++ texlive-2007/texk/web2c/xetexdir/xetex.mk 2008-11-11 22:38:31.000000000 -0500 @@ -4,6 +4,10 @@ Makefile: $(srcdir)/xetexdir/xetex.mk diff --git a/texlive.spec b/texlive.spec index 211819c..0027534 100644 --- a/texlive.spec +++ b/texlive.spec @@ -21,7 +21,7 @@ Name: texlive Version: %{texlive_ver} -Release: 38%{?dist} +Release: 39%{?dist} Summary: Binaries for the TeX formatting system Group: Applications/Publishing @@ -1232,7 +1232,7 @@ fi %{_mandir}/man1/texutil.1* %changelog -* Tue Nov 11 2008 Matthias Clasen - 2007-38 +* Tue Nov 11 2008 Matthias Clasen - 2007-39 - Rebuild against new poppler - Update poppler patch to remove references to xpdfVersion