From a88bb7fb0ff1482a5f6709c26797f2108fe91ae8 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 4 Jun 2008 18:25:50 +0000 Subject: [PATCH] 0.8.3 --- .cvsignore | 2 +- fix-qt4-build.patch | 12 ++++++------ poppler-0.8.0-ocg-crash.patch | 6 +++--- poppler-ObjStream.patch | 12 ++++++------ poppler.spec | 7 ++++--- sources | 2 +- 6 files changed, 21 insertions(+), 20 deletions(-) diff --git a/.cvsignore b/.cvsignore index 775da62..e72758d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -poppler-0.8.1.tar.gz +poppler-0.8.3.tar.gz diff --git a/fix-qt4-build.patch b/fix-qt4-build.patch index 74daab2..3d1859a 100644 --- a/fix-qt4-build.patch +++ b/fix-qt4-build.patch @@ -1,6 +1,6 @@ -diff -up poppler-0.8.1/poppler-0.8.1/qt4/Makefile.in.fix-qt4-build poppler-0.8.1/poppler-0.8.1/qt4/Makefile.in ---- poppler-0.8.1/poppler-0.8.1/qt4/Makefile.in.fix-qt4-build 20.8.12-21 10:29:14.000000000 -0500 -+++ poppler-0.8.1/poppler-0.8.1/qt4/Makefile.in 20.8.12-21 10:29:22.000000000 -0500 +diff -up poppler-0.8.3/poppler-0.8.3/qt4/Makefile.in.fix-qt4-build poppler-0.8.3/poppler-0.8.3/qt4/Makefile.in +--- poppler-0.8.3/poppler-0.8.3/qt4/Makefile.in.fix-qt4-build 20.8.32-21 10:29:14.000000000 -0500 ++++ poppler-0.8.3/poppler-0.8.3/qt4/Makefile.in 20.8.32-21 10:29:22.000000000 -0500 @@ -223,7 +223,7 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ @@ -10,9 +10,9 @@ diff -up poppler-0.8.1/poppler-0.8.1/qt4/Makefile.in.fix-qt4-build poppler-0.8.1 all: all-recursive .SUFFIXES: -diff -up poppler-0.8.1/poppler-0.8.1/qt4/src/Makefile.in.qt4 poppler-0.8.1/poppler-0.8.1/qt4/src/Makefile.in ---- poppler-0.8.1/poppler-0.8.1/qt4/src/Makefile.in.qt4 20.8.12-28 23:28:27.000000000 -0500 -+++ poppler-0.8.1/poppler-0.8.1/qt4/src/Makefile.in 20.8.12-28 23:28:46.000000000 -0500 +diff -up poppler-0.8.3/poppler-0.8.3/qt4/src/Makefile.in.qt4 poppler-0.8.3/poppler-0.8.3/qt4/src/Makefile.in +--- poppler-0.8.3/poppler-0.8.3/qt4/src/Makefile.in.qt4 20.8.32-28 23:28:27.000000000 -0500 ++++ poppler-0.8.3/poppler-0.8.3/qt4/src/Makefile.in 20.8.32-28 23:28:46.000000000 -0500 @@ -635,7 +635,7 @@ SUFFIXES: .moc # This rule lets GNU make create any *.moc from the equivalent *.h diff --git a/poppler-0.8.0-ocg-crash.patch b/poppler-0.8.0-ocg-crash.patch index f788afd..8c990e8 100644 --- a/poppler-0.8.0-ocg-crash.patch +++ b/poppler-0.8.0-ocg-crash.patch @@ -1,6 +1,6 @@ -diff -up poppler-0.8.1/poppler-0.8.1/poppler/OptionalContent.cc.jx poppler-0.8.1/poppler-0.8.1/poppler/OptionalContent.cc ---- poppler-0.8.1/poppler-0.8.1/poppler/OptionalContent.cc.jx 20.8.13-14 20:24:54.000000000 -0400 -+++ poppler-0.8.1/poppler-0.8.1/poppler/OptionalContent.cc 20.8.14-06 18:56:06.000000000 -0400 +diff -up poppler-0.8.3/poppler-0.8.3/poppler/OptionalContent.cc.jx poppler-0.8.3/poppler-0.8.3/poppler/OptionalContent.cc +--- poppler-0.8.3/poppler-0.8.3/poppler/OptionalContent.cc.jx 20.8.33-14 20:24:54.000000000 -0400 ++++ poppler-0.8.3/poppler-0.8.3/poppler/OptionalContent.cc 20.8.34-06 18:56:06.000000000 -0400 @@ -162,6 +162,8 @@ OptionalContentGroup* OCGs::findOcgByRef { //TODO: make this more efficient diff --git a/poppler-ObjStream.patch b/poppler-ObjStream.patch index b4e08c6..cb1a35d 100644 --- a/poppler-ObjStream.patch +++ b/poppler-ObjStream.patch @@ -1,6 +1,6 @@ -diff -up poppler-0.8.1/poppler-0.8.1/poppler/XRef.h.objstream poppler-0.8.1/poppler-0.8.1/poppler/XRef.h ---- poppler-0.8.1/poppler-0.8.1/poppler/XRef.h.objstream 20.8.11-21 21:00:59.000000000 +0100 -+++ poppler-0.8.1/poppler-0.8.1/poppler/XRef.h 20.8.12-18 17:18:47.000000000 +0100 +diff -up poppler-0.8.3/poppler-0.8.3/poppler/XRef.h.objstream poppler-0.8.3/poppler-0.8.3/poppler/XRef.h +--- poppler-0.8.3/poppler-0.8.3/poppler/XRef.h.objstream 20.8.31-21 21:00:59.000000000 +0100 ++++ poppler-0.8.3/poppler-0.8.3/poppler/XRef.h 20.8.32-18 17:18:47.000000000 +0100 @@ -19,7 +19,36 @@ class Dict; class Stream; @@ -47,9 +47,9 @@ diff -up poppler-0.8.1/poppler-0.8.1/poppler/XRef.h.objstream poppler-0.8.1/popp // Write access void setModifiedObject(Object* o, Ref r); -diff -up poppler-0.8.1/poppler-0.8.1/poppler/XRef.cc.objstream poppler-0.8.1/poppler-0.8.1/poppler/XRef.cc ---- poppler-0.8.1/poppler-0.8.1/poppler/XRef.cc.objstream 20.8.11-21 21:00:59.000000000 +0100 -+++ poppler-0.8.1/poppler-0.8.1/poppler/XRef.cc 20.8.12-18 17:18:47.000000000 +0100 +diff -up poppler-0.8.3/poppler-0.8.3/poppler/XRef.cc.objstream poppler-0.8.3/poppler-0.8.3/poppler/XRef.cc +--- poppler-0.8.3/poppler-0.8.3/poppler/XRef.cc.objstream 20.8.31-21 21:00:59.000000000 +0100 ++++ poppler-0.8.3/poppler-0.8.3/poppler/XRef.cc 20.8.32-18 17:18:47.000000000 +0100 @@ -50,34 +50,9 @@ // ObjectStream //------------------------------------------------------------------------ diff --git a/poppler.spec b/poppler.spec index 78abc0b..07dd449 100644 --- a/poppler.spec +++ b/poppler.spec @@ -2,7 +2,7 @@ Summary: PDF rendering library Name: poppler -Version: 0.8.1 +Version: 0.8.3 Release: 1%{?dist} License: GPLv2 and Redistributable, no modification permitted # the code is GPLv2 @@ -13,7 +13,6 @@ Source0: http://poppler.freedesktop.org/poppler-%{version}.tar.gz Source1: http://poppler.freedesktop.org/poppler-data-%{dataversion}.tar.gz Patch0: poppler-ObjStream.patch Patch1: fix-qt4-build.patch -Patch2: poppler-0.8.0-ocg-crash.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: gtk2-devel @@ -114,7 +113,6 @@ converting PDF files to a number of other formats. %setup -c -q -a1 %patch0 -p1 -b .objstream %patch1 -p1 -b .fix-qt4-build -%patch2 -p1 -b .ocg %build pushd %{name}-%{version} @@ -201,6 +199,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/* %changelog +* Wed Jun 4 2008 Matthias Clasen - 0.8.3-1 +- Update to 0.8.3 + * Mon Apr 28 2008 Matthias Clasen - 0.8.1-1 - Update to 0.8.1 diff --git a/sources b/sources index fd20880..6c68553 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -5a01efb00338e3e0375fd4159cdb96bf poppler-0.8.1.tar.gz +d5631bdbde9dda89ff20796005ece4d4 poppler-0.8.3.tar.gz b7f98e84a4d2a2c794271d746ec7ee0b poppler-data-0.2.0.tar.gz