rpms/texlive/F-10 texlive-poppler.patch,1.3,1.4
Jindrich Novy
jnovy at fedoraproject.org
Wed Oct 21 18:29:41 UTC 2009
- Previous message (by thread): rpms/django-typepad/EL-5 django-typepad.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/texlive-texmf/F-10 texlive-2007-latin.patch, NONE, 1.1 texlive-filter-requires.sh, 1.2, 1.3 texlive-texmf.spec, 1.30, 1.31
- 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-serv13232
Modified Files:
texlive-poppler.patch
Log Message:
- use the oldest variant of poppler patch for F10
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 | 35 +++++++++++++++---------------
texk/web2c/pdftexdir/utils.c | 4 +--
texk/web2c/xetexdir/XeTeX_ext.c | 4 +--
texk/web2c/xetexdir/pdfimage.cpp | 24 ++++++++++++++++-----
texk/web2c/xetexdir/xetex.mk | 10 ++++++--
10 files changed, 81 insertions(+), 60 deletions(-)
Index: texlive-poppler.patch
===================================================================
RCS file: /cvs/pkgs/rpms/texlive/F-10/texlive-poppler.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- texlive-poppler.patch 21 Oct 2009 18:08:30 -0000 1.3
+++ texlive-poppler.patch 21 Oct 2009 18:29:41 -0000 1.4
@@ -1,59 +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
-@@ -157,9 +157,9 @@ export needs_zlib
-
- # we need libxpdf for pdf[ex]tex, xetex
- test ! -d $srcdir/$LIBXPDFDIR && : ${needs_libxpdf=no}
--test "$with_pdftex" != no && : ${needs_libxpdf=yes}
--test "$with_pdfetex" != no && : ${needs_libxpdf=yes}
--test "$with_xetex" != no && : ${needs_libxpdf=yes}
-+test "$with_pdftex" != no && : ${needs_libxpdf=no}
-+test "$with_pdfetex" != no && : ${needs_libxpdf=no}
-+test "$with_xetex" != no && : ${needs_libxpdf=no}
- : ${needs_libxpdf=no}
- export needs_libxpdf
-
-@@ -207,7 +207,7 @@ dnl We cannot use variables (e.g. $LIBPN
- sinclude(libs/libpng/libpng.ac)
- sinclude(libs/zlib/zlib.ac)
- sinclude(libs/ncurses/ncurses.ac)
--sinclude(libs/xpdf/libxpdf.ac)
-+#sinclude(libs/xpdf/libxpdf.ac)
- sinclude(libs/t1lib/t1lib.ac)
- 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
-@@ -3442,9 +3442,9 @@ export needs_zlib
-
- # we need libxpdf for pdf[ex]tex, xetex
- test ! -d $srcdir/$LIBXPDFDIR && : ${needs_libxpdf=no}
--test "$with_pdftex" != no && : ${needs_libxpdf=yes}
--test "$with_pdfetex" != no && : ${needs_libxpdf=yes}
--test "$with_xetex" != no && : ${needs_libxpdf=yes}
-+test "$with_pdftex" != no && : ${needs_libxpdf=no}
-+test "$with_pdfetex" != no && : ${needs_libxpdf=no}
-+test "$with_xetex" != no && : ${needs_libxpdf=no}
- : ${needs_libxpdf=no}
- 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
-@@ -26,7 +26,7 @@ $Id: pdftexextra.in,v 1.4 2004/08/26 18:
- (generated from ../lib/texmfmp.c).
- */
-
--#define BANNER "This is pdfTeX, Version 3.141592-PDFTEX-VERSION-ETEX-VERSION"
-+#define BANNER "This is pdfTeX using libpoppler, Version 3.141592-PDFTEX-VERSION-ETEX-VERSION"
- #define COPYRIGHT_HOLDER "Peter Breitenlohner (eTeX)/Han The Thanh (pdfTeX)"
- #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 2007-11-28 11:53:15.000000000 +0100
@@ -2,6 +2,9 @@
# This fragment contains the parts of the makefile that are most likely to
# differ between releases of pdfeTeX.
@@ -83,8 +30,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-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 2007-11-28 11:53:15.000000000 +0100
@@ -26,25 +26,24 @@ $Id: pdftoepdf.cc,v 1.9 2006/09/01 18:06
#include <stdio.h>
#include <string.h>
@@ -155,9 +102,21 @@ diff -up texlive-2007/texk/web2c/pdftexd
LinkDest *link = pdf_doc->doc->findDest(&name);
if (link == 0 || !link->isOk())
pdftex_fail("PDF inclusion: invalid destination <%s>", page_name);
+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 2007-11-28 11:53:15.000000000 +0100
+@@ -26,7 +26,7 @@ $Id: pdftexextra.in,v 1.4 2004/08/26 18:
+ (generated from ../lib/texmfmp.c).
+ */
+
+-#define BANNER "This is pdfTeX, Version 3.141592-PDFTEX-VERSION-ETEX-VERSION"
++#define BANNER "This is pdfTeX using libpoppler, Version 3.141592-PDFTEX-VERSION-ETEX-VERSION"
+ #define COPYRIGHT_HOLDER "Peter Breitenlohner (eTeX)/Han The Thanh (pdfTeX)"
+ #define AUTHOR NULL
+ #define PROGRAM_HELP PDFTEXHELP
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 2007-11-28 12:03:48.000000000 +0100
@@ -25,22 +25,23 @@ $Id: //depot/Build/source.development/Te
#include <stdio.h>
#include <string.h>
@@ -206,14 +165,7 @@ diff -up texlive-2007/texk/web2c/pdftexd
Stream *s;
Object srcStream, srcName, catalogDict;
FILE *outfile;
-@@ -56,13 +57,13 @@ int main(int argc, char *argv[])
- int objnum = 0, objgen = 0;
- bool extract_xref_table = false;
- int c;
-- fprintf(stderr, "pdftosrc version %s\n", xpdfVersion);
-+ fprintf(stderr, "pdftosrc\n");
- if (argc < 2) {
- fprintf(stderr,
+@@ -62,7 +63,7 @@ int main(int argc, char *argv[])
"Usage: pdftosrc <PDF-file> [<stream-object-number>]\n");
exit(1);
}
@@ -223,9 +175,9 @@ 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 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
+--- texlive-2007/texk/web2c/pdftexdir/utils.c.poppler 2007-01-01 18:20:03.000000000 +0100
++++ texlive-2007/texk/web2c/pdftexdir/utils.c 2007-11-28 11:53:15.000000000 +0100
+@@ -37,7 +39,7 @@ $Id: //depot/Build/source.development/Te
#include "zlib.h"
#include "ptexlib.h"
#include "png.h"
@@ -234,21 +186,18 @@ diff -up texlive-2007/texk/web2c/pdftexd
#define check_nprintf(size_get, size_want) \
if ((unsigned)(size_get) >= (unsigned)(size_want)) \
-@@ -1261,9 +1261,9 @@ void initversionstring(char **versions)
+@@ -1261,7 +1263,7 @@ void initversionstring(char **versions)
(void) asprintf(versions,
"Compiled with libpng %s; using libpng %s\n"
"Compiled with zlib %s; using zlib %s\n"
- "Compiled with xpdf version %s\n",
-+ "Compiled with libpoppler\n",
++ "Compiled with libpoppler version %s\n",
PNG_LIBPNG_VER_STRING, png_libpng_ver,
-- ZLIB_VERSION, zlib_version, xpdfVersion);
-+ ZLIB_VERSION, zlib_version);
+ ZLIB_VERSION, zlib_version, xpdfVersion);
}
-
-
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 2007-11-28 11:53:15.000000000 +0100
@@ -11,10 +11,24 @@
#include "pdfimage.h"
@@ -288,8 +237,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 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 2007-11-28 11:53:15.000000000 +0100
@@ -33,7 +33,7 @@ authorization from SIL International.
*/
@@ -304,31 +253,13 @@ diff -up texlive-2007/texk/web2c/xetexdi
"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\n"
++ "Compiled with libpoppler version %s\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: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 2007-11-28 11:53:15.000000000 +0100
++++ texlive-2007/texk/web2c/xetexdir/xetex.mk 2007-11-28 11:53:15.000000000 +0100
@@ -4,6 +4,10 @@
Makefile: $(srcdir)/xetexdir/xetex.mk
@@ -367,3 +298,44 @@ diff -up texlive-2007/texk/web2c/xetexdi
XeTeX_mac.o: $(srcdir)/xetexdir/XeTeX_mac.c xetexd.h
$(compile) $(ICUCFLAGS) $(TECKITFLAGS) $(ALL_CFLAGS) $(XETEX_DEFINES) -c $< -o $@
+diff -up texlive-2007/configure.poppler texlive-2007/configure
+--- texlive-2007/configure.poppler 2007-01-09 15:16:26.000000000 +0100
++++ texlive-2007/configure 2007-11-28 11:53:15.000000000 +0100
+@@ -3442,9 +3442,9 @@ export needs_zlib
+
+ # we need libxpdf for pdf[ex]tex, xetex
+ test ! -d $srcdir/$LIBXPDFDIR && : ${needs_libxpdf=no}
+-test "$with_pdftex" != no && : ${needs_libxpdf=yes}
+-test "$with_pdfetex" != no && : ${needs_libxpdf=yes}
+-test "$with_xetex" != no && : ${needs_libxpdf=yes}
++test "$with_pdftex" != no && : ${needs_libxpdf=no}
++test "$with_pdfetex" != no && : ${needs_libxpdf=no}
++test "$with_xetex" != no && : ${needs_libxpdf=no}
+ : ${needs_libxpdf=no}
+ export needs_libxpdf
+
+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 2007-11-28 11:53:15.000000000 +0100
+@@ -157,9 +157,9 @@ export needs_zlib
+
+ # we need libxpdf for pdf[ex]tex, xetex
+ test ! -d $srcdir/$LIBXPDFDIR && : ${needs_libxpdf=no}
+-test "$with_pdftex" != no && : ${needs_libxpdf=yes}
+-test "$with_pdfetex" != no && : ${needs_libxpdf=yes}
+-test "$with_xetex" != no && : ${needs_libxpdf=yes}
++test "$with_pdftex" != no && : ${needs_libxpdf=no}
++test "$with_pdfetex" != no && : ${needs_libxpdf=no}
++test "$with_xetex" != no && : ${needs_libxpdf=no}
+ : ${needs_libxpdf=no}
+ export needs_libxpdf
+
+@@ -207,7 +207,7 @@ dnl We cannot use variables (e.g. $LIBPN
+ sinclude(libs/libpng/libpng.ac)
+ sinclude(libs/zlib/zlib.ac)
+ sinclude(libs/ncurses/ncurses.ac)
+-sinclude(libs/xpdf/libxpdf.ac)
++#sinclude(libs/xpdf/libxpdf.ac)
+ sinclude(libs/t1lib/t1lib.ac)
+ sinclude(libs/gd/gd.ac)
+ sinclude(libs/freetype/freetype.ac)
- Previous message (by thread): rpms/django-typepad/EL-5 django-typepad.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/texlive-texmf/F-10 texlive-2007-latin.patch, NONE, 1.1 texlive-filter-requires.sh, 1.2, 1.3 texlive-texmf.spec, 1.30, 1.31
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list