Remove unused patch

This commit is contained in:
Marek Kasik 2012-10-31 16:18:31 +01:00
parent afdf6dfece
commit 6f072c2af7
2 changed files with 4 additions and 20 deletions

View File

@ -1,14 +0,0 @@
--- poppler-0.12.4/poppler/Annot.cc 2010-01-17 01:06:58.000000000 +0100
+++ poppler-0.12.4/poppler/Annot.cc 2010-03-04 12:50:56.000000000 +0100
@@ -3173,7 +3173,10 @@ void AnnotWidget::generateFieldAppearanc
obj1.free();
// get the default appearance string
- if (Form::fieldLookup(field, "DA", &obj1)->isNull()) {
+ if (Form::fieldLookup(annot, "DA", &obj1)->isNull()) {
+ obj1.free();
+ }
+ if (!obj1.isString() && Form::fieldLookup(field, "DA", &obj1)->isNull()) {
obj1.free();
acroForm->lookup("DA", &obj1);
}

View File

@ -2,16 +2,12 @@
Summary: PDF rendering library
Name: poppler
Version: 0.20.2
Release: 4%{?dist}
Release: 5%{?dist}
License: (GPLv2 or GPLv3) and GPLv2+ and LGPLv2+ and MIT
Group: Development/Libraries
URL: http://poppler.freedesktop.org/
Source0: http://poppler.freedesktop.org/poppler-%{version}.tar.gz
## upstreamable patches
# http://bugzilla.redhat.com/show_bug.cgi?id=480868
Patch1: poppler-0.12.4-annot-appearance.patch
## backported patches
# http://bugzilla.redhat.com/show_bug.cgi?id=845578
# https://bugs.freedesktop.org/show_bug.cgi?id=3498
@ -130,7 +126,6 @@ converting PDF files to a number of other formats.
%prep
%setup -q
#patch1 -p1 -b .annot
%patch2 -p1 -b .empty-password
%patch3 -p1 -b .scale-init
%patch4 -p1 -b .ps-conversion
@ -254,6 +249,9 @@ test "$(pkg-config --modversion poppler-splash)" = "%{version}"
%changelog
* Wed Oct 31 2012 Marek Kasik <mkasik@redhat.com> 0.20.2-5
- Remove unused patch
* Wed Oct 31 2012 Marek Kasik <mkasik@redhat.com> 0.20.2-4
- Update License field