Use correct format string

Resolves: #1048202
This commit is contained in:
Marek Kasik 2014-01-03 14:26:03 +01:00
parent 744a3c3d15
commit bd63cda573
2 changed files with 34 additions and 1 deletions

View File

@ -0,0 +1,26 @@
From 58e04a08afee39370283c494ee2e4e392fd3b684 Mon Sep 17 00:00:00 2001
From: Fabio D'Urso <fabiodurso@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

View File

@ -2,12 +2,14 @@
Summary: PDF rendering library Summary: PDF rendering library
Name: poppler Name: poppler
Version: 0.24.3 Version: 0.24.3
Release: 2%{?dist} Release: 3%{?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.24.3-segExtraBytes.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
@ -145,6 +147,7 @@ Requires: %{name}-glib%{?_isa} = %{version}-%{release}
%prep %prep
%setup -q %setup -q
%patch0 -p1 -b .segExtraBytes
%patch50 -p1 -b .mocversiongrep %patch50 -p1 -b .mocversiongrep
# hammer to nuke rpaths, recheck on new releases # hammer to nuke rpaths, recheck on new releases
@ -279,6 +282,10 @@ test "$(pkg-config --modversion poppler-splash)" = "%{version}"
%changelog %changelog
* Fri Jan 3 2014 Marek Kasik <mkasik@redhat.com> - 0.24.3-3
- Use correct format string
- Resolves: #1048202
* Mon Nov 11 2013 Rex Dieter <rdieter@fedoraproject.org> 0.24.3-2 * Mon Nov 11 2013 Rex Dieter <rdieter@fedoraproject.org> 0.24.3-2
- rebuild (qt5 qreal/arm) - rebuild (qt5 qreal/arm)