rpms/poppler/F-12 poppler-0.12.1-objstream.patch, NONE, 1.1 .cvsignore, 1.42, 1.43 poppler.spec, 1.102, 1.103 sources, 1.46, 1.47 poppler-ObjStream.patch, 1.11, NONE
Rex Dieter
rdieter at fedoraproject.org
Mon Oct 19 14:38:59 UTC 2009
Author: rdieter
Update of /cvs/pkgs/rpms/poppler/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18843
Modified Files:
.cvsignore poppler.spec sources
Added Files:
poppler-0.12.1-objstream.patch
Removed Files:
poppler-ObjStream.patch
Log Message:
* Mon Oct 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.12.1-1
- poppler-0.12.1
- deprecate xpdf/pdftohtml Conflicts/Obsoletes
poppler-0.12.1-objstream.patch:
XRef.cc | 37 ++++++-------------------------------
XRef.h | 43 ++++++++++++++++++++++++++++++++++++++++---
2 files changed, 46 insertions(+), 34 deletions(-)
--- NEW FILE poppler-0.12.1-objstream.patch ---
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 <objStrNum>,
- // 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 <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)
- 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
@@ -1,8 +1,8 @@
//========================================================================
//
-// XRef.h
+//XRef.h
//
-// Copyright 1996-2003 Glyph & Cog, LLC
+//Copyright 1996-2003 Glyph & Cog, LLC
//
//========================================================================
@@ -36,7 +36,43 @@
class Dict;
class Stream;
class Parser;
-class ObjectStream;
+
+
+//------------------------------------------------------------------------
+// ObjectStream
+//------------------------------------------------------------------------
+
+class ObjectStream {
+public:
+
+ // Create an object stream, using object number <objStrNum>,
+ // 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 <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)
+ 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);
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/poppler/F-12/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- .cvsignore 9 Sep 2009 18:43:29 -0000 1.42
+++ .cvsignore 19 Oct 2009 14:38:58 -0000 1.43
@@ -1 +1 @@
-poppler-0.12.0.tar.gz
+poppler-0.12.1.tar.gz
Index: poppler.spec
===================================================================
RCS file: /cvs/pkgs/rpms/poppler/F-12/poppler.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -p -r1.102 -r1.103
--- poppler.spec 11 Sep 2009 18:05:09 -0000 1.102
+++ poppler.spec 19 Oct 2009 14:38:58 -0000 1.103
@@ -1,15 +1,17 @@
Summary: PDF rendering library
Name: poppler
-Version: 0.12.0
+Version: 0.12.1
Release: 1%{?dist}
License: GPLv2
Group: Development/Libraries
URL: http://poppler.freedesktop.org/
Source0: http://poppler.freedesktop.org/poppler-%{version}.tar.gz
-# for texlive/pdftex, TODO: upstream
-Patch0: poppler-ObjStream.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+## upstreamable patches
+# for texlive/pdftex, make ObjStream class public
+Patch100: poppler-0.12.1-objstream.patch
BuildRequires: automake libtool
BuildRequires: cairo-devel >= 1.8.4
@@ -93,15 +95,16 @@ Requires: qt4-devel
Summary: Command line utilities for converting PDF files
Group: Applications/Text
Requires: %{name} = %{version}-%{release}
-Conflicts: xpdf <= 1:3.01-8
-# There's an extras package that provides pdftohtml
-
+%if 0%{?fedora} < 11
+# last seen in fc8
Provides: pdftohtml
Obsoletes: pdftohtml
-
+# last seen in fc7
Provides: xpdf-utils = 1:3.01-27.fc7
Obsoletes: xpdf-utils <= 1:3.01-26.fc7
-
+# even earlier?
+Conflicts: xpdf <= 1:3.01-8
+%endif
%description utils
Poppler, a PDF rendering library, is a fork of the xpdf PDF
viewer developed by Derek Noonburg of Glyph and Cog, LLC.
@@ -112,14 +115,13 @@ converting PDF files to a number of othe
%prep
%setup -q
-%patch0 -p0 -b .objstream
+%patch100 -p1 -b .objstream
+
# hammer to nuke rpaths, recheck on new releases
autoreconf -i -f
%build
-# can use in a pinch, but isn't necessary (in general) -- Rex
-unset QTDIR && . /etc/profile.d/qt.sh
%configure \
--disable-static \
--enable-cairo-output \
@@ -135,9 +137,10 @@ make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
+
make install DESTDIR=$RPM_BUILD_ROOT
-rm $RPM_BUILD_ROOT%{_libdir}/lib*.la
+rm -fv $RPM_BUILD_ROOT%{_libdir}/lib*.la
%post -p /sbin/ldconfig
@@ -211,6 +214,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Oct 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.12.1-1
+- poppler-0.12.1
+- deprecate xpdf/pdftohtml Conflicts/Obsoletes
+
* Wed Sep 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.12.0-1
- Update to 0.12.0
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/poppler/F-12/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- sources 9 Sep 2009 18:43:29 -0000 1.46
+++ sources 19 Oct 2009 14:38:58 -0000 1.47
@@ -1 +1 @@
-399b25d9d71ad22bc9a2a9281769c49c poppler-0.12.0.tar.gz
+3432046ee111efa5b85e5f2cdde8af5c poppler-0.12.1.tar.gz
--- poppler-ObjStream.patch DELETED ---
More information about the fedora-extras-commits
mailing list