rpms/poppler/OLPC-2 poppler-ObjStream.patch, NONE, 1.1 poppler-qt3-check.patch, NONE, 1.1 .cvsignore, 1.16, 1.17 poppler.spec, 1.38, 1.39 sources, 1.16, 1.17
Reinier Heeres (rwh)
fedora-extras-commits at redhat.com
Wed Dec 12 16:45:10 UTC 2007
Author: rwh
Update of /cvs/pkgs/rpms/poppler/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25167/OLPC-2
Modified Files:
.cvsignore poppler.spec sources
Added Files:
poppler-ObjStream.patch poppler-qt3-check.patch
Log Message:
Import of poppler-0.6.2
poppler-ObjStream.patch:
--- NEW FILE poppler-ObjStream.patch ---
diff -up poppler-0.6.2/poppler-0.6.2/poppler/XRef.h.objstream poppler-0.6.2/poppler-0.6.2/poppler/XRef.h
--- poppler-0.6.2/poppler-0.6.2/poppler/XRef.h.objstream 2007-11-05 00:11:05.000000000 +0100
+++ poppler-0.6.2/poppler-0.6.2/poppler/XRef.h 2007-11-28 12:23:02.000000000 +0100
@@ -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
@@ -106,6 +135,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 -up poppler-0.6.2/poppler-0.6.2/poppler/XRef.cc.objstream poppler-0.6.2/poppler-0.6.2/poppler/XRef.cc
--- poppler-0.6.2/poppler-0.6.2/poppler/XRef.cc.objstream 2007-11-05 00:11:05.000000000 +0100
+++ poppler-0.6.2/poppler-0.6.2/poppler/XRef.cc 2007-11-28 12:23:02.000000000 +0100
@@ -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 @@ ObjectStream::ObjectStream(XRef *xref, i
nObjects = 0;
objs = NULL;
objNums = NULL;
+ offsets = NULL;
if (!xref->fetch(objStrNum, 0, &objStr)->isStream()) {
goto err1;
@@ -105,6 +81,7 @@ ObjectStream::ObjectStream(XRef *xref, i
goto err1;
}
first = obj1.getInt();
+ firstOffset = objStr.getStream()->getBaseStream()->getStart() + first;
obj1.free();
if (first < 0) {
goto err1;
@@ -131,7 +108,7 @@ ObjectStream::ObjectStream(XRef *xref, i
obj1.free();
obj2.free();
delete parser;
- gfree(offsets);
+// gfree(offsets);
goto err1;
}
objNums[i] = obj1.getInt();
@@ -141,7 +118,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;
}
}
@@ -170,7 +147,7 @@ ObjectStream::ObjectStream(XRef *xref, i
delete parser;
}
- gfree(offsets);
+// gfree(offsets);
err1:
objStr.free();
@@ -187,6 +164,7 @@ ObjectStream::~ObjectStream() {
delete[] objs;
}
gfree(objNums);
+ gfree(offsets);
}
Object *ObjectStream::getObject(int objIdx, int objNum, Object *obj) {
poppler-qt3-check.patch:
--- NEW FILE poppler-qt3-check.patch ---
diff -up poppler-0.6.2/poppler-0.6.2/configure.qt3-check poppler-0.6.2/poppler-0.6.2/configure
--- poppler-0.6.2/poppler-0.6.2/configure.qt3-check 2007-11-10 07:04:36.000000000 -0500
+++ poppler-0.6.2/poppler-0.6.2/configure 2007-12-02 21:14:01.000000000 -0500
@@ -26165,8 +26165,8 @@ fi
if test x$enable_poppler_qt = xyes; then
-qt_incdirs="$QTINC /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib/qt3/include /usr/lib/qt/include /usr/share/qt3/include"
-qt_libdirs="$QTLIB /usr/local/qt/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt3/lib /usr/lib/qt/lib /usr/share/qt3/lib"
+qt_incdirs="$QTINC /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib/qt3/include /usr/lib/qt/include /usr/share/qt3/include /usr/lib/qt-3.3/include"
+qt_libdirs="$QTLIB /usr/local/qt/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt3/lib /usr/lib/qt/lib /usr/share/qt3/lib /usr/lib/qt-3.3/lib"
if test -n "$QTDIR" ; then
qt_incdirs="$QTDIR/include $qt_incdirs"
qt_libdirs="$QTDIR/lib $qt_libdirs"
@@ -26192,11 +26192,6 @@ echo "${ECHO_T}$qt_incdir" >&6; }
echo $ECHO_N "checking for Qt libraries... $ECHO_C" >&6; }
qt_libdir="no"
for qt_check in $qt_libdirs ; do
- if test -r "$qt_check/$qt_test_la_library" ; then
- qt_libdir="$qt_check"
- break
- fi
-
if test -r "$qt_check/$qt_test_library" ; then
qt_libdir="$qt_check"
break
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/poppler/OLPC-2/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore 22 Sep 2006 02:11:32 -0000 1.16
+++ .cvsignore 12 Dec 2007 16:44:36 -0000 1.17
@@ -1,2 +1,2 @@
-poppler-0.5.4.tar.gz
poppler-data-0.1.tar.gz
+poppler-0.6.2.tar.gz
Index: poppler.spec
===================================================================
RCS file: /cvs/pkgs/rpms/poppler/OLPC-2/poppler.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- poppler.spec 2 Mar 2007 04:02:25 -0000 1.38
+++ poppler.spec 12 Dec 2007 16:44:36 -0000 1.39
@@ -2,18 +2,24 @@
Summary: PDF rendering library
Name: poppler
-Version: 0.5.4
-Release: 7%{?dist}
-License: GPL
+Version: 0.6.2
+Release: 3%{?dist}
+License: GPLv2 and Redistributable, no modification permitted
+# the code is GPLv2
+# the charmap data in /usr/share/poppler is redistributable
Group: Development/Libraries
URL: http://poppler.freedesktop.org/
Source0: http://poppler.freedesktop.org/poppler-%{version}.tar.gz
Source1: http://poppler.freedesktop.org/poppler-data-%{dataversion}.tar.gz
+# https://bugs.freedesktop.org/show_bug.cgi?id=12016
+Patch0: poppler-ObjStream.patch
+Patch1: poppler-qt3-check.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: gtk2-devel
BuildRequires: cairo-devel
BuildRequires: qt-devel
+BuildRequires: qt4-devel
%description
Poppler, a PDF rendering library, it's a fork of the xpdf PDF
@@ -24,6 +30,7 @@
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: pkgconfig
+Requires: gtk-doc
%description devel
Poppler, a PDF rendering library, it's a fork of the xpdf PDF
@@ -48,6 +55,22 @@
%description qt-devel
%{summary}.
+%package qt4
+Summary: Qt4 wrapper for poppler
+Group: System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
+%description qt4
+%{summary}.
+
+%package qt4-devel
+Summary: Development files for Qt4 wrapper
+Group: Development/Libraries
+Requires: %{name}-qt4 = %{version}-%{release}
+Requires: %{name}-devel = %{version}-%{release}
+Requires: qt4-devel
+%description qt4-devel
+%{summary}.
+
%package utils
Summary: Command line utilities for converting PDF files.
Group: Applications/Text
@@ -70,16 +93,24 @@
%prep
%setup -c -q -a1
+%patch0 -p1 -b .objstream
+%patch1 -p1 -b .qt3-check
%build
( cd %{name}-%{version}
%configure \
--disable-static \
--enable-cairo-output \
- --enable-poppler-qt
+ --enable-poppler-qt \
+ --enable-poppler-qt4 \
+ --enable-xpdf-headers
)
make %{?_smp_mflags} -C %{name}-%{version}
+pushd poppler-data-%{dataversion}
+cp COPYING COPYING-poppler-data
+cp README README-poppler-data
+popd
%install
rm -rf $RPM_BUILD_ROOT
@@ -95,8 +126,10 @@
%files
%defattr(-,root,root,-)
-%doc %{name}-%{version}/ChangeLog
%doc %{name}-%{version}/README
+%doc %{name}-%{version}/COPYING
+%doc poppler-data-%{dataversion}/README-poppler-data
+%doc poppler-data-%{dataversion}/COPYING-poppler-data
%{_libdir}/libpoppler-glib.so.*
%{_libdir}/libpoppler.so.*
%{_datadir}/poppler/
@@ -104,11 +137,13 @@
%files devel
%defattr(-,root,root,-)
%exclude %{_libdir}/pkgconfig/poppler-qt.pc
-%{_libdir}/pkgconfig/*
-%exclude %{_libdir}/libpoppler-qt.so
-%{_libdir}/lib*.so
-%dir %{_includedir}/poppler/
-%{_includedir}/poppler/glib/
+%{_libdir}/pkgconfig/poppler-cairo.pc
+%{_libdir}/pkgconfig/poppler-glib.pc
+%{_libdir}/pkgconfig/poppler.pc
+%{_libdir}/pkgconfig/poppler-splash.pc
+%{_libdir}/libpoppler-glib.so
+%{_libdir}/libpoppler.so
+%{_includedir}/poppler/
%{_datadir}/gtk-doc/html/poppler
%files qt
@@ -119,9 +154,17 @@
%defattr(-,root,root,-)
%{_libdir}/libpoppler-qt.so
%{_libdir}/pkgconfig/poppler-qt.pc
-%{_includedir}/poppler/poppler-qt.h
-%{_includedir}/poppler/poppler-link-qt3.h
-%{_includedir}/poppler/poppler-page-transition.h
+%{_includedir}/poppler/qt3/
+
+%files qt4
+%defattr(-,root,root,-)
+%{_libdir}/libpoppler-qt4.so.*
+
+%files qt4-devel
+%defattr(-,root,root,-)
+%{_libdir}/libpoppler-qt4.so
+%{_libdir}/pkgconfig/poppler-qt4.pc
+%{_includedir}/poppler/qt4/
%files utils
%defattr(-,root,root,-)
@@ -129,6 +172,34 @@
%{_mandir}/man1/*
%changelog
+* Sun Dec 2 2007 Matthias Clasen <mclasen at redhat.com> - 0.6.2-3
+- Fix the qt3 checks some more
+
+* Thu Nov 28 2007 Matthias Clasen <mclasen at redhat.com> - 0.6.2-2
+- package xpdf headers in poppler-devel (Jindrich Novy)
+- Fix qt3 detection (Denis Leroy)
+
+* Thu Nov 22 2007 Matthias Clasen <mclasen at redhat.com> - 0.6.2-1
+- Update to 0.6.2
+
+* Thu Oct 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 0.6-2
+- include qt4 wrapper
+
+* Tue Sep 4 2007 Kristian Høgsberg <krh at redhat.com> - 0.6-1
+- Update to 0.6
+
+* Wed Aug 15 2007 Matthias Clasen <mclasen at redhat.com> - 0.5.91-2
+- Remove debug spew
+
+* Tue Aug 14 2007 Matthias Clasen <mclasen at redhat.com> - 0.5.91-1
+- Update to 0.5.91
+
+* Wed Aug 8 2007 Matthias Clasen <mclasen at redhat.com> - 0.5.9-2
+- Update the license field
+
+* Mon Jun 18 2007 Matthias Clasen <mclasen at redhat.com> - 0.5.9-1
+- Update to 0.5.9
+
* Thu Mar 1 2007 Bill Nottingham <notting at redhat.com> - 0.5.4-7
- fix it so the qt pkgconfig/.so aren't in the main poppler-devel
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/poppler/OLPC-2/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources 22 Sep 2006 02:11:32 -0000 1.16
+++ sources 12 Dec 2007 16:44:36 -0000 1.17
@@ -1,2 +1,2 @@
-053fdfd70533ecce1a06353fa945f061 poppler-0.5.4.tar.gz
5c700eb06dda9dafec09cd85225e34d4 poppler-data-0.1.tar.gz
+9aa3247277f56d4ea8c045626531d19b poppler-0.6.2.tar.gz
More information about the fedora-extras-commits
mailing list