openSUSE Commits
Threads by month
- ----- 2025 -----
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
November 2016
- 1 participants
- 1494 discussions
Hello community,
here is the log from the commit of package poppler for openSUSE:Factory checked in at 2016-11-25 12:03:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 2016-10-14 09:26:17.…
[View More]000000000 +0200
+++ /work/SRC/openSUSE:Factory/.poppler.new/poppler-qt.changes 2016-11-25 12:03:40.000000000 +0100
@@ -1,0 +2,17 @@
+Mon Nov 21 09:09:29 UTC 2016 - zaitor(a)opensuse.org
+
+- Update to version 0.49.0:
+ + core:
+ - Merge type3 glyph handling from xpdf 3.04 (fdo#96667).
+ - Continue rendering in case of 'Singular matrix in shading
+ pattern fill (bgo#98623).
+ - Fix memory leak in parametrized gouraudTriangleShadedFill.
+ - Fix crash on broken files.
+ - PDFDoc::setDocInfoStringEntry(): treat value consisting of
+ just the unicode marker as an empty string.
+ - Fix UBSAN warning.
+ - Misc compile fixes.
+ + utils: pdfseparate: remove extra '%' in error message.
+ + build system: configure: Fix typo in disable nss help string.
+
+-------------------------------------------------------------------
poppler-qt5.changes: same change
poppler.changes: same change
Old:
----
poppler-0.48.0.tar.xz
New:
----
poppler-0.49.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ poppler-qt.spec ++++++
--- /var/tmp/diff_new_pack.qrdvTU/_old 2016-11-25 12:03:41.000000000 +0100
+++ /var/tmp/diff_new_pack.qrdvTU/_new 2016-11-25 12:03:41.000000000 +0100
@@ -21,11 +21,11 @@
Name: poppler-qt
%define _name poppler
-Version: 0.48.0
+Version: 0.49.0
Release: 0
# Actual version of poppler-data:
%define poppler_data_version 0.4.6
-%define poppler_sover 64
+%define poppler_sover 65
%define poppler_cpp_sover 0
%define poppler_glib_sover 8
%define poppler_qt4_sover 4
poppler-qt5.spec: same change
++++++ poppler.spec ++++++
--- /var/tmp/diff_new_pack.qrdvTU/_old 2016-11-25 12:03:41.000000000 +0100
+++ /var/tmp/diff_new_pack.qrdvTU/_new 2016-11-25 12:03:41.000000000 +0100
@@ -21,11 +21,11 @@
Name: poppler
%define _name poppler
-Version: 0.48.0
+Version: 0.49.0
Release: 0
# Actual version of poppler-data:
%define poppler_data_version 0.4.6
-%define poppler_sover 64
+%define poppler_sover 65
%define poppler_cpp_sover 0
%define poppler_glib_sover 8
%define poppler_qt4_sover 4
++++++ poppler-0.48.0.tar.xz -> poppler-0.49.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.48.0/CMakeLists.txt new/poppler-0.49.0/CMakeLists.txt
--- old/poppler-0.48.0/CMakeLists.txt 2016-10-08 17:35:47.000000000 +0200
+++ new/poppler-0.49.0/CMakeLists.txt 2016-11-15 00:10:25.000000000 +0100
@@ -22,7 +22,7 @@
endif()
set(POPPLER_MAJOR_VERSION "0")
-set(POPPLER_MINOR_VERSION "48")
+set(POPPLER_MINOR_VERSION "49")
set(POPPLER_MICRO_VERSION "0")
set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}")
@@ -502,7 +502,7 @@
else(MSVC)
add_library(poppler SHARED ${poppler_SRCS})
endif(MSVC)
-set_target_properties(poppler PROPERTIES VERSION 64.0.0 SOVERSION 64)
+set_target_properties(poppler PROPERTIES VERSION 65.0.0 SOVERSION 65)
target_link_libraries(poppler LINK_PRIVATE ${poppler_LIBS})
install(TARGETS poppler RUNTIME DESTINATION bin LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.48.0/ChangeLog new/poppler-0.49.0/ChangeLog
--- old/poppler-0.48.0/ChangeLog 2016-10-08 18:11:40.000000000 +0200
+++ new/poppler-0.49.0/ChangeLog 2016-11-15 00:25:23.000000000 +0100
@@ -1,3 +1,186 @@
+commit 02e2d8e2c3004c36d1f8f798e5a7a30166f48f37
+Author: Albert Astals Cid <aacid(a)kde.org>
+Date: Tue Nov 15 00:10:43 2016 +0100
+
+ 0.49
+
+ CMakeLists.txt | 4 ++--
+ NEWS | 5 ++++-
+ configure.ac | 2 +-
+ cpp/Doxyfile | 2 +-
+ poppler/Makefile.am | 2 +-
+ qt4/src/Doxyfile | 2 +-
+ qt5/src/Doxyfile | 2 +-
+ 7 files changed, 11 insertions(+), 8 deletions(-)
+
+commit f7f0f14e095425d171456a697804f2f34ed26426
+Author: Tor Lillqvist <tml(a)collabora.com>
+Date: Tue Nov 15 00:06:26 2016 +0100
+
+ VS 2013 has fmin() and fmax()
+
+ NEWS | 13 +++++++++++++
+ poppler/poppler-config.h.cmake | 3 ++-
+ 2 files changed, 15 insertions(+), 1 deletion(-)
+
+commit 07ac68603552b36a2a6b8ea5982f22f24f5835b1
+Author: Albert Astals Cid <aacid(a)kde.org>
+Date: Tue Nov 15 00:03:24 2016 +0100
+
+ Update (C)
+
+ poppler/PSOutputDev.cc | 1 +
+ poppler/poppler-config.h.in | 1 +
+ utils/pdfseparate.cc | 2 +-
+ 3 files changed, 3 insertions(+), 1 deletion(-)
+
+commit b837ae3bc69c5c76f1a4e3abaeb22d0574d6b2c8
+Author: Thomas Freitag <Thomas.Freitag(a)alfa.de>
+Date: Thu Nov 10 00:33:17 2016 +0100
+
+ Continue rendering in case of 'Singular matrix in shading pattern
+ fill'
+
+ Bug #98623
+
+ poppler/Gfx.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 6c01a48458a8b4896d606ef9bcc4af5e03393b72
+Author: Thomas Freitag <Thomas.Freitag(a)alfa.de>
+Date: Wed Nov 2 23:10:01 2016 +0100
+
+ merge type3 glyph handling from xpdf 3.04
+
+ Fixes bug #96667
+
+ poppler/SplashOutputDev.cc | 28 +++++++++++++++++++++++-----
+ poppler/SplashOutputDev.h | 1 -
+ 2 files changed, 23 insertions(+), 6 deletions(-)
+
+commit f43cb73939f85952d83afc87a6dc638dc1ae311b
+Author: Albert Astals Cid <aacid(a)kde.org>
+Date: Wed Nov 2 00:13:26 2016 +0100
+
+ Avoid UBSan warning about undefined downcast
+
+ ...of this-ptr of in-construction FormFieldSignature while still in
+ the base
+ FormField ctor by simply casting the parent-class field member
+ when needed
+
+ poppler/Form.cc | 83
+ ++++++++++++++++++++++++++++++++-------------------------
+ poppler/Form.h | 9 +++----
+ 2 files changed, 50 insertions(+), 42 deletions(-)
+
+commit 4539d0b002efbd19393fd55a6fb87b013acdb8f1
+Author: Caolán McNamara <caolanm(a)redhat.com>
+Date: Thu Oct 27 14:31:20 2016 +0200
+
+ PSOutputDev.cc: std::max requires <algorithm>
+
+ poppler/PSOutputDev.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 4619957cbab81ab0b25f3fdd3ed872f0ad93f074
+Author: Tor Lillqvist <tml(a)collabora.com>
+Date: Thu Oct 27 14:27:32 2016 +0200
+
+ VS 2013 has fmin() and fmax()
+
+ poppler/poppler-config.h.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit be073d39f72f625bf3d8482ead76881150695bf4
+Author: Albert Astals Cid <aacid(a)kde.org>
+Date: Mon Oct 31 10:11:56 2016 +0100
+
+ Fix typo in disable nss help string
+
+ Bug #98514
+
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 2a09ec47aef8870dba345f4045e691ffb5a59f4d
+Author: Albert Astals Cid <aacid(a)kde.org>
+Date: Mon Oct 24 20:04:22 2016 +0200
+
+ Fix memory leak in parametrized gouraudTriangleShadedFill
+
+ poppler/SplashOutputDev.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 169889b8e196cfcd288e6555fb048fbbf95ba3f6
+Author: Albert Astals Cid <aacid(a)kde.org>
+Date: Mon Oct 24 20:04:00 2016 +0200
+
+ Fix crash on broken files
+
+ splash/Splash.cc | 38 ++++++++++++++++++++------------------
+ 1 file changed, 20 insertions(+), 18 deletions(-)
+
+commit 269a91e3b03a19acc06fd0f72356f2e48a6368a7
+Author: Jakub Alba <jakubalba(a)gmail.com>
+Date: Tue Aug 23 13:20:44 2016 +0200
+
+ PDFDoc::setDocInfoStringEntry(): treat value consisting of just the
+ unicode marker as an empty string
+
+ poppler/PDFDoc.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 43cfdf9de45e6833a2815b173f8cc945f1c5f9d6
+Author: Jakub Alba <jakubalba(a)gmail.com>
+Date: Tue Aug 23 13:19:07 2016 +0200
+
+ goo: add GooString::hasJustUnicodeMarker(void)
+
+ goo/GooString.cc | 2 +-
+ goo/GooString.h | 3 ++-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+commit e3c5bdf4fcd29c5d180046d1c279d3f99c1027a7
+Author: Jakub Alba <jakubalba(a)gmail.com>
+Date: Fri Oct 21 23:06:23 2016 +0200
+
+ update copyrights
+
+ cpp/poppler-document.cpp | 2 +-
+ cpp/poppler-document.h | 2 +-
+ cpp/poppler-embedded-file.cpp | 2 +-
+ cpp/poppler-global.cpp | 2 +-
+ cpp/poppler-private.cpp | 2 +-
+ cpp/poppler-private.h | 2 +-
+ glib/poppler-document.cc | 2 +-
+ glib/poppler-document.h | 2 +-
+ goo/GooString.cc | 2 +-
+ goo/GooString.h | 2 +-
+ poppler/Object.h | 2 +-
+ poppler/PDFDoc.cc | 2 +-
+ poppler/PDFDoc.h | 2 +-
+ poppler/XRef.cc | 2 +-
+ poppler/XRef.h | 2 +-
+ qt4/src/poppler-document.cc | 2 +-
+ qt4/src/poppler-private.cc | 2 +-
+ qt4/src/poppler-private.h | 2 +-
+ qt4/src/poppler-qt4.h | 2 +-
+ qt5/src/poppler-document.cc | 2 +-
+ qt5/src/poppler-private.cc | 2 +-
+ qt5/src/poppler-private.h | 2 +-
+ qt5/src/poppler-qt5.h | 2 +-
+ 23 files changed, 23 insertions(+), 23 deletions(-)
+
+commit 5d15a52aade68c618c356fe403ca500e74917ef7
+Author: Pino Toscano <pino(a)kde.org>
+Date: Sun Oct 9 13:04:46 2016 +0200
+
+ pdfseparate: remove extra '%' in error message
+
+ utils/pdfseparate.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
commit 036bcee237c814197af3324cd3697ea88d9ac6d3
Author: Albert Astals Cid <aacid(a)kde.org>
Date: Sat Oct 8 17:55:31 2016 +0200
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.48.0/NEWS new/poppler-0.49.0/NEWS
--- old/poppler-0.48.0/NEWS 2016-10-08 17:37:16.000000000 +0200
+++ new/poppler-0.49.0/NEWS 2016-11-15 00:07:30.000000000 +0100
@@ -1,3 +1,19 @@
+Release 0.49.0
+ core:
+ * Merge type3 glyph handling from xpdf 3.04. Bug #96667
+ * Continue rendering in case of 'Singular matrix in shading pattern fill. Bug #98623
+ * Fix memory leak in parametrized gouraudTriangleShadedFill
+ * Fix crash on broken files
+ * PDFDoc::setDocInfoStringEntry(): treat value consisting of just the unicode marker as an empty string
+ * Fix UBSAN warning
+ * Misc compile fixes
+
+ utils:
+ * pdfseparate: remove extra '%' in error message
+
+ build system:
+ * configure: Fix typo in disable nss help string
+
Release 0.48.0
core:
* Fix crashes and memory leaks in invalid files.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.48.0/configure new/poppler-0.49.0/configure
--- old/poppler-0.48.0/configure 2016-10-08 17:41:50.000000000 +0200
+++ new/poppler-0.49.0/configure 2016-11-15 00:11:46.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for poppler 0.48.0.
+# Generated by GNU Autoconf 2.69 for poppler 0.49.0.
#
# 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.48.0'
-PACKAGE_STRING='poppler 0.48.0'
+PACKAGE_VERSION='0.49.0'
+PACKAGE_STRING='poppler 0.49.0'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=poppler'
PACKAGE_URL=''
@@ -1554,7 +1554,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.48.0 to adapt to many kinds of systems.
+\`configure' configures poppler 0.49.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1629,7 +1629,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of poppler 0.48.0:";;
+ short | recursive ) echo "Configuration of poppler 0.49.0:";;
esac
cat <<\_ACEOF
@@ -1660,7 +1660,7 @@
Use openjpeg for JPEG2000 images. 'auto' prefers
openjpeg1 over openjpeg2 if both are available due
to regressions in openjpeg2 [[default=auto]]
- --disable-nss Do not build against libnss3.
+ --disable-libnss Do not build against libnss3.
--disable-libtiff Don't build against libtiff.
--disable-largefile omit support for large files
--disable-zlib Don't build against zlib.
@@ -1860,7 +1860,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-poppler configure 0.48.0
+poppler configure 0.49.0
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2554,7 +2554,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.48.0, which was
+It was created by poppler $as_me 0.49.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3418,7 +3418,7 @@
# Define the identity of the package.
PACKAGE='poppler'
- VERSION='0.48.0'
+ VERSION='0.49.0'
cat >>confdefs.h <<_ACEOF
@@ -18500,7 +18500,7 @@
cat >>confdefs.h <<_ACEOF
-#define POPPLER_VERSION "0.48.0"
+#define POPPLER_VERSION "0.49.0"
_ACEOF
@@ -25819,11 +25819,11 @@
POPPLER_MAJOR_VERSION=0
-POPPLER_MINOR_VERSION=48
+POPPLER_MINOR_VERSION=49
POPPLER_MICRO_VERSION=0
-POPPLER_VERSION=0.48.0
+POPPLER_VERSION=0.49.0
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"
@@ -26483,7 +26483,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.48.0, which was
+This file was extended by poppler $as_me 0.49.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -26549,7 +26549,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.48.0
+poppler config.status 0.49.0
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.48.0/configure.ac new/poppler-0.49.0/configure.ac
--- old/poppler-0.48.0/configure.ac 2016-10-08 17:35:15.000000000 +0200
+++ new/poppler-0.49.0/configure.ac 2016-11-15 00:09:49.000000000 +0100
@@ -1,5 +1,5 @@
m4_define([poppler_version_major],[0])
-m4_define([poppler_version_minor],[48])
+m4_define([poppler_version_minor],[49])
m4_define([poppler_version_micro],[0])
m4_define([poppler_version],[poppler_version_major.poppler_version_minor.poppler_version_micro])
@@ -262,7 +262,7 @@
dnl Test for NSS
AC_ARG_ENABLE(libnss,
- AC_HELP_STRING([--disable-nss],
+ AC_HELP_STRING([--disable-libnss],
[Do not build against libnss3.]),
enable_libnss=$enableval,
enable_libnss="try")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.48.0/cpp/poppler-document.cpp new/poppler-0.49.0/cpp/poppler-document.cpp
--- old/poppler-0.48.0/cpp/poppler-document.cpp 2016-07-24 12:26:51.000000000 +0200
+++ new/poppler-0.49.0/cpp/poppler-document.cpp 2016-10-23 19:08:37.000000000 +0200
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2009-2011, Pino Toscano <pino(a)kde.org>
- * Copyright (C) 2016 Jakub Kucharski <jakubkucharski97(a)gmail.com>
+ * Copyright (C) 2016 Jakub Alba <jakubalba(a)gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.48.0/cpp/poppler-document.h new/poppler-0.49.0/cpp/poppler-document.h
--- old/poppler-0.48.0/cpp/poppler-document.h 2016-07-24 12:26:51.000000000 +0200
+++ new/poppler-0.49.0/cpp/poppler-document.h 2016-10-23 19:08:37.000000000 +0200
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2009-2010, Pino Toscano <pino(a)kde.org>
- * Copyright (C) 2016 Jakub Kucharski <jakubkucharski97(a)gmail.com>
+ * Copyright (C) 2016 Jakub Alba <jakubalba(a)gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.48.0/cpp/poppler-embedded-file.cpp new/poppler-0.49.0/cpp/poppler-embedded-file.cpp
--- old/poppler-0.48.0/cpp/poppler-embedded-file.cpp 2016-06-09 20:09:35.000000000 +0200
+++ new/poppler-0.49.0/cpp/poppler-embedded-file.cpp 2016-10-23 19:08:37.000000000 +0200
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2009-2011, Pino Toscano <pino(a)kde.org>
- * Copyright (C) 2016 Jakub Kucharski <jakubkucharski97(a)gmail.com>
+ * Copyright (C) 2016 Jakub Alba <jakubalba(a)gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.48.0/cpp/poppler-global.cpp new/poppler-0.49.0/cpp/poppler-global.cpp
--- old/poppler-0.48.0/cpp/poppler-global.cpp 2016-06-09 20:09:35.000000000 +0200
+++ new/poppler-0.49.0/cpp/poppler-global.cpp 2016-10-23 19:08:37.000000000 +0200
@@ -3,7 +3,7 @@
* Copyright (C) 2010, Hib Eris <hib(a)hiberis.nl>
* Copyright (C) 2014, 2015 Hans-Peter Deifel <hpdeifel(a)gmx.de>
* Copyright (C) 2015, Tamas Szekeres <szekerest(a)gmail.com>
- * Copyright (C) 2016 Jakub Kucharski <jakubkucharski97(a)gmail.com>
+ * Copyright (C) 2016 Jakub Alba <jakubalba(a)gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.48.0/cpp/poppler-private.cpp new/poppler-0.49.0/cpp/poppler-private.cpp
--- old/poppler-0.48.0/cpp/poppler-private.cpp 2016-07-12 23:01:58.000000000 +0200
+++ new/poppler-0.49.0/cpp/poppler-private.cpp 2016-10-23 19:08:37.000000000 +0200
@@ -2,7 +2,7 @@
* Copyright (C) 2009-2010, Pino Toscano <pino(a)kde.org>
* Copyright (C) 2013 Adrian Johnson <ajohnson(a)redneon.com>
* Copyright (C) 2014, Hans-Peter Deifel <hpdeifel(a)gmx.de>
- * Copyright (C) 2016 Jakub Kucharski <jakubkucharski97(a)gmail.com>
+ * Copyright (C) 2016 Jakub Alba <jakubalba(a)gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.48.0/cpp/poppler-private.h new/poppler-0.49.0/cpp/poppler-private.h
--- old/poppler-0.48.0/cpp/poppler-private.h 2016-06-09 20:09:35.000000000 +0200
+++ new/poppler-0.49.0/cpp/poppler-private.h 2016-10-23 19:08:37.000000000 +0200
@@ -2,7 +2,7 @@
* Copyright (C) 2009, Pino Toscano <pino(a)kde.org>
* Copyright (C) 2013 Adrian Johnson <ajohnson(a)redneon.com>
* Copyright (C) 2014, Hans-Peter Deifel <hpdeifel(a)gmx.de>
- * Copyright (C) 2016 Jakub Kucharski <jakubkucharski97(a)gmail.com>
+ * Copyright (C) 2016 Jakub Alba <jakubalba(a)gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.48.0/cpp/poppler-version.h new/poppler-0.49.0/cpp/poppler-version.h
--- old/poppler-0.48.0/cpp/poppler-version.h 2016-10-08 17:42:07.000000000 +0200
+++ new/poppler-0.49.0/cpp/poppler-version.h 2016-11-15 00:11:57.000000000 +0100
@@ -21,9 +21,9 @@
#include "poppler-global.h"
-#define POPPLER_VERSION "0.48.0"
+#define POPPLER_VERSION "0.49.0"
#define POPPLER_VERSION_MAJOR 0
-#define POPPLER_VERSION_MINOR 48
+#define POPPLER_VERSION_MINOR 49
#define POPPLER_VERSION_MICRO 0
namespace poppler
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.48.0/glib/poppler-document.cc new/poppler-0.49.0/glib/poppler-document.cc
--- old/poppler-0.48.0/glib/poppler-document.cc 2016-07-24 12:26:51.000000000 +0200
+++ new/poppler-0.49.0/glib/poppler-document.cc 2016-10-23 19:08:37.000000000 +0200
@@ -1,7 +1,7 @@
/* poppler-document.cc: glib wrapper for poppler
* Copyright (C) 2005, Red Hat, Inc.
*
- * Copyright (C) 2016 Jakub Kucharski <jakubkucharski97(a)gmail.com>
+ * Copyright (C) 2016 Jakub Alba <jakubalba(a)gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.48.0/glib/poppler-document.h new/poppler-0.49.0/glib/poppler-document.h
--- old/poppler-0.48.0/glib/poppler-document.h 2016-07-05 23:37:01.000000000 +0200
+++ new/poppler-0.49.0/glib/poppler-document.h 2016-10-23 19:08:37.000000000 +0200
@@ -1,7 +1,7 @@
/* poppler-document.h: glib interface to poppler
* Copyright (C) 2004, Red Hat, Inc.
*
- * Copyright (C) 2016 Jakub Kucharski <jakubkucharski97(a)gmail.com>
+ * Copyright (C) 2016 Jakub Alba <jakubalba(a)gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.48.0/glib/reference/html/index.html new/poppler-0.49.0/glib/reference/html/index.html
--- old/poppler-0.48.0/glib/reference/html/index.html 2016-10-08 18:11:41.000000000 +0200
+++ new/poppler-0.49.0/glib/reference/html/index.html 2016-11-15 00:25:24.000000000 +0100
@@ -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.48.0
+ for Poppler 0.49.0
</p></div>
</div>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.48.0/glib/reference/html/poppler-Version-and-Features-Information.html new/poppler-0.49.0/glib/reference/html/poppler-Version-and-Features-Information.html
--- old/poppler-0.48.0/glib/reference/html/poppler-Version-and-Features-Information.html 2016-10-08 18:11:41.000000000 +0200
+++ new/poppler-0.49.0/glib/reference/html/poppler-Version-and-Features-Information.html 2016-11-15 00:25:24.000000000 +0100
@@ -189,7 +189,7 @@
<hr>
<div class="refsect2">
<a name="POPPLER-MINOR-VERSION:CAPS"></a><h3>POPPLER_MINOR_VERSION</h3>
-<pre class="programlisting">#define POPPLER_MINOR_VERSION (48)
+<pre class="programlisting">#define POPPLER_MINOR_VERSION (49)
</pre>
<p>The major version number of the poppler header files (e.g. in poppler version
0.1.2 this is 1.)</p>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.48.0/glib/reference/version.xml new/poppler-0.49.0/glib/reference/version.xml
--- old/poppler-0.48.0/glib/reference/version.xml 2016-10-08 17:42:06.000000000 +0200
+++ new/poppler-0.49.0/glib/reference/version.xml 2016-11-15 00:11:56.000000000 +0100
@@ -1 +1 @@
-0.48.0
+0.49.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.48.0/goo/GooString.cc new/poppler-0.49.0/goo/GooString.cc
--- old/poppler-0.48.0/goo/GooString.cc 2016-09-06 23:15:06.000000000 +0200
+++ new/poppler-0.49.0/goo/GooString.cc 2016-10-23 23:01:46.000000000 +0200
@@ -25,7 +25,7 @@
// Copyright (C) 2012 Pino Toscano <pino(a)kde.org>
// Copyright (C) 2013 Jason Crain <jason(a)aquaticape.us>
// Copyright (C) 2015 William Bader <williambader(a)hotmail.com>
-// Copyright (C) 2016 Jakub Kucharski <jakubkucharski97(a)gmail.com>
+// Copyright (C) 2016 Jakub Alba <jakubalba(a)gmail.com>
//
// 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
@@ -912,7 +912,7 @@
return strcmp(s + length - suffixLen, suffix) == 0;
}
-GBool GooString::hasUnicodeMarker(void)
+GBool GooString::hasUnicodeMarker(void) const
{
return length > 1 && (s[0] & 0xff) == 0xfe && (s[1] & 0xff) == 0xff;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.48.0/goo/GooString.h new/poppler-0.49.0/goo/GooString.h
--- old/poppler-0.48.0/goo/GooString.h 2016-09-06 23:14:07.000000000 +0200
+++ new/poppler-0.49.0/goo/GooString.h 2016-10-23 23:01:46.000000000 +0200
@@ -21,7 +21,7 @@
// Copyright (C) 2012-2014 Fabio D'Urso <fabiodurso(a)hotmail.it>
// Copyright (C) 2013 Jason Crain <jason(a)aquaticape.us>
// Copyright (C) 2015 Adam Reichold <adam.reichold(a)t-online.de>
-// Copyright (C) 2016 Jakub Kucharski <jakubkucharski97(a)gmail.com>
+// Copyright (C) 2016 Jakub Alba <jakubalba(a)gmail.com>
//
// 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
@@ -160,7 +160,8 @@
// Return true if string ends with suffix
GBool endsWith(const char *suffix) const;
- GBool hasUnicodeMarker(void);
+ GBool hasUnicodeMarker(void) const;
+ GBool hasJustUnicodeMarker(void) const { return length == 2 && hasUnicodeMarker(); }
// Sanitizes the string so that it does
// not contain any ( ) < > [ ] { } / %
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.48.0/poppler/Form.cc new/poppler-0.49.0/poppler/Form.cc
--- old/poppler-0.48.0/poppler/Form.cc 2016-09-04 15:32:21.000000000 +0200
+++ new/poppler-0.49.0/poppler/Form.cc 2016-11-02 00:26:12.000000000 +0100
@@ -171,7 +171,6 @@
FormWidget(docA, aobj, num, ref, p)
{
type = formButton;
- parent = static_cast<FormFieldButton*>(field);
onStr = NULL;
Object obj1, obj2;
@@ -200,7 +199,7 @@
// 12.7.4.2.3 Check Boxes
// Yes should be used as the name for the on state
- return parent->getButtonType() == formButtonCheck ? (char *)"Yes" : NULL;
+ return parent()->getButtonType() == formButtonCheck ? (char *)"Yes" : NULL;
}
FormWidgetButton::~FormWidgetButton ()
@@ -210,7 +209,7 @@
FormButtonType FormWidgetButton::getButtonType () const
{
- return parent->getButtonType ();
+ return parent()->getButtonType ();
}
void FormWidgetButton::setAppearanceState(const char *state) {
@@ -227,20 +226,25 @@
void FormWidgetButton::setState (GBool astate)
{
//pushButtons don't have state
- if (parent->getButtonType() == formButtonPush)
+ if (parent()->getButtonType() == formButtonPush)
return;
// Silently return if can't set ON state
if (astate && !onStr)
return;
- parent->setState(astate ? onStr->getCString() : (char *)"Off");
+ parent()->setState(astate ? onStr->getCString() : (char *)"Off");
// Parent will call setAppearanceState()
}
GBool FormWidgetButton::getState ()
{
- return onStr ? parent->getState(onStr->getCString()) : gFalse;
+ return onStr ? parent()->getState(onStr->getCString()) : gFalse;
+}
+
+FormFieldButton *FormWidgetButton::parent() const
+{
+ return static_cast<FormFieldButton*>(field);
}
@@ -248,17 +252,16 @@
FormWidget(docA, aobj, num, ref, p)
{
type = formText;
- parent = static_cast<FormFieldText*>(field);
}
GooString* FormWidgetText::getContent ()
{
- return parent->getContent();
+ return parent()->getContent();
}
GooString* FormWidgetText::getContentCopy ()
{
- return parent->getContentCopy();
+ return parent()->getContentCopy();
}
void FormWidgetText::updateWidgetAppearance()
@@ -269,42 +272,42 @@
bool FormWidgetText::isMultiline () const
{
- return parent->isMultiline();
+ return parent()->isMultiline();
}
bool FormWidgetText::isPassword () const
{
- return parent->isPassword();
+ return parent()->isPassword();
}
bool FormWidgetText::isFileSelect () const
{
- return parent->isFileSelect();
+ return parent()->isFileSelect();
}
bool FormWidgetText::noSpellCheck () const
{
- return parent->noSpellCheck();
+ return parent()->noSpellCheck();
}
bool FormWidgetText::noScroll () const
{
- return parent->noScroll();
+ return parent()->noScroll();
}
bool FormWidgetText::isComb () const
{
- return parent->isComb();
+ return parent()->isComb();
}
bool FormWidgetText::isRichText () const
{
- return parent->isRichText();
+ return parent()->isRichText();
}
int FormWidgetText::getMaxLen () const
{
- return parent->getMaxLen ();
+ return parent()->getMaxLen ();
}
void FormWidgetText::setContent(GooString* new_content)
@@ -314,14 +317,18 @@
return;
}
- parent->setContentCopy(new_content);
+ parent()->setContentCopy(new_content);
+}
+
+FormFieldText *FormWidgetText::parent() const
+{
+ return static_cast<FormFieldText*>(field);
}
FormWidgetChoice::FormWidgetChoice(PDFDoc *docA, Object *aobj, unsigned num, Ref ref, FormField *p) :
FormWidget(docA, aobj, num, ref, p)
{
type = formChoice;
- parent = static_cast<FormFieldChoice*>(field);
}
FormWidgetChoice::~FormWidgetChoice()
@@ -330,7 +337,7 @@
bool FormWidgetChoice::_checkRange (int i)
{
- if (i < 0 || i >= parent->getNumChoices()) {
+ if (i < 0 || i >= parent()->getNumChoices()) {
error(errInternal, -1, "FormWidgetChoice::_checkRange i out of range : {0:d}", i);
return false;
}
@@ -344,7 +351,7 @@
return;
}
if (!_checkRange(i)) return;
- parent->select(i);
+ parent()->select(i);
}
void FormWidgetChoice::toggle (int i)
@@ -354,7 +361,7 @@
return;
}
if (!_checkRange(i)) return;
- parent->toggle(i);
+ parent()->toggle(i);
}
void FormWidgetChoice::deselectAll ()
@@ -363,7 +370,7 @@
error(errInternal, -1, "FormWidgetChoice::deselectAll called on a read only field\n");
return;
}
- parent->deselectAll();
+ parent()->deselectAll();
}
GooString* FormWidgetChoice::getEditChoice ()
@@ -372,7 +379,7 @@
error(errInternal, -1, "FormFieldChoice::getEditChoice called on a non-editable choice\n");
return NULL;
}
- return parent->getEditChoice();
+ return parent()->getEditChoice();
}
void FormWidgetChoice::updateWidgetAppearance()
@@ -384,7 +391,7 @@
bool FormWidgetChoice::isSelected (int i)
{
if (!_checkRange(i)) return false;
- return parent->isSelected(i);
+ return parent()->isSelected(i);
}
void FormWidgetChoice::setEditChoice (GooString* new_content)
@@ -398,59 +405,63 @@
return;
}
- parent->setEditChoice(new_content);
+ parent()->setEditChoice(new_content);
}
int FormWidgetChoice::getNumChoices()
{
- return parent->getNumChoices();
+ return parent()->getNumChoices();
}
GooString* FormWidgetChoice::getChoice(int i)
{
- return parent->getChoice(i);
+ return parent()->getChoice(i);
}
bool FormWidgetChoice::isCombo () const
{
- return parent->isCombo();
+ return parent()->isCombo();
}
bool FormWidgetChoice::hasEdit () const
{
- return parent->hasEdit();
+ return parent()->hasEdit();
}
bool FormWidgetChoice::isMultiSelect () const
{
- return parent->isMultiSelect();
+ return parent()->isMultiSelect();
}
bool FormWidgetChoice::noSpellCheck () const
{
- return parent->noSpellCheck();
+ return parent()->noSpellCheck();
}
bool FormWidgetChoice::commitOnSelChange () const
{
- return parent->commitOnSelChange();
+ return parent()->commitOnSelChange();
}
bool FormWidgetChoice::isListBox () const
{
- return parent->isListBox();
+ return parent()->isListBox();
+}
+
+FormFieldChoice *FormWidgetChoice::parent() const
+{
+ return static_cast<FormFieldChoice*>(field);
}
FormWidgetSignature::FormWidgetSignature(PDFDoc *docA, Object *aobj, unsigned num, Ref ref, FormField *p) :
FormWidget(docA, aobj, num, ref, p)
{
type = formSignature;
- parent = static_cast<FormFieldSignature*>(field);
}
SignatureInfo *FormWidgetSignature::validateSignature(bool doVerifyCert, bool forceRevalidation)
{
- return parent->validateSignature(doVerifyCert, forceRevalidation);
+ return static_cast<FormFieldSignature*>(field)->validateSignature(doVerifyCert, forceRevalidation);
}
void FormWidgetSignature::updateWidgetAppearance()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.48.0/poppler/Form.h new/poppler-0.49.0/poppler/Form.h
--- old/poppler-0.48.0/poppler/Form.h 2016-09-06 23:31:43.000000000 +0200
+++ new/poppler-0.49.0/poppler/Form.h 2016-11-02 00:20:13.000000000 +0100
@@ -167,8 +167,8 @@
void updateWidgetAppearance();
protected:
+ FormFieldButton *parent() const;
GooString *onStr;
- FormFieldButton *parent;
};
//------------------------------------------------------------------------
@@ -197,7 +197,7 @@
bool isRichText () const;
int getMaxLen () const;
protected:
- FormFieldText *parent;
+ FormFieldText *parent() const;
};
//------------------------------------------------------------------------
@@ -238,7 +238,7 @@
bool isListBox () const;
protected:
bool _checkRange (int i);
- FormFieldChoice *parent;
+ FormFieldChoice *parent() const;
};
//------------------------------------------------------------------------
@@ -251,9 +251,6 @@
void updateWidgetAppearance();
SignatureInfo *validateSignature(bool doVerifyCert, bool forceRevalidation);
-
-protected:
- FormFieldSignature *parent;
};
//------------------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.48.0/poppler/Gfx.cc new/poppler-0.49.0/poppler/Gfx.cc
--- old/poppler-0.48.0/poppler/Gfx.cc 2016-05-31 18:40:39.000000000 +0200
+++ new/poppler-0.49.0/poppler/Gfx.cc 2016-11-10 00:31:52.000000000 +0100
@@ -2348,6 +2348,7 @@
det = ctm[0] * ctm[3] - ctm[1] * ctm[2];
if (fabs(det) < 0.000001) {
error(errSyntaxError, getPos(), "Singular matrix in shading pattern fill");
+ restoreStateStack(savedState);
return;
}
det = 1 / det;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.48.0/poppler/Makefile.am new/poppler-0.49.0/poppler/Makefile.am
--- old/poppler-0.48.0/poppler/Makefile.am 2016-10-08 17:37:01.000000000 +0200
+++ new/poppler-0.49.0/poppler/Makefile.am 2016-11-15 00:10:33.000000000 +0100
@@ -327,7 +327,7 @@
$(win32_libs)
libpoppler_la_LDFLAGS = \
- -version-info 64:0:0 \
+ -version-info 65:0:0 \
@create_shared_lib@ \
@auto_import_flags@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.48.0/poppler/Makefile.in new/poppler-0.49.0/poppler/Makefile.in
--- old/poppler-0.48.0/poppler/Makefile.in 2016-10-08 17:41:52.000000000 +0200
+++ new/poppler-0.49.0/poppler/Makefile.in 2016-11-15 00:11:47.000000000 +0100
@@ -839,7 +839,7 @@
$(win32_libs)
libpoppler_la_LDFLAGS = \
- -version-info 64:0:0 \
+ -version-info 65:0:0 \
@create_shared_lib@ \
@auto_import_flags@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.48.0/poppler/Object.h new/poppler-0.49.0/poppler/Object.h
--- old/poppler-0.48.0/poppler/Object.h 2016-07-05 23:37:01.000000000 +0200
+++ new/poppler-0.49.0/poppler/Object.h 2016-10-23 19:08:37.000000000 +0200
@@ -21,7 +21,7 @@
// Copyright (C) 2013 Thomas Freitag <Thomas.Freitag(a)alfa.de>
// Copyright (C) 2013 Adrian Johnson <ajohnson(a)redneon.com>
// Copyright (C) 2013 Adrian Perez de Castro <aperez(a)igalia.com>
-// Copyright (C) 2016 Jakub Kucharski <jakubkucharski97(a)gmail.com>
+// Copyright (C) 2016 Jakub Alba <jakubalba(a)gmail.com>
//
// 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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.48.0/poppler/PDFDoc.cc new/poppler-0.49.0/poppler/PDFDoc.cc
--- old/poppler-0.48.0/poppler/PDFDoc.cc 2016-09-07 16:47:08.000000000 +0200
+++ new/poppler-0.49.0/poppler/PDFDoc.cc 2016-10-23 23:02:16.000000000 +0200
@@ -34,7 +34,7 @@
// Copyright (C) 2015 Li Junling <lijunling(a)sina.com>
// Copyright (C) 2015 André Guerreiro <aguerreiro1985(a)gmail.com>
// Copyright (C) 2015 André Esser <bepandre(a)hotmail.com>
-// Copyright (C) 2016 Jakub Kucharski <jakubkucharski97(a)gmail.com>
+// Copyright (C) 2016 Jakub Alba <jakubalba(a)gmail.com>
//
// 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
@@ -615,7 +615,7 @@
void PDFDoc::setDocInfoStringEntry(const char *key, GooString *value)
{
- GBool removeEntry = !value || value->getLength() == 0;
+ GBool removeEntry = !value || value->getLength() == 0 || value->hasJustUnicodeMarker();
if (removeEntry) {
delete value;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.48.0/poppler/PDFDoc.h new/poppler-0.49.0/poppler/PDFDoc.h
--- old/poppler-0.48.0/poppler/PDFDoc.h 2016-07-05 23:37:01.000000000 +0200
+++ new/poppler-0.49.0/poppler/PDFDoc.h 2016-10-23 19:08:37.000000000 +0200
@@ -29,7 +29,7 @@
// Copyright (C) 2013 Adrian Perez de Castro <aperez(a)igalia.com>
// Copyright (C) 2015 André Guerreiro <aguerreiro1985(a)gmail.com>
// Copyright (C) 2015 André Esser <bepandre(a)hotmail.com>
-// Copyright (C) 2016 Jakub Kucharski <jakubkucharski97(a)gmail.com>
+// Copyright (C) 2016 Jakub Alba <jakubalba(a)gmail.com>
//
// 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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.48.0/poppler/PSOutputDev.cc new/poppler-0.49.0/poppler/PSOutputDev.cc
--- old/poppler-0.48.0/poppler/PSOutputDev.cc 2016-09-04 15:32:21.000000000 +0200
+++ new/poppler-0.49.0/poppler/PSOutputDev.cc 2016-11-15 00:02:03.000000000 +0100
@@ -30,6 +30,7 @@
// Copyright (C) 2012 Lu Wang <coolwanglu(a)gmail.com>
// Copyright (C) 2014 Till Kamppeter <till.kamppeter(a)gmail.com>
// Copyright (C) 2015 Marek Kasik <mkasik(a)redhat.com>
+// Copyright (C) 2016 Caolán McNamara <caolanm(a)redhat.com>
//
// 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
@@ -48,6 +49,7 @@
#include <signal.h>
#include <math.h>
#include <limits.h>
+#include <algorithm>
#include "goo/GooString.h"
#include "goo/GooList.h"
#include "goo/GooHash.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.48.0/poppler/SplashOutputDev.cc new/poppler-0.49.0/poppler/SplashOutputDev.cc
--- old/poppler-0.48.0/poppler/SplashOutputDev.cc 2016-09-04 15:19:58.000000000 +0200
+++ new/poppler-0.49.0/poppler/SplashOutputDev.cc 2016-11-02 22:59:53.000000000 +0100
@@ -1323,6 +1323,10 @@
struct T3GlyphStack {
Gushort code; // character code
+ GBool haveDx; // set after seeing a d0/d1 operator
+ GBool doNotCache; // set if we see a gsave/grestore before
+ // the d0/d1
+
//----- cache info
T3FontCache *cache; // font cache for the current font
T3FontCacheTag *cacheTag; // pointer to cache tag for the glyph
@@ -1600,11 +1604,21 @@
void SplashOutputDev::saveState(GfxState *state) {
splash->saveState();
+ if (t3GlyphStack && !t3GlyphStack->haveDx) {
+ t3GlyphStack->doNotCache = gTrue;
+ error(errSyntaxWarning, -1,
+ "Save (q) operator before d0/d1 in Type 3 glyph");
+ }
}
void SplashOutputDev::restoreState(GfxState *state) {
splash->restoreState();
needFontUpdate = gTrue;
+ if (t3GlyphStack && !t3GlyphStack->haveDx) {
+ t3GlyphStack->doNotCache = gTrue;
+ error(errSyntaxWarning, -1,
+ "Restore (Q) operator before d0/d1 in Type 3 glyph");
+ }
}
void SplashOutputDev::updateAll(GfxState *state) {
@@ -2668,8 +2682,8 @@
t3GlyphStack->cache = t3Font;
t3GlyphStack->cacheTag = NULL;
t3GlyphStack->cacheData = NULL;
-
- haveT3Dx = gFalse;
+ t3GlyphStack->haveDx = gFalse;
+ t3GlyphStack->doNotCache = gFalse;
return gFalse;
}
@@ -2699,7 +2713,7 @@
}
void SplashOutputDev::type3D0(GfxState *state, double wx, double wy) {
- haveT3Dx = gTrue;
+ t3GlyphStack->haveDx = gTrue;
}
void SplashOutputDev::type3D1(GfxState *state, double wx, double wy,
@@ -2711,10 +2725,14 @@
int i, j;
// ignore multiple d0/d1 operators
- if (haveT3Dx) {
+ if (t3GlyphStack->haveDx) {
+ return;
+ }
+ t3GlyphStack->haveDx = gTrue;
+ // don't cache if we got a gsave/grestore before the d1
+ if (t3GlyphStack->doNotCache) {
return;
}
- haveT3Dx = gTrue;
if (unlikely(t3GlyphStack == NULL)) {
error(errSyntaxWarning, -1, "t3GlyphStack was null in SplashOutputDev::type3D1");
@@ -4762,17 +4780,17 @@
default:
break;
}
- SplashGouraudColor *splashShading = new SplashGouraudPattern(bDirectColorTranslation, state, shading, colorMode);
// restore vector antialias because we support it here
if (shading->isParameterized()) {
+ SplashGouraudColor *splashShading = new SplashGouraudPattern(bDirectColorTranslation, state, shading, colorMode);
GBool vaa = getVectorAntialias();
GBool retVal = gFalse;
setVectorAntialias(gTrue);
retVal = splash->gouraudTriangleShadedFill(splashShading);
setVectorAntialias(vaa);
+ delete splashShading;
return retVal;
}
- delete splashShading;
return gFalse;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.48.0/poppler/SplashOutputDev.h new/poppler-0.49.0/poppler/SplashOutputDev.h
--- old/poppler-0.48.0/poppler/SplashOutputDev.h 2016-05-02 00:08:03.000000000 +0200
+++ new/poppler-0.49.0/poppler/SplashOutputDev.h 2016-11-02 22:59:53.000000000 +0100
@@ -459,7 +459,6 @@
t3FontCache[splashOutT3FontCacheSize];
int nT3Fonts; // number of valid entries in t3FontCache
T3GlyphStack *t3GlyphStack; // Type 3 glyph context stack
- GBool haveT3Dx; // set after seeing a d0/d1 operator
SplashFont *font; // current font
GBool needFontUpdate; // set when the font needs to be updated
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.48.0/poppler/XRef.cc new/poppler-0.49.0/poppler/XRef.cc
--- old/poppler-0.48.0/poppler/XRef.cc 2016-09-06 00:02:05.000000000 +0200
+++ new/poppler-0.49.0/poppler/XRef.cc 2016-10-23 19:08:37.000000000 +0200
@@ -24,7 +24,7 @@
// Copyright (C) 2012, 2013 Fabio D'Urso <fabiodurso(a)hotmail.it>
// Copyright (C) 2013, 2014 Adrian Johnson <ajohnson(a)redneon.com>
// Copyright (C) 2013 Pino Toscano <pino(a)kde.org>
-// Copyright (C) 2016 Jakub Kucharski <jakubkucharski97(a)gmail.com>
+// Copyright (C) 2016 Jakub Alba <jakubalba(a)gmail.com>
//
// 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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.48.0/poppler/XRef.h new/poppler-0.49.0/poppler/XRef.h
--- old/poppler-0.48.0/poppler/XRef.h 2016-07-05 23:37:01.000000000 +0200
+++ new/poppler-0.49.0/poppler/XRef.h 2016-10-23 19:08:37.000000000 +0200
@@ -22,7 +22,7 @@
// Copyright (C) 2012, 2013, 2016 Thomas Freitag <Thomas.Freitag(a)kabelmail.de>
// Copyright (C) 2012, 2013 Fabio D'Urso <fabiodurso(a)hotmail.it>
// Copyright (C) 2013 Adrian Johnson <ajohnson(a)redneon.com>
-// Copyright (C) 2016 Jakub Kucharski <jakubkucharski97(a)gmail.com>
+// Copyright (C) 2016 Jakub Alba <jakubalba(a)gmail.com>
//
// 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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.48.0/poppler/poppler-config.h.cmake new/poppler-0.49.0/poppler/poppler-config.h.cmake
--- old/poppler-0.48.0/poppler/poppler-config.h.cmake 2016-05-02 00:08:03.000000000 +0200
+++ new/poppler-0.49.0/poppler/poppler-config.h.cmake 2016-11-15 00:06:05.000000000 +0100
@@ -15,6 +15,7 @@
//
// Copyright (C) 2014 Bogdan Cristea <cristeab(a)gmail.com>
// Copyright (C) 2014 Hib Eris <hib(a)hiberis.nl>
+// Copyright (C) 2016 Tor Lillqvist <tml(a)collabora.com>
//
// 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
@@ -186,7 +187,7 @@
#define GCC_PRINTF_FORMAT(fmt_index, va_index)
#endif
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && _MSC_VER < 1800
#define fmax(a, b) std::max(a, b)
#define fmin(a, b) std::min(a, b)
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.48.0/poppler/poppler-config.h.in new/poppler-0.49.0/poppler/poppler-config.h.in
--- old/poppler-0.48.0/poppler/poppler-config.h.in 2016-05-02 00:08:04.000000000 +0200
+++ new/poppler-0.49.0/poppler/poppler-config.h.in 2016-11-15 00:01:38.000000000 +0100
@@ -15,6 +15,7 @@
//
// Copyright (C) 2014 Bogdan Cristea <cristeab(a)gmail.com>
// Copyright (C) 2014 Hib Eris <hib(a)hiberis.nl>
+// Copyright (C) 2016 Tor Lillqvist <tml(a)collabora.com>
//
// 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
@@ -186,7 +187,7 @@
#define GCC_PRINTF_FORMAT(fmt_index, va_index)
#endif
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && _MSC_VER < 1800
#define fmax(a, b) std::max(a, b)
#define fmin(a, b) std::min(a, b)
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.48.0/qt4/src/poppler-document.cc new/poppler-0.49.0/qt4/src/poppler-document.cc
--- old/poppler-0.48.0/qt4/src/poppler-document.cc 2016-07-24 23:06:49.000000000 +0200
+++ new/poppler-0.49.0/qt4/src/poppler-document.cc 2016-10-23 19:08:37.000000000 +0200
@@ -9,7 +9,7 @@
* Copyright (C) 2012 Fabio D'Urso <fabiodurso(a)hotmail.it>
* Copyright (C) 2014 Adam Reichold <adamreichold(a)myopera.com>
* Copyright (C) 2015 William Bader <williambader(a)hotmail.com>
- * Copyright (C) 2016 Jakub Kucharski <jakubkucharski97(a)gmail.com>
+ * Copyright (C) 2016 Jakub Alba <jakubalba(a)gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.48.0/qt4/src/poppler-private.cc new/poppler-0.49.0/qt4/src/poppler-private.cc
--- old/poppler-0.48.0/qt4/src/poppler-private.cc 2016-07-24 12:27:50.000000000 +0200
+++ new/poppler-0.49.0/qt4/src/poppler-private.cc 2016-10-23 19:08:37.000000000 +0200
@@ -4,7 +4,7 @@
* Copyright (C) 2008, 2010, 2011 by Pino Toscano <pino(a)kde.org>
* Copyright (C) 2013 by Thomas Freitag <Thomas.Freitag(a)alfa.de>
* Copyright (C) 2013 Adrian Johnson <ajohnson(a)redneon.com>
- * Copyright (C) 2016 Jakub Kucharski <jakubkucharski97(a)gmail.com>
+ * Copyright (C) 2016 Jakub Alba <jakubalba(a)gmail.com>
* Inspired on code by
* Copyright (C) 2004 by Albert Astals Cid <tsdgeos(a)terra.es>
* Copyright (C) 2004 by Enrico Ros <eros.kde(a)email.it>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.48.0/qt4/src/poppler-private.h new/poppler-0.49.0/qt4/src/poppler-private.h
--- old/poppler-0.48.0/qt4/src/poppler-private.h 2016-07-24 12:27:50.000000000 +0200
+++ new/poppler-0.49.0/qt4/src/poppler-private.h 2016-10-23 19:08:37.000000000 +0200
@@ -7,7 +7,7 @@
* Copyright (C) 2011 Hib Eris <hib(a)hiberis.nl>
* Copyright (C) 2012, 2013 Thomas Freitag <Thomas.Freitag(a)alfa.de>
* Copyright (C) 2013 Julien Nabet <serval2412(a)yahoo.fr>
- * Copyright (C) 2016 Jakub Kucharski <jakubkucharski97(a)gmail.com>
+ * Copyright (C) 2016 Jakub Alba <jakubalba(a)gmail.com>
* Inspired on code by
* Copyright (C) 2004 by Albert Astals Cid <tsdgeos(a)terra.es>
* Copyright (C) 2004 by Enrico Ros <eros.kde(a)email.it>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.48.0/qt4/src/poppler-qt4.h new/poppler-0.49.0/qt4/src/poppler-qt4.h
--- old/poppler-0.48.0/qt4/src/poppler-qt4.h 2016-07-24 12:29:33.000000000 +0200
+++ new/poppler-0.49.0/qt4/src/poppler-qt4.h 2016-10-23 19:08:37.000000000 +0200
@@ -14,7 +14,7 @@
* Copyright (C) 2012, Tobias Koenig <tobias.koenig(a)kdab.com>
* Copyright (C) 2012, 2014, 2015 Adam Reichold <adamreichold(a)myopera.com>
* Copyright (C) 2012, 2013 Thomas Freitag <Thomas.Freitag(a)alfa.de>
- * Copyright (C) 2016 Jakub Kucharski <jakubkucharski97(a)gmail.com>
+ * Copyright (C) 2016 Jakub Alba <jakubalba(a)gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.48.0/qt5/src/poppler-document.cc new/poppler-0.49.0/qt5/src/poppler-document.cc
--- old/poppler-0.48.0/qt5/src/poppler-document.cc 2016-07-24 23:07:22.000000000 +0200
+++ new/poppler-0.49.0/qt5/src/poppler-document.cc 2016-10-23 19:08:37.000000000 +0200
@@ -9,7 +9,7 @@
* Copyright (C) 2012 Fabio D'Urso <fabiodurso(a)hotmail.it>
* Copyright (C) 2014 Adam Reichold <adamreichold(a)myopera.com>
* Copyright (C) 2015 William Bader <williambader(a)hotmail.com>
- * Copyright (C) 2016 Jakub Kucharski <jakubkucharski97(a)gmail.com>
+ * Copyright (C) 2016 Jakub Alba <jakubalba(a)gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.48.0/qt5/src/poppler-private.cc new/poppler-0.49.0/qt5/src/poppler-private.cc
--- old/poppler-0.48.0/qt5/src/poppler-private.cc 2016-07-24 12:40:56.000000000 +0200
+++ new/poppler-0.49.0/qt5/src/poppler-private.cc 2016-10-23 19:08:37.000000000 +0200
@@ -4,7 +4,7 @@
* Copyright (C) 2008, 2010, 2011, 2014 by Pino Toscano <pino(a)kde.org>
* Copyright (C) 2013 by Thomas Freitag <Thomas.Freitag(a)alfa.de>
* Copyright (C) 2013 Adrian Johnson <ajohnson(a)redneon.com>
- * Copyright (C) 2016 Jakub Kucharski <jakubkucharski97(a)gmail.com>
+ * Copyright (C) 2016 Jakub Alba <jakubalba(a)gmail.com>
* Inspired on code by
* Copyright (C) 2004 by Albert Astals Cid <tsdgeos(a)terra.es>
* Copyright (C) 2004 by Enrico Ros <eros.kde(a)email.it>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.48.0/qt5/src/poppler-private.h new/poppler-0.49.0/qt5/src/poppler-private.h
--- old/poppler-0.48.0/qt5/src/poppler-private.h 2016-07-24 12:40:56.000000000 +0200
+++ new/poppler-0.49.0/qt5/src/poppler-private.h 2016-10-23 19:08:37.000000000 +0200
@@ -9,7 +9,7 @@
* Copyright (C) 2013 Anthony Granger <grangeranthony(a)gmail.com>
* Copyright (C) 2014 Bogdan Cristea <cristeab(a)gmail.com>
* Copyright (C) 2014 Aki Koskinen <freedesktop(a)akikoskinen.info>
- * Copyright (C) 2016 Jakub Kucharski <jakubkucharski97(a)gmail.com>
+ * Copyright (C) 2016 Jakub Alba <jakubalba(a)gmail.com>
* Inspired on code by
* Copyright (C) 2004 by Albert Astals Cid <tsdgeos(a)terra.es>
* Copyright (C) 2004 by Enrico Ros <eros.kde(a)email.it>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.48.0/qt5/src/poppler-qt5.h new/poppler-0.49.0/qt5/src/poppler-qt5.h
--- old/poppler-0.48.0/qt5/src/poppler-qt5.h 2016-07-24 12:41:37.000000000 +0200
+++ new/poppler-0.49.0/qt5/src/poppler-qt5.h 2016-10-23 19:08:37.000000000 +0200
@@ -15,7 +15,7 @@
* Copyright (C) 2012, 2014, 2015 Adam Reichold <adamreichold(a)myopera.com>
* Copyright (C) 2012, 2013 Thomas Freitag <Thomas.Freitag(a)alfa.de>
* Copyright (C) 2013 Anthony Granger <grangeranthony(a)gmail.com>
- * Copyright (C) 2016 Jakub Kucharski <jakubkucharski97(a)gmail.com>
+ * Copyright (C) 2016 Jakub Alba <jakubalba(a)gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.48.0/splash/Splash.cc new/poppler-0.49.0/splash/Splash.cc
--- old/poppler-0.48.0/splash/Splash.cc 2016-09-04 15:32:21.000000000 +0200
+++ new/poppler-0.49.0/splash/Splash.cc 2016-10-24 20:00:44.000000000 +0200
@@ -5745,24 +5745,26 @@
colorinterp = scanColorMap[0] * scanLimitL + scanColorMap[1];
bitmapOff = scanLineOff + scanLimitL * colorComps;
- for (int X = scanLimitL; X <= scanLimitR && bitmapOff + colorComps <= bitmapOffLimit; ++X, colorinterp += scanColorMap[0], bitmapOff += colorComps) {
- // FIXME : standard rectangular clipping can be done for a
- // complete scanline which is faster
- // --> see SplashClip and its methods
- if (!clip->test(X, Y))
- continue;
+ if (likely(bitmapOff >= 0)) {
+ for (int X = scanLimitL; X <= scanLimitR && bitmapOff + colorComps <= bitmapOffLimit; ++X, colorinterp += scanColorMap[0], bitmapOff += colorComps) {
+ // FIXME : standard rectangular clipping can be done for a
+ // complete scanline which is faster
+ // --> see SplashClip and its methods
+ if (!clip->test(X, Y))
+ continue;
- assert(fabs(colorinterp - (scanColorMap[0] * X + scanColorMap[1])) < 1e-10);
- assert(bitmapOff == Y * rowSize + colorComps * X && scanLineOff == Y * rowSize);
+ assert(fabs(colorinterp - (scanColorMap[0] * X + scanColorMap[1])) < 1e-10);
+ assert(bitmapOff == Y * rowSize + colorComps * X && scanLineOff == Y * rowSize);
- shading->getParameterizedColor(colorinterp, bitmapMode, &bitmapData[bitmapOff]);
+ shading->getParameterizedColor(colorinterp, bitmapMode, &bitmapData[bitmapOff]);
- // make the shading visible.
- // Note that opacity is handled by the bDirectBlit stuff, see
- // above for comments and below for implementation.
- if (hasAlpha)
- bitmapAlpha[Y * bitmapWidth + X] = 255;
- }
+ // make the shading visible.
+ // Note that opacity is handled by the bDirectBlit stuff, see
+ // above for comments and below for implementation.
+ if (hasAlpha)
+ bitmapAlpha[Y * bitmapWidth + X] = 255;
+ }
+ }
}
}
} else {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.48.0/utils/pdfseparate.cc new/poppler-0.49.0/utils/pdfseparate.cc
--- old/poppler-0.48.0/utils/pdfseparate.cc 2016-05-02 00:08:04.000000000 +0200
+++ new/poppler-0.49.0/utils/pdfseparate.cc 2016-11-14 23:59:24.000000000 +0100
@@ -6,7 +6,7 @@
//
// Copyright (C) 2011, 2012, 2015 Thomas Freitag <Thomas.Freitag(a)alfa.de>
// Copyright (C) 2012-2014 Albert Astals Cid <aacid(a)kde.org>
-// Copyright (C) 2013 Pino Toscano <pino(a)kde.org>
+// Copyright (C) 2013, 2016 Pino Toscano <pino(a)kde.org>
// Copyright (C) 2013 Daniel Kahn Gillmor <dkg(a)fifthhorseman.net>
// Copyright (C) 2013 Suzuki Toshiya <mpsuzuki(a)hiroshima-u.ac.jp>
//
@@ -97,7 +97,7 @@
}
}
if (!foundmatch && firstPage != lastPage) {
- error(errSyntaxError, -1, "'{0:s}' must contain '%%d' if more than one page should be extracted", destFileName);
+ error(errSyntaxError, -1, "'{0:s}' must contain '%d' if more than one page should be extracted", destFileName);
free(auxDestFileName);
delete doc;
return false;
[View Less]
1
0
Hello community,
here is the log from the commit of package llvm3_8 for openSUSE:Factory checked in at 2016-11-25 12:03:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/llvm3_8 (Old)
and /work/SRC/openSUSE:Factory/.llvm3_8.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "llvm3_8"
Changes:
--------
--- /work/SRC/openSUSE:Factory/llvm3_8/llvm3_8.changes 2016-10-31 09:53:21.…
[View More]000000000 +0100
+++ /work/SRC/openSUSE:Factory/.llvm3_8.new/llvm3_8.changes 2016-11-25 12:03:23.000000000 +0100
@@ -1,0 +2,12 @@
+Fri Nov 18 13:40:40 UTC 2016 - jslaby(a)suse.com
+
+- require libLTO in llvm-devel. Otherwise, when I use
+ find_package(LLVM REQUIRED CONFIG), I see:
+ CMake Error at /usr/share/llvm/cmake/LLVMExports.cmake:555 (message):
+ The imported target "LTO" references the file
+
+ "/usr/lib64/libLTO.so.3.8.1"
+
+ but this file does not exist.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ llvm3_8.spec ++++++
--- /var/tmp/diff_new_pack.MkiYmt/_old 2016-11-25 12:03:26.000000000 +0100
+++ /var/tmp/diff_new_pack.MkiYmt/_new 2016-11-25 12:03:26.000000000 +0100
@@ -131,6 +131,7 @@
Requires: groff
Requires: libstdc++-devel
Requires: libtool
+Requires: libLTO%{_sonum}
Requires: ncurses-devel
Requires: pkgconfig
Requires: pkgconfig(libedit)
[View Less]
1
0
Hello community,
here is the log from the commit of package python3-virtualenv for openSUSE:Factory checked in at 2016-11-25 12:03:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python3-virtualenv (Old)
and /work/SRC/openSUSE:Factory/.python3-virtualenv.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python3-virtualenv"
Changes:
--------
--- /work/SRC/openSUSE:Factory/…
[View More]python3-virtualenv/python3-virtualenv-doc.changes 2016-09-09 10:14:41.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.python3-virtualenv.new/python3-virtualenv-doc.changes 2016-11-25 12:03:13.000000000 +0100
@@ -1,0 +2,10 @@
+Thu Nov 17 16:49:36 UTC 2016 - arun(a)gmx.de
+
+- update to version 15.1.0:
+ * Support Python 3.6.
+ * Upgrade setuptools to 28.0.0.
+ * Upgrade pip to 9.0.1.
+ * Don’t install pre-release versions of pip, setuptools, or wheel
+ from PyPI.
+
+-------------------------------------------------------------------
python3-virtualenv.changes: same change
Old:
----
virtualenv-15.0.3.tar.gz
New:
----
virtualenv-15.1.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python3-virtualenv-doc.spec ++++++
--- /var/tmp/diff_new_pack.haKxTb/_old 2016-11-25 12:03:15.000000000 +0100
+++ /var/tmp/diff_new_pack.haKxTb/_new 2016-11-25 12:03:15.000000000 +0100
@@ -17,7 +17,7 @@
Name: python3-virtualenv-doc
-Version: 15.0.3
+Version: 15.1.0
Release: 0
Url: http://www.virtualenv.org/
Summary: Documentation for python3-virtualenv
python3-virtualenv.spec: same change
++++++ virtualenv-15.0.3.tar.gz -> virtualenv-15.1.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/virtualenv-15.0.3/PKG-INFO new/virtualenv-15.1.0/PKG-INFO
--- old/virtualenv-15.0.3/PKG-INFO 2016-08-05 14:44:21.000000000 +0200
+++ new/virtualenv-15.1.0/PKG-INFO 2016-11-16 03:39:36.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: virtualenv
-Version: 15.0.3
+Version: 15.1.0
Summary: Virtual Python Environment builder
Home-page: https://virtualenv.pypa.io/
Author: Jannis Leidel, Carl Meyer and Brian Rosner
@@ -47,27 +47,28 @@
Release History
===============
- 15.0.3 (2016-08-05)
+ 15.1.0 (2016-11-15)
-------------------
- * Test for given python path actually being an executable *file*, #939
+ * Support Python 3.6.
- * Only search for copy actual existing Tcl/Tk directories (PR #937)
+ * Upgrade setuptools to 28.0.0.
- * Generically search for correct Tcl/Tk version (PR #926, PR #933)
+ * Upgrade pip to 9.0.1.
+
+ * Don't install pre-release versions of pip, setuptools, or wheel from PyPI.
- * Upgrade setuptools to 22.0.5
- 15.0.2 (2016-05-28)
+ 15.0.3 (2016-08-05)
-------------------
- * Copy Tcl/Tk libs on Windows to allow them to run,
- fixes #93 (PR #888)
+ * Test for given python path actually being an executable *file*, #939
- * Upgrade setuptools to 21.2.1.
+ * Only search for copy actual existing Tcl/Tk directories (PR #937)
- * Upgrade pip to 8.1.2.
+ * Generically search for correct Tcl/Tk version (PR #926, PR #933)
+ * Upgrade setuptools to 22.0.5
`Full Changelog <https://virtualenv.pypa.io/en/latest/changes.html>`_.
Keywords: setuptools deployment installation distutils
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/virtualenv-15.0.3/docs/changes.rst new/virtualenv-15.1.0/docs/changes.rst
--- old/virtualenv-15.0.3/docs/changes.rst 2016-08-05 14:22:26.000000000 +0200
+++ new/virtualenv-15.1.0/docs/changes.rst 2016-11-16 03:39:30.000000000 +0100
@@ -1,6 +1,18 @@
Release History
===============
+15.1.0 (2016-11-15)
+-------------------
+
+* Support Python 3.6.
+
+* Upgrade setuptools to 28.0.0.
+
+* Upgrade pip to 9.0.1.
+
+* Don't install pre-release versions of pip, setuptools, or wheel from PyPI.
+
+
15.0.3 (2016-08-05)
-------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/virtualenv-15.0.3/virtualenv.egg-info/PKG-INFO new/virtualenv-15.1.0/virtualenv.egg-info/PKG-INFO
--- old/virtualenv-15.0.3/virtualenv.egg-info/PKG-INFO 2016-08-05 14:44:21.000000000 +0200
+++ new/virtualenv-15.1.0/virtualenv.egg-info/PKG-INFO 2016-11-16 03:39:36.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: virtualenv
-Version: 15.0.3
+Version: 15.1.0
Summary: Virtual Python Environment builder
Home-page: https://virtualenv.pypa.io/
Author: Jannis Leidel, Carl Meyer and Brian Rosner
@@ -47,27 +47,28 @@
Release History
===============
- 15.0.3 (2016-08-05)
+ 15.1.0 (2016-11-15)
-------------------
- * Test for given python path actually being an executable *file*, #939
+ * Support Python 3.6.
- * Only search for copy actual existing Tcl/Tk directories (PR #937)
+ * Upgrade setuptools to 28.0.0.
- * Generically search for correct Tcl/Tk version (PR #926, PR #933)
+ * Upgrade pip to 9.0.1.
+
+ * Don't install pre-release versions of pip, setuptools, or wheel from PyPI.
- * Upgrade setuptools to 22.0.5
- 15.0.2 (2016-05-28)
+ 15.0.3 (2016-08-05)
-------------------
- * Copy Tcl/Tk libs on Windows to allow them to run,
- fixes #93 (PR #888)
+ * Test for given python path actually being an executable *file*, #939
- * Upgrade setuptools to 21.2.1.
+ * Only search for copy actual existing Tcl/Tk directories (PR #937)
- * Upgrade pip to 8.1.2.
+ * Generically search for correct Tcl/Tk version (PR #926, PR #933)
+ * Upgrade setuptools to 22.0.5
`Full Changelog <https://virtualenv.pypa.io/en/latest/changes.html>`_.
Keywords: setuptools deployment installation distutils
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/virtualenv-15.0.3/virtualenv.egg-info/SOURCES.txt new/virtualenv-15.1.0/virtualenv.egg-info/SOURCES.txt
--- old/virtualenv-15.0.3/virtualenv.egg-info/SOURCES.txt 2016-08-05 14:44:21.000000000 +0200
+++ new/virtualenv-15.1.0/virtualenv.egg-info/SOURCES.txt 2016-11-16 03:39:36.000000000 +0100
@@ -40,6 +40,6 @@
virtualenv_embedded/site.py
virtualenv_support/__init__.py
virtualenv_support/argparse-1.4.0-py2.py3-none-any.whl
-virtualenv_support/pip-8.1.2-py2.py3-none-any.whl
-virtualenv_support/setuptools-22.0.5-py2.py3-none-any.whl
+virtualenv_support/pip-9.0.1-py2.py3-none-any.whl
+virtualenv_support/setuptools-28.8.0-py2.py3-none-any.whl
virtualenv_support/wheel-0.29.0-py2.py3-none-any.whl
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/virtualenv-15.0.3/virtualenv.py new/virtualenv-15.1.0/virtualenv.py
--- old/virtualenv-15.0.3/virtualenv.py 2016-08-05 14:22:20.000000000 +0200
+++ new/virtualenv-15.1.0/virtualenv.py 2016-11-16 03:39:30.000000000 +0100
@@ -36,7 +36,7 @@
except ImportError:
import configparser as ConfigParser
-__version__ = "15.0.3"
+__version__ = "15.1.0"
virtualenv_version = __version__ # legacy
if sys.version_info < (2, 6):
@@ -155,6 +155,8 @@
'_collections_abc',
'_bootlocale',
])
+ if minver >= 6:
+ REQUIRED_MODULES.extend(['enum'])
if is_pypy:
# these are needed to correctly display the exceptions that may happen
@@ -889,7 +891,6 @@
"PIP_FIND_LINKS": findlinks,
"PIP_USE_WHEEL": "1",
"PIP_ONLY_BINARY": ":all:",
- "PIP_PRE": "1",
"PIP_USER": "0",
}
Files old/virtualenv-15.0.3/virtualenv_support/pip-8.1.2-py2.py3-none-any.whl and new/virtualenv-15.1.0/virtualenv_support/pip-8.1.2-py2.py3-none-any.whl differ
Files old/virtualenv-15.0.3/virtualenv_support/pip-9.0.1-py2.py3-none-any.whl and new/virtualenv-15.1.0/virtualenv_support/pip-9.0.1-py2.py3-none-any.whl differ
Files old/virtualenv-15.0.3/virtualenv_support/setuptools-22.0.5-py2.py3-none-any.whl and new/virtualenv-15.1.0/virtualenv_support/setuptools-22.0.5-py2.py3-none-any.whl differ
Files old/virtualenv-15.0.3/virtualenv_support/setuptools-28.8.0-py2.py3-none-any.whl and new/virtualenv-15.1.0/virtualenv_support/setuptools-28.8.0-py2.py3-none-any.whl differ
[View Less]
1
0
Hello community,
here is the log from the commit of package zypper for openSUSE:Factory checked in at 2016-11-25 12:02:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/zypper (Old)
and /work/SRC/openSUSE:Factory/.zypper.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "zypper"
Changes:
--------
--- /work/SRC/openSUSE:Factory/zypper/zypper.changes 2016-11-11 14:32:41.000000000 +…
[View More]0100
+++ /work/SRC/openSUSE:Factory/.zypper.new/zypper.changes 2016-11-25 12:02:50.000000000 +0100
@@ -1,0 +2,6 @@
+Tue Nov 22 17:19:43 CET 2016 - ma(a)suse.de
+
+- Properly escape patch script output in xml mode (bsc#1010712)
+- version 1.13.14
+
+-------------------------------------------------------------------
Old:
----
zypper-1.13.13.tar.bz2
New:
----
zypper-1.13.14.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ zypper.spec ++++++
--- /var/tmp/diff_new_pack.9xrlcf/_old 2016-11-25 12:02:51.000000000 +0100
+++ /var/tmp/diff_new_pack.9xrlcf/_new 2016-11-25 12:02:51.000000000 +0100
@@ -34,7 +34,7 @@
Summary: Command line software manager using libzypp
License: GPL-2.0+
Group: System/Packages
-Version: 1.13.13
+Version: 1.13.14
Release: 0
Source: %{name}-%{version}.tar.bz2
Source1: %{name}-rpmlintrc
++++++ zypper-1.13.13.tar.bz2 -> zypper-1.13.14.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/zypper/zypper-1.13.13.tar.bz2 /work/SRC/openSUSE:Factory/.zypper.new/zypper-1.13.14.tar.bz2 differ: char 11, line 1
[View Less]
1
0
Hello community,
here is the log from the commit of package libsolv for openSUSE:Factory checked in at 2016-11-25 12:02:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libsolv (Old)
and /work/SRC/openSUSE:Factory/.libsolv.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libsolv"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libsolv/libsolv.changes 2016-08-03 11:37:28.…
[View More]000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libsolv.new/libsolv.changes 2016-11-25 12:02:42.000000000 +0100
@@ -1,0 +2,10 @@
+Thu Nov 10 15:09:25 CET 2016 - mls(a)suse.de
+
+- make testcase_str2solvid work with ignored packages
+- improve checks against corrupt rpm
+- add SOLVER_FLAG_FOCUS_BEST solver flag
+- rework susetags multi-line handling [bnc#1007273]
+- build both for python2 and python3
+- bump version to 0.6.24
+
+-------------------------------------------------------------------
Old:
----
libsolv-0.6.23.tar.bz2
New:
----
libsolv-0.6.24.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libsolv.spec ++++++
--- /var/tmp/diff_new_pack.s4C782/_old 2016-11-25 12:02:43.000000000 +0100
+++ /var/tmp/diff_new_pack.s4C782/_new 2016-11-25 12:02:43.000000000 +0100
@@ -17,7 +17,7 @@
Name: libsolv
-Version: 0.6.23
+Version: 0.6.24
Release: 0
Url: https://github.com/openSUSE/libsolv
Source: libsolv-%{version}.tar.bz2
@@ -27,6 +27,7 @@
%bcond_without disable_shared
%bcond_without perl_binding
%bcond_without python_binding
+%bcond_without python3_binding
%bcond_without ruby_binding
%bcond_with zypp
@@ -71,10 +72,14 @@
BuildRequires: swig
%endif
%if %{with python_binding}
-%global python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(True);")
+%global python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(True))")
BuildRequires: python-devel
BuildRequires: swig
%endif
+%if %{with python3_binding}
+%global python3_sitearch %(python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(True))")
+BuildRequires: python3-devel
+%endif
Summary: A new approach to package dependency solving
License: BSD-3-Clause
@@ -150,6 +155,13 @@
%description -n python-solv
Python bindings for sat solver.
+%package -n python3-solv
+Summary: Python3 bindings for the libsolv library
+Group: Development/Languages/Python
+
+%description -n python3-solv
+Python3 bindings for sat solver.
+
%package -n perl-solv
Requires: perl = %{perl_version}
Summary: Perl bindings for the libsolv library
@@ -182,6 +194,7 @@
%{?with_disable_shared:-DDISABLE_SHARED=1} \
%{?with_perl_binding:-DENABLE_PERL=1} \
%{?with_python_binding:-DENABLE_PYTHON=1} \
+ %{?with_python3_binding:-DENABLE_PYTHON3=1} \
%{?with_ruby_binding:-DENABLE_RUBY=1} \
%{?with_zypp:-DENABLE_SUSEREPO=1 -DENABLE_HELIXREPO=1} \
-DUSE_VENDORDIRS=1 \
@@ -190,13 +203,16 @@
%install
make DESTDIR=$RPM_BUILD_ROOT install
-%if %{with python_binding}
%if 0%{?suse_version}
+%if %{with python_binding}
pushd $RPM_BUILD_ROOT/%{python_sitearch}
python %py_libdir/py_compile.py *.py
python -O %py_libdir/py_compile.py *.py
popd
%endif
+%if %{with python3_binding}
+%py3_compile $RPM_BUILD_ROOT/%{python3_sitearch}
+%endif
%endif
%if %{with disable_shared}
# we want to leave the .a file untouched
@@ -269,4 +285,13 @@
%{python_sitearch}/*
%endif
+%if %{with python3_binding}
+%files -n python3-solv
+%defattr(-,root,root)
+%{python3_sitearch}/*solv*
+%if 0%{?suse_version}
+%{python3_sitearch}/*/*solv*
+%endif
+%endif
+
%changelog
++++++ libsolv-0.6.23.tar.bz2 -> libsolv-0.6.24.tar.bz2 ++++++
++++ 4068 lines of diff (skipped)
[View Less]
1
0
Hello community,
here is the log from the commit of package ntp for openSUSE:Factory checked in at 2016-11-25 12:02:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ntp (Old)
and /work/SRC/openSUSE:Factory/.ntp.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ntp"
Changes:
--------
--- /work/SRC/openSUSE:Factory/ntp/ntp.changes 2016-10-14 09:27:46.000000000 +0200
+++ /work/SRC/…
[View More]openSUSE:Factory/.ntp.new/ntp.changes 2016-11-25 12:02:26.000000000 +0100
@@ -1,0 +2,25 @@
+Mon Nov 21 16:14:17 UTC 2016 - max(a)suse.com
+
+- Update to 4.2.8p9:
+ * CVE-2016-9311: Trap crash.
+ * CVE-2016-9310: Mode 6 unauthenticated trap information
+ disclosure and DDoS vector.
+ * CVE-2016-7427: Broadcast Mode Replay Prevention DoS.
+ * CVE-2016-7428: Broadcast Mode Poll Interval Enforcement DoS.
+ * CVE-2016-7431: Regression: 010-origin: Zero Origin Timestamp
+ Bypass.
+ * CVE-2016-7434: Null pointer dereference in
+ _IO_str_init_static_internal().
+ * CVE-2016-7429: Interface selection attack.
+ * CVE-2016-7426: Client rate limiting and server responses.
+ * CVE-2016-7433: Reboot sync calculation problem.
+ * Fix a spurious error message (obsoletes ntp-sigchld.patch).
+ * Other bugfixes, see /usr/share/doc/packages/ntp/ChangeLog.
+- Fix a regression in "trap" (bsc#981252, ntp-trap.patch).
+- Reduce the number of netlink groups to listen on for changes to
+ the local network setup (bsc#992606, ntp-netlink.patch).
+- Fix segfault in "sntp -a" (bnc#1009434, ntp-sntp-a.patch).
+- Silence an OpenSSL version warning (bsc#992038,
+ ntp-openssl-version.patch).
+
+-------------------------------------------------------------------
Old:
----
ntp-4.2.8p8.tar.gz
ntp-sigchld.patch
New:
----
ntp-4.2.8p9.tar.gz
ntp-netlink.patch
ntp-openssl-version.patch
ntp-sntp-a.patch
ntp-trap.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ntp.spec ++++++
--- /var/tmp/diff_new_pack.oMGpDa/_old 2016-11-25 12:02:28.000000000 +0100
+++ /var/tmp/diff_new_pack.oMGpDa/_new 2016-11-25 12:02:28.000000000 +0100
@@ -21,7 +21,7 @@
%global _ntpunitsdir %{_libexecdir}/systemd/ntp-units.d
%endif
Name: ntp
-Version: 4.2.8p8
+Version: 4.2.8p9
Release: 0
Summary: Network Time Protocol daemon (version 4)
License: (MIT and BSD-3-Clause and BSD-4-Clause) and GPL-2.0
@@ -54,10 +54,13 @@
Patch19: ntp-ENOBUFS.patch
Patch20: ntp-sntp-dst.patch
Patch21: ntp-4.2.6p2-ntpq-speedup-782060.patch
-Patch22: ntp-sigchld.patch
+Patch22: ntp-openssl-version.patch
Patch23: ntp-processname.patch
Patch24: ntp-daemonize.patch
Patch25: ntp-usrgrp-resolver.patch
+Patch26: ntp-sntp-a.patch
+Patch27: ntp-netlink.patch
+Patch28: ntp-trap.patch
BuildRequires: autoconf
BuildRequires: avahi-compat-mDNSResponder-devel
@@ -130,10 +133,13 @@
%patch19 -p1
%patch20 -p1
%patch21
-%patch22 -p1
+%patch22
%patch23
%patch24
%patch25 -p1
+%patch26
+%patch27
+%patch28
# fix DOS line breaks
sed -i 's/\r//g' html/scripts/{footer.txt,style.css}
++++++ ntp-4.2.8p8.tar.gz -> ntp-4.2.8p9.tar.gz ++++++
/work/SRC/openSUSE:Factory/ntp/ntp-4.2.8p8.tar.gz /work/SRC/openSUSE:Factory/.ntp.new/ntp-4.2.8p9.tar.gz differ: char 5, line 1
++++++ ntp-netlink.patch ++++++
--- ntpd/ntp_io.c
+++ ntpd/ntp_io.c
@@ -4765,9 +4765,7 @@ init_async_notifications()
ZERO(sa);
sa.nl_family = PF_NETLINK;
sa.nl_groups = RTMGRP_LINK | RTMGRP_IPV4_IFADDR
- | RTMGRP_IPV6_IFADDR | RTMGRP_IPV4_ROUTE
- | RTMGRP_IPV4_MROUTE | RTMGRP_IPV6_ROUTE
- | RTMGRP_IPV6_MROUTE;
+ | RTMGRP_IPV6_IFADDR | RTMGRP_IPV4_ROUTE;
if (bind(fd, (struct sockaddr *)&sa, sizeof(sa)) < 0) {
msyslog(LOG_ERR,
"bind failed on routing socket (%m) - using polled interface update");
++++++ ntp-openssl-version.patch ++++++
--- libntp/ssl_init.c.orig
+++ libntp/ssl_init.c
@@ -52,15 +52,6 @@ atexit_ssl_cleanup(void)
void
ssl_check_version(void)
{
- if ((SSLeay() ^ OPENSSL_VERSION_NUMBER) & ~0xff0L) {
- msyslog(LOG_WARNING,
- "OpenSSL version mismatch. Built against %lx, you have %lx",
- (u_long)OPENSSL_VERSION_NUMBER, SSLeay());
- fprintf(stderr,
- "OpenSSL version mismatch. Built against %lx, you have %lx\n",
- (u_long)OPENSSL_VERSION_NUMBER, SSLeay());
- }
-
INIT_SSL();
}
++++++ ntp-sntp-a.patch ++++++
--- sntp/main.c.orig
+++ sntp/main.c
@@ -379,7 +379,6 @@ handle_lookup(
{
struct addrinfo hints; /* Local copy is OK */
struct dns_ctx *ctx;
- long l;
char * name_copy;
size_t name_sz;
size_t octets;
@@ -407,9 +406,8 @@ handle_lookup(
ctx->timeout = response_tv;
/* The following should arguably be passed in... */
- if (ENABLED_OPT(AUTHENTICATION) &&
- atoint(OPT_ARG(AUTHENTICATION), &l)) {
- ctx->key_id = l;
+ if (ENABLED_OPT(AUTHENTICATION)) {
+ ctx->key_id = OPT_VALUE_AUTHENTICATION;
get_key(ctx->key_id, &ctx->key);
} else {
ctx->key_id = -1;
++++++ ntp-trap.patch ++++++
--- ntpd/ntp_config.c
+++ ntpd/ntp_config.c
@@ -4315,11 +4315,11 @@ config_ntpd(
config_mdnstries(ptree);
config_setvar(ptree);
config_ttl(ptree);
- config_trap(ptree);
config_vars(ptree);
io_open_sockets();
+ config_trap(ptree);
config_other_modes(ptree);
config_peers(ptree);
config_unpeers(ptree);
[View Less]
1
0
Hello community,
here is the log from the commit of package skelcd-control-openSUSE for openSUSE:Factory checked in at 2016-11-25 12:02:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/skelcd-control-openSUSE (Old)
and /work/SRC/openSUSE:Factory/.skelcd-control-openSUSE.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "skelcd-control-openSUSE"
Changes:
--------
--- /work/SRC/…
[View More]openSUSE:Factory/skelcd-control-openSUSE/skelcd-control-openSUSE-promo.changes 2016-11-09 11:37:20.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.skelcd-control-openSUSE.new/skelcd-control-openSUSE-promo.changes 2016-11-25 12:02:16.000000000 +0100
@@ -1,0 +2,8 @@
+Tue Nov 22 16:43:21 CET 2016 - schubi(a)suse.de
+
+- control.xml: Removed double entries "branding-openSUSE" from
+ supported_desktops/one_supported_desktop/packages.
+ (bnc#1010989)
+- 42.2.99.4
+
+-------------------------------------------------------------------
skelcd-control-openSUSE.changes: same change
Old:
----
skelcd-control-openSUSE-42.2.99.3.tar.bz2
New:
----
skelcd-control-openSUSE-42.2.99.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ skelcd-control-openSUSE-promo.spec ++++++
--- /var/tmp/diff_new_pack.2Kdes9/_old 2016-11-25 12:02:17.000000000 +0100
+++ /var/tmp/diff_new_pack.2Kdes9/_new 2016-11-25 12:02:17.000000000 +0100
@@ -27,7 +27,7 @@
#
######################################################################
Name: skelcd-control-openSUSE-promo
-Version: 42.2.99.3
+Version: 42.2.99.4
Release: 0
Summary: The openSUSE Installation Control file
License: MIT
skelcd-control-openSUSE.spec: same change
++++++ skelcd-control-openSUSE-42.2.99.3.tar.bz2 -> skelcd-control-openSUSE-42.2.99.4.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-control-openSUSE-42.2.99.3/control/control.openSUSE.xml new/skelcd-control-openSUSE-42.2.99.4/control/control.openSUSE.xml
--- old/skelcd-control-openSUSE-42.2.99.3/control/control.openSUSE.xml 2016-11-03 10:52:12.000000000 +0100
+++ new/skelcd-control-openSUSE-42.2.99.4/control/control.openSUSE.xml 2016-11-22 17:02:14.000000000 +0100
@@ -155,7 +155,7 @@
<label_id>desktop_gnome</label_id>
<logon>gdm</logon>
<cursor>DMZ</cursor>
- <packages>gdm branding-openSUSE</packages>
+ <packages>gdm</packages>
<order config:type="integer">1</order>
<patterns>gnome x11 base</patterns>
<icon>pattern-gnome</icon>
@@ -167,7 +167,7 @@
<label_id>desktop_kde</label_id>
<logon>sddm</logon>
<cursor>DMZ</cursor>
- <packages>sddm branding-openSUSE</packages>
+ <packages>sddm</packages>
<order config:type="integer">1</order>
<patterns>kde x11 base</patterns>
<icon>pattern-kde4</icon>
@@ -192,7 +192,7 @@
<label_id>desktop_xfce</label_id>
<logon>lightdm</logon>
<cursor>DMZ</cursor>
- <packages>lightdm branding-openSUSE</packages>
+ <packages>lightdm</packages>
<order config:type="integer">4</order>
<patterns>xfce x11 base</patterns>
<icon>pattern-xfce</icon>
@@ -206,7 +206,7 @@
<label_id>desktop_lxde</label_id>
<logon>lightdm</logon>
<cursor>DMZ</cursor>
- <packages>lxde-common branding-openSUSE</packages>
+ <packages>lxde-common</packages>
<order config:type="integer">5</order>
<patterns>lxde x11 base</patterns>
<icon>pattern-lxde</icon>
@@ -218,7 +218,7 @@
<label_id>desktop_min_x</label_id>
<logon></logon>
<cursor>DMZ</cursor>
- <packages>xorg-x11-server branding-openSUSE</packages>
+ <packages>xorg-x11-server</packages>
<order config:type="integer">6</order>
<patterns>x11 base</patterns>
<icon>yast-x11</icon>
@@ -230,7 +230,7 @@
<label_id>desktop_enlightenment</label_id>
<logon>lightdm</logon>
<cursor>DMZ</cursor>
- <packages>lightdm branding-openSUSE</packages>
+ <packages>lightdm</packages>
<order config:type="integer">7</order>
<patterns>enlightenment x11 base</patterns>
<icon>pattern-enlightenment</icon>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-control-openSUSE-42.2.99.3/package/skelcd-control-openSUSE.changes new/skelcd-control-openSUSE-42.2.99.4/package/skelcd-control-openSUSE.changes
--- old/skelcd-control-openSUSE-42.2.99.3/package/skelcd-control-openSUSE.changes 2016-11-03 10:52:13.000000000 +0100
+++ new/skelcd-control-openSUSE-42.2.99.4/package/skelcd-control-openSUSE.changes 2016-11-22 17:02:14.000000000 +0100
@@ -1,4 +1,12 @@
-------------------------------------------------------------------
+Tue Nov 22 16:43:21 CET 2016 - schubi(a)suse.de
+
+- control.xml: Removed double entries "branding-openSUSE" from
+ supported_desktops/one_supported_desktop/packages.
+ (bnc#1010989)
+- 42.2.99.4
+
+-------------------------------------------------------------------
Wed Nov 2 16:16:22 CET 2016 - shundhammer(a)suse.de
- Added subvolumes (fate#321737)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-control-openSUSE-42.2.99.3/package/skelcd-control-openSUSE.spec new/skelcd-control-openSUSE-42.2.99.4/package/skelcd-control-openSUSE.spec
--- old/skelcd-control-openSUSE-42.2.99.3/package/skelcd-control-openSUSE.spec 2016-11-03 10:52:13.000000000 +0100
+++ new/skelcd-control-openSUSE-42.2.99.4/package/skelcd-control-openSUSE.spec 2016-11-22 17:02:14.000000000 +0100
@@ -27,7 +27,7 @@
#
######################################################################
Name: skelcd-control-openSUSE
-Version: 42.2.99.3
+Version: 42.2.99.4
Release: 0
Summary: The openSUSE Installation Control file
License: MIT
[View Less]
1
0
Hello community,
here is the log from the commit of package rpcbind for openSUSE:Factory checked in at 2016-11-25 12:02:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rpcbind (Old)
and /work/SRC/openSUSE:Factory/.rpcbind.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rpcbind"
Changes:
--------
--- /work/SRC/openSUSE:Factory/rpcbind/rpcbind.changes 2016-11-16 13:31:19.…
[View More]000000000 +0100
+++ /work/SRC/openSUSE:Factory/.rpcbind.new/rpcbind.changes 2016-11-25 12:02:06.000000000 +0100
@@ -1,0 +2,6 @@
+Tue Nov 22 08:27:10 CET 2016 - kukuk(a)suse.de
+
+- Add 0012-Move-default-state-dir-to-a-subdirectory-of-var-run.patch
+ from upstream, replacing systemd tmpfile solution.
+
+-------------------------------------------------------------------
Old:
----
rpcbind.conf
New:
----
0012-Move-default-state-dir-to-a-subdirectory-of-var-run.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rpcbind.spec ++++++
--- /var/tmp/diff_new_pack.F6mAYK/_old 2016-11-25 12:02:07.000000000 +0100
+++ /var/tmp/diff_new_pack.F6mAYK/_new 2016-11-25 12:02:07.000000000 +0100
@@ -27,7 +27,6 @@
Source2: sysconfig.rpcbind
Source3: rpcbind.xml
Source4: pmap_set.c
-Source5: rpcbind.conf
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: libtirpc-devel >= 1.0.1
BuildRequires: libtool
@@ -47,6 +46,7 @@
Patch9: 0009-init_transport-move-the-registration-code-into-a-sep.patch
Patch10: 0010-Fix-the-behavior-when-specifying-the-h-option.patch
Patch11: 0011-Clean-up-the-way-we-handle-the-h-option-in-init_tran.patch
+Patch12: 0012-Move-default-state-dir-to-a-subdirectory-of-var-run.patch
Patch14: 0014-When-using-systemd-redirect-syslog-calls-to-the-syst.patch
Patch30: 0030-systemd-fix-rmtcall.patch
Patch31: 0031-rpcbind-manpage.patch
@@ -74,6 +74,7 @@
#%patch9 -p1
#%patch10 -p1
#%patch11 -p1
+%patch12 -p1
#%patch14 -p1
#%patch30 -p1
%patch31 -p1
@@ -101,8 +102,6 @@
install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/var/adm/fillup-templates/
mkdir -p $RPM_BUILD_ROOT%_datadir/omc/svcinfo.d
install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%_datadir/omc/svcinfo.d/
-mkdir -p $RPM_BUILD_ROOT/usr/lib/tmpfiles.d
-install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/
#
install -m 755 pmap_set $RPM_BUILD_ROOT/sbin/pmap_set2
# create symlink for rcrpcbind
@@ -124,7 +123,6 @@
%post
%{fillup_only -n rpcbind}
-/usr/bin/systemd-tmpfiles --create rpcbind.conf ||:
%service_add_post %{name}.service %{name}.socket
%postun
@@ -139,7 +137,6 @@
%{_sbindir}/rcrpcbind
%{_mandir}/*/*
/var/adm/fillup-templates/sysconfig.rpcbind
-/usr/lib/tmpfiles.d/rpcbind.conf
%{_datadir}/omc/svcinfo.d/rpcbind.xml
%{_unitdir}/%{name}.service
%{_unitdir}/%{name}.socket
++++++ 0012-Move-default-state-dir-to-a-subdirectory-of-var-run.patch ++++++
>From 2e78e6fb51292fea798355e5cb749dbc1de26ca6 Mon Sep 17 00:00:00 2001
From: NeilBrown <neilb(a)suse.com>
Date: Wed, 16 Nov 2016 10:53:07 -0500
Subject: [PATCH 1/1] Move default state-dir to a subdirectory of /var/run
rpcbind can save state in a file to allow restart without forgetting
about running services.
The default location is currently "/tmp" which is
not ideal for system files. It is particularly unpleasant
to put simple files there rather than creating a directory
to contain them.
On a modern Linux system it is preferable to use /run, and there it is
even more consistent with practice to use a subdirectory.
This directory needs to be create one each boot, and while there are
tools (e.g. systemd-tmpfiles) which can do that it is cleaner to keep
rpcbind self-contained and have it create the directory.
So change the default location to /var/run/rpcbind, and create that
directory. If a different user-id is used, we need to create
and chown the directory before dropping privileges. We do this
with care so avoid chowning the wrong thing by mistake.
Signed-off-by: NeilBrown <neilb(a)suse.com>
Signed-off-by: Steve Dickson <steved(a)redhat.com>
---
configure.ac | 4 ++--
src/rpcbind.c | 5 +++++
src/rpcbind.h | 1 +
src/warmstart.c | 37 +++++++++++++++++++++++++++++++++----
4 files changed, 41 insertions(+), 6 deletions(-)
diff --git a/configure.ac b/configure.ac
index f84921e..acc6914 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,8 +22,8 @@ AC_ARG_ENABLE([warmstarts],
AM_CONDITIONAL(WARMSTART, test x$enable_warmstarts = xyes)
AC_ARG_WITH([statedir],
- AS_HELP_STRING([--with-statedir=ARG], [use ARG as state dir @<:@default=/tmp@:>@])
- ,, [with_statedir=/tmp])
+ AS_HELP_STRING([--with-statedir=ARG], [use ARG as state dir @<:@default=/var/run/rpcbind@:>@])
+ ,, [with_statedir=/var/run/rpcbind])
AC_SUBST([statedir], [$with_statedir])
AC_ARG_WITH([rpcuser],
diff --git a/src/rpcbind.c b/src/rpcbind.c
index 87ccdc2..8db8dfc 100644
--- a/src/rpcbind.c
+++ b/src/rpcbind.c
@@ -263,6 +263,11 @@ main(int argc, char *argv[])
syslog(LOG_ERR, "cannot get uid of '%s': %m", id);
exit(1);
}
+#ifdef WARMSTART
+ if (warmstart) {
+ mkdir_warmstart(p->pw_uid);
+ }
+#endif
if (setgid(p->pw_gid) == -1) {
syslog(LOG_ERR, "setgid to '%s' (%d) failed: %m", id, p->pw_gid);
exit(1);
diff --git a/src/rpcbind.h b/src/rpcbind.h
index 74f9591..5b1a9bb 100644
--- a/src/rpcbind.h
+++ b/src/rpcbind.h
@@ -129,6 +129,7 @@ int is_localroot(struct netbuf *);
extern void pmap_service(struct svc_req *, SVCXPRT *);
#endif
+void mkdir_warmstart(int uid);
void write_warmstart(void);
void read_warmstart(void);
diff --git a/src/warmstart.c b/src/warmstart.c
index 122a058..aafcb61 100644
--- a/src/warmstart.c
+++ b/src/warmstart.c
@@ -45,19 +45,23 @@
#include <syslog.h>
#include <unistd.h>
#include <errno.h>
+#include <fcntl.h>
#include "rpcbind.h"
-#ifndef RPCBIND_STATEDIR
-#define RPCBIND_STATEDIR "/tmp"
-#endif
-
/* These files keep the pmap_list and rpcb_list in XDR format */
#define RPCBFILE RPCBIND_STATEDIR "/rpcbind.xdr"
#ifdef PORTMAP
#define PMAPFILE RPCBIND_STATEDIR "/portmap.xdr"
#endif
+#ifndef O_DIRECTORY
+#define O_DIRECTORY 0
+#endif
+#ifndef O_NOFOLLOW
+#define O_NOFOLLOW 0
+#endif
+
static bool_t write_struct __P((char *, xdrproc_t, void *));
static bool_t read_struct __P((char *, xdrproc_t, void *));
@@ -139,8 +143,33 @@ error:
}
void
+mkdir_warmstart(int uid)
+{
+ /* Already exists? */
+ if (access(RPCBIND_STATEDIR, X_OK) == 0)
+ return;
+
+ if (mkdir(RPCBIND_STATEDIR, 0770) == 0) {
+ int fd = open(RPCBIND_STATEDIR, O_RDONLY | O_DIRECTORY | O_NOFOLLOW);
+ if (fd >= 0) {
+ if (fchown(fd, uid, -1) < 0) {
+ syslog(LOG_ERR,
+ "mkdir_warmstart: open failed '%s', errno %d (%s)",
+ RPCBIND_STATEDIR, errno, strerror(errno));
+ }
+ close(fd);
+ } else
+ syslog(LOG_ERR, "mkdir_warmstart: open failed '%s', errno %d (%s)",
+ RPCBIND_STATEDIR, errno, strerror(errno));
+ } else
+ syslog(LOG_ERR, "mkdir_warmstart: mkdir failed '%s', errno %d (%s)",
+ RPCBIND_STATEDIR, errno, strerror(errno));
+}
+
+void
write_warmstart()
{
+ (void) mkdir(RPCBIND_STATEDIR, 0770);
(void) write_struct(RPCBFILE, (xdrproc_t)xdr_rpcblist_ptr, &list_rbl);
#ifdef PORTMAP
(void) write_struct(PMAPFILE, (xdrproc_t)xdr_pmaplist_ptr, &list_pml);
--
1.8.5.6
[View Less]
1
0
Hello community,
here is the log from the commit of package gpgme for openSUSE:Factory checked in at 2016-11-24 23:15:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gpgme (Old)
and /work/SRC/openSUSE:Factory/.gpgme.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gpgme"
Changes:
--------
--- /work/SRC/openSUSE:Factory/gpgme/gpgme.changes 2016-11-22 18:56:37.000000000 +0100
+++…
[View More] /work/SRC/openSUSE:Factory/.gpgme.new/gpgme.changes 2016-11-24 23:15:54.000000000 +0100
@@ -1,0 +2,6 @@
+Tue Nov 22 23:19:10 UTC 2016 - lbeltrame(a)kde.org
+
+- Add remove-a-forgotten-instance-of-libsuffix.diff: fix CMake
+ files for gpgmepp (or they won't work with KDE software)
+
+-------------------------------------------------------------------
New:
----
remove-a-forgotten-instance-of-libsuffix.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gpgme.spec ++++++
--- /var/tmp/diff_new_pack.aQpO3Y/_old 2016-11-24 23:15:55.000000000 +0100
+++ /var/tmp/diff_new_pack.aQpO3Y/_new 2016-11-24 23:15:55.000000000 +0100
@@ -33,6 +33,8 @@
Source3: gpgme.keyring
# used to have a fixed timestamp
Source99: %{name}.changes
+#PATCH-FIX-UPSTREAM: remove-a-forgotten-instance-of-libsuffix.diff - Fix cmake files (or it will break KDE software building)
+Patch1: remove-a-forgotten-instance-of-libsuffix.diff
BuildRequires: gpg2 >= 2.0.10
BuildRequires: libassuan-devel >= 2.0.2
BuildRequires: libgpg-error-devel >= 1.17
@@ -187,6 +189,7 @@
%prep
%setup -q
+%patch1 -p1
%build
build_timestamp=$(date -u +%{Y}-%{m}-%{dT}%{H}:%{M}+0000 -r %{SOURCE99})
++++++ remove-a-forgotten-instance-of-libsuffix.diff ++++++
>From 572c1aac107125ce62230251713349348373db5a Mon Sep 17 00:00:00 2001
From: Heiko Becker <heirecka(a)exherbo.org>
Date: Wed, 16 Nov 2016 23:09:45 +0100
Subject: [PATCH] Remove a forgotten instance of @libsuffix@
* lang/cpp/src/GpgmeppConfig.cmake.in.in: Remove a forgotten
instance of @libsuffix@.
--
b2c07bd47bd608afa5cc819b60a7b5bb8c9dd96a removed @libsuffix@ from
cmake config files, but missed one instance.
Signed-off-by: Heiko Becker <heirecka(a)exherbo.org>
---
lang/cpp/src/GpgmeppConfig.cmake.in.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lang/cpp/src/GpgmeppConfig.cmake.in.in b/lang/cpp/src/GpgmeppConfig.cmake.in.in
index 928d19f..cbe9713 100644
--- a/lang/cpp/src/GpgmeppConfig.cmake.in.in
+++ b/lang/cpp/src/GpgmeppConfig.cmake.in.in
@@ -63,7 +63,7 @@ add_library(Gpgmepp SHARED IMPORTED)
set_target_properties(Gpgmepp PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES "@resolved_includedir@/gpgme++;@resolved_includedir@"
- INTERFACE_LINK_LIBRARIES "pthread;@resolved_libdir@/libgpgme@libsuffix@;@LIBASSUAN_LIBS@"
+ INTERFACE_LINK_LIBRARIES "pthread;@resolved_libdir@/libgpgme.so;@LIBASSUAN_LIBS@"
IMPORTED_LOCATION "@resolved_libdir@/libgpgmepp.so"
)
--
2.8.0.rc3
[View Less]
1
0
Hello community,
here is the log from the commit of package libproxy for openSUSE:Factory checked in at 2016-11-24 23:15:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libproxy (Old)
and /work/SRC/openSUSE:Factory/.libproxy.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libproxy"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libproxy/libproxy-plugins.changes 2016-10-10 …
[View More]17:32:03.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libproxy.new/libproxy-plugins.changes 2016-11-24 23:15:43.000000000 +0100
@@ -1,0 +2,5 @@
+Tue Nov 22 08:18:37 UTC 2016 - dimstar(a)opensuse.org
+
+- Add libproxy-cmake-3.7.patch: Fix build with cmake 3.7.
+
+-------------------------------------------------------------------
libproxy.changes: same change
New:
----
libproxy-cmake-3.7.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libproxy-plugins.spec ++++++
--- /var/tmp/diff_new_pack.CRZcWn/_old 2016-11-24 23:15:44.000000000 +0100
+++ /var/tmp/diff_new_pack.CRZcWn/_new 2016-11-24 23:15:44.000000000 +0100
@@ -49,6 +49,8 @@
Patch1: libproxy-python3-support.patch
# PATCH-FIX-UPSTREAM libproxy-FindMono-4.6.patch gh#libproxy/libproxy#37 dimstar(a)opensuse.org -- Fall back to mcs if gmcs cannot be found
Patch2: libproxy-FindMono-4.6.patch
+# PATCH-FIX-UPSTREAM libproxy-cmake-3.7.patch gh#libproxy/libproxy#46 dimstar(a)opensuse.org -- Fix build with cmake 3.7
+Patch3: libproxy-cmake-3.7.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: cmake
BuildRequires: gcc-c++
@@ -343,6 +345,7 @@
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
mkdir build
%build
++++++ libproxy.spec ++++++
--- /var/tmp/diff_new_pack.CRZcWn/_old 2016-11-24 23:15:44.000000000 +0100
+++ /var/tmp/diff_new_pack.CRZcWn/_new 2016-11-24 23:15:44.000000000 +0100
@@ -49,6 +49,8 @@
Patch1: libproxy-python3-support.patch
# PATCH-FIX-UPSTREAM libproxy-FindMono-4.6.patch gh#libproxy/libproxy#37 dimstar(a)opensuse.org -- Fall back to mcs if gmcs cannot be found
Patch2: libproxy-FindMono-4.6.patch
+# PATCH-FIX-UPSTREAM libproxy-cmake-3.7.patch gh#libproxy/libproxy#46 dimstar(a)opensuse.org -- Fix build with cmake 3.7
+Patch3: libproxy-cmake-3.7.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: cmake
BuildRequires: gcc-c++
@@ -343,6 +345,7 @@
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
mkdir build
%build
++++++ libproxy-cmake-3.7.patch ++++++
>From 72bda7188408bd3c2491ea664da294cc483220bc Mon Sep 17 00:00:00 2001
From: Andrey Rakhmatullin <wrar(a)wrar.name>
Date: Sun, 20 Nov 2016 18:40:49 +0500
Subject: [PATCH] Set CMP0054 CMake policy to NEW.
CMake 3.7 exports a "t" variable for all projects and because of that
the elseif statement in cmake/CMakeCSharpInformation.cmake:311 works
incorrectly if CMP0054 is not set to NEW (as "t" is expanded to the
variable value).
---
CMakeLists.txt | 3 +++
1 file changed, 3 insertions(+)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5313787..451e7a6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,6 +3,9 @@ cmake_minimum_required(VERSION 2.6)
if(POLICY CMP0011)
cmake_policy(SET CMP0011 NEW)
endif(POLICY CMP0011)
+if(POLICY CMP0054)
+ cmake_policy(SET CMP0054 NEW)
+endif(POLICY CMP0054)
# Make sure we look in our cmake folder for additional definitions
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake )
[View Less]
1
0