download.lst | 4 ++-- external/libcdr/UnpackedTarball_libcdr.mk | 4 ++++ external/libcdr/libcdr-visibility-win.patch | 11 +++++++++++ solenv/flatpak-manifest.in | 6 +++--- 4 files changed, 20 insertions(+), 5 deletions(-)
New commits: commit a8965ebc1b29ba578fc3e9cd6915e85e807d9fd6 Author: David Tardon <[email protected]> AuthorDate: Sat Dec 29 14:53:07 2018 +0100 Commit: David Tardon <[email protected]> CommitDate: Sat Dec 29 22:01:48 2018 +0100 upload libcdr 0.1.5 Change-Id: I01454cc35baf96743bd19e64dd3a7269c58621bf Reviewed-on: https://gerrit.libreoffice.org/65715 Tested-by: Jenkins Reviewed-by: David Tardon <[email protected]> diff --git a/download.lst b/download.lst index 792c808d8a2b..0745b7058f3c 100644 --- a/download.lst +++ b/download.lst @@ -17,8 +17,8 @@ export BZIP2_TARBALL := 00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz export CAIRO_SHA256SUM := 7623081b94548a47ee6839a7312af34e9322997806948b6eec421a8c6d0594c9 export CAIRO_VERSION_MICRO := 12 export CAIRO_TARBALL := cairo-1.15.$(CAIRO_VERSION_MICRO).tar.xz -export CDR_SHA256SUM := e7a7e8b00a3df5798110024d7061fe9d1c3330277d2e4fa9213294f966a4a66d -export CDR_TARBALL := libcdr-0.1.4.tar.xz +export CDR_SHA256SUM := 6ace5c499a8be34ad871e825442ce388614ae2d8675c4381756a7319429e3a48 +export CDR_TARBALL := libcdr-0.1.5.tar.xz export CLUCENE_SHA256SUM := ddfdc433dd8ad31b5c5819cc4404a8d2127472a3b720d3e744e8c51d79732eab export CLUCENE_TARBALL := 48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz export LIBCMIS_SHA256SUM := d7b18d9602190e10d437f8a964a32e983afd57e2db316a07d87477a79f5000a2 diff --git a/external/libcdr/UnpackedTarball_libcdr.mk b/external/libcdr/UnpackedTarball_libcdr.mk index 4ca54804e6aa..23874f7d01b5 100644 --- a/external/libcdr/UnpackedTarball_libcdr.mk +++ b/external/libcdr/UnpackedTarball_libcdr.mk @@ -15,6 +15,10 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libcdr,0)) $(eval $(call gb_UnpackedTarball_update_autoconf_configs,libcdr)) +$(eval $(call gb_UnpackedTarball_add_patches,libcdr, \ + external/libcdr/libcdr-visibility-win.patch \ +)) + ifeq ($(COM_IS_CLANG),TRUE) ifneq ($(filter -fsanitize=%,$(CC)),) $(eval $(call gb_UnpackedTarball_add_patches,libcdr, \ diff --git a/external/libcdr/libcdr-visibility-win.patch b/external/libcdr/libcdr-visibility-win.patch new file mode 100644 index 000000000000..7700cfd32f2f --- /dev/null +++ b/external/libcdr/libcdr-visibility-win.patch @@ -0,0 +1,11 @@ +--- configure.dt 2018-12-29 16:23:02.355271146 +0100 ++++ configure 2018-12-29 16:23:21.644060142 +0100 +@@ -19116,6 +19116,8 @@ + + + if test $platform_win32 = yes; then : ++ HAVE_VISIBILITY_TRUE='#' ++ HAVE_VISIBILITY_FALSE= + + else + diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in index 3f8323a66935..7da44be8953d 100644 --- a/solenv/flatpak-manifest.in +++ b/solenv/flatpak-manifest.in @@ -205,10 +205,10 @@ "dest-filename": "external/tarballs/libabw-0.1.2.tar.xz" }, { - "url": "https://dev-www.libreoffice.org/src/libcdr-0.1.4.tar.xz";, - "sha256": "e7a7e8b00a3df5798110024d7061fe9d1c3330277d2e4fa9213294f966a4a66d", + "url": "https://dev-www.libreoffice.org/src/libcdr-0.1.5.tar.xz";, + "sha256": "6ace5c499a8be34ad871e825442ce388614ae2d8675c4381756a7319429e3a48", "type": "file", - "dest-filename": "external/tarballs/libcdr-0.1.4.tar.xz" + "dest-filename": "external/tarballs/libcdr-0.1.5.tar.xz" }, { "url": "https://dev-www.libreoffice.org/src/libcmis-0.5.2.tar.xz";, _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
