From c5ff0fd86c6c94f00298b29d49b4c25edbe92601 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 12 Nov 2008 03:23:37 +0000 Subject: [PATCH] fix the patch --- texlive-poppler.patch | 77 ++++++++----------------------------------- texlive.spec | 5 ++- 2 files changed, 16 insertions(+), 66 deletions(-) diff --git a/texlive-poppler.patch b/texlive-poppler.patch index 9e039ce..d891167 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 21:48:59.000000000 -0500 ++++ texlive-2007/configure.in 2008-11-11 22:18:27.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 21:48:59.000000000 -0500 ++++ texlive-2007/configure 2008-11-11 22:18:27.000000000 -0500 @@ -3442,9 +3442,9 @@ export needs_zlib # we need libxpdf for pdf[ex]tex, xetex @@ -39,40 +39,9 @@ diff -up texlive-2007/configure.poppler texlive-2007/configure : ${needs_libxpdf=no} export needs_libxpdf -@@ -4097,6 +4097,7 @@ int main() { - char *p = testbuf; - int i; - int version_num; -+ memset(p, 0, sizeof(testbuf)); - /* T1_GetLibIdent() might return something like '0.8-beta2'; - convert the leading numbers to a single digit: */ - for (i = 0; i < BUFLEN - 1; i++) { -@@ -4661,11 +4662,11 @@ else - fi - - OLD_LDFLAGS=$LDFLAGS -- OLD_CPP=$CPP -+ OLD_CPPFLAGS=$CPPFLAGS - OLD_LIBS=$LIBS - - LDFLAGS="$LDFLAGS $EXTRA_ICU_LIBDIR" -- CPP="$CPP $EXTRA_ICU_INCLUDE" -+ CPPFLAGS="$CPPFLAGS $EXTRA_ICU_INCLUDE -include urename.h" - - if test "$with_system_icu" = yes; then - echo $ac_n "checking for ubidi_open in -licuuc""... $ac_c" 1>&6 -@@ -4767,7 +4768,7 @@ done - fi - - LDFLAGS=$OLD_LDFLAGS -- CPP=$OLD_CPP -+ CPPFLAGS=$OLD_CPPFLAGS - LIBS=$OLD_LIBS - - if test "$with_system_icu" != yes; then 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 21:48:59.000000000 -0500 ++++ texlive-2007/texk/web2c/pdftexdir/pdftexextra.in 2008-11-11 22:18:27.000000000 -0500 @@ -26,7 +26,7 @@ $Id: pdftexextra.in,v 1.4 2004/08/26 18: (generated from ../lib/texmfmp.c). */ @@ -84,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 21:48:59.000000000 -0500 ++++ texlive-2007/texk/web2c/pdftexdir/pdftex.mk 2008-11-11 22:18:27.000000000 -0500 @@ -2,6 +2,9 @@ # This fragment contains the parts of the makefile that are most likely to # differ between releases of pdfeTeX. @@ -115,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 21:48:59.000000000 -0500 ++++ texlive-2007/texk/web2c/pdftexdir/pdftoepdf.cc 2008-11-11 22:18:27.000000000 -0500 @@ -26,25 +26,24 @@ $Id: pdftoepdf.cc,v 1.9 2006/09/01 18:06 #include #include @@ -188,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:04:01.000000000 -0500 ++++ texlive-2007/texk/web2c/pdftexdir/pdftosrc.cc 2008-11-11 22:21:30.000000000 -0500 @@ -25,22 +25,23 @@ $Id: //depot/Build/source.development/Te #include #include @@ -255,26 +224,17 @@ 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:03:18.000000000 -0500 -@@ -20,7 +20,9 @@ Foundation, Inc., 59 Temple Place, Suite - $Id: texlive-poppler.patch,v 1.2 2008/11/12 03:06:34 mclasen Exp $ - */ - -+#ifndef __linux__ - #include "openbsd-compat.h" -+#endif - #ifdef HAVE_ASPRINTF /* asprintf is not defined in openbsd-compat.h, but in stdio.h */ - # include - #endif -@@ -37,7 +39,6 @@ $Id: //depot/Build/source.development/Te ++++ texlive-2007/texk/web2c/pdftexdir/utils.c 2008-11-11 22:20:59.000000000 -0500 +@@ -37,7 +37,7 @@ $Id: //depot/Build/source.development/Te #include "zlib.h" #include "ptexlib.h" #include "png.h" -#include "xpdf/config.h" /* just to get the xpdf version */ ++#include "poppler/poppler-config.h" /* just to get the xpdf version */ #define check_nprintf(size_get, size_want) \ if ((unsigned)(size_get) >= (unsigned)(size_want)) \ -@@ -1261,9 +1262,9 @@ void initversionstring(char **versions) +@@ -1261,9 +1261,9 @@ void initversionstring(char **versions) (void) asprintf(versions, "Compiled with libpng %s; using libpng %s\n" "Compiled with zlib %s; using zlib %s\n" @@ -286,18 +246,9 @@ diff -up texlive-2007/texk/web2c/pdftexdir/utils.c.poppler texlive-2007/texk/web } -@@ -1369,7 +1370,7 @@ int newcolorstack(integer s, integer lit - colstacks_size += STACK_INCREMENT; - /* If (MAX_COLORSTACKS mod STACK_INCREMENT = 0) then we don't - need to check the case that size overruns MAX_COLORSTACKS. */ -- colstacks = xretalloc(colstacks, colstacks_size, colstack_type); -+ xretalloc(colstacks, colstacks_size, colstack_type); - } - /* claim new color stack */ - colstack_num = colstacks_used++; 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 21:48:59.000000000 -0500 ++++ texlive-2007/texk/web2c/xetexdir/pdfimage.cpp 2008-11-11 22:18:27.000000000 -0500 @@ -11,10 +11,24 @@ #include "pdfimage.h" @@ -338,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 21:48:59.000000000 -0500 ++++ texlive-2007/texk/web2c/xetexdir/XeTeX_ext.c 2008-11-11 22:18:27.000000000 -0500 @@ -33,7 +33,7 @@ authorization from SIL International. */ @@ -358,8 +309,8 @@ diff -up texlive-2007/texk/web2c/xetexdir/XeTeX_ext.c.poppler texlive-2007/texk/ ; 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 21:48:59.000000000 -0500 -+++ texlive-2007/texk/web2c/xetexdir/xetex.mk 2008-11-11 21:48:59.000000000 -0500 +--- 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 @@ -4,6 +4,10 @@ Makefile: $(srcdir)/xetexdir/xetex.mk diff --git a/texlive.spec b/texlive.spec index c328c93..211819c 100644 --- a/texlive.spec +++ b/texlive.spec @@ -21,7 +21,7 @@ Name: texlive Version: %{texlive_ver} -Release: 37%{?dist} +Release: 38%{?dist} Summary: Binaries for the TeX formatting system Group: Applications/Publishing @@ -456,7 +456,6 @@ ln -s dvips.1 texk/pdvipsk/pdvips.1 # set up mendexk tar xfz %{SOURCE1002} -C texk - %build set -x # define CCACHE_DIR to let the build pass with ccache enabled. @@ -1233,7 +1232,7 @@ fi %{_mandir}/man1/texutil.1* %changelog -* Tue Nov 11 2008 Matthias Clasen - 2007-37 +* Tue Nov 11 2008 Matthias Clasen - 2007-38 - Rebuild against new poppler - Update poppler patch to remove references to xpdfVersion