From 425cb86ffbac4aa8e6a640c64181900135a5f049 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 28 Apr 2008 22:11:25 +0000 Subject: [PATCH] update patches --- fix-qt4-build.patch | 12 ++++++------ poppler-0.8.0-ocg-crash.patch | 6 +++--- poppler-ObjStream.patch | 12 ++++++------ 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/fix-qt4-build.patch b/fix-qt4-build.patch index dce040e..74daab2 100644 --- a/fix-qt4-build.patch +++ b/fix-qt4-build.patch @@ -1,6 +1,6 @@ -diff -up poppler-0.8.0/poppler-0.8.0/qt4/Makefile.in.fix-qt4-build poppler-0.8.0/poppler-0.8.0/qt4/Makefile.in ---- poppler-0.8.0/poppler-0.8.0/qt4/Makefile.in.fix-qt4-build 2008-02-21 10:29:14.000000000 -0500 -+++ poppler-0.8.0/poppler-0.8.0/qt4/Makefile.in 2008-02-21 10:29:22.000000000 -0500 +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 @@ -223,7 +223,7 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ @@ -10,9 +10,9 @@ diff -up poppler-0.8.0/poppler-0.8.0/qt4/Makefile.in.fix-qt4-build poppler-0.8.0 all: all-recursive .SUFFIXES: -diff -up poppler-0.8.0/poppler-0.8.0/qt4/src/Makefile.in.qt4 poppler-0.8.0/poppler-0.8.0/qt4/src/Makefile.in ---- poppler-0.8.0/poppler-0.8.0/qt4/src/Makefile.in.qt4 2008-02-28 23:28:27.000000000 -0500 -+++ poppler-0.8.0/poppler-0.8.0/qt4/src/Makefile.in 2008-02-28 23:28:46.000000000 -0500 +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 @@ -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 fcb69a4..f788afd 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.0/poppler-0.8.0/poppler/OptionalContent.cc.jx poppler-0.8.0/poppler-0.8.0/poppler/OptionalContent.cc ---- poppler-0.8.0/poppler-0.8.0/poppler/OptionalContent.cc.jx 2008-03-14 20:24:54.000000000 -0400 -+++ poppler-0.8.0/poppler-0.8.0/poppler/OptionalContent.cc 2008-04-06 18:56:06.000000000 -0400 +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 @@ -162,6 +162,8 @@ OptionalContentGroup* OCGs::findOcgByRef { //TODO: make this more efficient diff --git a/poppler-ObjStream.patch b/poppler-ObjStream.patch index 1d4f336..b4e08c6 100644 --- a/poppler-ObjStream.patch +++ b/poppler-ObjStream.patch @@ -1,6 +1,6 @@ -diff -up poppler-0.8.0/poppler-0.8.0/poppler/XRef.h.objstream poppler-0.8.0/poppler-0.8.0/poppler/XRef.h ---- poppler-0.8.0/poppler-0.8.0/poppler/XRef.h.objstream 2008-01-21 21:00:59.000000000 +0100 -+++ poppler-0.8.0/poppler-0.8.0/poppler/XRef.h 2008-02-18 17:18:47.000000000 +0100 +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 @@ -19,7 +19,36 @@ class Dict; class Stream; @@ -47,9 +47,9 @@ diff -up poppler-0.8.0/poppler-0.8.0/poppler/XRef.h.objstream poppler-0.8.0/popp // Write access void setModifiedObject(Object* o, Ref r); -diff -up poppler-0.8.0/poppler-0.8.0/poppler/XRef.cc.objstream poppler-0.8.0/poppler-0.8.0/poppler/XRef.cc ---- poppler-0.8.0/poppler-0.8.0/poppler/XRef.cc.objstream 2008-01-21 21:00:59.000000000 +0100 -+++ poppler-0.8.0/poppler-0.8.0/poppler/XRef.cc 2008-02-18 17:18:47.000000000 +0100 +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 @@ -50,34 +50,9 @@ // ObjectStream //------------------------------------------------------------------------