rpms/texlive/F-10 texlive-poppler.patch,1.2,1.3
Jindrich Novy
jnovy at fedoraproject.org
Wed Oct 21 18:08:31 UTC 2009
- Previous message (by thread): rpms/python-batchhttp/EL-5 import.log, NONE, 1.1 python-batchhttp.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/python-remoteobjects/EL-5 import.log, NONE, 1.1 python-remoteobjects.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jnovy
Update of /cvs/pkgs/rpms/texlive/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6205
Modified Files:
texlive-poppler.patch
Log Message:
- revert the poppler patch, F10 poppler is too old
texlive-poppler.patch:
configure | 6 ++---
configure.in | 8 +++----
texk/web2c/pdftexdir/pdftex.mk | 7 ++++--
texk/web2c/pdftexdir/pdftexextra.in | 2 -
texk/web2c/pdftexdir/pdftoepdf.cc | 41 +++++++++++++++++-------------------
texk/web2c/pdftexdir/pdftosrc.cc | 37 ++++++++++++++++----------------
texk/web2c/pdftexdir/utils.c | 6 ++---
texk/web2c/xetexdir/XeTeX_ext.c | 8 ++-----
texk/web2c/xetexdir/pdfimage.cpp | 24 ++++++++++++++++-----
texk/web2c/xetexdir/xetex.mk | 10 ++++++--
10 files changed, 84 insertions(+), 65 deletions(-)
Index: texlive-poppler.patch
===================================================================
RCS file: /cvs/pkgs/rpms/texlive/F-10/texlive-poppler.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- texlive-poppler.patch 21 Oct 2009 17:26:46 -0000 1.2
+++ texlive-poppler.patch 21 Oct 2009 18:08:30 -0000 1.3
@@ -1,6 +1,6 @@
diff -up texlive-2007/configure.in.poppler texlive-2007/configure.in
---- texlive-2007/configure.in.poppler 2007-01-09 02:17:11.000000000 +0100
-+++ texlive-2007/configure.in 2009-10-15 14:57:43.000000000 +0200
+--- 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
@@ -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.poppl
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 15:16:26.000000000 +0100
-+++ texlive-2007/configure 2009-10-15 14:57:43.000000000 +0200
+--- texlive-2007/configure.poppler 2007-01-09 09:16:26.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
@@ -40,8 +40,8 @@ diff -up texlive-2007/configure.poppler
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-27 00:37:34.000000000 +0100
-+++ texlive-2007/texk/web2c/pdftexdir/pdftexextra.in 2009-10-15 14:57:43.000000000 +0200
+--- 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
@@ -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/pdftexd
#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-27 00:37:34.000000000 +0100
-+++ texlive-2007/texk/web2c/pdftexdir/pdftex.mk 2009-10-15 14:57:43.000000000 +0200
+--- 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
@@ -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/pdftexd
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-27 00:37:34.000000000 +0100
-+++ texlive-2007/texk/web2c/pdftexdir/pdftoepdf.cc 2009-10-15 14:57:52.000000000 +0200
+--- 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
@@ -26,25 +26,24 @@ $Id: pdftoepdf.cc,v 1.9 2006/09/01 18:06
#include <stdio.h>
#include <string.h>
@@ -146,24 +146,6 @@ diff -up texlive-2007/texk/web2c/pdftexd
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;
- }
- }
-@@ -689,7 +688,7 @@ read_pdf_info(char *image_name, char *pa
- // 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();
-+ pdf_version_found = pdf_doc->doc->getPDFMajorVersion() + pdf_doc->doc->getPDFMinorVersion()/10.;
- pdf_version_wanted = 1 + (minor_pdf_version_wanted * 0.1);
- if (pdf_version_found > pdf_version_wanted) {
- char msg[] =
@@ -703,7 +702,7 @@ read_pdf_info(char *image_name, char *pa
epdf_num_pages = pdf_doc->doc->getCatalog()->getNumPages();
if (page_name) {
@@ -174,8 +156,8 @@ diff -up texlive-2007/texk/web2c/pdftexd
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-27 00:37:34.000000000 +0100
-+++ texlive-2007/texk/web2c/pdftexdir/pdftosrc.cc 2009-10-15 14:57:43.000000000 +0200
+--- 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
@@ -25,22 +25,23 @@ $Id: //depot/Build/source.development/Te
#include <stdio.h>
#include <string.h>
@@ -241,8 +223,8 @@ diff -up texlive-2007/texk/web2c/pdftexd
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 18:20:03.000000000 +0100
-+++ texlive-2007/texk/web2c/pdftexdir/utils.c 2009-10-15 14:57:43.000000000 +0200
+--- 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
@@ -37,7 +37,7 @@ $Id: //depot/Build/source.development/Te
#include "zlib.h"
#include "ptexlib.h"
@@ -265,8 +247,8 @@ diff -up texlive-2007/texk/web2c/pdftexd
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 11:29:12.000000000 +0100
-+++ texlive-2007/texk/web2c/xetexdir/pdfimage.cpp 2009-10-15 14:57:43.000000000 +0200
+--- 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
@@ -11,10 +11,24 @@
#include "pdfimage.h"
@@ -306,8 +288,8 @@ diff -up texlive-2007/texk/web2c/xetexdi
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 14:04:36.000000000 +0100
-+++ texlive-2007/texk/web2c/xetexdir/XeTeX_ext.c 2009-10-15 14:57:43.000000000 +0200
+--- 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
@@ -33,7 +33,7 @@ authorization from SIL International.
*/
@@ -345,8 +327,8 @@ diff -up texlive-2007/texk/web2c/xetexdi
);
}
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 2009-10-15 14:57:41.000000000 +0200
-+++ texlive-2007/texk/web2c/xetexdir/xetex.mk 2009-10-15 14:57:43.000000000 +0200
+--- 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
- Previous message (by thread): rpms/python-batchhttp/EL-5 import.log, NONE, 1.1 python-batchhttp.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/python-remoteobjects/EL-5 import.log, NONE, 1.1 python-remoteobjects.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list