diff options
author | Dima Panov <fluffy@FreeBSD.org> | 2021-02-04 09:21:55 +0000 |
---|---|---|
committer | Dima Panov <fluffy@FreeBSD.org> | 2021-02-04 09:21:55 +0000 |
commit | 5c2dafb758712d1ab6ea5ddc287c57aabf3f8419 (patch) | |
tree | 0d517e7549a35d092012ce3bb76c1b04698c8836 /editors/libreoffice/files/patch-configure | |
parent | devel/py-hg-evolve: Update to 10.2.0. (diff) |
Please welcome LibreOffice suite 7.1.0 release!
Release Notes: https://blog.documentfoundation.org/blog/2021/02/03/libreoffice-7-1-community/
Notes
Notes:
svn path=/head/; revision=564006
Diffstat (limited to 'editors/libreoffice/files/patch-configure')
-rw-r--r-- | editors/libreoffice/files/patch-configure | 64 |
1 files changed, 49 insertions, 15 deletions
diff --git a/editors/libreoffice/files/patch-configure b/editors/libreoffice/files/patch-configure index 07e79b665e01..18d09e237b5f 100644 --- a/editors/libreoffice/files/patch-configure +++ b/editors/libreoffice/files/patch-configure @@ -1,18 +1,52 @@ ---- configure 2018-08-03 03:58:40.000000000 +0800 -+++ configure 2018-08-10 05:28:52.021925000 +0800 -@@ -31735,7 +31735,7 @@ - +--- configure.orig 2021-01-14 20:28:32 UTC ++++ configure +@@ -30505,12 +30505,12 @@ if test -n "$MDDS_CFLAGS"; then + pkg_cv_MDDS_CFLAGS="$MDDS_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mdds-1.5 >= 1.5.0\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "mdds-1.5 >= 1.5.0") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mdds-1.7 >= 1.7.0\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "mdds-1.7 >= 1.7.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_MDDS_CFLAGS=`$PKG_CONFIG --cflags "mdds-1.5 >= 1.5.0" 2>/dev/null` ++ pkg_cv_MDDS_CFLAGS=`$PKG_CONFIG --cflags "mdds-1.7 >= 1.7.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes +@@ -30522,12 +30522,12 @@ if test -n "$MDDS_LIBS"; then + pkg_cv_MDDS_LIBS="$MDDS_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mdds-1.5 >= 1.5.0\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "mdds-1.5 >= 1.5.0") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mdds-1.7 >= 1.7.0\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "mdds-1.7 >= 1.7.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_MDDS_LIBS=`$PKG_CONFIG --libs "mdds-1.5 >= 1.5.0" 2>/dev/null` ++ pkg_cv_MDDS_LIBS=`$PKG_CONFIG --libs "mdds-1.7 >= 1.7.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes +@@ -30548,14 +30548,14 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- MDDS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "mdds-1.5 >= 1.5.0" 2>&1` ++ MDDS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "mdds-1.7 >= 1.7.0" 2>&1` + else +- MDDS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "mdds-1.5 >= 1.5.0" 2>&1` ++ MDDS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "mdds-1.7 >= 1.7.0" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$MDDS_PKG_ERRORS" >&5 +- as_fn_error $? "Package requirements (mdds-1.5 >= 1.5.0) were not met: ++ as_fn_error $? "Package requirements (mdds-1.7 >= 1.7.0) were not met: -- elif test "$_os" = "NetBSD" -o "$_os" = "OpenBSD" -o "$_os" = "DragonFly" \ -+ elif test "$_os" = "NetBSD" -o "$_os" = "OpenBSD" -o "$_os" = "DragonFly" -o "$_os" = "FreeBSD" \ - && test "$with_system_openssl" != "no"; then - with_system_openssl=yes - SYSTEM_OPENSSL=TRUE -@@ -34402,5 +34412,5 @@ - fi + $MDDS_PKG_ERRORS --if test "$_os" = "SunOS" -o "$_os" = "FreeBSD" -o "$_os" = "Darwin"; then -+if test "$_os" = "SunOS" -o "$_os" = "Darwin"; then - if test -z "$with_gnu_patch"; then - GNUPATCH=$PATCH |