[poppler] Use correct format string
mkasik
mkasik at fedoraproject.org
Fri Jan 3 13:27:09 UTC 2014
commit bd63cda573407e63183e9df2fc985992d9396a18
Author: Marek Kasik <mkasik at redhat.com>
Date: Fri Jan 3 14:26:03 2014 +0100
Use correct format string
Resolves: #1048202
poppler-0.24.3-segExtraBytes.patch | 26 ++++++++++++++++++++++++++
poppler.spec | 9 ++++++++-
2 files changed, 34 insertions(+), 1 deletions(-)
---
diff --git a/poppler-0.24.3-segExtraBytes.patch b/poppler-0.24.3-segExtraBytes.patch
new file mode 100644
index 0000000..6a4fb3a
--- /dev/null
+++ b/poppler-0.24.3-segExtraBytes.patch
@@ -0,0 +1,26 @@
+From 58e04a08afee39370283c494ee2e4e392fd3b684 Mon Sep 17 00:00:00 2001
+From: Fabio D'Urso <fabiodurso at hotmail.it>
+Date: Sat, 7 Dec 2013 16:33:09 +0000
+Subject: [PATCH] segExtraBytes is a goffset not an int so use lld
+
+Fixes KDE bug #328511
+---
+ poppler/JBIG2Stream.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/poppler/JBIG2Stream.cc b/poppler/JBIG2Stream.cc
+index 12de50e..dbc7bdc 100644
+--- a/poppler/JBIG2Stream.cc
++++ b/poppler/JBIG2Stream.cc
+@@ -1495,7 +1495,7 @@ void JBIG2Stream::readSegments() {
+ // arithmetic-coded symbol dictionary segments when numNewSyms
+ // == 0. Segments like this often occur for blank pages.
+
+- error(errSyntaxError, curStr->getPos(), "{0:d} extraneous byte{1:s} after segment",
++ error(errSyntaxError, curStr->getPos(), "{0:lld} extraneous byte{1:s} after segment",
+ segExtraBytes, (segExtraBytes > 1) ? "s" : "");
+
+ // Burn through the remaining bytes -- inefficient, but
+--
+1.8.4.2
+
diff --git a/poppler.spec b/poppler.spec
index 5cbf0b4..9944591 100644
--- a/poppler.spec
+++ b/poppler.spec
@@ -2,12 +2,14 @@
Summary: PDF rendering library
Name: poppler
Version: 0.24.3
-Release: 2%{?dist}
+Release: 3%{?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.xz
+Patch0: poppler-0.24.3-segExtraBytes.patch
+
## upstreamable patches
# fix configure checks for moc versions
Patch50: poppler-0.24.2-mocversiongrep.patch
@@ -145,6 +147,7 @@ Requires: %{name}-glib%{?_isa} = %{version}-%{release}
%prep
%setup -q
+%patch0 -p1 -b .segExtraBytes
%patch50 -p1 -b .mocversiongrep
# hammer to nuke rpaths, recheck on new releases
@@ -279,6 +282,10 @@ test "$(pkg-config --modversion poppler-splash)" = "%{version}"
%changelog
+* Fri Jan 3 2014 Marek Kasik <mkasik at redhat.com> - 0.24.3-3
+- Use correct format string
+- Resolves: #1048202
+
* Mon Nov 11 2013 Rex Dieter <rdieter at fedoraproject.org> 0.24.3-2
- rebuild (qt5 qreal/arm)
More information about the scm-commits
mailing list