[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - download.lst external/libpagemaker solenv/flatpak-manifest.in

David Tardon dtardon at redhat.com
Tue Jan 9 19:26:51 UTC 2018


 download.lst                                          |    4 ++--
 external/libpagemaker/ExternalProject_libpagemaker.mk |    3 +--
 solenv/flatpak-manifest.in                            |    6 +++---
 3 files changed, 6 insertions(+), 7 deletions(-)

New commits:
commit 449b0fe2ebdc04b3e7be547b151bef97acbb14ea
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Jan 8 20:30:43 2018 +0100

    upload libpagemaker 0.0.4
    
    Change-Id: Idc4b7eaa3331ee3831f7d27ca66663e23c30b8c9
    Reviewed-on: https://gerrit.libreoffice.org/47615
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: David Tardon <dtardon at redhat.com>
    (cherry picked from commit 3164e193c2bd1b224231caab3b9306d5f10d9f85)
    Reviewed-on: https://gerrit.libreoffice.org/47678
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/download.lst b/download.lst
index 2eb621658abe..f96ddba2582d 100644
--- a/download.lst
+++ b/download.lst
@@ -186,8 +186,8 @@ export ORCUS_SHA256SUM := d7041ef455bb78db66b4ba7876af1b3d0fa377b9444e3ef72ceacc
 export ORCUS_TARBALL := liborcus-0.13.1.tar.gz
 export OWNCLOUD_ANDROID_LIB_SHA256SUM := b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb
 export OWNCLOUD_ANDROID_LIB_TARBALL := owncloud-android-library-0.9.4-no-binary-deps.tar.gz
-export PAGEMAKER_SHA256SUM := 3b5de037692f8e156777a75e162f6b110fa24c01749e4a66d7eb83f364e52a33
-export PAGEMAKER_TARBALL := libpagemaker-0.0.3.tar.bz2
+export PAGEMAKER_SHA256SUM := 66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d
+export PAGEMAKER_TARBALL := libpagemaker-0.0.4.tar.xz
 export PDFIUM_SHA256SUM := 7dc0d33fc24b1612865f5e173d48800ba3f2db891c57e3f92b9d2ce56ffeb72f
 export PDFIUM_TARBALL := pdfium-3235.tar.bz2
 export PIXMAN_SHA256SUM := 21b6b249b51c6800dc9553b65106e1e37d0e25df942c90531d4c3997aa20a88e
diff --git a/external/libpagemaker/ExternalProject_libpagemaker.mk b/external/libpagemaker/ExternalProject_libpagemaker.mk
index 852b6e846dd9..91e494402cc1 100644
--- a/external/libpagemaker/ExternalProject_libpagemaker.mk
+++ b/external/libpagemaker/ExternalProject_libpagemaker.mk
@@ -34,8 +34,7 @@ $(call gb_ExternalProject_get_state_target,libpagemaker,build) :
 			--disable-weffc \
 			$(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
 			CXXFLAGS="$(gb_CXXFLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" \
-			CPPFLAGS="$(CPPFLAGS) $(BOOST_CPPFLAGS) \
-				-DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED" \
+			CPPFLAGS="$(CPPFLAGS) $(BOOST_CPPFLAGS)" \
 			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 		&& $(MAKE) \
 	)
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 25c34377dd88..0f212badf2a2 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -254,10 +254,10 @@
                     "dest-filename": "external/tarballs/libodfgen-0.1.6.tar.bz2"
                 },
                 {
-                    "url": "https://dev-www.libreoffice.org/src/libpagemaker-0.0.3.tar.bz2",
-                    "sha256": "3b5de037692f8e156777a75e162f6b110fa24c01749e4a66d7eb83f364e52a33",
+                    "url": "https://dev-www.libreoffice.org/src/libpagemaker-0.0.4.tar.xz",
+                    "sha256": "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d",
                     "type": "file",
-                    "dest-filename": "external/tarballs/libpagemaker-0.0.3.tar.bz2"
+                    "dest-filename": "external/tarballs/libpagemaker-0.0.4.tar.xz"
                 },
                 {
                     "url": "https://dev-www.libreoffice.org/src/librevenge-0.0.4.tar.bz2",


More information about the Libreoffice-commits mailing list