diff options
| author | Tobias C. Berner <tcberner@FreeBSD.org> | 2021-08-07 13:52:34 +0200 |
|---|---|---|
| committer | Tobias C. Berner <tcberner@FreeBSD.org> | 2021-08-07 13:52:34 +0200 |
| commit | 2e8a7f6a4674d4ee40da1553a19047481f0c6c63 (patch) | |
| tree | b7ecdf682afedde046e98ba28c3c3414b980518d /print/texlive-base/files/patch-configure | |
| parent | x11-toolkits/fox17: prepare for freetype2 update (diff) | |
print/texlive-base: prepare for freetype2 upgrade
- freetype2 will no longer ship freetype-config (which was a pkg-config
wrapper) in the near future -- use pkg-config to gather the required
flags.
Original version by: diizzy
PR: 251512
PR: 257576
Diffstat (limited to 'print/texlive-base/files/patch-configure')
| -rw-r--r-- | print/texlive-base/files/patch-configure | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/print/texlive-base/files/patch-configure b/print/texlive-base/files/patch-configure index 429162c7401d..1b7fc3453ca9 100644 --- a/print/texlive-base/files/patch-configure +++ b/print/texlive-base/files/patch-configure @@ -1,6 +1,6 @@ --- configure.orig 2015-04-12 11:22:39 UTC +++ configure -@@ -5685,6 +5685,15 @@ $as_echo "$as_me: -> installed \`zlib +@@ -5685,7 +5685,16 @@ $as_echo "$as_me: -> installed \`zlib' headers and as_fn_error $? "Sorry, \`--with-system-teckit' requires \`--with-system-zlib'" "$LINENO" 5 fi fi @@ -8,15 +8,27 @@ +if test "${with_teckit_includes+set}" = set; then : + withval=$with_teckit_includes; +fi -+ + +# Check whether --with-teckit-libdir was given. +if test "${with_teckit_libdir+set}" = set; then : + withval=$with_teckit_libdir; +fi - ++ test "x$need_teckit" = xyes && { need_zlib=yes -@@ -21284,11 +21293,12 @@ elif test "x$need_graphite2:$with_system + } +@@ -21198,8 +21207,8 @@ else + FT2_CONFIG="$ac_cv_prog_FT2_CONFIG" + fi + if $FT2_CONFIG --ftversion >/dev/null 2>&1; then +- FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags` +- FREETYPE2_LIBS=`$FT2_CONFIG --libs` ++ FREETYPE2_INCLUDES=`pkg-config freetype2 --cflags` ++ FREETYPE2_LIBS=`pkg-config freetype2 --libs` + elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then + as_fn_error $? "did not find freetype-config required for system freetype2 library" "$LINENO" 5 + fi +@@ -21284,11 +21293,12 @@ elif test "x$need_graphite2:$with_system_graphite2" = as_fn_error $? "did not find graphite2" "$LINENO" 5 fi |