Hello community,
here is the log from the commit of package poppler for openSUSE:Factory checked
in at 2014-08-06 15:31:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/poppler (Old)
and /work/SRC/openSUSE:Factory/.poppler.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "poppler"
Changes:
--------
--- /work/SRC/openSUSE:Factory/poppler/poppler-qt.changes 2014-07-21
21:39:01.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.poppler.new/poppler-qt.changes 2014-08-06
15:31:43.000000000 +0200
@@ -1,0 +2,16 @@
+Mon Aug 4 18:02:42 UTC 2014 - zai...@opensuse.org
+
+- Update to version 0.26.3:
+ + qt5:
+ - autoconf: Improve moc-qt5 detection.
+ - Fix compilation with MinGW.
+ + glib:
+ - Fix typo in api docs.
+ - Use C90-style comments in public headers.
+ + core: Error out instead of exiting if allInter grows too much
+ (fdo#78714).
+ + qt4: Update required version to Qt 4.7.0.
+ + build system: Include stdio.h from poppler-config.h.
+ + misc: Update .gitignore files.
+
+-------------------------------------------------------------------
poppler-qt5.changes: same change
poppler.changes: same change
Old:
----
poppler-0.26.2.tar.xz
New:
----
poppler-0.26.3.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ poppler-qt.spec ++++++
--- /var/tmp/diff_new_pack.M8VGzb/_old 2014-08-06 15:31:45.000000000 +0200
+++ /var/tmp/diff_new_pack.M8VGzb/_new 2014-08-06 15:31:45.000000000 +0200
@@ -21,7 +21,7 @@
Name: poppler-qt
%define _name poppler
-Version: 0.26.2
+Version: 0.26.3
Release: 0
# Actual version of poppler-data:
%define poppler_data_version 0.4.6
@@ -42,7 +42,7 @@
BuildRequires: libjpeg-devel
BuildRequires: libtiff-devel
%if %build_qt
-BuildRequires: libqt4-devel
+BuildRequires: libqt4-devel >= 4.7.0
%endif
%if %build_qt5
BuildRequires: pkgconfig(Qt5Core)
poppler-qt5.spec: same change
++++++ poppler.spec ++++++
--- /var/tmp/diff_new_pack.M8VGzb/_old 2014-08-06 15:31:45.000000000 +0200
+++ /var/tmp/diff_new_pack.M8VGzb/_new 2014-08-06 15:31:45.000000000 +0200
@@ -21,7 +21,7 @@
Name: poppler
%define _name poppler
-Version: 0.26.2
+Version: 0.26.3
Release: 0
# Actual version of poppler-data:
%define poppler_data_version 0.4.6
@@ -42,7 +42,7 @@
BuildRequires: libjpeg-devel
BuildRequires: libtiff-devel
%if %build_qt
-BuildRequires: libqt4-devel
+BuildRequires: libqt4-devel >= 4.7.0
%endif
%if %build_qt5
BuildRequires: pkgconfig(Qt5Core)
++++++ poppler-0.26.2.tar.xz -> poppler-0.26.3.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/poppler-0.26.2/CMakeLists.txt
new/poppler-0.26.3/CMakeLists.txt
--- old/poppler-0.26.2/CMakeLists.txt 2014-06-19 19:58:41.000000000 +0200
+++ new/poppler-0.26.3/CMakeLists.txt 2014-07-20 18:18:52.000000000 +0200
@@ -18,7 +18,7 @@
set(POPPLER_MAJOR_VERSION "0")
set(POPPLER_MINOR_VERSION "26")
-set(POPPLER_MICRO_VERSION "2")
+set(POPPLER_MICRO_VERSION "3")
set(POPPLER_VERSION
"${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}")
# command line switches
@@ -86,7 +86,7 @@
set(TEXTOUT_WORD_LIST ON)
# setting the minimum required versions for some components
-set(QT4_MIN_VERSION "4.4.0")
+set(QT4_MIN_VERSION "4.7.0")
set(CAIRO_VERSION "1.10.0")
set(GLIB_REQUIRED "2.18")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/poppler-0.26.2/ChangeLog new/poppler-0.26.3/ChangeLog
--- old/poppler-0.26.2/ChangeLog 2014-06-19 20:09:42.000000000 +0200
+++ new/poppler-0.26.3/ChangeLog 2014-07-20 18:31:46.000000000 +0200
@@ -1,3 +1,227 @@
+commit 87d12c09281e3d12cda0fadcd65ab78928dff283
+Author: Albert Astals Cid <aa...@kde.org>
+Date: Sun Jul 20 18:20:57 2014 +0200
+
+ 0.26.3
+
+ CMakeLists.txt | 2 +-
+ configure.ac | 2 +-
+ cpp/Doxyfile | 2 +-
+ qt4/src/Doxyfile | 2 +-
+ qt5/src/Doxyfile | 2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+
+commit 69e5b81640c9bb31f0876fa8eb7ba28dbf38923f
+Author: Albert Astals Cid <aa...@kde.org>
+Date: Sun Jul 20 18:18:29 2014 +0200
+
+ News for 0.26.3
+
+ NEWS | 21 +++++++++++++++++++++
+ 1 file changed, 21 insertions(+)
+
+commit c368c0714d57c089057d974908295d850a1b5108
+Author: Albert Astals Cid <aa...@kde.org>
+Date: Sun Jul 20 18:15:22 2014 +0200
+
+ Update Thomas' (C)
+
+ splash/SplashXPathScanner.cc | 2 +-
+ splash/SplashXPathScanner.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 639179318c43a907a27e86778b720d33d481a9f9
+Author: Pino Toscano <p...@kde.org>
+Date: Thu Jul 17 07:33:10 2014 +0200
+
+ glib: use C90-style comments in public headers
+
+ glib/poppler-media.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 1161e728de9ca7c9a5fb0e24c4a5e4a79c65a849
+Author: Thomas Freitag <thomas.frei...@alfa.de>
+Date: Sat Jul 12 17:04:42 2014 +0200
+
+ Error out instead of exiting if allInter grows too much
+
+ Bug #78714
+
+ splash/SplashXPathScanner.cc | 25 +++++++++++++++++--------
+ splash/SplashXPathScanner.h | 2 +-
+ 2 files changed, 18 insertions(+), 9 deletions(-)
+
+commit e82a24a585d251f767725f61700dc1f8fe169a52
+Author: Pino Toscano <p...@kde.org>
+Date: Sat Jul 12 08:35:45 2014 +0200
+
+ cmake: sync poppler-config.h.cmake with poppler-config.h.in
+
+ poppler/poppler-config.h.cmake | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+commit a5ad55b7cb9dc4e62754954291e4ecb8e05b5d67
+Author: Albert Astals Cid <aa...@kde.org>
+Date: Fri Jul 11 00:32:07 2014 +0200
+
+ Add Hib's (C)
+
+ poppler/poppler-config.h.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 4f4ee736075d5b1d1bf4911a26c2f80a7122fe04
+Author: Aki Koskinen <freedesk...@akikoskinen.info>
+Date: Fri Jul 11 00:30:52 2014 +0200
+
+ Fix compilation of Qt5 frontend with MinGW
+
+ qt5/src/poppler-private.h | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+commit ddd91675792d9d496b06223867e05d2a190b878b
+Author: Hib Eris <h...@hiberis.nl>
+Date: Thu May 29 16:58:55 2014 +0200
+
+ Include stdio.h from poppler-config.h
+
+ In poppler-config.h there is a check for __MINGW_PRINTF_FORMAT,
+ which is set by stdio.h.
+
+ This fixes this warning when compling with the mingw-w64-compiler:
+
+ XRef.cc: In member function 'virtual void
+ XRef::XRefTableWriter::writeEntry(Goffset, int, XRefEntryType)':
+ XRef.cc:1460:94: warning: unknown conversion type character 'l'
+ in format [-Wformat=]
+ outStr->printf("%010lli %05i %c\r\n", (long long)offset, gen,
+ (type==xrefEntryFree)?'f':'n');
+ ^
+ XRef.cc:1460:94: warning: format '%i' expects argument of type 'int',
+ but argument 3 has type 'Goffset {aka long long int}' [-Wformat=]
+ XRef.cc:1460:94: warning: too many arguments for format
+ [-Wformat-extra-args]
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=79762
+
+ poppler/poppler-config.h.in | 2 ++
+ 1 file changed, 2 insertions(+)
+
+commit 47a947f1dc664793a7037888a46a297a46c79d6c
+Author: Hib Eris <h...@hiberis.nl>
+Date: Thu Jun 19 10:11:21 2014 +0200
+
+ Fix moc-qt5 detection
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=80250
+
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit aa6205d195c56a77e897bad125bf213aba138422
+Author: Jason Crain <ja...@aquaticape.us>
+Date: Mon Jul 7 23:52:39 2014 -0500
+
+ Increase required Qt4 version to 4.7.0
+
+ We use Qt::LayoutDirectionAuto, introduced in 4.7.0.
+
+ bug #81005
+
+ CMakeLists.txt | 2 +-
+ configure.ac | 8 ++++----
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+commit e5862155b1c549b6774bb4f25c09c45857ff1734
+Author: Hib Eris <h...@hiberis.nl>
+Date: Wed Jun 4 20:58:56 2014 +0200
+
+ Add Changelog to .gitignore
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=79744
+
+ .gitignore | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 5f22649694d64c4170db82847b599576d5377176
+Author: Hib Eris <h...@hiberis.nl>
+Date: Wed Jun 4 20:56:23 2014 +0200
+
+ Add *.gir, *.typelib to glib/.gitignore
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=79744
+
+ glib/.gitignore | 2 ++
+ 1 file changed, 2 insertions(+)
+
+commit b63f57985719c7884b67f46fc4afd4954c44c5ab
+Author: Hib Eris <h...@hiberis.nl>
+Date: Wed Jun 4 20:54:30 2014 +0200
+
+ Add poppler-undeclared.txt to .gitignore
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=79744
+
+ glib/reference/.gitignore | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 5e0f4e2516d5a3997ea9c9a9927e24d4f3abe136
+Author: Hib Eris <h...@hiberis.nl>
+Date: Wed Jun 4 20:52:15 2014 +0200
+
+ Add poppler-forms, stress-threads-qt, test-render-to-file to
+ .gitignore
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=79744
+
+ qt4/tests/.gitignore | 3 +++
+ qt5/tests/.gitignore | 3 +++
+ 2 files changed, 6 insertions(+)
+
+commit 4d2400e7bb8ae9208030b9615dda7c53e571be8b
+Author: Hib Eris <h...@hiberis.nl>
+Date: Wed Jun 4 10:09:16 2014 +0200
+
+ Add test-driver to .gitignore
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=79744
+
+ .gitignore | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 4c35e0213be26f21b628ff8d9f170252bb0106c9
+Author: Hib Eris <h...@hiberis.nl>
+Date: Wed Jun 4 10:06:20 2014 +0200
+
+ Add poppler-qt5.pc to .gitignore
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=79744
+
+ .gitignore | 2 ++
+ 1 file changed, 2 insertions(+)
+
+commit 2b455b85168d5c9d8641d9a91bfde81ccab18e54
+Author: Pino Toscano <p...@kde.org>
+Date: Sun Jul 6 11:13:54 2014 +0200
+
+ glib: fix typo in apidox
+
+ glib/poppler.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 266a61ab1c9f536a4fb7d68c8f285c854eb2d6e9
+Author: Albert Astals Cid <aa...@kde.org>
+Date: Thu Jun 19 20:16:19 2014 +0200
+
+ 0.26.2
+
+ CMakeLists.txt | 2 +-
+ NEWS | 10 ++++++++++
+ configure.ac | 2 +-
+ cpp/Doxyfile | 2 +-
+ qt4/src/Doxyfile | 2 +-
+ qt5/src/Doxyfile | 2 +-
+ 6 files changed, 15 insertions(+), 5 deletions(-)
+
commit 3381ee20efca2ce27733182d0d6720c1e6936a7f
Author: Albert Astals Cid <aa...@kde.org>
Date: Thu Jun 19 19:57:31 2014 +0200
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/poppler-0.26.2/NEWS new/poppler-0.26.3/NEWS
--- old/poppler-0.26.2/NEWS 2014-06-19 19:58:24.000000000 +0200
+++ new/poppler-0.26.3/NEWS 2014-07-20 18:18:23.000000000 +0200
@@ -1,3 +1,24 @@
+Release 0.26.3
+ qt5:
+ * autoconf: Improve moc-qt5 detection
+ * Fix compilation with MinGW
+
+ glib:
+ * Fix typo in api docs
+ * use C90-style comments in public headers
+
+ core:
+ * Error out instead of exiting if allInter grows too much. Bug #78714
+
+ qt4:
+ * Update required version to Qt 4.7.0
+
+ build system:
+ * Include stdio.h from poppler-config.h
+
+ misc:
+ * Update .gitignore files
+
Release 0.26.2
core:
* Make sure we have an xref before using. KDE Bug #335413
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/poppler-0.26.2/configure new/poppler-0.26.3/configure
--- old/poppler-0.26.2/configure 2014-06-19 19:59:53.000000000 +0200
+++ new/poppler-0.26.3/configure 2014-07-20 18:22:03.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for poppler 0.26.2.
+# Generated by GNU Autoconf 2.69 for poppler 0.26.3.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=poppler>.
#
@@ -591,8 +591,8 @@
# Identity of this package.
PACKAGE_NAME='poppler'
PACKAGE_TARNAME='poppler'
-PACKAGE_VERSION='0.26.2'
-PACKAGE_STRING='poppler 0.26.2'
+PACKAGE_VERSION='0.26.3'
+PACKAGE_STRING='poppler 0.26.3'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=poppler'
PACKAGE_URL=''
@@ -1528,7 +1528,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures poppler 0.26.2 to adapt to many kinds of systems.
+\`configure' configures poppler 0.26.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1602,7 +1602,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of poppler 0.26.2:";;
+ short | recursive ) echo "Configuration of poppler 0.26.3:";;
esac
cat <<\_ACEOF
@@ -1815,7 +1815,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-poppler configure 0.26.2
+poppler configure 0.26.3
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2509,7 +2509,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by poppler $as_me 0.26.2, which was
+It was created by poppler $as_me 0.26.3, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3373,7 +3373,7 @@
# Define the identity of the package.
PACKAGE='poppler'
- VERSION='0.26.2'
+ VERSION='0.26.3'
cat >>confdefs.h <<_ACEOF
@@ -17836,7 +17836,7 @@
cat >>confdefs.h <<_ACEOF
-#define POPPLER_VERSION "0.26.2"
+#define POPPLER_VERSION "0.26.3"
_ACEOF
@@ -22348,12 +22348,12 @@
pkg_cv_POPPLER_QT4_CFLAGS="$POPPLER_QT4_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"QtCore >= 4.4.0 QtGui >= 4.4.0 QtXml >= 4.4.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "QtCore >= 4.4.0 QtGui >= 4.4.0 QtXml
>= 4.4.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"QtCore >= 4.7.0 QtGui >= 4.7.0 QtXml >= 4.7.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "QtCore >= 4.7.0 QtGui >= 4.7.0 QtXml
>= 4.7.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_POPPLER_QT4_CFLAGS=`$PKG_CONFIG --cflags "QtCore >= 4.4.0 QtGui >=
4.4.0 QtXml >= 4.4.0" 2>/dev/null`
+ pkg_cv_POPPLER_QT4_CFLAGS=`$PKG_CONFIG --cflags "QtCore >= 4.7.0 QtGui >=
4.7.0 QtXml >= 4.7.0" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -22365,12 +22365,12 @@
pkg_cv_POPPLER_QT4_LIBS="$POPPLER_QT4_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"QtCore >= 4.4.0 QtGui >= 4.4.0 QtXml >= 4.4.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "QtCore >= 4.4.0 QtGui >= 4.4.0 QtXml
>= 4.4.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"QtCore >= 4.7.0 QtGui >= 4.7.0 QtXml >= 4.7.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "QtCore >= 4.7.0 QtGui >= 4.7.0 QtXml
>= 4.7.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_POPPLER_QT4_LIBS=`$PKG_CONFIG --libs "QtCore >= 4.4.0 QtGui >= 4.4.0
QtXml >= 4.4.0" 2>/dev/null`
+ pkg_cv_POPPLER_QT4_LIBS=`$PKG_CONFIG --libs "QtCore >= 4.7.0 QtGui >= 4.7.0
QtXml >= 4.7.0" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -22391,14 +22391,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- POPPLER_QT4_PKG_ERRORS=`$PKG_CONFIG --short-errors
--print-errors --cflags --libs "QtCore >= 4.4.0 QtGui >= 4.4.0 QtXml >= 4.4.0"
2>&1`
+ POPPLER_QT4_PKG_ERRORS=`$PKG_CONFIG --short-errors
--print-errors --cflags --libs "QtCore >= 4.7.0 QtGui >= 4.7.0 QtXml >= 4.7.0"
2>&1`
else
- POPPLER_QT4_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags
--libs "QtCore >= 4.4.0 QtGui >= 4.4.0 QtXml >= 4.4.0" 2>&1`
+ POPPLER_QT4_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags
--libs "QtCore >= 4.7.0 QtGui >= 4.7.0 QtXml >= 4.7.0" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$POPPLER_QT4_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (QtCore >= 4.4.0 QtGui >= 4.4.0
QtXml >= 4.4.0) were not met:
+ as_fn_error $? "Package requirements (QtCore >= 4.7.0 QtGui >= 4.7.0
QtXml >= 4.7.0) were not met:
$POPPLER_QT4_PKG_ERRORS
@@ -22439,12 +22439,12 @@
pkg_cv_POPPLER_QT4_TEST_CFLAGS="$POPPLER_QT4_TEST_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"QtTest >= 4.4.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "QtTest >= 4.4.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"QtTest >= 4.7.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "QtTest >= 4.7.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_POPPLER_QT4_TEST_CFLAGS=`$PKG_CONFIG --cflags "QtTest >= 4.4.0"
2>/dev/null`
+ pkg_cv_POPPLER_QT4_TEST_CFLAGS=`$PKG_CONFIG --cflags "QtTest >= 4.7.0"
2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -22456,12 +22456,12 @@
pkg_cv_POPPLER_QT4_TEST_LIBS="$POPPLER_QT4_TEST_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"QtTest >= 4.4.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "QtTest >= 4.4.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"QtTest >= 4.7.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "QtTest >= 4.7.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_POPPLER_QT4_TEST_LIBS=`$PKG_CONFIG --libs "QtTest >= 4.4.0"
2>/dev/null`
+ pkg_cv_POPPLER_QT4_TEST_LIBS=`$PKG_CONFIG --libs "QtTest >= 4.7.0"
2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -22482,14 +22482,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- POPPLER_QT4_TEST_PKG_ERRORS=`$PKG_CONFIG --short-errors
--print-errors --cflags --libs "QtTest >= 4.4.0" 2>&1`
+ POPPLER_QT4_TEST_PKG_ERRORS=`$PKG_CONFIG --short-errors
--print-errors --cflags --libs "QtTest >= 4.7.0" 2>&1`
else
- POPPLER_QT4_TEST_PKG_ERRORS=`$PKG_CONFIG --print-errors
--cflags --libs "QtTest >= 4.4.0" 2>&1`
+ POPPLER_QT4_TEST_PKG_ERRORS=`$PKG_CONFIG --print-errors
--cflags --libs "QtTest >= 4.7.0" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$POPPLER_QT4_TEST_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (QtTest >= 4.4.0) were not met:
+ as_fn_error $? "Package requirements (QtTest >= 4.7.0) were not met:
$POPPLER_QT4_TEST_PKG_ERRORS
@@ -22531,12 +22531,12 @@
pkg_cv_POPPLER_QT4_CFLAGS="$POPPLER_QT4_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"QtCore >= 4.4.0 QtGui >= 4.4.0 QtXml >= 4.4.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "QtCore >= 4.4.0 QtGui >= 4.4.0 QtXml
>= 4.4.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"QtCore >= 4.7.0 QtGui >= 4.7.0 QtXml >= 4.7.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "QtCore >= 4.7.0 QtGui >= 4.7.0 QtXml
>= 4.7.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_POPPLER_QT4_CFLAGS=`$PKG_CONFIG --cflags "QtCore >= 4.4.0 QtGui >=
4.4.0 QtXml >= 4.4.0" 2>/dev/null`
+ pkg_cv_POPPLER_QT4_CFLAGS=`$PKG_CONFIG --cflags "QtCore >= 4.7.0 QtGui >=
4.7.0 QtXml >= 4.7.0" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -22548,12 +22548,12 @@
pkg_cv_POPPLER_QT4_LIBS="$POPPLER_QT4_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"QtCore >= 4.4.0 QtGui >= 4.4.0 QtXml >= 4.4.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "QtCore >= 4.4.0 QtGui >= 4.4.0 QtXml
>= 4.4.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"QtCore >= 4.7.0 QtGui >= 4.7.0 QtXml >= 4.7.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "QtCore >= 4.7.0 QtGui >= 4.7.0 QtXml
>= 4.7.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_POPPLER_QT4_LIBS=`$PKG_CONFIG --libs "QtCore >= 4.4.0 QtGui >= 4.4.0
QtXml >= 4.4.0" 2>/dev/null`
+ pkg_cv_POPPLER_QT4_LIBS=`$PKG_CONFIG --libs "QtCore >= 4.7.0 QtGui >= 4.7.0
QtXml >= 4.7.0" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -22574,9 +22574,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- POPPLER_QT4_PKG_ERRORS=`$PKG_CONFIG --short-errors
--print-errors --cflags --libs "QtCore >= 4.4.0 QtGui >= 4.4.0 QtXml >= 4.4.0"
2>&1`
+ POPPLER_QT4_PKG_ERRORS=`$PKG_CONFIG --short-errors
--print-errors --cflags --libs "QtCore >= 4.7.0 QtGui >= 4.7.0 QtXml >= 4.7.0"
2>&1`
else
- POPPLER_QT4_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags
--libs "QtCore >= 4.4.0 QtGui >= 4.4.0 QtXml >= 4.4.0" 2>&1`
+ POPPLER_QT4_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags
--libs "QtCore >= 4.7.0 QtGui >= 4.7.0 QtXml >= 4.7.0" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$POPPLER_QT4_PKG_ERRORS" >&5
@@ -22603,12 +22603,12 @@
pkg_cv_POPPLER_QT4_TEST_CFLAGS="$POPPLER_QT4_TEST_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"QtTest >= 4.4.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "QtTest >= 4.4.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"QtTest >= 4.7.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "QtTest >= 4.7.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_POPPLER_QT4_TEST_CFLAGS=`$PKG_CONFIG --cflags "QtTest >= 4.4.0"
2>/dev/null`
+ pkg_cv_POPPLER_QT4_TEST_CFLAGS=`$PKG_CONFIG --cflags "QtTest >= 4.7.0"
2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -22620,12 +22620,12 @@
pkg_cv_POPPLER_QT4_TEST_LIBS="$POPPLER_QT4_TEST_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"QtTest >= 4.4.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "QtTest >= 4.4.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"QtTest >= 4.7.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "QtTest >= 4.7.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_POPPLER_QT4_TEST_LIBS=`$PKG_CONFIG --libs "QtTest >= 4.4.0"
2>/dev/null`
+ pkg_cv_POPPLER_QT4_TEST_LIBS=`$PKG_CONFIG --libs "QtTest >= 4.7.0"
2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -22646,9 +22646,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- POPPLER_QT4_TEST_PKG_ERRORS=`$PKG_CONFIG --short-errors
--print-errors --cflags --libs "QtTest >= 4.4.0" 2>&1`
+ POPPLER_QT4_TEST_PKG_ERRORS=`$PKG_CONFIG --short-errors
--print-errors --cflags --libs "QtTest >= 4.7.0" 2>&1`
else
- POPPLER_QT4_TEST_PKG_ERRORS=`$PKG_CONFIG --print-errors
--cflags --libs "QtTest >= 4.4.0" 2>&1`
+ POPPLER_QT4_TEST_PKG_ERRORS=`$PKG_CONFIG --print-errors
--cflags --libs "QtTest >= 4.7.0" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$POPPLER_QT4_TEST_PKG_ERRORS" >&5
@@ -23429,7 +23429,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Qt5 moc-qt5" >&5
$as_echo_n "checking for Qt5 moc-qt5... " >&6; }
mocversion=`$MOCQT52 -v 2>&1`
- mocversiongrep=`echo $mocversion | grep "Qt 5\|moc 5"`
+ mocversiongrep=`echo $mocversion | grep "Qt 5\|moc-qt5 5\|moc 5"`
if test x"$mocversiongrep" != x"$mocversion"; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}qtchooser", so it can be a
program name with args.
@@ -25002,9 +25002,9 @@
POPPLER_MINOR_VERSION=26
-POPPLER_MICRO_VERSION=2
+POPPLER_MICRO_VERSION=3
-POPPLER_VERSION=0.26.2
+POPPLER_VERSION=0.26.3
ac_config_files="$ac_config_files Makefile goo/Makefile fofi/Makefile
splash/Makefile poppler/Makefile utils/Makefile glib/Makefile
glib/poppler-features.h glib/reference/Makefile glib/reference/version.xml
glib/demo/Makefile test/Makefile qt4/Makefile qt4/src/Makefile
qt4/tests/Makefile qt4/demos/Makefile qt5/Makefile qt5/src/Makefile
qt5/tests/Makefile qt5/demos/Makefile cpp/Makefile cpp/poppler-version.h
cpp/tests/Makefile poppler.pc poppler-uninstalled.pc poppler-cairo.pc
poppler-cairo-uninstalled.pc poppler-splash.pc poppler-splash-uninstalled.pc
poppler-glib.pc poppler-glib-uninstalled.pc poppler-qt4.pc
poppler-qt4-uninstalled.pc poppler-qt5.pc poppler-qt5-uninstalled.pc
poppler-cpp.pc poppler-cpp-uninstalled.pc"
@@ -25656,7 +25656,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by poppler $as_me 0.26.2, which was
+This file was extended by poppler $as_me 0.26.3, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -25722,7 +25722,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-poppler config.status 0.26.2
+poppler config.status 0.26.3
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/poppler-0.26.2/configure.ac
new/poppler-0.26.3/configure.ac
--- old/poppler-0.26.2/configure.ac 2014-06-19 19:58:36.000000000 +0200
+++ new/poppler-0.26.3/configure.ac 2014-07-20 18:18:46.000000000 +0200
@@ -1,6 +1,6 @@
m4_define([poppler_version_major],[0])
m4_define([poppler_version_minor],[26])
-m4_define([poppler_version_micro],[2])
+m4_define([poppler_version_micro],[3])
m4_define([poppler_version],[poppler_version_major.poppler_version_minor.poppler_version_micro])
AC_PREREQ(2.59)
@@ -568,17 +568,17 @@
enable_poppler_qt4="try")
if test x$enable_poppler_qt4 = xyes; then
PKG_CHECK_MODULES(POPPLER_QT4,
- QtCore >= 4.4.0 QtGui >= 4.4.0 QtXml >= 4.4.0)
+ QtCore >= 4.7.0 QtGui >= 4.7.0 QtXml >= 4.7.0)
PKG_CHECK_MODULES(POPPLER_QT4_TEST,
- QtTest >= 4.4.0)
+ QtTest >= 4.7.0)
elif test x$enable_poppler_qt4 = xtry; then
PKG_CHECK_MODULES(POPPLER_QT4,
- QtCore >= 4.4.0 QtGui >= 4.4.0 QtXml >= 4.4.0,
+ QtCore >= 4.7.0 QtGui >= 4.7.0 QtXml >= 4.7.0,
[enable_poppler_qt4="yes"],
[enable_poppler_qt4="no"])
if test x$enable_poppler_qt4 = xyes; then
PKG_CHECK_MODULES(POPPLER_QT4_TEST,
- QtTest >= 4.4.0,
+ QtTest >= 4.7.0,
[enable_poppler_qt4="yes"],
[enable_poppler_qt4="no"])
fi
@@ -656,7 +656,7 @@
AC_CHECK_TOOL(MOCQT52, moc-qt5)
AC_MSG_CHECKING([for Qt5 moc-qt5])
mocversion=`$MOCQT52 -v 2>&1`
- mocversiongrep=`echo $mocversion | grep "Qt 5\|moc 5"`
+ mocversiongrep=`echo $mocversion | grep "Qt 5\|moc-qt5 5\|moc 5"`
if test x"$mocversiongrep" != x"$mocversion"; then
AC_CHECK_TOOL(QTCHOOSER, qtchooser)
AC_MSG_CHECKING([for qtchooser])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/poppler-0.26.2/cpp/poppler-version.h
new/poppler-0.26.3/cpp/poppler-version.h
--- old/poppler-0.26.2/cpp/poppler-version.h 2014-06-19 20:00:07.000000000
+0200
+++ new/poppler-0.26.3/cpp/poppler-version.h 2014-07-20 18:22:21.000000000
+0200
@@ -21,10 +21,10 @@
#include "poppler-global.h"
-#define POPPLER_VERSION "0.26.2"
+#define POPPLER_VERSION "0.26.3"
#define POPPLER_VERSION_MAJOR 0
#define POPPLER_VERSION_MINOR 26
-#define POPPLER_VERSION_MICRO 2
+#define POPPLER_VERSION_MICRO 3
namespace poppler
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/poppler-0.26.2/glib/Poppler-0.18.gir
new/poppler-0.26.3/glib/Poppler-0.18.gir
--- old/poppler-0.26.2/glib/Poppler-0.18.gir 2014-06-19 20:01:03.000000000
+0200
+++ new/poppler-0.26.3/glib/Poppler-0.18.gir 2014-07-20 18:23:14.000000000
+0200
@@ -2847,7 +2847,7 @@
value="0"
c:identifier="POPPLER_ERROR_INVALID"
glib:nick="invalid">
- <doc xml:space="preserve">Generic error when a document opration
fails</doc>
+ <doc xml:space="preserve">Generic error when a document operation
fails</doc>
</member>
<member name="encrypted"
value="1"
@@ -4279,7 +4279,7 @@
<type name="gint" c:type="gint"/>
</constant>
<constant name="MICRO_VERSION"
- value="2"
+ value="3"
c:type="POPPLER_MICRO_VERSION"
version="0.12">
<doc xml:space="preserve">The micro version number of the poppler header
files (e.g. in poppler version
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/poppler-0.26.2/glib/poppler-media.h
new/poppler-0.26.3/glib/poppler-media.h
--- old/poppler-0.26.2/glib/poppler-media.h 2014-04-26 17:37:22.000000000
+0200
+++ new/poppler-0.26.3/glib/poppler-media.h 2014-07-20 18:11:10.000000000
+0200
@@ -29,7 +29,7 @@
#define POPPLER_MEDIA(obj) (G_TYPE_CHECK_INSTANCE_CAST
((obj), POPPLER_TYPE_MEDIA, PopplerMedia))
#define POPPLER_IS_MEDIA(obj) (G_TYPE_CHECK_INSTANCE_TYPE
((obj), POPPLER_TYPE_MEDIA))
-// FIXME: this should be generic (PopplerSaveToCallbackFunc)
+/* FIXME: this should be generic (PopplerSaveToCallbackFunc) */
/**
* PopplerMediaSaveFunc:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/poppler-0.26.2/glib/poppler.h
new/poppler-0.26.3/glib/poppler.h
--- old/poppler-0.26.2/glib/poppler.h 2014-04-26 17:37:22.000000000 +0200
+++ new/poppler-0.26.3/glib/poppler.h 2014-07-09 00:13:44.000000000 +0200
@@ -29,7 +29,7 @@
/**
* PopplerError:
- * @POPPLER_ERROR_INVALID: Generic error when a document opration fails
+ * @POPPLER_ERROR_INVALID: Generic error when a document operation fails
* @POPPLER_ERROR_ENCRYPTED: Document is encrypted
* @POPPLER_ERROR_OPEN_FILE: File could not be opened for writing when saving
document
* @POPPLER_ERROR_BAD_CATALOG: Failed to read the document catalog
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/poppler-0.26.2/glib/reference/html/api-index-full.html
new/poppler-0.26.3/glib/reference/html/api-index-full.html
--- old/poppler-0.26.2/glib/reference/html/api-index-full.html 2014-06-19
20:09:44.000000000 +0200
+++ new/poppler-0.26.3/glib/reference/html/api-index-full.html 2014-07-20
18:31:47.000000000 +0200
@@ -722,11 +722,11 @@
<dd></dd>
<a name="idxE"></a><h3 class="title">E</h3>
<dt>
-<a class="link" href="poppler-poppler.html#POPPLER-ERROR:CAPS"
title="POPPLER_ERROR">POPPLER_ERROR</a>, macro in <a class="link"
href="poppler-poppler.html" title="poppler">poppler</a>
+<a class="link" href="poppler-poppler.html#PopplerError" title="enum
PopplerError">PopplerError</a>, enum in <a class="link"
href="poppler-poppler.html" title="poppler">poppler</a>
</dt>
<dd></dd>
<dt>
-<a class="link" href="poppler-poppler.html#PopplerError" title="enum
PopplerError">PopplerError</a>, enum in <a class="link"
href="poppler-poppler.html" title="poppler">poppler</a>
+<a class="link" href="poppler-poppler.html#POPPLER-ERROR:CAPS"
title="POPPLER_ERROR">POPPLER_ERROR</a>, macro in <a class="link"
href="poppler-poppler.html" title="poppler">poppler</a>
</dt>
<dd></dd>
<a name="idxF"></a><h3 class="title">F</h3>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/poppler-0.26.2/glib/reference/html/index.html
new/poppler-0.26.3/glib/reference/html/index.html
--- old/poppler-0.26.2/glib/reference/html/index.html 2014-06-19
20:09:44.000000000 +0200
+++ new/poppler-0.26.3/glib/reference/html/index.html 2014-07-20
18:31:47.000000000 +0200
@@ -15,7 +15,7 @@
<div>
<div><table class="navigation" id="top" width="100%" cellpadding="2"
cellspacing="0"><tr><th valign="middle"><p class="title">Poppler Reference
Manual</p></th></tr></table></div>
<div><p class="releaseinfo">
- for Poppler 0.26.2
+ for Poppler 0.26.3
</p></div>
</div>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/poppler-0.26.2/glib/reference/html/poppler-Version-and-Features-Information.html
new/poppler-0.26.3/glib/reference/html/poppler-Version-and-Features-Information.html
---
old/poppler-0.26.2/glib/reference/html/poppler-Version-and-Features-Information.html
2014-06-19 20:09:44.000000000 +0200
+++
new/poppler-0.26.3/glib/reference/html/poppler-Version-and-Features-Information.html
2014-07-20 18:31:47.000000000 +0200
@@ -113,7 +113,7 @@
<hr>
<div class="refsect2">
<a name="POPPLER-MICRO-VERSION:CAPS"></a><h3>POPPLER_MICRO_VERSION</h3>
-<pre class="programlisting">#define POPPLER_MICRO_VERSION (2)
+<pre class="programlisting">#define POPPLER_MICRO_VERSION (3)
</pre>
<p>The micro version number of the poppler header files (e.g. in poppler
version
0.1.2 this is 2.)</p>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/poppler-0.26.2/glib/reference/html/poppler-poppler.html
new/poppler-0.26.3/glib/reference/html/poppler-poppler.html
--- old/poppler-0.26.2/glib/reference/html/poppler-poppler.html 2014-06-19
20:09:44.000000000 +0200
+++ new/poppler-0.26.3/glib/reference/html/poppler-poppler.html 2014-07-20
18:31:47.000000000 +0200
@@ -292,7 +292,7 @@
<tr>
<td class="enum_member_name"><p><a
name="POPPLER-ERROR-INVALID:CAPS"></a>POPPLER_ERROR_INVALID</p></td>
<td class="enum_member_description">
-<p>Generic error when a document opration fails</p>
+<p>Generic error when a document operation fails</p>
</td>
<td class="enum_member_annotations"> </td>
</tr>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/poppler-0.26.2/glib/reference/version.xml
new/poppler-0.26.3/glib/reference/version.xml
--- old/poppler-0.26.2/glib/reference/version.xml 2014-06-19
20:00:07.000000000 +0200
+++ new/poppler-0.26.3/glib/reference/version.xml 2014-07-20
18:22:20.000000000 +0200
@@ -1 +1 @@
-0.26.2
+0.26.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/poppler-0.26.2/poppler/poppler-config.h.cmake
new/poppler-0.26.3/poppler/poppler-config.h.cmake
--- old/poppler-0.26.2/poppler/poppler-config.h.cmake 2014-04-26
17:37:22.000000000 +0200
+++ new/poppler-0.26.3/poppler/poppler-config.h.cmake 2014-07-12
17:05:21.000000000 +0200
@@ -14,6 +14,7 @@
// under GPL version 2 or later
//
// Copyright (C) 2014 Bogdan Cristea <crist...@gmail.com>
+// Copyright (C) 2014 Hib Eris <h...@hiberis.nl>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -23,12 +24,14 @@
#ifndef POPPLER_CONFIG_H
#define POPPLER_CONFIG_H
+#include <stdio.h>
+
// We duplicate some of the config.h #define's here since they are
// used in some of the header files we install. The #ifndef/#endif
// around #undef look odd, but it's to silence warnings about
// redefining those symbols.
-/* Defines the poppler version */
+/* Defines the poppler version. */
#ifndef POPPLER_VERSION
#define POPPLER_VERSION "${POPPLER_VERSION}"
#endif
@@ -174,7 +177,7 @@
#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
#ifdef __MINGW_PRINTF_FORMAT
#define GCC_PRINTF_FORMAT(fmt_index, va_index) \
- __attribute__((__format__(__MINGW_PRINTF_FORMAT, fmt_index, va_index)))
+ __attribute__((__format__(__MINGW_PRINTF_FORMAT, fmt_index, va_index)))
#else
#define GCC_PRINTF_FORMAT(fmt_index, va_index) \
__attribute__((__format__(__printf__, fmt_index, va_index)))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/poppler-0.26.2/poppler/poppler-config.h.in
new/poppler-0.26.3/poppler/poppler-config.h.in
--- old/poppler-0.26.2/poppler/poppler-config.h.in 2014-04-26
17:37:22.000000000 +0200
+++ new/poppler-0.26.3/poppler/poppler-config.h.in 2014-07-11
00:32:06.000000000 +0200
@@ -14,6 +14,7 @@
// under GPL version 2 or later
//
// Copyright (C) 2014 Bogdan Cristea <crist...@gmail.com>
+// Copyright (C) 2014 Hib Eris <h...@hiberis.nl>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -23,6 +24,8 @@
#ifndef POPPLER_CONFIG_H
#define POPPLER_CONFIG_H
+#include <stdio.h>
+
// We duplicate some of the config.h #define's here since they are
// used in some of the header files we install. The #ifndef/#endif
// around #undef look odd, but it's to silence warnings about
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/poppler-0.26.2/qt5/src/poppler-private.h
new/poppler-0.26.3/qt5/src/poppler-private.h
--- old/poppler-0.26.2/qt5/src/poppler-private.h 2014-04-26
17:37:22.000000000 +0200
+++ new/poppler-0.26.3/qt5/src/poppler-private.h 2014-07-11
00:30:32.000000000 +0200
@@ -8,6 +8,7 @@
* Copyright (C) 2012, 2013 Thomas Freitag <thomas.frei...@alfa.de>
* Copyright (C) 2013 Anthony Granger <grangeranth...@gmail.com>
* Copyright (C) 2014 Bogdan Cristea <crist...@gmail.com>
+ * Copyright (C) 2014 Aki Koskinen <freedesk...@akikoskinen.info>
* Inspired on code by
* Copyright (C) 2004 by Albert Astals Cid <tsdg...@terra.es>
* Copyright (C) 2004 by Enrico Ros <eros....@email.it>
@@ -86,11 +87,7 @@
m_filePath = filePath;
#ifdef _WIN32
- wchar_t *fileName = new WCHAR[filePath.length()];
- std::wstring wstr = (const wchar_t *)filePath.utf16();
- int length = wstr._Copy_s(fileName, filePath.length(),
filePath.length());
- doc = new PDFDoc(fileName, length, ownerPassword, userPassword);
- delete[] fileName;
+ doc = new PDFDoc((wchar_t *)filePath.utf16(),
filePath.length(), ownerPassword, userPassword);
#else
GooString *fileName = new
GooString(QFile::encodeName(filePath));
doc = new PDFDoc(fileName, ownerPassword, userPassword);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/poppler-0.26.2/splash/SplashXPathScanner.cc
new/poppler-0.26.3/splash/SplashXPathScanner.cc
--- old/poppler-0.26.2/splash/SplashXPathScanner.cc 2014-04-26
17:37:22.000000000 +0200
+++ new/poppler-0.26.3/splash/SplashXPathScanner.cc 2014-07-20
18:15:04.000000000 +0200
@@ -13,7 +13,7 @@
//
// Copyright (C) 2008, 2010, 2014 Albert Astals Cid <aa...@kde.org>
// Copyright (C) 2010 Paweł Wiejacha <pawel.wieja...@gmail.com>
-// Copyright (C) 2013 Thomas Freitag <thomas.frei...@alfa.de>
+// Copyright (C) 2013, 2014 Thomas Freitag <thomas.frei...@alfa.de>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -272,8 +272,9 @@
if (seg->flags & splashXPathHoriz) {
y = splashFloor(seg->y0);
if (y >= yMin && y <= yMax) {
- addIntersection(segYMin, segYMax, seg->flags,
- y, splashFloor(seg->x0), splashFloor(seg->x1));
+ if (!addIntersection(segYMin, segYMax, seg->flags,
+ y, splashFloor(seg->x0), splashFloor(seg->x1)))
+ break;
}
} else if (seg->flags & splashXPathVert) {
y0 = splashFloor(segYMin);
@@ -286,7 +287,8 @@
}
x = splashFloor(seg->x0);
for (y = y0; y <= y1; ++y) {
- addIntersection(segYMin, segYMax, seg->flags, y, x, x);
+ if (!addIntersection(segYMin, segYMax, seg->flags, y, x, x))
+ break;
}
} else {
if (seg->x0 < seg->x1) {
@@ -321,8 +323,9 @@
} else if (xx1 > segXMax) {
xx1 = segXMax;
}
- addIntersection(segYMin, segYMax, seg->flags, y,
- splashFloor(xx0), splashFloor(xx1));
+ if (!addIntersection(segYMin, segYMax, seg->flags, y,
+ splashFloor(xx0), splashFloor(xx1)))
+ break;
}
}
}
@@ -340,12 +343,17 @@
inter[yMax - yMin + 1] = i;
}
-void SplashXPathScanner::addIntersection(double segYMin, double segYMax,
+GBool SplashXPathScanner::addIntersection(double segYMin, double segYMax,
Guint segFlags,
int y, int x0, int x1) {
if (allInterLen == allInterSize) {
- allInterSize *= 2;
- allInter = (SplashIntersect *)greallocn(allInter, allInterSize,
+ unsigned int newInterSize = ((unsigned int) allInterSize * 2 > INT_MAX /
sizeof(SplashIntersect)) ? allInterSize + 32768 : allInterSize * 2;
+ if (newInterSize >= INT_MAX / sizeof(SplashIntersect)) {
+ error(errInternal, -1, "Bogus memory allocation size in
SplashXPathScanner::addIntersection {0:d}", newInterSize);
+ return gFalse;
+ }
+ allInterSize = newInterSize;
+ allInter = (SplashIntersect *)greallocn(allInter, newInterSize,
sizeof(SplashIntersect));
}
allInter[allInterLen].y = y;
@@ -365,6 +373,7 @@
allInter[allInterLen].count = 0;
}
++allInterLen;
+ return gTrue;
}
void SplashXPathScanner::renderAALine(SplashBitmap *aaBuf,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/poppler-0.26.2/splash/SplashXPathScanner.h
new/poppler-0.26.3/splash/SplashXPathScanner.h
--- old/poppler-0.26.2/splash/SplashXPathScanner.h 2014-04-26
17:37:22.000000000 +0200
+++ new/poppler-0.26.3/splash/SplashXPathScanner.h 2014-07-20
18:15:13.000000000 +0200
@@ -11,7 +11,7 @@
// All changes made under the Poppler project to this file are licensed
// under GPL version 2 or later
//
-// Copyright (C) 2013 Thomas Freitag <thomas.frei...@alfa.de>
+// Copyright (C) 2013, 2014 Thomas Freitag <thomas.frei...@alfa.de>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -85,7 +85,7 @@
private:
void computeIntersections();
- void addIntersection(double segYMin, double segYMax,
+ GBool addIntersection(double segYMin, double segYMax,
Guint segFlags,
int y, int x0, int x1);
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
