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
This commit is contained in:
parent
174d1d3f3b
commit
0e334b25b9
4 changed files with 6 additions and 18 deletions
|
@ -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
|
||||
|
|
1
external/libcdr/UnpackedTarball_libcdr.mk
vendored
1
external/libcdr/UnpackedTarball_libcdr.mk
vendored
|
@ -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:
|
||||
|
|
11
external/libcdr/ax_gcc_func_attribute.m4.patch
vendored
11
external/libcdr/ax_gcc_func_attribute.m4.patch
vendored
|
@ -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
|
8
external/libcdr/libcdr-visibility-win.patch
vendored
8
external/libcdr/libcdr-visibility-win.patch
vendored
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in a new issue