download.lst | 8 ++--
external/libabw/UnpackedTarball_libabw.mk | 4 --
external/libabw/libabw-msvc.patch.1 | 46 ----------------------------
external/libcdr/UnpackedTarball_libcdr.mk | 4 ++
external/libcdr/libcdr-visibility-win.patch | 11 ++++++
solenv/flatpak-manifest.in | 12 +++----
6 files changed, 25 insertions(+), 60 deletions(-)
New commits:
commit 8268439d9ad9d167e4cc4cdbe74e39644a32b7c4
Author: David Tardon <dtar...@redhat.com>
AuthorDate: Sat Dec 29 14:53:07 2018 +0100
Commit: Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Sat Nov 6 00:38:58 2021 +0100
upload libcdr 0.1.5
Reviewed-on: https://gerrit.libreoffice.org/65715
Tested-by: Jenkins
Reviewed-by: David Tardon <dtar...@redhat.com>
(cherry picked from commit a8965ebc1b29ba578fc3e9cd6915e85e807d9fd6)
Change-Id: I01454cc35baf96743bd19e64dd3a7269c58621bf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124772
Tested-by: Michael Stahl <michael.st...@allotropia.de>
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
diff --git a/download.lst b/download.lst
index fcf9c059a7d2..712ea9d0ba52 100644
--- a/download.lst
+++ b/download.lst
@@ -17,8 +17,8 @@ export BZIP2_TARBALL :=
00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz
export CAIRO_SHA256SUM :=
5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331
export CAIRO_VERSION_MICRO := 0
export CAIRO_TARBALL := cairo-1.16.$(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 :=
6acbdf22ecdbaba37728729b75bfc085ee5a4b49a6024757cfb86ccd3da27b0e
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 7233a24bdaa8..7db6021ece3c 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -243,10 +243,10 @@
"dest-filename": "external/tarballs/libabw-0.1.3.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.1.tar.gz";,
commit 6cf9a05b42fb59fa5ebb06d792d7e733790bdb5d
Author: David Tardon <dtar...@redhat.com>
AuthorDate: Sat Aug 17 16:46:47 2019 +0200
Commit: Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Sat Nov 6 00:38:49 2021 +0100
upload libabw 0.1.3
Reviewed-on: https://gerrit.libreoffice.org/77639
Tested-by: Jenkins
Reviewed-by: David Tardon <dtar...@redhat.com>
(cherry picked from commit 2a733f30cc994ead8cc3d1e64947bba6e8fe3924)
Change-Id: Ibb45a473f49a9ba8f9cf53593dead375ac8a1951
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124771
Tested-by: Michael Stahl <michael.st...@allotropia.de>
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
diff --git a/download.lst b/download.lst
index b4f7df8d263c..fcf9c059a7d2 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 2ca2e5a7c1e4..7233a24bdaa8 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";,
