From f0ca5d38fd67bdb01cff5c0ce9e13a192c69c9ae Mon Sep 17 00:00:00 2001 From: Marek Kasik Date: Aug 19 2010 13:54:36 +0000 Subject: * Thu Aug 19 2010 Marek Kasik - 0.14.2-1 - Update to 0.14.2 - Remove poppler-0.12.1-objstream.patch --- diff --git a/.gitignore b/.gitignore index 898e144..90aa1fe 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ poppler-0.14.1.tar.gz +poppler-0.14.2.tar.gz diff --git a/poppler-0.12.1-objstream.patch b/poppler-0.12.1-objstream.patch deleted file mode 100644 index cbfbbc8..0000000 --- a/poppler-0.12.1-objstream.patch +++ /dev/null @@ -1,148 +0,0 @@ -diff -up poppler-0.12.1/poppler/XRef.cc.objstream poppler-0.12.1/poppler/XRef.cc ---- poppler-0.12.1/poppler/XRef.cc.objstream 2009-10-17 17:23:09.000000000 -0500 -+++ poppler-0.12.1/poppler/XRef.cc 2009-10-19 08:29:24.552691208 -0500 -@@ -69,37 +69,9 @@ - // ObjectStream - //------------------------------------------------------------------------ - --class ObjectStream { --public: -- -- // Create an object stream, using object number , -- // generation 0. -- ObjectStream(XRef *xref, int objStrNumA); -- -- GBool isOk() { return ok; } -- -- ~ObjectStream(); -- -- // Return the object number of this object stream. -- int getObjStrNum() { return objStrNum; } -- -- // Get the th object from this stream, which should be -- // object number , 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) -- GBool ok; --}; -- - ObjectStream::ObjectStream(XRef *xref, int objStrNumA) { - Stream *str; - Parser *parser; -- int *offsets; - Object objStr, obj1, obj2; - int first, i; - -@@ -107,6 +79,7 @@ ObjectStream::ObjectStream(XRef *xref, i - nObjects = 0; - objs = NULL; - objNums = NULL; -+ offsets = NULL; - ok = gFalse; - - if (!xref->fetch(objStrNum, 0, &objStr)->isStream()) { -@@ -128,6 +101,7 @@ ObjectStream::ObjectStream(XRef *xref, i - goto err1; - } - first = obj1.getInt(); -+ firstOffset = objStr.getStream()->getBaseStream()->getStart() + first; - obj1.free(); - if (first < 0) { - goto err1; -@@ -156,7 +130,7 @@ ObjectStream::ObjectStream(XRef *xref, i - obj1.free(); - obj2.free(); - delete parser; -- gfree(offsets); -+// gfree(offsets); - goto err1; - } - objNums[i] = obj1.getInt(); -@@ -166,7 +140,7 @@ ObjectStream::ObjectStream(XRef *xref, i - if (objNums[i] < 0 || offsets[i] < 0 || - (i > 0 && offsets[i] < offsets[i-1])) { - delete parser; -- gfree(offsets); -+// gfree(offsets); - goto err1; - } - } -@@ -195,7 +169,7 @@ ObjectStream::ObjectStream(XRef *xref, i - delete parser; - } - -- gfree(offsets); -+ // gfree(offsets); - ok = gTrue; - - err1: -@@ -212,6 +186,7 @@ ObjectStream::~ObjectStream() { - delete[] objs; - } - gfree(objNums); -+ gfree(offsets); - } - - Object *ObjectStream::getObject(int objIdx, int objNum, Object *obj) { -diff -up poppler-0.12.1/poppler/XRef.h.objstream poppler-0.12.1/poppler/XRef.h ---- poppler-0.12.1/poppler/XRef.h.objstream 2009-09-09 16:22:31.000000000 -0500 -+++ poppler-0.12.1/poppler/XRef.h 2009-10-19 08:34:12.152684910 -0500 -@@ -36,7 +36,43 @@ - class Dict; - class Stream; - class Parser; --class ObjectStream; -+ -+ -+//------------------------------------------------------------------------ -+// ObjectStream -+//------------------------------------------------------------------------ -+ -+class ObjectStream { -+public: -+ -+ // Create an object stream, using object number , -+ // generation 0. -+ ObjectStream(XRef *xref, int objStrNumA); -+ -+ GBool isOk() { return ok; } -+ -+ ~ObjectStream(); -+ -+ // Return the object number of this object stream. -+ int getObjStrNum() { return objStrNum; } -+ -+ // Get the th object from this stream, which should be -+ // object number , 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) -+ GBool ok; -+ int *offsets; // the object offsets (length = nObjects) -+ Guint firstOffset; -+}; - - //------------------------------------------------------------------------ - // XRef -@@ -123,6 +159,7 @@ public: - 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 --git a/poppler.spec b/poppler.spec index c7f0fa9..683cb0d 100644 --- a/poppler.spec +++ b/poppler.spec @@ -1,7 +1,7 @@ Summary: PDF rendering library Name: poppler -Version: 0.14.1 +Version: 0.14.2 Release: 1%{?dist} License: GPLv2 Group: Development/Libraries @@ -9,13 +9,11 @@ URL: http://poppler.freedesktop.org/ Source0: http://poppler.freedesktop.org/poppler-%{version}.tar.gz ## upstreamable patches - -## upstream patches -# for texlive/pdftex, make ObjStream class public -Patch100: poppler-0.12.1-objstream.patch # http://bugzilla.redhat.com/show_bug.cgi?id=480868 Patch104: poppler-0.12.4-annot-appearance.patch +## upstream patches + Requires: poppler-data >= 0.4.0 BuildRequires: automake libtool BuildRequires: cairo-devel >= 1.8.4 @@ -136,7 +134,6 @@ converting PDF files to a number of other formats. %prep %setup -q -#%patch100 -p1 -b .objstream %patch104 -p1 -b .annot chmod -x goo/GooTimer.h @@ -192,7 +189,7 @@ rm -fv $RPM_BUILD_ROOT%{_libdir}/lib*.la %files %defattr(-,root,root,-) %doc COPYING README -%{_libdir}/libpoppler.so.6* +%{_libdir}/libpoppler.so.7* %files devel %defattr(-,root,root,-) @@ -248,6 +245,10 @@ rm -fv $RPM_BUILD_ROOT%{_libdir}/lib*.la %changelog +* Thu Aug 19 2010 Marek Kasik - 0.14.2-1 +- Update to 0.14.2 +- Remove poppler-0.12.1-objstream.patch + * Fri Jul 16 2010 Marek Kasik - 0.14.1-1 - Update to 0.14.1 - Don't apply poppler-0.12.1-objstream.patch, it is not needed anymore diff --git a/sources b/sources index 5df6532..3f5c2a2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1d27cb8a09aaa373660fd608b258022a poppler-0.14.1.tar.gz +f050ade7438aa45e50f94b3f86848d28 poppler-0.14.2.tar.gz