From f30bfaa7d70b0ad38ab0af6ba558bf54f9bd3504 Mon Sep 17 00:00:00 2001 From: Jindrich Novy Date: May 20 2009 16:59:46 +0000 Subject: - fix pdftoepdf and rebuild because of poppler soname bump (#501651) --- diff --git a/texlive-poppler.patch b/texlive-poppler.patch index 702c057..f3c4851 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:38:31.000000000 -0500 +--- texlive-2007/configure.in.poppler 2007-01-09 02:17:11.000000000 +0100 ++++ texlive-2007/configure.in 2009-05-20 18:43:56.000000000 +0200 @@ -157,9 +157,9 @@ export needs_zlib # we need libxpdf for pdf[ex]tex, xetex @@ -24,8 +24,8 @@ diff -up texlive-2007/configure.in.poppler texlive-2007/configure.in sinclude(libs/gd/gd.ac) 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:38:31.000000000 -0500 +--- texlive-2007/configure.poppler 2007-01-09 15:16:26.000000000 +0100 ++++ texlive-2007/configure 2009-05-20 18:43:56.000000000 +0200 @@ -3442,9 +3442,9 @@ export needs_zlib # we need libxpdf for pdf[ex]tex, xetex @@ -40,8 +40,8 @@ diff -up texlive-2007/configure.poppler texlive-2007/configure export needs_libxpdf 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:38:31.000000000 -0500 +--- texlive-2007/texk/web2c/pdftexdir/pdftexextra.in.poppler 2006-12-27 00:37:34.000000000 +0100 ++++ texlive-2007/texk/web2c/pdftexdir/pdftexextra.in 2009-05-20 18:43:56.000000000 +0200 @@ -26,7 +26,7 @@ $Id: pdftexextra.in,v 1.4 2004/08/26 18: (generated from ../lib/texmfmp.c). */ @@ -52,8 +52,8 @@ diff -up texlive-2007/texk/web2c/pdftexdir/pdftexextra.in.poppler texlive-2007/t #define AUTHOR NULL #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:38:31.000000000 -0500 +--- texlive-2007/texk/web2c/pdftexdir/pdftex.mk.poppler 2006-12-27 00:37:34.000000000 +0100 ++++ texlive-2007/texk/web2c/pdftexdir/pdftex.mk 2009-05-20 18:43:56.000000000 +0200 @@ -2,6 +2,9 @@ # This fragment contains the parts of the makefile that are most likely to # differ between releases of pdfeTeX. @@ -83,8 +83,8 @@ diff -up texlive-2007/texk/web2c/pdftexdir/pdftex.mk.poppler texlive-2007/texk/w cd $(pdftexdir) && $(MAKE) pdftosrc.o 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:38:31.000000000 -0500 +--- texlive-2007/texk/web2c/pdftexdir/pdftoepdf.cc.poppler 2006-12-27 00:37:34.000000000 +0100 ++++ texlive-2007/texk/web2c/pdftexdir/pdftoepdf.cc 2009-05-20 18:44:23.000000000 +0200 @@ -26,25 +26,24 @@ $Id: pdftoepdf.cc,v 1.9 2006/09/01 18:06 #include #include @@ -146,6 +146,15 @@ diff -up texlive-2007/texk/web2c/pdftexdir/pdftoepdf.cc.poppler texlive-2007/tex if (obj->isBool()) { pdf_printf("%s", obj->getBool()? "true" : "false"); } else if (obj->isInt()) { +@@ -634,7 +633,7 @@ static void writeEncodings() + } + for (r = encodingList; r != 0; r = n) { + n = r->next; +- delete r->font; ++ r->font->decRefCnt(); + delete r; + } + } @@ -703,7 +702,7 @@ read_pdf_info(char *image_name, char *pa epdf_num_pages = pdf_doc->doc->getCatalog()->getNumPages(); if (page_name) { @@ -156,8 +165,8 @@ diff -up texlive-2007/texk/web2c/pdftexdir/pdftoepdf.cc.poppler texlive-2007/tex if (link == 0 || !link->isOk()) 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:38:31.000000000 -0500 +--- texlive-2007/texk/web2c/pdftexdir/pdftosrc.cc.poppler 2006-12-27 00:37:34.000000000 +0100 ++++ texlive-2007/texk/web2c/pdftexdir/pdftosrc.cc 2009-05-20 18:43:56.000000000 +0200 @@ -25,22 +25,23 @@ $Id: //depot/Build/source.development/Te #include #include @@ -223,8 +232,8 @@ diff -up texlive-2007/texk/web2c/pdftexdir/pdftosrc.cc.poppler texlive-2007/texk doc = new PDFDoc(fileName); 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:38:31.000000000 -0500 +--- texlive-2007/texk/web2c/pdftexdir/utils.c.poppler 2007-01-01 18:20:03.000000000 +0100 ++++ texlive-2007/texk/web2c/pdftexdir/utils.c 2009-05-20 18:43:56.000000000 +0200 @@ -37,7 +37,7 @@ $Id: //depot/Build/source.development/Te #include "zlib.h" #include "ptexlib.h" @@ -247,8 +256,8 @@ 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:38:31.000000000 -0500 +--- texlive-2007/texk/web2c/xetexdir/pdfimage.cpp.poppler 2006-12-09 11:29:12.000000000 +0100 ++++ texlive-2007/texk/web2c/xetexdir/pdfimage.cpp 2009-05-20 18:43:56.000000000 +0200 @@ -11,10 +11,24 @@ #include "pdfimage.h" @@ -288,8 +297,8 @@ 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:39:46.000000000 -0500 +--- texlive-2007/texk/web2c/xetexdir/XeTeX_ext.c.poppler 2007-01-15 14:04:36.000000000 +0100 ++++ texlive-2007/texk/web2c/xetexdir/XeTeX_ext.c 2009-05-20 18:43:56.000000000 +0200 @@ -33,7 +33,7 @@ authorization from SIL International. */ @@ -327,8 +336,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 22:38:31.000000000 -0500 -+++ texlive-2007/texk/web2c/xetexdir/xetex.mk 2008-11-11 22:38:31.000000000 -0500 +--- texlive-2007/texk/web2c/xetexdir/xetex.mk.poppler 2009-05-20 18:43:56.000000000 +0200 ++++ texlive-2007/texk/web2c/xetexdir/xetex.mk 2009-05-20 18:43:56.000000000 +0200 @@ -4,6 +4,10 @@ Makefile: $(srcdir)/xetexdir/xetex.mk diff --git a/texlive.spec b/texlive.spec index 5149776..ffd8539 100644 --- a/texlive.spec +++ b/texlive.spec @@ -1237,7 +1237,7 @@ fi %changelog * Wed May 20 2009 Jindrich Novy - 2007-43 -- rebuild because of poppler soname bump (#501651) +- fix pdftoepdf and rebuild because of poppler soname bump (#501651) * Thu Apr 02 2009 Jindrich Novy - 2007-42 - avoid clashes with getline() from glibc