Date: Fri, 6 Aug 2021 09:48:59 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: 85892130a89e - main - chinese/ttfm: prepare for freetype2 update Message-ID: <202108060948.1769mxEg062978@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=85892130a89e9a579ebeda2f31894c625b30dde9 commit 85892130a89e9a579ebeda2f31894c625b30dde9 Author: Tobias C. Berner <tcberner@FreeBSD.org> AuthorDate: 2021-08-06 09:46:43 +0000 Commit: Tobias C. Berner <tcberner@FreeBSD.org> CommitDate: 2021-08-06 09:48:47 +0000 chinese/ttfm: 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 --- chinese/ttfm/Makefile | 2 ++ chinese/ttfm/files/patch-Makefile | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/chinese/ttfm/Makefile b/chinese/ttfm/Makefile index 592e305b50da..863818688818 100644 --- a/chinese/ttfm/Makefile +++ b/chinese/ttfm/Makefile @@ -13,6 +13,8 @@ LICENSE= MIT LIB_DEPENDS= libfreetype.so:print/freetype2 +USES= pkgconfig + MAKE_ARGS= FREETYPE_BASE=${LOCALBASE:Q} CC="${CC}" PORTDOCS= README USAGE diff --git a/chinese/ttfm/files/patch-Makefile b/chinese/ttfm/files/patch-Makefile new file mode 100644 index 000000000000..ef80b855d5fc --- /dev/null +++ b/chinese/ttfm/files/patch-Makefile @@ -0,0 +1,18 @@ +Fix build against modern freetype. + +- Freetype no longer installes fretype-config. +- The compiler and linker flags can be gathered via pkg-config. + +--- Makefile.orig 2021-08-06 09:43:46 UTC ++++ Makefile +@@ -4,8 +4,8 @@ FREETYPE_LIB=$(FREETYPE_BASE)/lib + prefix=/usr + + CC=gcc +-CFLAGS=$(RPM_OPT_FLAGS) -Wall -pedantic `freetype-config --cflags` +-LDFALGS=`freetype-config --libs` ++CFLAGS=$(RPM_OPT_FLAGS) -Wall -pedantic `pkg-config --cflags freetype2` ++LDFALGS=`pkg-config --libs freetype2` + + all: ttfinfo +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202108060948.1769mxEg062978>