diff options
| author | Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2025-01-29 00:58:19 +0800 |
|---|---|---|
| committer | Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2025-01-29 01:05:00 +0800 |
| commit | ca315094f93a92aed537fab6a0efba9c4330ec77 (patch) | |
| tree | 6ed01bfa37da10ee139facff4e1b9303686e1200 /print/libmspub01/files | |
| parent | german/mythes: Update to 2025.01.05 (diff) | |
print/libmspub01: Simplify ICU fix
- Add LICENSE_FILE
Diffstat (limited to 'print/libmspub01/files')
| -rw-r--r-- | print/libmspub01/files/patch-configure | 52 | ||||
| -rw-r--r-- | print/libmspub01/files/patch-configure.ac | 11 |
2 files changed, 52 insertions, 11 deletions
diff --git a/print/libmspub01/files/patch-configure b/print/libmspub01/files/patch-configure new file mode 100644 index 000000000000..44c9a1679326 --- /dev/null +++ b/print/libmspub01/files/patch-configure @@ -0,0 +1,52 @@ +--- configure.orig 2018-02-28 12:02:05 UTC ++++ configure +@@ -18856,12 +18856,12 @@ if test -n "$ICU_CFLAGS"; then + pkg_cv_ICU_CFLAGS="$ICU_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"icu-i18n\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "icu-i18n") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"icu-i18n icu-uc\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "icu-i18n icu-uc") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_ICU_CFLAGS=`$PKG_CONFIG --cflags "icu-i18n" 2>/dev/null` ++ pkg_cv_ICU_CFLAGS=`$PKG_CONFIG --cflags "icu-i18n icu-uc" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes +@@ -18873,12 +18873,12 @@ if test -n "$ICU_LIBS"; then + pkg_cv_ICU_LIBS="$ICU_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"icu-i18n\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "icu-i18n") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"icu-i18n icu-uc\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "icu-i18n icu-uc") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_ICU_LIBS=`$PKG_CONFIG --libs "icu-i18n" 2>/dev/null` ++ pkg_cv_ICU_LIBS=`$PKG_CONFIG --libs "icu-i18n icu-uc" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes +@@ -18899,14 +18899,14 @@ fi + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- ICU_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "icu-i18n" 2>&1` ++ ICU_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "icu-i18n icu-uc" 2>&1` + else +- ICU_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "icu-i18n" 2>&1` ++ ICU_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "icu-i18n icu-uc" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$ICU_PKG_ERRORS" >&5 + +- as_fn_error $? "Package requirements (icu-i18n) were not met: ++ as_fn_error $? "Package requirements (icu-i18n icu-uc) were not met: + + $ICU_PKG_ERRORS + diff --git a/print/libmspub01/files/patch-configure.ac b/print/libmspub01/files/patch-configure.ac deleted file mode 100644 index c2316cbe73e6..000000000000 --- a/print/libmspub01/files/patch-configure.ac +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.ac.orig 2025-01-04 20:17:51 UTC -+++ configure.ac -@@ -104,7 +104,7 @@ AC_CHECK_HEADERS( - # ======== - # Find icu - # ======== --PKG_CHECK_MODULES([ICU], [icu-i18n]) -+PKG_CHECK_MODULES([ICU], [icu-i18n icu-uc]) - AC_SUBST(ICU_CFLAGS) - AC_SUBST(ICU_LIBS) - |