download.lst | 4 ++--
external/poppler/ExternalProject_poppler.mk | 2 +-
external/poppler/UnpackedTarball_poppler.mk | 4 ++--
external/poppler/poppler-0.26.4-std-max.patch.1 | 10 ----------
external/poppler/poppler-0.46.0-std-max.patch.1 | 10 ++++++++++
external/poppler/poppler-0.46.0-unused-private-field.patch.1 | 11 +++++++++++
external/poppler/poppler-nochecknew.patch.1 | 11 -----------
external/poppler/poppler-notests.patch.1 | 8 ++++----
8 files changed, 30 insertions(+), 30 deletions(-)
New commits:
commit 92986a1d516195ed73ad2036ee0647a54baf84b6
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Aug 12 15:19:57 2016 +0100
Resolves: tdf#101460 use most recent poppler release
Change-Id: I660e1f13eb4b05fdb7257f422eca288c2d07cf4d
Reviewed-on: https://gerrit.libreoffice.org/28087
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
(cherry picked from commit 10290000117b562e3f179c3d1073774dd54cdfee)
Reviewed-on: https://gerrit.libreoffice.org/28366
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Michael Stahl <mst...@redhat.com>
diff --git a/download.lst b/download.lst
index 716303b..6e38903 100644
--- a/download.lst
+++ b/download.lst
@@ -127,8 +127,8 @@ export PAGEMAKER_TARBALL := libpagemaker-0.0.3.tar.bz2
export PIXMAN_TARBALL := c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2
export PNG_MD5SUM := 3121bdc77c365a87e054b9f859f421fe
export PNG_TARBALL := libpng-1.6.19.tar.gz
-export POPPLER_MD5SUM := 35c0660065d023365e9854c13e289d12
-export POPPLER_TARBALL := poppler-0.26.4.tar.gz
+export POPPLER_MD5SUM := 38c758d84437378ec4f5aae9f875301d
+export POPPLER_TARBALL := poppler-0.46.0.tar.bz2
export POSTGRESQL_TARBALL :=
c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2
ifeq ($(PYTHON_VERSION_MINOR),3)
diff --git a/external/poppler/ExternalProject_poppler.mk
b/external/poppler/ExternalProject_poppler.mk
index 806a041..eab1d91 100644
--- a/external/poppler/ExternalProject_poppler.mk
+++ b/external/poppler/ExternalProject_poppler.mk
@@ -18,7 +18,7 @@ $(eval $(call gb_ExternalProject_register_targets,poppler,\
$(call gb_ExternalProject_get_state_target,poppler,build) :
$(call gb_ExternalProject_run,build,\
$(if $(filter TRUE,$(DISABLE_DYNLOADING)),CFLAGS="$(CFLAGS)
$(gb_VISIBILITY_FLAGS) $(gb_COMPILEROPTFLAGS)" CXXFLAGS="$(CXXFLAGS)
$(gb_VISIBILITY_FLAGS) $(gb_VISIBILITY_FLAGS_CXX) $(gb_COMPILEROPTFLAGS)",$(if
$(filter MSC-120,$(COM)-$(VCVER)),CXXFLAGS="$(CXXFLAGS) -I$(SRCDIR)/include")) \
- MAKE=$(MAKE) ./configure \
+ MAKE=$(MAKE) PKG_CONFIG="" ./configure \
--with-pic \
--enable-static \
--disable-shared \
diff --git a/external/poppler/UnpackedTarball_poppler.mk
b/external/poppler/UnpackedTarball_poppler.mk
index 49a4ff6..4de2242 100644
--- a/external/poppler/UnpackedTarball_poppler.mk
+++ b/external/poppler/UnpackedTarball_poppler.mk
@@ -15,9 +15,9 @@ $(eval $(call gb_UnpackedTarball_add_patches,poppler,\
external/poppler/poppler-notests.patch.1 \
$(if $(filter
MSC-120,$(COM)-$(VCVER)),external/poppler/poppler-snprintf.patch.1) \
external/poppler/poppler-mac-fake.patch.1 \
- external/poppler/poppler-nochecknew.patch.1 \
external/poppler/poppler-vs2013.patch.1 \
- external/poppler/poppler-0.26.4-std-max.patch.1 \
+ external/poppler/poppler-0.46.0-std-max.patch.1 \
+ external/poppler/poppler-0.46.0-unused-private-field.patch.1 \
external/poppler/ubsan.patch.0 \
))
diff --git a/external/poppler/poppler-0.26.4-std-max.patch.1
b/external/poppler/poppler-0.26.4-std-max.patch.1
deleted file mode 100644
index 0c5a2c8..0000000
--- a/external/poppler/poppler-0.26.4-std-max.patch.1
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/poppler/Annot.cc
-+++ b/poppler/Annot.cc
-@@ -71,6 +71,7 @@
- #include "DateInfo.h"
- #include "Link.h"
- #include <string.h>
-+#include <algorithm>
-
- #if MULTITHREADED
- # define annotLocker() MutexLocker locker(&mutex)
diff --git a/external/poppler/poppler-0.46.0-std-max.patch.1
b/external/poppler/poppler-0.46.0-std-max.patch.1
new file mode 100644
index 0000000..96a9abe
--- /dev/null
+++ b/external/poppler/poppler-0.46.0-std-max.patch.1
@@ -0,0 +1,10 @@
+--- a/poppler/PSOutputDev.cc
++++ b/poppler/PSOutputDev.cc
+@@ -48,6 +48,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 --git a/external/poppler/poppler-0.46.0-unused-private-field.patch.1
b/external/poppler/poppler-0.46.0-unused-private-field.patch.1
new file mode 100644
index 0000000..e0765fc
--- /dev/null
+++ b/external/poppler/poppler-0.46.0-unused-private-field.patch.1
@@ -0,0 +1,11 @@
+--- a/goo/GooString.h
++++ b/goo/GooString.h
+@@ -175,7 +175,7 @@
+ // You can tweak the final object size for different time/space tradeoffs.
+ // In libc malloc(), rounding is 16 so it's best to choose a value that
+ // is a multiple of 16.
+- class MemoryLayout {
++ struct MemoryLayout {
+ char c[sizeof(char*)];
+ int i;
+ char* s;
diff --git a/external/poppler/poppler-nochecknew.patch.1
b/external/poppler/poppler-nochecknew.patch.1
deleted file mode 100644
index 1e4890f..0000000
--- a/external/poppler/poppler-nochecknew.patch.1
+++ /dev/null
@@ -1,11 +0,0 @@
---- poppler-0.22.5/configure
-+++ poppler-0.22.5/configure
-@@ -24014,7 +24014,7 @@
- fi
- case "$enable_compile_warnings" in
- no) ;;
-- yes) CXXFLAGS="-Wall -Woverloaded-virtual -Wnon-virtual-dtor
-Wcast-align -fno-exceptions -fno-check-new -fno-common $CXXFLAGS";
-+ yes) CXXFLAGS="-Wall -Woverloaded-virtual -Wnon-virtual-dtor
-Wcast-align -fno-exceptions -fno-common $CXXFLAGS";
- CFLAGS="-Wall $CFLAGS" ;;
- kde) CXXFLAGS="-Wnon-virtual-dtor -Wno-long-long -Wundef \
- -D_XOPEN_SOURCE=600 -D_BSD_SOURCE -Wcast-align \
diff --git a/external/poppler/poppler-notests.patch.1
b/external/poppler/poppler-notests.patch.1
index a92ce57..ffac173 100644
--- a/external/poppler/poppler-notests.patch.1
+++ b/external/poppler/poppler-notests.patch.1
@@ -1,11 +1,11 @@
--- a/Makefile.in
+++ b/Makefile.in
-@@ -470,7 +470,7 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
--with-testdatadir=$(TESTDATADIR)
+@@ -483,7 +483,7 @@
+ @BUILD_POPPLER_QT4_TRUE@qt4_pc_file = poppler-qt4.pc
@BUILD_POPPLER_CPP_TRUE@cpp_subdir = cpp
@BUILD_POPPLER_CPP_TRUE@cpp_pc_file = poppler-cpp.pc
- @BUILD_UTILS_TRUE@utils_subdir = utils
--SUBDIRS = goo fofi $(splash_subdir) poppler $(utils_subdir) $(glib_subdir)
test $(qt4_subdir) $(qt5_subdir) $(cpp_subdir)
-+SUBDIRS = goo fofi $(splash_subdir) poppler $(utils_subdir) $(glib_subdir)
$(qt4_subdir) $(qt5_subdir) $(cpp_subdir)
+-SUBDIRS = goo fofi $(splash_subdir) poppler utils $(glib_subdir) test
$(qt4_subdir) $(qt5_subdir) $(cpp_subdir)
++SUBDIRS = goo fofi $(splash_subdir) poppler utils $(glib_subdir)
$(qt4_subdir) $(qt5_subdir) $(cpp_subdir)
# Add CMake buildsystem files here so they get added on make dist
EXTRA_DIST = README-XPDF poppler.pc.in poppler-uninstalled.pc.in \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
