rpms/texlive/devel texlive-poppler.patch, 1.1, 1.2 texlive.spec, 1.44, 1.45
Matthias Clasen
mclasen at fedoraproject.org
Wed Nov 12 03:07:04 UTC 2008
Author: mclasen
Update of /cvs/extras/rpms/texlive/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10640
Modified Files:
texlive-poppler.patch texlive.spec
Log Message:
update poppler patch
texlive-poppler.patch:
Index: texlive-poppler.patch
===================================================================
RCS file: /cvs/extras/rpms/texlive/devel/texlive-poppler.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- texlive-poppler.patch 2 Dec 2007 08:03:19 -0000 1.1
+++ texlive-poppler.patch 12 Nov 2008 03:06:34 -0000 1.2
@@ -1,6 +1,90 @@
+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
+@@ -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 21:48:59.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
+
+@@ -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
+@@ -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-27 00:37:34.000000000 +0100
-+++ texlive-2007/texk/web2c/pdftexdir/pdftex.mk 2007-11-28 11:53:15.000000000 +0100
+--- 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
@@ -2,6 +2,9 @@
# This fragment contains the parts of the makefile that are most likely to
# differ between releases of pdfeTeX.
@@ -30,8 +114,8 @@
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 2007-11-28 11:53:15.000000000 +0100
+--- 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
@@ -26,25 +26,24 @@ $Id: pdftoepdf.cc,v 1.9 2006/09/01 18:06
#include <stdio.h>
#include <string.h>
@@ -102,21 +186,9 @@
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-27 00:37:34.000000000 +0100
-+++ texlive-2007/texk/web2c/pdftexdir/pdftosrc.cc 2007-11-28 12:03:48.000000000 +0100
+--- 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
@@ -25,22 +25,23 @@ $Id: //depot/Build/source.development/Te
#include <stdio.h>
#include <string.h>
@@ -165,7 +237,14 @@
Stream *s;
Object srcStream, srcName, catalogDict;
FILE *outfile;
-@@ -62,7 +63,7 @@ int main(int argc, char *argv[])
+@@ -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,
"Usage: pdftosrc <PDF-file> [<stream-object-number>]\n");
exit(1);
}
@@ -175,29 +254,50 @@
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 2007-11-28 11:53:15.000000000 +0100
-@@ -37,7 +39,7 @@ $Id: //depot/Build/source.development/Te
+--- 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$
+ */
+
++#ifndef __linux__
+ #include "openbsd-compat.h"
++#endif
+ #ifdef HAVE_ASPRINTF /* asprintf is not defined in openbsd-compat.h, but in stdio.h */
+ # include <stdio.h>
+ #endif
+@@ -37,7 +39,6 @@ $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,7 +1263,7 @@ void initversionstring(char **versions)
+@@ -1261,9 +1262,9 @@ 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 version %s\n",
++ "Compiled with libpoppler\n",
PNG_LIBPNG_VER_STRING, png_libpng_ver,
- ZLIB_VERSION, zlib_version, xpdfVersion);
+- ZLIB_VERSION, zlib_version, xpdfVersion);
++ ZLIB_VERSION, zlib_version);
}
+
+
+@@ -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 11:29:12.000000000 +0100
-+++ texlive-2007/texk/web2c/xetexdir/pdfimage.cpp 2007-11-28 11:53:15.000000000 +0100
+--- 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
@@ -11,10 +11,24 @@
#include "pdfimage.h"
@@ -237,8 +337,8 @@
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 2007-11-28 11:53:15.000000000 +0100
+--- 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
@@ -33,7 +33,7 @@ authorization from SIL International.
*/
@@ -258,8 +358,8 @@
;
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 2007-11-28 11:53:15.000000000 +0100
-+++ texlive-2007/texk/web2c/xetexdir/xetex.mk 2007-11-28 11:53:15.000000000 +0100
+--- 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
@@ -4,6 +4,10 @@
Makefile: $(srcdir)/xetexdir/xetex.mk
@@ -298,44 +398,3 @@
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)
Index: texlive.spec
===================================================================
RCS file: /cvs/extras/rpms/texlive/devel/texlive.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- texlive.spec 12 Nov 2008 02:21:33 -0000 1.44
+++ texlive.spec 12 Nov 2008 03:06:34 -0000 1.45
@@ -21,7 +21,7 @@
Name: texlive
Version: %{texlive_ver}
-Release: 36%{?dist}
+Release: 37%{?dist}
Summary: Binaries for the TeX formatting system
Group: Applications/Publishing
@@ -1233,8 +1233,9 @@
%{_mandir}/man1/texutil.1*
%changelog
-* Tue Nov 11 2008 Matthias Clasen <mclasen at redhat.com> - 2007-36
+* Tue Nov 11 2008 Matthias Clasen <mclasen at redhat.com> - 2007-37
- Rebuild against new poppler
+- Update poppler patch to remove references to xpdfVersion
* Wed Aug 27 2008 Jindrich Novy <jnovy at redhat.com> - 2007-35
- texlive-context requires texlive-texmf-context (#455163)
More information about the scm-commits
mailing list