Attachment 161796 Details for Bug 242416 – patch for texlive to compile against poppler

[patch] patch for texlive to compile against poppler

texlive-2007-0.9.patch (text/plain), 19.75 KB, created by Jiri Cerny on 2007-08-18 14:12:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jiri Cerny

Created: 2007-08-18 14:12:29 UTC

Size: 19.75 KB

patch

obsolete

>diff -ur --new-file texlive-2007.orig/texlive-poppler.patch texlive-2007/texlive-poppler.patch
>--- texlive-2007.orig/texlive-poppler.patch	1970-01-01 01:00:00.000000000 +0100
>+++ texlive-2007/texlive-poppler.patch	2007-08-18 08:20:42.000000000 +0200
>@@ -0,0 +1,361 @@
>+
>+diff -ur texlive-2007.fedora/texk/web2c/pdftexdir/Makefile.in texlive-2007/texk/web2c/pdftexdir/Makefile.in
>+--- texlive-2007.fedora/texk/web2c/pdftexdir/Makefile.in	2007-08-17 16:39:06.000000000 +0200
>++++ texlive-2007/texk/web2c/pdftexdir/Makefile.in	2007-08-17 20:07:44.000000000 +0200
>+@@ -8,7 +8,9 @@
>+ kpathsea_srcdir_parent = $(srcdir)/../..
>+ kpathsea_dir_parent = ../..
>+ 
>+-ALL_CXXFLAGS = @CXXFLAGS@ @DEFS@ $(XXCFLAGS) -I. -I$(srcdir) -I$(kpathsea_dir_parent) -I$(kpathsea_srcdir_parent) @LIBXPDFCPPFLAGS@ -I$(LIBOBSDCOMPATDIR) -I$(LIBOBSDCOMPATDIR)/.. -I$(LIBOBSDCOMPATFSRCDIR) -I$(LIBOBSDCOMPATFSRCDIR)/..
>++ALL_CXXFLAGS = @CXXFLAGS@ @DEFS@ $(XXCFLAGS) -I. -I$(srcdir) -I$(kpathsea_dir_parent) \
>++	       -I$(kpathsea_srcdir_parent) -I/usr/include/poppler/xpdf-headers -I$(LIBOBSDCOMPATDIR) \
>++	       -I$(LIBOBSDCOMPATDIR)/.. -I$(LIBOBSDCOMPATFSRCDIR) -I$(LIBOBSDCOMPATFSRCDIR)/..
>+ CXX = @CXX@
>+ 
>+ .SUFFIXES: .cc .o
>+diff -ur texlive-2007.fedora/texk/web2c/pdftexdir/pdftex.mk texlive-2007/texk/web2c/pdftexdir/pdftex.mk
>+--- texlive-2007.fedora/texk/web2c/pdftexdir/pdftex.mk	2007-08-17 16:39:06.000000000 +0200
>++++ texlive-2007/texk/web2c/pdftexdir/pdftex.mk	2007-08-17 20:07:44.000000000 +0200
>+@@ -2,6 +2,9 @@
>+ # This fragment contains the parts of the makefile that are most likely to
>+ # differ between releases of pdfeTeX.
>+ 
>++# use libpoppler instead of included xpdf code
>++ADDLDFLAGS = -lpoppler
>++
>+ # We build pdftex
>+ pdftex = @PETEX@ pdftex
>+ pdftexdir = pdftexdir
>+@@ -29,7 +32,7 @@
>+ 
>+ # Making pdftex
>+ pdftex: pdftexd.h $(pdftex_o) $(pdftexextra_o) $(pdftexlibsdep)
>+-	@CXXHACKLINK@ $(pdftex_o) $(pdftexextra_o) $(pdftexlibs) $(socketlibs) @CXXHACKLDLIBS@ @CXXLDEXTRA@ -lpng
>++	@CXXHACKLINK@ $(pdftex_o) $(pdftexextra_o) $(pdftexlibs) $(socketlibs) @CXXHACKLDLIBS@ @CXXLDEXTRA@ -lpng $(ADDLDFLAGS)
>+ 
>+ # C file dependencies.
>+ $(pdftex_c) pdftexcoerce.h pdftexd.h: pdftex.p $(web2c_texmf) $(srcdir)/$(pdftexdir)/pdftex.defines $(srcdir)/$(pdftexdir)/pdftex.h
>+@@ -156,7 +159,7 @@
>+ pdftosrc = pdftosrc
>+ 
>+ pdftosrc: $(pdftexdir)/pdftosrc.o $(LIBXPDFDEP)
>+-	@CXXHACKLINK@ $(pdftexdir)/pdftosrc.o $(LDLIBXPDF) -lm @CXXLDEXTRA@
>++	@CXXHACKLINK@ $(pdftexdir)/pdftosrc.o $(LDLIBXPDF) -lm @CXXLDEXTRA@  $(ADDLDFLAGS)
>+ $(pdftexdir)/pdftosrc.o:$(srcdir)/$(pdftexdir)/pdftosrc.cc
>+ 	cd $(pdftexdir) && $(MAKE) pdftosrc.o
>+ check: pdftosrc-check
>+diff -ur texlive-2007.fedora/texk/web2c/pdftexdir/pdftexextra.in texlive-2007/texk/web2c/pdftexdir/pdftexextra.in
>+--- texlive-2007.fedora/texk/web2c/pdftexdir/pdftexextra.in	2006-12-27 00:37:34.000000000 +0100
>++++ texlive-2007/texk/web2c/pdftexdir/pdftexextra.in	2007-08-17 20:07:44.000000000 +0200
>+@@ -26,7 +26,7 @@
>+    (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 -ur texlive-2007.fedora/texk/web2c/pdftexdir/pdftoepdf.cc texlive-2007/texk/web2c/pdftexdir/pdftoepdf.cc
>+--- texlive-2007.fedora/texk/web2c/pdftexdir/pdftoepdf.cc	2006-12-27 00:37:34.000000000 +0100
>++++ texlive-2007/texk/web2c/pdftexdir/pdftoepdf.cc	2007-08-17 20:07:44.000000000 +0200
>+@@ -26,25 +26,24 @@
>+ #include <stdio.h>
>+ #include <string.h>
>+ #include <ctype.h>
>+-#include <aconf.h>
>+-#include <GString.h>
>+-#include <gmem.h>
>+-#include <gfile.h>
>+-#include <config.h>
>+ #include <assert.h>
>+-#include "Object.h"
>+-#include "Stream.h"
>+-#include "Array.h"
>+-#include "Dict.h"
>+-#include "XRef.h"
>+-#include "Catalog.h"
>+-#include "Link.h"
>+-#include "Page.h"
>+-#include "GfxFont.h"
>+-#include "PDFDoc.h"
>+-#include "GlobalParams.h"
>+-#include "Error.h"
>+-
>++#include <dirent.h>
>++#include <poppler/poppler-config.h>
>++#include <goo/GooString.h>
>++#include <goo/gmem.h>
>++#include <goo/gfile.h>
>++#include "poppler/Object.h"
>++#include "poppler/Stream.h"
>++#include "poppler/Array.h"
>++#include "poppler/Dict.h"
>++#include "poppler/XRef.h"
>++#include "poppler/Link.h"
>++#include "poppler/Catalog.h"
>++#include "poppler/Page.h"
>++#include "poppler/GfxFont.h"
>++#include "poppler/PDFDoc.h"
>++#include "poppler/GlobalParams.h"
>++#include "poppler/Error.h"
>+ #include "epdf.h"
>+ 
>+ // This file is mostly C and not very much C++; it's just used to interface
>+@@ -169,7 +168,7 @@
>+     fprintf(stderr, "\npdfTeX Debug: Creating %s (%d)\n", p->file_name,
>+             p->occurences);
>+ #endif
>+-    GString *docName = new GString(p->file_name);
>++    GooString *docName = new GooString(p->file_name);
>+     p->doc = new PDFDoc(docName);       // takes ownership of docName
>+     if (!p->doc->isOk() || !p->doc->okToPrint()) {
>+         pdftex_fail("xpdf: reading PDF image failed");
>+@@ -511,7 +510,7 @@
>+     int i, l, c;
>+     Ref ref;
>+     char *p;
>+-    GString *s;
>++    GooString *s;
>+     if (obj->isBool()) {
>+         pdf_printf("%s", obj->getBool()? "true" : "false");
>+     } else if (obj->isInt()) {
>+@@ -703,7 +702,7 @@
>+     epdf_num_pages = pdf_doc->doc->getCatalog()->getNumPages();
>+     if (page_name) {
>+         // get page by name
>+-        GString name(page_name);
>++        GooString name(page_name);
>+         LinkDest *link = pdf_doc->doc->findDest(&name);
>+         if (link == 0 || !link->isOk())
>+             pdftex_fail("PDF inclusion: invalid destination <%s>", page_name);
>+diff -ur texlive-2007.fedora/texk/web2c/pdftexdir/pdftosrc.cc texlive-2007/texk/web2c/pdftexdir/pdftosrc.cc
>+--- texlive-2007.fedora/texk/web2c/pdftexdir/pdftosrc.cc	2006-12-27 00:37:34.000000000 +0100
>++++ texlive-2007/texk/web2c/pdftexdir/pdftosrc.cc	2007-08-17 20:07:44.000000000 +0200
>+@@ -25,22 +25,23 @@
>+ #include <stdio.h>
>+ #include <string.h>
>+ #include <ctype.h>
>+-#include <aconf.h>
>+ #include <assert.h>
>+-#include <GString.h>
>+-#include <gmem.h>
>+-#include <gfile.h>
>+-#include "Object.h"
>+-#include "Stream.h"
>+-#include "Array.h"
>+-#include "Dict.h"
>+-#include "XRef.h"
>+-#include "Catalog.h"
>+-#include "Page.h"
>+-#include "GfxFont.h"
>+-#include "PDFDoc.h"
>+-#include "GlobalParams.h"
>+-#include "Error.h"
>++
>++#include <dirent.h>
>++#include <goo/GooString.h>
>++#include <goo/gmem.h>
>++#include <goo/gfile.h>
>++#include <poppler/Object.h>
>++#include <poppler/Stream.h>
>++#include <poppler/Array.h>
>++#include <poppler/Dict.h>
>++#include <poppler/XRef.h>
>++#include <poppler/Catalog.h>
>++#include <poppler/Page.h>
>++#include <poppler/GfxFont.h>
>++#include <poppler/PDFDoc.h>
>++#include <poppler/GlobalParams.h>
>++#include <poppler/Error.h>
>+ 
>+ static XRef *xref = 0;
>+ 
>+@@ -48,7 +49,7 @@
>+ {
>+     char *p, buf[1024];
>+     PDFDoc *doc;
>+-    GString *fileName;
>++    GooString *fileName;
>+     Stream *s;
>+     Object srcStream, srcName, catalogDict;
>+     FILE *outfile;
>+@@ -62,7 +63,7 @@
>+                 "Usage: pdftosrc <PDF-file> [<stream-object-number>]\n");
>+         exit(1);
>+     }
>+-    fileName = new GString(argv[1]);
>++    fileName = new GooString(argv[1]);
>+     globalParams = new GlobalParams();
>+     doc = new PDFDoc(fileName);
>+     if (!doc->isOk()) {
>+Only in texlive-2007/texk/web2c/pdftexdir: pdftosrc.cc.poppler
>+Only in texlive-2007/texk/web2c/pdftexdir: pdftosrc.o
>+Only in texlive-2007/texk/web2c/pdftexdir: pkin.o
>+Only in texlive-2007/texk/web2c/pdftexdir: subfont.o
>+Only in texlive-2007/texk/web2c/pdftexdir: tounicode.o
>+diff -ur texlive-2007.fedora/texk/web2c/pdftexdir/utils.c texlive-2007/texk/web2c/pdftexdir/utils.c
>+--- texlive-2007.fedora/texk/web2c/pdftexdir/utils.c	2007-08-17 16:39:06.000000000 +0200
>++++ texlive-2007/texk/web2c/pdftexdir/utils.c	2007-08-17 20:07:44.000000000 +0200
>+@@ -39,7 +39,7 @@
>+ #include "zlib.h"
>+ #include "ptexlib.h"
>+ #include "png.h"
>+-#include "xpdf/config.h"        /* just to get the xpdf version */
>++#include "poppler/xpdf-headers/poppler/poppler-config.h"        /* just to get the xpdf version */
>+ 
>+ #define check_nprintf(size_get, size_want) \
>+     if ((unsigned)(size_get) >= (unsigned)(size_want)) \
>+@@ -1263,7 +1263,7 @@
>+     (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",
>+                     PNG_LIBPNG_VER_STRING, png_libpng_ver,
>+                     ZLIB_VERSION, zlib_version, xpdfVersion);
>+ }
>+diff -ur texlive-bin-2007.orig/configure texlive-bin-2007/configure
>+--- texlive-bin-2007.orig/configure	2007-07-03 12:08:40.000000000 +0200
>++++ texlive-bin-2007/configure	2007-07-03 12:08:40.000000000 +0200
>+@@ -3442,9 +3442,9 @@
>+ 
>+ # 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 -ur texlive-bin-2007.orig/configure.in texlive-bin-2007/configure.in
>+--- texlive-bin-2007.orig/configure.in	2007-07-03 12:08:40.000000000 +0200
>++++ texlive-bin-2007/configure.in	2007-07-03 12:08:40.000000000 +0200
>+@@ -157,9 +157,9 @@
>+ 
>+ # 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 @@
>+ 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 -u texlive-2007.fedora/texk/web2c/xetexdir/XeTeX_ext.c texlive-2007/texk/web2c/xetexdir/XeTeX_ext.c
>+--- texlive-2007.fedora/texk/web2c/xetexdir/XeTeX_ext.c	2007-01-15 14:04:36.000000000 +0100
>++++ texlive-2007/texk/web2c/xetexdir/XeTeX_ext.c	2007-08-17 22:27:28.000000000 +0200
>+@@ -33,7 +33,7 @@
>+  */
>+ 
>+ #ifdef XETEX_OTHER
>+-#include "xpdf/config.h"
>++#include "poppler/poppler-config.h"
>+ #include "png.h"
>+ #endif
>+ 
>+@@ -194,7 +194,7 @@
>+ #else
>+ 		"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"
>+ #endif
>+ 		;
>+ 
>+diff -u texlive-2007.fedora/texk/web2c/xetexdir/pdfimage.cpp texlive-2007/texk/web2c/xetexdir/pdfimage.cpp
>+--- texlive-2007.fedora/texk/web2c/xetexdir/pdfimage.cpp	2006-12-09 11:29:12.000000000 +0100
>++++ texlive-2007/texk/web2c/xetexdir/pdfimage.cpp	2007-08-17 22:27:28.000000000 +0200
>+@@ -11,10 +11,24 @@
>+ 
>+ #include "pdfimage.h"
>+ 
>+-#include "PDFDoc.h"
>+-#include "Catalog.h"
>+-#include "Page.h"
>+-#include "GString.h"
>++#include <dirent.h>
>++#include <poppler/poppler-config.h>
>++#include <goo/GooString.h>
>++#include <goo/gmem.h>
>++#include <goo/gfile.h>
>++#include "poppler/Object.h"
>++#include "poppler/Stream.h"
>++#include "poppler/Array.h"
>++#include "poppler/Dict.h"
>++#include "poppler/XRef.h"
>++#include "poppler/Link.h"
>++#include "poppler/Catalog.h"
>++#include "poppler/Page.h"
>++#include "poppler/GfxFont.h"
>++#include "poppler/PDFDoc.h"
>++#include "poppler/GlobalParams.h"
>++#include "poppler/Error.h"
>++
>+ 
>+ #include "XeTeX_ext.h"
>+ 
>+@@ -28,7 +42,7 @@
>+ int
>+ pdf_get_rect(char* filename, int page_num, int pdf_box, realrect* box)
>+ {
>+-	GString*	name = new GString(filename);
>++	GooString*	name = new GooString(filename);
>+ 	PDFDoc*		doc = new PDFDoc(name);
>+ 	
>+ 	if (!doc) {
>+diff -u texlive-2007.fedora/texk/web2c/xetexdir/xetex.mk texlive-2007/texk/web2c/xetexdir/xetex.mk
>+--- texlive-2007.fedora/texk/web2c/xetexdir/xetex.mk	2007-08-17 16:39:06.000000000 +0200
>++++ texlive-2007/texk/web2c/xetexdir/xetex.mk	2007-08-17 22:43:40.000000000 +0200
>+@@ -4,6 +4,10 @@
>+ 
>+ Makefile: $(srcdir)/xetexdir/xetex.mk
>+ 
>++# use libpoppler instead of included xpdf code
>++ADDLDFLAGS = -lpoppler
>++
>++
>+ # We build xetex unless configure decides to skip it
>+ xetex = @XETEX@ xetex
>+ 
>+@@ -29,7 +33,7 @@
>+ 
>+ @XETEX_GENERIC@ XETEX_DEFINES = -DXETEX_OTHER
>+ 
>+-@XETEX_GENERIC@ EXTRALIBS = @LDLIBXPDF@ @LDLIBPNG@ @LDFONTCONFIG@
>++@XETEX_GENERIC@ EXTRALIBS = @LDLIBXPDF@ @LDLIBPNG@ @LDFONTCONFIG@ $(ADDLDFLAGS)
>+ 
>+ @XETEX_GENERIC@ EXTRADEPS = @LIBXPDFDEP@ @LIBPNGDEP@
>+ 
>+@@ -144,7 +148,7 @@
>+ 	$(compile) $(ALL_CFLAGS) $(LIBPNGCPPFLAGS) $(ZLIBCPPFLAGS) -c $< -o $@
>+ 
>+ pdfimage.o: $(srcdir)/xetexdir/pdfimage.cpp $(srcdir)/xetexdir/pdfimage.h
>+-	$(CXX) $(ALL_CFLAGS) $(LIBXPDFCPPFLAGS) -c $< -o $@
>++	$(CXX) $(ALL_CFLAGS) $(LIBXPDFCPPFLAGS) -I/usr/include/poppler/xpdf-headers -c $< -o $@
>+ 
>+ XeTeX_pic.o: $(srcdir)/xetexdir/XeTeX_pic.c $(srcdir)/xetexdir/XeTeX_ext.h $(XeTeXImageHdrs)
>+ 	$(compile) $(TECKITFLAGS) $(ALL_CFLAGS) $(XETEX_DEFINES) -c $< -o $@
>+@@ -187,7 +191,7 @@
>+ 
>+ # special rules for files that need the TECkit headers as well
>+ XeTeX_ext.o: $(srcdir)/xetexdir/XeTeX_ext.c xetexd.h
>+-	$(compile) $(ICUCFLAGS) $(FTFLAGS) $(TECKITFLAGS) $(LIBPNGCPPFLAGS) $(LIBXPDFCPPFLAGS) $(ZLIBCPPFLAGS) $(ALL_CFLAGS) $(XETEX_DEFINES) -c $< -o $@
>++	$(compile) $(ICUCFLAGS) $(FTFLAGS) $(TECKITFLAGS) $(LIBPNGCPPFLAGS) $(LIBXPDFCPPFLAGS) $(ZLIBCPPFLAGS) $(ALL_CFLAGS) $(XETEX_DEFINES) -I/usr/include/poppler/xpdf-headers -c $< -o $@
>+ XeTeX_mac.o: $(srcdir)/xetexdir/XeTeX_mac.c xetexd.h
>+ 	$(compile) $(ICUCFLAGS) $(TECKITFLAGS) $(ALL_CFLAGS) $(XETEX_DEFINES) -c $< -o $@
>+ 
>diff -ur --new-file texlive-2007.orig/texlive.spec texlive-2007/texlive.spec
>--- texlive-2007.orig/texlive.spec	2007-08-15 16:47:03.000000000 +0200
>+++ texlive-2007/texlive.spec	2007-08-18 08:39:40.000000000 +0200
>@@ -13,6 +13,8 @@
> #  the binaries link against the shared. That seems to be broken, build
> #  fails with --enable-shared (interestingly, it works in teTeX 3.0)
> #
>+#Builds now with poppler, however pdftosrc cannot be build, so it is disabled. 
>+
> %define desktop_file_utils_version 0.9
> %define default_letter_paper 0
> # lcdf typetools can be easily built as a separate tool, so it should be
>@@ -39,7 +41,7 @@
> # Source0-99: main sources
> #####
> Source0:	http://tug.org/svn/texlive/branches/branch2007/Master/source/source.tar.bz2
>-Source1:	xpdf-3.02.tar.bz2
>+#Source1:	xpdf-3.02.tar.bz2
> 
> Source10:	texlive.cron
> # Source30 is http://xdvi.sourceforge.net/xdvi48x48.gif converted to png
>@@ -123,6 +125,9 @@
> Patch305:       texlive-source-xdvizilla.patch
> Patch306:       texlive-source-CVE-2007-0650.patch
> 
>+Patch1000:	texlive-poppler.patch
>+
>+
> BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> 
> BuildRequires:	flex bison ed
>@@ -133,10 +138,12 @@
> # for non-modular xorg - use xorg-devel instead of above
> BuildRequires:	lesstif libicu-devel teckit-devel
> BuildRequires:	texlive-texmf = %{version}
>+BuildRequires:  poppler-xpdfheaders >= 0.5.91
> Requires:	flex bison ed
> Requires:	texlive-texmf = %{version}
> Requires:	texlive-fonts = %{version}-%{release}
> Requires:	texlive-texmf-errata = %{version}
>+Requires:	poppler >= 0.5.91
> # make sure fonts package installed before running post - since
> # fmtutil-sys is symlink to fmtutil
> Requires(post):	%{_bindir}/fmtutil
>@@ -323,10 +330,10 @@
> %setup -q -T -c -a0
> 
> # replace old xpdf with 3.02 from upstream to fix CVE-2007-3387
>-pushd libs
>-rm -rf xpdf
>-tar fxj %{SOURCE1}
>-popd
>+#pushd libs
>+#rm -rf xpdf
>+#tar fxj %{SOURCE1}
>+#popd
> 
> # fix for debuginfo rpmlint happiness
> chmod -x texk/dvipdfm/macglyphs.h
>@@ -399,6 +406,8 @@
> %patch305 -p0
> %patch306 -p0
> 
>+%patch1000 -p1 -b .poppler
>+
> 
> pushd texk/kpathsea
> %{__sed} -i 's?^TEXMF =.*?TEXMF = {\$TEXMFCONFIG,\$TEXMFVAR,\$TEXMFHOME,\$TEXMFSYSCONFIG,\!\!\$TEXMFSYSVAR,\!\!\$TEXMFLOCAL,\!\!\$TEXMFMAIN,\!\!\$TEXMFDIST}?' texmf.in
>@@ -419,7 +428,7 @@
> # icu: includes some changes
> # md5: the aladdin md5 code (not a library)
> # xpdf: may soon be replaced by libpoppler and removed
>-%{__rm} -r libs/{curl,expat,freetype,freetype2,gd,howto,jpeg,libgnuw32,libgsw32,libpng,libttf,ncurses,obsdcompat,regex,teckit,t1lib,unzip,zlib,type1}/
>+%{__rm} -r libs/{curl,expat,freetype,freetype2,gd,howto,jpeg,libgnuw32,libgsw32,libpng,libttf,ncurses,obsdcompat,regex,teckit,t1lib,xpdf,unzip,zlib,type1}/
> 
> # allow Xaw3d enabled build of xdvi
> %{__sed} -i 's|/Xaw/|/Xaw3d/|' texk/xdvik/gui/*.[ch] texk/xdvik/*.[ch]
>diff -ur --new-file texlive-2007.orig/unused_hunk texlive-2007/unused_hunk
>--- texlive-2007.orig/unused_hunk	1970-01-01 01:00:00.000000000 +0100
>+++ texlive-2007/unused_hunk	2007-08-17 20:45:53.000000000 +0200
>@@ -0,0 +1,51 @@
>+diff -ur texlive-2007.fedora/texk/web2c/pdftexdir/depend.mk texlive-2007/texk/web2c/pdftexdir/depend.mk
>+--- texlive-2007.fedora/texk/web2c/pdftexdir/depend.mk	2007-08-17 16:39:06.000000000 +0200
>++++ texlive-2007/texk/web2c/pdftexdir/depend.mk	2007-08-17 20:07:44.000000000 +0200
>+@@ -1,44 +1,5 @@
>+-epdf.o: epdf.c ptexlib.h ../pdftexd.h ../texmfmp.h ../cpascal.h \
>+- ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h ptexmac.h
>+-mapfile.o: mapfile.c ptexlib.h ../pdftexd.h ../texmfmp.h ../cpascal.h \
>+- ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h ptexmac.h
>+-papersiz.o: papersiz.c ptexlib.h ../pdftexd.h ../texmfmp.h \
>+- ../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \
>+- ptexmac.h
>+-utils.o: utils.c ptexlib.h ../pdftexd.h ../texmfmp.h ../cpascal.h \
>+- ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h ptexmac.h \
>+-pdftexextra.h
>+-vfpacket.o: vfpacket.c ptexlib.h ../pdftexd.h ../texmfmp.h \
>+- ../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \
>+- ptexmac.h
>+-pkin.o: pkin.c ptexlib.h ../pdftexd.h ../texmfmp.h ../cpascal.h \
>+- ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h ptexmac.h
>+-writefont.o: writefont.c ptexlib.h \
>+- ../pdftexd.h ../texmfmp.h ../cpascal.h ../config.h ../help.h \
>+- ../texmfmem.h ../pdftexcoerce.h ptexmac.h
>+-writet1.o: writet1.c ptexlib.h ../pdftexd.h ../texmfmp.h ../cpascal.h \
>+- ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h ptexmac.h
>+-writet3.o: writet3.c ptexlib.h ../pdftexd.h ../texmfmp.h ../cpascal.h \
>+- ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h ptexmac.h
>+-writezip.o: writezip.c ptexlib.h ../pdftexd.h ../texmfmp.h \
>+- ../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \
>+- ptexmac.h
>+-writeenc.o: writeenc.c ptexlib.h ../pdftexd.h ../texmfmp.h \
>+- ../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \
>+- ptexmac.h
>+-writettf.o: writettf.c ptexlib.h writettf.h ../pdftexd.h ../texmfmp.h \
>+- ../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \
>+- ptexmac.h macnames.c
>+-writejpg.o: writejpg.c ptexlib.h ../pdftexd.h ../texmfmp.h \
>+- ../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \
>+- ptexmac.h image.h
>+-writepng.o: writepng.c ptexlib.h ../pdftexd.h ../texmfmp.h \
>+- ../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \
>+- ptexmac.h image.h
>+-writeimg.o: writeimg.c ptexlib.h ../pdftexd.h ../texmfmp.h \
>+- ../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \
>+- ptexmac.h image.h
>+-pdftoepdf.o: pdftoepdf.cc \
>+- epdf.h
>++pdftoepdf.o: pdftoepdf.cc epdf.h ../../kpathsea/c-auto.h \
>++  ../../kpathsea/c-proto.h ../../web2c/c-auto.h ../../web2c/config.h \
>++  ../../kpathsea/c-fopen.h ../../web2c/pdftexdir/ptexmac.h
>+ ttf2afm.o: ttf2afm.c writettf.h macnames.c
>+ pdftosrc.o: pdftosrc.cc

Actions: View | Diff

Attachments on bug 242416: 158208 | 161796 | 161797 | 161799 | 161800 | 161801 | 161802 | 161803 | 161973 | 161974 | 161975 | 195671 | 195691