diff options
| author | Tobias C. Berner <tcberner@FreeBSD.org> | 2021-08-06 09:46:43 +0000 |
|---|---|---|
| committer | Tobias C. Berner <tcberner@FreeBSD.org> | 2021-08-06 09:48:47 +0000 |
| commit | 85892130a89e9a579ebeda2f31894c625b30dde9 (patch) | |
| tree | d338e9a0bcda45b43ee7a7edd128ab753477c815 | |
| parent | 378370d760d59768bf4354db4226f0effb9bf4eb (diff) | |
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
| -rw-r--r-- | chinese/ttfm/Makefile | 2 | ||||
| -rw-r--r-- | chinese/ttfm/files/patch-Makefile | 18 |
2 files changed, 20 insertions, 0 deletions
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 + |