rpms/poppler
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to 0.26.2

Browse Source
This commit is contained in:
Marek Kasik 2014-06-27 13:32:34 +02:00
parent 30b06c5e6e
commit f8722c12f4
4 changed files with 7 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -12,3 +12,4 @@
/poppler-0.24.2.tar.xz /poppler-0.24.2.tar.xz
/poppler-0.24.3.tar.xz /poppler-0.24.3.tar.xz
/poppler-0.26.0.tar.xz /poppler-0.26.0.tar.xz
/poppler-0.26.2.tar.xz

27
poppler-0.26.0-multiple-defs.patch
View File

@ -1,27 +0,0 @@
From c859d2b891a115c79d04db14463791dfb1c46a20 Mon Sep 17 00:00:00 2001
From: Carlos Garcia Campos <carlosgc@gnome.org>
Date: Wed, 30 Apr 2014 09:25:31 +0200
Subject: [PATCH] glib: Fix multiple definition of PopplerTextSpan
https://bugs.freedesktop.org/show_bug.cgi?id=78103
---
glib/poppler-structure-element.h | 3 ---
1 file changed, 3 deletions(-)
diff --git a/glib/poppler-structure-element.h b/glib/poppler-structure-element.h
index 4596a41..3848c21 100644
--- a/glib/poppler-structure-element.h
+++ b/glib/poppler-structure-element.h
@@ -250,9 +250,6 @@ typedef enum {
} PopplerStructureTableScope;
-typedef struct _PopplerTextSpan PopplerTextSpan;
-
-
GType poppler_structure_element_get_type (void) G_GNUC_CONST;
PopplerStructureElementKind poppler_structure_element_get_kind (PopplerStructureElement *poppler_structure_element);
gint poppler_structure_element_get_page (PopplerStructureElement *poppler_structure_element);
--
1.9.0

11
poppler.spec
View File

@ -1,15 +1,12 @@
Summary: PDF rendering library Summary: PDF rendering library
Name: poppler Name: poppler
Version: 0.26.0 Version: 0.26.2
Release: 2%{?dist} Release: 1%{?dist}
License: (GPLv2 or GPLv3) and GPLv2+ and LGPLv2+ and MIT License: (GPLv2 or GPLv3) and GPLv2+ and LGPLv2+ and MIT
Group: Development/Libraries Group: Development/Libraries
URL: http://poppler.freedesktop.org/ URL: http://poppler.freedesktop.org/
Source0: http://poppler.freedesktop.org/poppler-%{version}.tar.xz Source0: http://poppler.freedesktop.org/poppler-%{version}.tar.xz
Patch0: poppler-0.26.0-multiple-defs.patch
## upstreamable patches ## upstreamable patches
# fix configure checks for moc versions # fix configure checks for moc versions
Patch50: poppler-0.24.2-mocversiongrep.patch Patch50: poppler-0.24.2-mocversiongrep.patch
@ -146,7 +143,6 @@ Requires: %{name}-glib%{?_isa} = %{version}-%{release}
%prep %prep
%setup -q %setup -q
%patch0 -p1 -b .multiple-defs
%patch50 -p1 -b .mocversiongrep %patch50 -p1 -b .mocversiongrep
@ -282,6 +278,9 @@ test "$(pkg-config --modversion poppler-splash)" = "%{version}"
%changelog %changelog
* Fri Jun 27 2014 Marek Kasik <mkasik@redhat.com> - 0.26.2-1
- Update to 0.26.2
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.26.0-2 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.26.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild

2
sources
View File

@ -1 +1 @@
76c3b2f18002a0f1e2bbbc7cccd1b957 poppler-0.26.0.tar.xz 10dcb979a57c0cbaa72d2d04c6adc32c poppler-0.26.2.tar.xz