[Libreoffice-commits] core.git: Branch 'libreoffice-5-2-1' - download.lst

2016-08-24 Thread Michael Stahl 
 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit baf1a1dfa85652243af65a61225923b143f1ba61
Author: Michael Stahl 
Date:   Wed Aug 24 14:46:44 2016 +0200

libpng: upgrade to release 1.6.24

Change-Id: I5528522d866262655eadcfcf09c038e0c6097bb9
Reviewed-on: https://gerrit.libreoffice.org/28364
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 
(cherry picked from commit 1efbdfc97ec0834274d13abe0f0d318b5f3c)
Reviewed-on: https://gerrit.libreoffice.org/28367
Reviewed-by: Christian Lohmaier 
(cherry picked from commit f90be96ed400a5471d6c3a5cfa5087957803a9fe)
Reviewed-on: https://gerrit.libreoffice.org/28370
Tested-by: Christian Lohmaier 

diff --git a/download.lst b/download.lst
index 6e38903..13c7e9f 100644
--- a/download.lst
+++ b/download.lst
@@ -125,8 +125,8 @@ export OWNCLOUD_ANDROID_LIB_TARBALL := 
owncloud-android-library-0.9.4-no-binary-
 export PAGEMAKER_MD5SUM := 5c4985a68be0b79d3f809da5e12b143c
 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 PNG_MD5SUM := 65213080dd30a9b16193d9b83adc1ee9
+export PNG_TARBALL := libpng-1.6.24.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
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-2-1' - download.lst external/poppler

2016-08-24 Thread Caolán McNamara 
 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 d26fb60f2f66d95d806696dfbb75b907ea3e82ed
Author: Caolán McNamara 
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 
Tested-by: Caolán McNamara 
(cherry picked from commit 1029117b562e3f179c3d1073774dd54cdfee)
Reviewed-on: https://gerrit.libreoffice.org/28366
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 
(cherry picked from commit 92986a1d516195ed73ad2036ee0647a54baf84b6)
Reviewed-on: https://gerrit.libreoffice.org/28369
Reviewed-by: Christian Lohmaier 
Tested-by: Christian Lohmaier 

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..000
--- 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 
-+#include 
- 
- #if MULTITHREADED
- #  define annotLocker()   MutexLocker locker()
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 000..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 
+ #include 
+ #include 
++#include 
+ #include "goo/GooString.h"
+ #include "goo/GooList.h"
+ #include "goo/GooHash.h"