mirror of
https://git.freebsd.org/ports.git
synced 2025-06-20 12:10:31 -04:00
3a67c00d08
- Switch to active fork (removes the need to patch for mutliple CVEs) This is what Alpine Linux, Arch Linux, Debian and Fedora uses. - Add patch to use pkg-config (pkgconfig) to detect freetype(2) References: https://github.com/caolanm/libwmf (no proper release notes available) https://github.com/archlinux/svntogit-packages/blob/packages/libwmf/trunk/libwmf-freetype.patch PR: 252114 Submitted by: daniel.engberg.lists@pyret.net
51 lines
1.5 KiB
Text
51 lines
1.5 KiB
Text
--- configure.ac.orig 2019-02-01 17:51:32 UTC
|
|
+++ configure.ac
|
|
@@ -391,40 +391,19 @@ AC_ARG_WITH(freetype,[ --with-freetype=DIR use fr
|
|
fi
|
|
])
|
|
|
|
-if [ test -n "$FREETYPE_DIR" ]; then
|
|
- AC_PATH_PROG(FREETYPE_CONFIG,freetype-config, ,[$FREETYPE_DIR/bin:$PATH])
|
|
-else
|
|
- AC_PATH_PROG(FREETYPE_CONFIG,freetype-config)
|
|
-fi
|
|
+PKG_CHECK_MODULES(FREETYPE2, freetype2,
|
|
+ CFLAGS="$CFLAGS $FREETYPE2_CFLAGS"
|
|
+ LDFLAGS="$LDFLAGS $FREETYPE2_LIBS",
|
|
+ AC_MSG_ERROR([*** Unable to find FreeType2 library (http://www.freetype.org/)])
|
|
+)
|
|
|
|
-if [ test -n "$FREETYPE_CONFIG" ]; then
|
|
- if [ test -n "$FREETYPE_DIR" ]; then
|
|
- freetype_cflags="`$FREETYPE_CONFIG --cflags` -I$FREETYPE_DIR/include"
|
|
- freetype_libs=`$FREETYPE_CONFIG --libs`
|
|
- else
|
|
- freetype_cflags=`$FREETYPE_CONFIG --cflags`
|
|
- freetype_libs=`$FREETYPE_CONFIG --libs`
|
|
- fi
|
|
-else
|
|
- if [ test -n "$FREETYPE_DIR" ]; then
|
|
- freetype_cflags="-I$FREETYPE_DIR/include/freetype2 -I$FREETYPE_DIR/include"
|
|
- freetype_libs="-L$FREETYPE_DIR/lib -lfreetype"
|
|
- else
|
|
- freetype_cflags=""
|
|
- freetype_libs="-lfreetype"
|
|
- fi
|
|
-fi
|
|
-
|
|
-CPPFLAGS="$freetype_cflags $CPPFLAGS"
|
|
-LDFLAGS="$LDFLAGS $freetype_libs"
|
|
-
|
|
AC_CHECK_LIB(freetype,FT_Init_FreeType,[
|
|
- WMF_FT_LDFLAGS="$freetype_libs"
|
|
+ WMF_FT_LDFLAGS="$FREETYPE2_LIBS"
|
|
],[ AC_MSG_ERROR([* * * freetype(2) is required * * *])
|
|
])
|
|
AC_CHECK_HEADER(ft2build.h,[
|
|
- WMF_FT_CFLAGS="$freetype_cflags"
|
|
- WMF_FT_CONFIG_CFLAGS="$freetype_cflags"
|
|
+ WMF_FT_CFLAGS="$FREETYPE2_CFLAGS"
|
|
+ WMF_FT_CONFIG_CFLAGS="$FREETYPE2_CFLAGS"
|
|
],[ AC_MSG_ERROR([* * * freetype(2) is required * * *])
|
|
])
|
|
|