Date: Sat, 7 Aug 2021 06:07:40 GMT From: "Tobias C. Berner" <tcberner@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 3fba6f604d82 - main - graphics/dia: prepare for freetype2 update Message-ID: <202108070607.17767elU096662@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=3fba6f604d82add50fb46b4f4e38f0be9ccfda44 commit 3fba6f604d82add50fb46b4f4e38f0be9ccfda44 Author: Tobias C. Berner <tcberner@FreeBSD.org> AuthorDate: 2021-08-07 06:01:42 +0000 Commit: Tobias C. Berner <tcberner@FreeBSD.org> CommitDate: 2021-08-07 06:01:42 +0000 graphics/dia: prepare for freetype2 update - 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. PR: 251512 --- graphics/dia/files/patch-configure | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/graphics/dia/files/patch-configure b/graphics/dia/files/patch-configure new file mode 100644 index 000000000000..d66486f056e2 --- /dev/null +++ b/graphics/dia/files/patch-configure @@ -0,0 +1,32 @@ +--- configure.orig 2021-08-07 06:00:14 UTC ++++ configure +@@ -16849,7 +16849,7 @@ if ${ac_cv_lib_freetype_FT_Init_FreeType+:} false; the + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lfreetype `freetype-config --libs` $LIBS" ++LIBS="-lfreetype `pkg-config freetype2 --libs` $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -16889,7 +16889,7 @@ fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if FreeType version is 2.0.9 or higher" >&5 + $as_echo_n "checking if FreeType version is 2.0.9 or higher... " >&6; } + old_CPPFLAGS="$CPPFLAGS" +- CPPFLAGS="$CPPFLAGS `freetype-config --cflags`" ++ CPPFLAGS="$CPPFLAGS `pkg-config freetype2 --cflags`" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include <ft2build.h> +@@ -16902,9 +16902,9 @@ _ACEOF + if ac_fn_c_try_cpp "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } +- FREETYPE_LIBS=`freetype-config --libs` ++ FREETYPE_LIBS=`pkg-config freetype2 --libs` + +- FREETYPE_CFLAGS=`freetype-config --cflags` ++ FREETYPE_CFLAGS=`pkg-config freetype2 --cflags` + + GTK_MODULES="$GTK_MODULES pangoft2" +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202108070607.17767elU096662>