From owner-dev-commits-ports-main@freebsd.org Sat Aug 7 06:07:41 2021 Return-Path: Delivered-To: dev-commits-ports-main@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 36ACE665658; Sat, 7 Aug 2021 06:07:41 +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 4GhX2512Tyz4jBF; Sat, 7 Aug 2021 06:07:41 +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 082FC1C288; Sat, 7 Aug 2021 06:07:41 +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 17767ePc096663; Sat, 7 Aug 2021 06:07:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 17767elU096662; Sat, 7 Aug 2021 06:07:40 GMT (envelope-from git) Date: Sat, 7 Aug 2021 06:07:40 GMT Message-Id: <202108070607.17767elU096662@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: 3fba6f604d82 - main - graphics/dia: 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: 3fba6f604d82add50fb46b4f4e38f0be9ccfda44 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Aug 2021 06:07:41 -0000 The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=3fba6f604d82add50fb46b4f4e38f0be9ccfda44 commit 3fba6f604d82add50fb46b4f4e38f0be9ccfda44 Author: Tobias C. Berner AuthorDate: 2021-08-07 06:01:42 +0000 Commit: Tobias C. Berner 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 +@@ -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" +