diff options
| author | Xisco Fauli <xiscofauli@libreoffice.org> | 2024-11-26 13:39:23 +0100 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2024-11-26 15:09:25 +0100 |
| commit | 0e334b25b91b4585a8660e49355c3442ebfd334e (patch) | |
| tree | eb42a35792ea0447f960e72da04a71b438a8d064 | |
| parent | 174d1d3f3b57547c86ff858d1c2ed931eca3bb37 (diff) | |
libcdr: upgrade to 0.1.8
Generated with:
./autogen.sh
./configure
make dist-xz
Change-Id: I46b921f3c2ef41ab52e272df5afd82a1d9331f42
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177332
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Tested-by: Jenkins
| -rw-r--r-- | download.lst | 4 | ||||
| -rw-r--r-- | external/libcdr/UnpackedTarball_libcdr.mk | 1 | ||||
| -rw-r--r-- | external/libcdr/ax_gcc_func_attribute.m4.patch | 11 | ||||
| -rw-r--r-- | external/libcdr/libcdr-visibility-win.patch | 8 |
4 files changed, 6 insertions, 18 deletions
diff --git a/download.lst b/download.lst index 7957fba48298..9ad2af9d2f22 100644 --- a/download.lst +++ b/download.lst @@ -45,8 +45,8 @@ CAIRO_TARBALL := cairo-1.17.$(CAIRO_VERSION_MICRO).tar.xz # three static lines # so that git cherry-pick # will not run into conflicts -CDR_SHA256SUM := 5666249d613466b9aa1e987ea4109c04365866e9277d80f6cd9663e86b8ecdd4 -CDR_TARBALL := libcdr-0.1.7.tar.xz +CDR_SHA256SUM := ced677c8300b29c91d3004bb1dddf0b99761bf5544991c26c2ee8f427e87193c +CDR_TARBALL := libcdr-0.1.8.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts diff --git a/external/libcdr/UnpackedTarball_libcdr.mk b/external/libcdr/UnpackedTarball_libcdr.mk index f0e80f06f05f..fd227a2f7445 100644 --- a/external/libcdr/UnpackedTarball_libcdr.mk +++ b/external/libcdr/UnpackedTarball_libcdr.mk @@ -17,7 +17,6 @@ $(eval $(call gb_UnpackedTarball_update_autoconf_configs,libcdr)) $(eval $(call gb_UnpackedTarball_add_patches,libcdr, \ external/libcdr/libcdr-visibility-win.patch \ - external/libcdr/ax_gcc_func_attribute.m4.patch \ )) # vim: set noet sw=4 ts=4: diff --git a/external/libcdr/ax_gcc_func_attribute.m4.patch b/external/libcdr/ax_gcc_func_attribute.m4.patch deleted file mode 100644 index 37f4edf0bd46..000000000000 --- a/external/libcdr/ax_gcc_func_attribute.m4.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- configure -+++ configure -@@ -19167,7 +19167,7 @@ - - _ACEOF - if ac_fn_cxx_try_link "$LINENO"; then : -- if test -s conftest.err; then : -+ if grep -- -Wattributes conftest.err; then : - ax_cv_have_func_attribute_visibility=no - else - ax_cv_have_func_attribute_visibility=yes diff --git a/external/libcdr/libcdr-visibility-win.patch b/external/libcdr/libcdr-visibility-win.patch index 7700cfd32f2f..5333b5e44b1f 100644 --- a/external/libcdr/libcdr-visibility-win.patch +++ b/external/libcdr/libcdr-visibility-win.patch @@ -1,11 +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 @@ +@@ -23329,6 +23329,8 @@ - - if test $platform_win32 = yes; then : + if test $platform_win32 = yes + then : + HAVE_VISIBILITY_TRUE='#' + HAVE_VISIBILITY_FALSE= - else + else $as_nop |