diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2017-02-07 19:42:00 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2017-02-07 19:42:00 +0000 |
| commit | c1bba509f3225de038a826dea9aaa6f550d8c036 (patch) | |
| tree | 7dd88d98027bb4a82edf9d246e0eafde5dac585f /editors/libreoffice/files/patch-configure | |
| parent | Update to 0.12.1. (diff) | |
- Catch up with liborcus 0.12.1.
- Make option GNOME imply GTK2 again.
Notes
Notes:
svn path=/head/; revision=433584
Diffstat (limited to 'editors/libreoffice/files/patch-configure')
| -rw-r--r-- | editors/libreoffice/files/patch-configure | 54 |
1 files changed, 52 insertions, 2 deletions
diff --git a/editors/libreoffice/files/patch-configure b/editors/libreoffice/files/patch-configure index 3def1c5fb76a..971d3c414373 100644 --- a/editors/libreoffice/files/patch-configure +++ b/editors/libreoffice/files/patch-configure @@ -1,6 +1,56 @@ ---- configure.orig 2016-10-28 14:59:52 UTC +--- configure.orig 2017-01-12 01:09:22 UTC +++ configure -@@ -31912,7 +31912,7 @@ fi +@@ -29353,12 +29353,12 @@ if test -n "$ORCUS_CFLAGS"; then + pkg_cv_ORCUS_CFLAGS="$ORCUS_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"liborcus-0.11 >= 0.11.2\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "liborcus-0.11 >= 0.11.2") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"liborcus-0.12 >= 0.12.0\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "liborcus-0.12 >= 0.12.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_ORCUS_CFLAGS=`$PKG_CONFIG --cflags "liborcus-0.11 >= 0.11.2" 2>/dev/null` ++ pkg_cv_ORCUS_CFLAGS=`$PKG_CONFIG --cflags "liborcus-0.12 >= 0.12.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes +@@ -29370,12 +29370,12 @@ if test -n "$ORCUS_LIBS"; then + pkg_cv_ORCUS_LIBS="$ORCUS_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"liborcus-0.11 >= 0.11.2\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "liborcus-0.11 >= 0.11.2") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"liborcus-0.12 >= 0.12.0\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "liborcus-0.12 >= 0.12.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_ORCUS_LIBS=`$PKG_CONFIG --libs "liborcus-0.11 >= 0.11.2" 2>/dev/null` ++ pkg_cv_ORCUS_LIBS=`$PKG_CONFIG --libs "liborcus-0.12 >= 0.12.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes +@@ -29396,14 +29396,14 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- ORCUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "liborcus-0.11 >= 0.11.2" 2>&1` ++ ORCUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "liborcus-0.12 >= 0.12.0" 2>&1` + else +- ORCUS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "liborcus-0.11 >= 0.11.2" 2>&1` ++ ORCUS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "liborcus-0.12 >= 0.12.0" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$ORCUS_PKG_ERRORS" >&5 + +- as_fn_error $? "Package requirements (liborcus-0.11 >= 0.11.2) were not met: ++ as_fn_error $? "Package requirements (liborcus-0.12 >= 0.12.0) were not met: + + $ORCUS_PKG_ERRORS + +@@ -31927,7 +31927,7 @@ fi |