From owner-dev-commits-ports-all@freebsd.org Fri Aug 6 09:48:59 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id DC68F652888; Fri, 6 Aug 2021 09:48:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Gh0zv5gZTz3r4S; Fri, 6 Aug 2021 09:48:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id ABBB3382D; Fri, 6 Aug 2021 09:48:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1769mxWB062979; Fri, 6 Aug 2021 09:48:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1769mxEg062978; Fri, 6 Aug 2021 09:48:59 GMT (envelope-from git) Date: Fri, 6 Aug 2021 09:48:59 GMT Message-Id: <202108060948.1769mxEg062978@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Tobias C. Berner" Subject: git: 85892130a89e - main - chinese/ttfm: prepare for freetype2 update MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tcberner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 85892130a89e9a579ebeda2f31894c625b30dde9 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Aug 2021 09:48:59 -0000 The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=85892130a89e9a579ebeda2f31894c625b30dde9 commit 85892130a89e9a579ebeda2f31894c625b30dde9 Author: Tobias C. Berner AuthorDate: 2021-08-06 09:46:43 +0000 Commit: Tobias C. Berner 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 +