download.lst | 8 ++-- external/libabw/UnpackedTarball_libabw.mk | 4 -- external/libabw/libabw-msvc.patch.1 | 46 ------------------------- external/libvisio/0001-fix-debug-build.patch.1 | 40 --------------------- external/libvisio/UnpackedTarball_libvisio.mk | 1 external/libvisio/ubsan.patch | 4 +- solenv/flatpak-manifest.in | 12 +++--- 7 files changed, 12 insertions(+), 103 deletions(-)
New commits: commit 4cd02996eeec0c209271371d2a6ba2fa185a05e2 Author: David Tardon <dtar...@redhat.com> AuthorDate: Sat Aug 17 17:06:07 2019 +0200 Commit: Andras Timar <andras.ti...@collabora.com> CommitDate: Wed Aug 21 16:23:03 2019 +0200 upload libvisio 0.1.7 Change-Id: I4eb115c7c085b325370e9cd8f80e1b03f16f5033 Reviewed-on: https://gerrit.libreoffice.org/77640 Tested-by: Jenkins Reviewed-by: David Tardon <dtar...@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/77885 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com> Reviewed-by: Andras Timar <andras.ti...@collabora.com> diff --git a/download.lst b/download.lst index 7ef1490a39aa..410215e48d77 100644 --- a/download.lst +++ b/download.lst @@ -250,8 +250,8 @@ export TWAIN_DSM_SHA256SUM := 82c818be771f242388457aa8c807e4b52aa84dc22b21c6c561 export TWAIN_DSM_TARBALL := twaindsm_2.4.1.orig.tar.gz export UCPP_SHA256SUM := 983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776 export UCPP_TARBALL := 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz -export VISIO_SHA256SUM := fe1002d3671d53c09bc65e47ec948ec7b67e6fb112ed1cd10966e211a8bb50f9 -export VISIO_TARBALL := libvisio-0.1.6.tar.xz +export VISIO_SHA256SUM := 8faf8df870cb27b09a787a1959d6c646faa44d0d8ab151883df408b7166bea4c +export VISIO_TARBALL := libvisio-0.1.7.tar.xz export WPD_SHA256SUM := 323f68beaf4f35e5a4d7daffb4703d0566698280109210fa4eaa90dea27d6610 export WPD_VERSION_MICRO := 2 export WPD_TARBALL := libwpd-0.10.$(WPD_VERSION_MICRO).tar.xz diff --git a/external/libvisio/0001-fix-debug-build.patch.1 b/external/libvisio/0001-fix-debug-build.patch.1 deleted file mode 100644 index 4146e6e8bfe7..000000000000 --- a/external/libvisio/0001-fix-debug-build.patch.1 +++ /dev/null @@ -1,40 +0,0 @@ -From 15f3774513d0181ad90da382297c175cc3424462 Mon Sep 17 00:00:00 2001 -From: David Tardon <dtar...@redhat.com> -Date: Sun, 22 Oct 2017 21:24:43 +0200 -Subject: [PATCH] fix debug build - -Change-Id: I860b6034e5d833900652aec8c3647eeae185e538 ---- - src/lib/VDXParser.cpp | 2 +- - src/lib/VSDXParser.cpp | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/lib/VDXParser.cpp b/src/lib/VDXParser.cpp -index f2f3154..0f07efd 100644 ---- a/src/lib/VDXParser.cpp -+++ b/src/lib/VDXParser.cpp -@@ -916,7 +916,7 @@ xmlChar *libvisio::VDXParser::readStringData(xmlTextReaderPtr reader) - ret = xmlTextReaderRead(reader); - if (1 == ret && stringValue) - { -- VSD_DEBUG_MSG(("VDXParser::readStringData stringValue %s\n", (const char *)stringValue)); -+ VSD_DEBUG_MSG(("VDXParser::readStringData stringValue %s\n", (const char *)stringValue.get())); - return stringValue.release(); - } - } -diff --git a/src/lib/VSDXParser.cpp b/src/lib/VSDXParser.cpp -index 488be3a..efd46b9 100644 ---- a/src/lib/VSDXParser.cpp -+++ b/src/lib/VSDXParser.cpp -@@ -555,7 +555,7 @@ xmlChar *libvisio::VSDXParser::readStringData(xmlTextReaderPtr reader) - std::unique_ptr<xmlChar, void (*)(void *)> stringValue(xmlTextReaderGetAttribute(reader, BAD_CAST("V")), xmlFree); - if (stringValue) - { -- VSD_DEBUG_MSG(("VSDXParser::readStringData stringValue %s\n", (const char *)stringValue)); -+ VSD_DEBUG_MSG(("VSDXParser::readStringData stringValue %s\n", (const char *)stringValue.get())); - return stringValue.release(); - } - return nullptr; --- -2.14.1 - diff --git a/external/libvisio/UnpackedTarball_libvisio.mk b/external/libvisio/UnpackedTarball_libvisio.mk index 1ab8b392c4e8..eba43f3b7a6e 100644 --- a/external/libvisio/UnpackedTarball_libvisio.mk +++ b/external/libvisio/UnpackedTarball_libvisio.mk @@ -17,7 +17,6 @@ $(eval $(call gb_UnpackedTarball_update_autoconf_configs,libvisio)) $(eval $(call gb_UnpackedTarball_add_patches,libvisio, \ external/libvisio/ubsan.patch \ - external/libvisio/0001-fix-debug-build.patch.1 \ )) ifeq ($(COM_IS_CLANG),TRUE) diff --git a/external/libvisio/ubsan.patch b/external/libvisio/ubsan.patch index 7bba63fda7a1..c9ffbd98f4b6 100644 --- a/external/libvisio/ubsan.patch +++ b/external/libvisio/ubsan.patch @@ -4,8 +4,8 @@ } if (U_SUCCESS(status) && conv) { -- const char *src = (const char *)&characters[0]; -+ const char *src = (const char *)characters.data(); +- const auto *src = (const char *)&characters[0]; ++ const auto *src = (const char *)characters.data(); const char *srcLimit = (const char *)src + characters.size(); while (src < srcLimit) { diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in index 2d53be212354..eea0e611ba69 100644 --- a/solenv/flatpak-manifest.in +++ b/solenv/flatpak-manifest.in @@ -333,10 +333,10 @@ "dest-filename": "external/tarballs/ltm-1.0.zip" }, { - "url": "https://dev-www.libreoffice.org/src/libvisio-0.1.6.tar.xz", - "sha256": "fe1002d3671d53c09bc65e47ec948ec7b67e6fb112ed1cd10966e211a8bb50f9", + "url": "https://dev-www.libreoffice.org/src/libvisio-0.1.7.tar.xz", + "sha256": "8faf8df870cb27b09a787a1959d6c646faa44d0d8ab151883df408b7166bea4c", "type": "file", - "dest-filename": "external/tarballs/libvisio-0.1.6.tar.xz" + "dest-filename": "external/tarballs/libvisio-0.1.7.tar.xz" }, { "url": "https://dev-www.libreoffice.org/src/libwpd-0.10.2.tar.xz", commit 94d1f18d210cdbae60cfcc4f3db1cbc1316bf06a Author: David Tardon <dtar...@redhat.com> AuthorDate: Sat Aug 17 16:46:47 2019 +0200 Commit: Andras Timar <andras.ti...@collabora.com> CommitDate: Wed Aug 21 16:22:48 2019 +0200 upload libabw 0.1.3 Change-Id: Ibb45a473f49a9ba8f9cf53593dead375ac8a1951 Reviewed-on: https://gerrit.libreoffice.org/77639 Tested-by: Jenkins Reviewed-by: David Tardon <dtar...@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/77884 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com> Reviewed-by: Andras Timar <andras.ti...@collabora.com> diff --git a/download.lst b/download.lst index 86e3b75bb8fe..7ef1490a39aa 100644 --- a/download.lst +++ b/download.lst @@ -1,5 +1,5 @@ -export ABW_SHA256SUM := 0b72944d5af81dda0a5c5803ee84cbac4b81441a4d767aa57029adc6744c2485 -export ABW_TARBALL := libabw-0.1.2.tar.xz +export ABW_SHA256SUM := e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed +export ABW_TARBALL := libabw-0.1.3.tar.xz export APACHE_COMMONS_LOGGING_SHA256SUM := 49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81 export APACHE_COMMONS_LOGGING_TARBALL := commons-logging-1.2-src.tar.gz export APR_SHA256SUM := 1af06e1720a58851d90694a984af18355b65bb0d047be03ec7d659c746d6dbdb diff --git a/external/libabw/UnpackedTarball_libabw.mk b/external/libabw/UnpackedTarball_libabw.mk index 27195d3a0ab3..7b9ba49e7e69 100644 --- a/external/libabw/UnpackedTarball_libabw.mk +++ b/external/libabw/UnpackedTarball_libabw.mk @@ -15,10 +15,6 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libabw,0)) $(eval $(call gb_UnpackedTarball_update_autoconf_configs,libabw)) -$(eval $(call gb_UnpackedTarball_add_patches,libabw, \ - external/libabw/libabw-msvc.patch.1 \ -)) - ifeq ($(COM_IS_CLANG),TRUE) ifneq ($(filter -fsanitize=%,$(CC)),) $(eval $(call gb_UnpackedTarball_add_patches,libabw, \ diff --git a/external/libabw/libabw-msvc.patch.1 b/external/libabw/libabw-msvc.patch.1 deleted file mode 100644 index d14b122f9575..000000000000 --- a/external/libabw/libabw-msvc.patch.1 +++ /dev/null @@ -1,46 +0,0 @@ -From 49f6461d4751d3b16e32ab8f9c93a3856b33be49 Mon Sep 17 00:00:00 2001 -From: Miklos Vajna <vmik...@collabora.co.uk> -Date: Wed, 2 Aug 2017 14:53:36 +0200 -Subject: [PATCH] m4: MSVC defines __cplusplus as 199711L still - -See e.g. -<https://stackoverflow.com/questions/37503029/cplusplus-is-equal-to-199711-in-msvc-does-it-support-c11>, -on MSVC we can't depend on the value of __cplusplus, since that one is a -too low value, even if everything else works fine. ---- - m4/ax_cxx_compile_stdcxx.m4 | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff -Naur a/configure b/configure ---- a/configure 2017-08-02 14:50:09.000000000 +0200 -+++ b/configure 2017-08-02 14:50:57.000000000 +0200 -@@ -16001,7 +16001,7 @@ - - #error "This is not a C++ compiler" - --#elif __cplusplus < 201103L -+#elif __cplusplus < 201103L && !(defined _MSC_VER) - - #error "This is not a C++11 compiler" - -@@ -16314,7 +16314,7 @@ - - #error "This is not a C++ compiler" - --#elif __cplusplus < 201103L -+#elif __cplusplus < 201103L && !(defined _MSC_VER) - - #error "This is not a C++11 compiler" - -@@ -16636,7 +16636,7 @@ - - #error "This is not a C++ compiler" - --#elif __cplusplus < 201103L -+#elif __cplusplus < 201103L && !(defined _MSC_VER) - - #error "This is not a C++11 compiler" - --- -2.12.3 - diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in index 369bef4c1233..2d53be212354 100644 --- a/solenv/flatpak-manifest.in +++ b/solenv/flatpak-manifest.in @@ -237,10 +237,10 @@ "dest-filename": "external/tarballs/libgpg-error-1.27.tar.bz2" }, { - "url": "https://dev-www.libreoffice.org/src/libabw-0.1.2.tar.xz", - "sha256": "0b72944d5af81dda0a5c5803ee84cbac4b81441a4d767aa57029adc6744c2485", + "url": "https://dev-www.libreoffice.org/src/libabw-0.1.3.tar.xz", + "sha256": "e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed", "type": "file", - "dest-filename": "external/tarballs/libabw-0.1.2.tar.xz" + "dest-filename": "external/tarballs/libabw-0.1.3.tar.xz" }, { "url": "https://dev-www.libreoffice.org/src/libcdr-0.1.4.tar.xz", _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits