diff options
Diffstat (limited to 'print/tex-xdvik/files/patch-texk-xdvik-configure')
| -rw-r--r-- | print/tex-xdvik/files/patch-texk-xdvik-configure | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/print/tex-xdvik/files/patch-texk-xdvik-configure b/print/tex-xdvik/files/patch-texk-xdvik-configure index dade70b597be..81793860c9a4 100644 --- a/print/tex-xdvik/files/patch-texk-xdvik-configure +++ b/print/tex-xdvik/files/patch-texk-xdvik-configure @@ -1,20 +1,18 @@ ---- texk/xdvik/configure.orig 2014-04-13 03:58:38 UTC +--- texk/xdvik/configure.orig 2022-02-17 21:07:51 UTC +++ texk/xdvik/configure -@@ -667,6 +667,7 @@ X_CFLAGS +@@ -668,6 +668,7 @@ ALLOCA XMKMF LIBOBJS ALLOCA +FONTCONFIGCPPFLAGS PS_DEF CPP - OTOOL64 -@@ -13309,6 +13310,20 @@ $as_echo "#define A4 1" >>confdefs.h + LT_SYS_LIBRARY_PATH +@@ -13867,6 +13868,18 @@ fi fi + -+$as_echo "#define PTEX 1" >>confdefs.h -+ +if pkg-config fontconfig --modversion > /dev/null 2>&1; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: adding fontconfig-\`pkg-config fontconfig --modversion\` library" >&5 +$as_echo "adding fontconfig-\`pkg-config fontconfig --modversion\` library" >&6; } @@ -29,18 +27,18 @@ ac_config_headers="$ac_config_headers c-auto.h:c-auto.in" -@@ -18393,8 +18408,8 @@ else - FT2_CONFIG="$ac_cv_prog_FT2_CONFIG" +@@ -19063,8 +19076,8 @@ if $FT2_CONFIG --ftversion >/dev/null 2>&1; then + PKG_CONFIG="$ac_cv_prog_PKG_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 -@@ -18408,6 +18423,82 @@ $(FREETYPE2_DEPEND): ${top_builddir}/../../libs/freety + elif $PKG_CONFIG --libs freetype2 >/dev/null 2>&1; then + FREETYPE2_INCLUDES=`$PKG_CONFIG --cflags freetype2` + FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2` +@@ -19081,6 +19094,82 @@ fi ${top_builddir}/../../libs/freetype2/freetype2/ft2build.h: cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS) rebuild' fi |