Attachment 161797 Details for Bug 242416 – patch for poppler-0.5.91 to include the Xpdf headers.

[patch] patch for poppler-0.5.91 to include the Xpdf headers.

poppler-0.5.91.patch (text/plain), 8.55 KB, created by Jiri Cerny on 2007-08-18 14:14:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jiri Cerny

Created: 2007-08-18 14:14:23 UTC

Size: 8.55 KB

patch

obsolete

>diff -ru --new-file poppler-0.5.91.orig/poppler-ObjStream.patch poppler-0.5.91/poppler-ObjStream.patch
>--- poppler-0.5.91.orig/poppler-ObjStream.patch	1970-01-01 01:00:00.000000000 +0100
>+++ poppler-0.5.91/poppler-ObjStream.patch	2007-08-17 20:01:46.000000000 +0200
>@@ -0,0 +1,139 @@
>+diff -ur poppler-0.5.91.fedora/poppler-0.5.91/poppler/XRef.cc poppler-0.5.91/poppler-0.5.91/poppler/XRef.cc
>+--- poppler-0.5.91.fedora/poppler-0.5.91/poppler/XRef.cc	2007-07-14 20:21:56.000000000 +0200
>++++ poppler-0.5.91/poppler-0.5.91/poppler/XRef.cc	2007-08-17 18:38:10.000000000 +0200
>+@@ -50,34 +50,9 @@
>+ // ObjectStream
>+ //------------------------------------------------------------------------
>+ 
>+-class ObjectStream {
>+-public:
>+-
>+-  // Create an object stream, using object number <objStrNum>,
>+-  // generation 0.
>+-  ObjectStream(XRef *xref, int objStrNumA);
>+-
>+-  ~ObjectStream();
>+-
>+-  // Return the object number of this object stream.
>+-  int getObjStrNum() { return objStrNum; }
>+-
>+-  // Get the <objIdx>th object from this stream, which should be
>+-  // object number <objNum>, generation 0.
>+-  Object *getObject(int objIdx, int objNum, Object *obj);
>+-
>+-private:
>+-
>+-  int objStrNum;		// object number of the object stream
>+-  int nObjects;			// number of objects in the stream
>+-  Object *objs;			// the objects (length = nObjects)
>+-  int *objNums;			// the object numbers (length = nObjects)
>+-};
>+-
>+ ObjectStream::ObjectStream(XRef *xref, int objStrNumA) {
>+   Stream *str;
>+   Parser *parser;
>+-  int *offsets;
>+   Object objStr, obj1, obj2;
>+   int first, i;
>+ 
>+@@ -85,6 +60,7 @@
>+   nObjects = 0;
>+   objs = NULL;
>+   objNums = NULL;
>++  offsets = NULL;
>+ 
>+   if (!xref->fetch(objStrNum, 0, &objStr)->isStream()) {
>+     goto err1;
>+@@ -105,6 +81,7 @@
>+     goto err1;
>+   }
>+   first = obj1.getInt();
>++  firstOffset = objStr.getStream()->getBaseStream()->getStart() + first;
>+   obj1.free();
>+   if (first < 0) {
>+     goto err1;
>+@@ -131,7 +108,7 @@
>+       obj1.free();
>+       obj2.free();
>+       delete parser;
>+-      gfree(offsets);
>++//       gfree(offsets);
>+       goto err1;
>+     }
>+     objNums[i] = obj1.getInt();
>+@@ -141,7 +118,7 @@
>+     if (objNums[i] < 0 || offsets[i] < 0 ||
>+ 	(i > 0 && offsets[i] < offsets[i-1])) {
>+       delete parser;
>+-      gfree(offsets);
>++//       gfree(offsets);
>+       goto err1;
>+     }
>+   }
>+@@ -170,7 +147,7 @@
>+     delete parser;
>+   }
>+ 
>+-  gfree(offsets);
>++//   gfree(offsets);
>+ 
>+  err1:
>+   objStr.free();
>+@@ -187,6 +164,7 @@
>+     delete[] objs;
>+   }
>+   gfree(objNums);
>++  gfree(offsets);
>+ }
>+ 
>+ Object *ObjectStream::getObject(int objIdx, int objNum, Object *obj) {
>+diff -ur poppler-0.5.91.fedora/poppler-0.5.91/poppler/XRef.h poppler-0.5.91/poppler-0.5.91/poppler/XRef.h
>+--- poppler-0.5.91.fedora/poppler-0.5.91/poppler/XRef.h	2007-07-14 20:21:56.000000000 +0200
>++++ poppler-0.5.91/poppler-0.5.91/poppler/XRef.h	2007-08-17 18:33:48.000000000 +0200
>+@@ -19,7 +19,36 @@
>+ class Dict;
>+ class Stream;
>+ class Parser;
>+-class ObjectStream;
>++
>++class ObjectStream {
>++public:
>++
>++  // Create an object stream, using object number <objStrNum>,
>++  // generation 0.
>++  ObjectStream(XRef *xref, int objStrNumA);
>++
>++  ~ObjectStream();
>++
>++  // Return the object number of this object stream.
>++  int getObjStrNum() { return objStrNum; }
>++
>++  // Get the <objIdx>th object from this stream, which should be
>++  // object number <objNum>, generation 0.
>++  Object *getObject(int objIdx, int objNum, Object *obj);
>++
>++  int *getOffsets() { return offsets; }
>++  Guint getFirstOffset() { return firstOffset; }
>++
>++private:
>++
>++  int objStrNum;		// object number of the object stream
>++  int nObjects;			// number of objects in the stream
>++  Object *objs;			// the objects (length = nObjects)
>++  int *objNums;			// the object numbers (length = nObjects)
>++  int *offsets;			// the object offsets (length = nObjects)
>++  Guint firstOffset;
>++};
>++
>+ 
>+ //------------------------------------------------------------------------
>+ // XRef
>+@@ -135,6 +135,7 @@
>+   int getSize() { return size; }
>+   XRefEntry *getEntry(int i) { return &entries[i]; }
>+   Object *getTrailerDict() { return &trailerDict; }
>++  ObjectStream *getObjStr() { return objStr; }
>+ 
>+   // Write access
>+   void setModifiedObject(Object* o, Ref r);
>+
>diff -ru --new-file poppler-0.5.91.orig/poppler.spec poppler-0.5.91/poppler.spec
>--- poppler-0.5.91.orig/poppler.spec	2007-08-17 11:10:41.000000000 +0200
>+++ poppler-0.5.91/poppler.spec	2007-08-18 09:05:27.000000000 +0200
>@@ -3,7 +3,7 @@
> Summary: PDF rendering library
> Name: poppler
> Version: 0.5.91
>-Release: 2%{?dist}
>+Release: 4%{?dist}
> License: GPLv2 and Redistributable, no modification permitted
> # the code is GPLv2
> # the charmap data in /usr/share/poppler is redistributable
>@@ -11,7 +11,11 @@
> URL:     http://poppler.freedesktop.org/
> Source0: http://poppler.freedesktop.org/poppler-%{version}.tar.gz
> Source1: http://poppler.freedesktop.org/poppler-data-%{dataversion}.tar.gz
>+
> Patch0: debug-spew.patch
>+Patch1: xpdfheaders.patch
>+Patch2: poppler-ObjStream.patch
>+
> BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
> 
> BuildRequires: gtk2-devel
>@@ -72,15 +76,30 @@
> This utils package installs a number of command line tools for
> converting PDF files to a number of other formats.
> 
>+%package xpdfheaders 
>+Summary: Old unsupported Xpdf headers
>+Group:   Development/Libraries
>+Requires: %{name}-devel = %{version}-%{release}
>+%description xpdfheaders
>+Poppler, a PDF rendering library, it's a fork of the xpdf PDF
>+viewer developed by Derek Noonburg of Glyph and Cog, LLC.
>+
>+This xpdfheaders contains old unsupported Xpdf header files that
>+are needed for compilation of some older packages, in particular 
>+of TeXlive.
>+
> %prep
> %setup -c -q -a1
>-%patch -p1 -b .debug-spew
>+%patch0 -p1 -b .debug-spew
>+%patch1 -p1 -b .xpdfheaders
>+%patch2 -p1 -b .objstr
> 
> %build
> ( cd  %{name}-%{version}
> %configure \
>   --disable-static \
>   --enable-cairo-output \
>+  --enable-xpdf-headers \
>   --enable-poppler-qt
> )
> make %{?_smp_mflags} -C %{name}-%{version}
>@@ -137,6 +156,10 @@
> %{_bindir}/*
> %{_mandir}/man1/*
> 
>+%files xpdfheaders
>+%defattr(-,root,root,-)
>+%{_includedir}/poppler/xpdf-headers
>+
> %changelog
> * Wed Aug 15 2007 Matthias Clasen <mclasen@redhat.com> - 0.5.91-2
> - Remove debug spew
>diff -ru --new-file poppler-0.5.91.orig/xpdfheaders.patch poppler-0.5.91/xpdfheaders.patch
>--- poppler-0.5.91.orig/xpdfheaders.patch	1970-01-01 01:00:00.000000000 +0100
>+++ poppler-0.5.91/xpdfheaders.patch	2007-08-17 13:28:44.000000000 +0200
>@@ -0,0 +1,36 @@
>+diff -ur poppler-0.5.91.orig/poppler-0.5.91/goo/Makefile.in poppler-0.5.91/poppler-0.5.91/goo/Makefile.in
>+--- poppler-0.5.91.orig/poppler-0.5.91/goo/Makefile.in	2007-08-17 12:51:49.000000000 +0200
>++++ poppler-0.5.91/poppler-0.5.91/goo/Makefile.in	2007-08-17 12:54:33.000000000 +0200
>+@@ -248,7 +248,7 @@
>+ target_alias = @target_alias@
>+ win32_libs = @win32_libs@
>+ noinst_LTLIBRARIES = libgoo.la
>+-@ENABLE_XPDF_HEADERS_TRUE@poppler_goo_includedir = $(includedir)/poppler/goo
>++@ENABLE_XPDF_HEADERS_TRUE@poppler_goo_includedir = $(includedir)/poppler/xpdf-headers/goo
>+ @ENABLE_XPDF_HEADERS_TRUE@poppler_goo_include_HEADERS = \
>+ @ENABLE_XPDF_HEADERS_TRUE@	GooHash.h				\
>+ @ENABLE_XPDF_HEADERS_TRUE@	GooList.h				\
>+diff -ur poppler-0.5.91.orig/poppler-0.5.91/poppler/Makefile.in poppler-0.5.91/poppler-0.5.91/poppler/Makefile.in
>+--- poppler-0.5.91.orig/poppler-0.5.91/poppler/Makefile.in	2007-08-17 12:51:49.000000000 +0200
>++++ poppler-0.5.91/poppler-0.5.91/poppler/Makefile.in	2007-08-17 12:55:25.000000000 +0200
>+@@ -409,7 +409,7 @@
>+ 	$(win32_libs)
>+ 
>+ libpoppler_la_LDFLAGS = -version-info 1:0:0 @create_shared_lib@
>+-@ENABLE_XPDF_HEADERS_TRUE@poppler_includedir = $(includedir)/poppler
>++@ENABLE_XPDF_HEADERS_TRUE@poppler_includedir = $(includedir)/poppler/xpdf-headers/poppler
>+ @ENABLE_XPDF_HEADERS_TRUE@poppler_include_HEADERS = \
>+ @ENABLE_XPDF_HEADERS_TRUE@	$(splash_headers)	\
>+ @ENABLE_XPDF_HEADERS_TRUE@	Annot.h			\
>+diff -ur poppler-0.5.91.orig/poppler-0.5.91/splash/Makefile.in poppler-0.5.91/poppler-0.5.91/splash/Makefile.in
>+--- poppler-0.5.91.orig/poppler-0.5.91/splash/Makefile.in	2007-08-17 12:51:49.000000000 +0200
>++++ poppler-0.5.91/poppler-0.5.91/splash/Makefile.in	2007-08-17 12:54:57.000000000 +0200
>+@@ -263,7 +263,7 @@
>+ 	$(FREETYPE_CFLAGS)
>+ 
>+ noinst_LTLIBRARIES = libsplash.la
>+-@ENABLE_XPDF_HEADERS_TRUE@poppler_splash_includedir = $(includedir)/poppler/splash
>++@ENABLE_XPDF_HEADERS_TRUE@poppler_splash_includedir = $(includedir)/poppler/xpdf-headers/splash
>+ @ENABLE_XPDF_HEADERS_TRUE@poppler_splash_include_HEADERS = \
>+ @ENABLE_XPDF_HEADERS_TRUE@	Splash.h				\
>+ @ENABLE_XPDF_HEADERS_TRUE@	SplashBitmap.h				\

Actions: View | Diff

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