rpms/texlive/devel texlive-poppler.patch, 1.3, 1.4 texlive.spec, 1.46, 1.47

Matthias Clasen mclasen at fedoraproject.org
Wed Nov 12 03:42:42 UTC 2008 

Author: mclasen

Update of /cvs/extras/rpms/texlive/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16007

Modified Files:
	texlive-poppler.patch texlive.spec 
Log Message:
nuke more xpdfVersion references


texlive-poppler.patch:

Index: texlive-poppler.patch
===================================================================
RCS file: /cvs/extras/rpms/texlive/devel/texlive-poppler.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- texlive-poppler.patch	12 Nov 2008 03:23:37 -0000	1.3
+++ texlive-poppler.patch	12 Nov 2008 03:42:12 -0000	1.4
@@ -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:18:27.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
@@ -25,7 +25,7 @@
  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:18:27.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
@@ -41,7 +41,7 @@
  
 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:18:27.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).
  */
@@ -53,7 +53,7 @@
  #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:18:27.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.
@@ -84,7 +84,7 @@
  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:18:27.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>
@@ -157,7 +157,7 @@
              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:21:30.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>
@@ -224,7 +224,7 @@
      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:20:59.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"
@@ -248,7 +248,7 @@
  
 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:18:27.000000000 -0500
++++ texlive-2007/texk/web2c/xetexdir/pdfimage.cpp	2008-11-11 22:38:31.000000000 -0500
 @@ -11,10 +11,24 @@
  
  #include "pdfimage.h"
@@ -289,7 +289,7 @@
  	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:18:27.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.
   */
  
@@ -304,13 +304,31 @@
  		"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 version %s\n"
++		"Compiled with libpoppler\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:18:27.000000000 -0500
-+++ texlive-2007/texk/web2c/xetexdir/xetex.mk	2008-11-11 22:18:27.000000000 -0500
+--- 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


Index: texlive.spec
===================================================================
RCS file: /cvs/extras/rpms/texlive/devel/texlive.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- texlive.spec	12 Nov 2008 03:23:37 -0000	1.46
+++ texlive.spec	12 Nov 2008 03:42:12 -0000	1.47
@@ -21,7 +21,7 @@
 
 Name:		texlive
 Version:	%{texlive_ver}
-Release:	38%{?dist}
+Release:	39%{?dist}
 Summary:	Binaries for the TeX formatting system
 
 Group:		Applications/Publishing
@@ -1232,7 +1232,7 @@
 %{_mandir}/man1/texutil.1*
 
 %changelog
-* Tue Nov 11 2008 Matthias Clasen <mclasen at redhat.com> - 2007-38
+* Tue Nov 11 2008 Matthias Clasen <mclasen at redhat.com> - 2007-39
 - Rebuild against new poppler
 - Update poppler patch to remove references to xpdfVersion

More information about the fedora-extras-commits mailing list