From owner-dev-commits-ports-main@freebsd.org Wed Apr 7 04:20:18 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 218DD5C8FFD; Wed, 7 Apr 2021 04:20:18 +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 4FFWQS3PLyz3nRG; Wed, 7 Apr 2021 04:20:16 +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 9D0F318D1C; Wed, 7 Apr 2021 04:20:15 +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 1374KFCx022311; Wed, 7 Apr 2021 04:20:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1374KFU8022305; Wed, 7 Apr 2021 04:20:15 GMT (envelope-from git) Date: Wed, 7 Apr 2021 04:20:15 GMT Message-Id: <202104070420.1374KFU8022305@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Tobias Kortkamp Subject: git: ebb0dd9648ac - main - x11-fonts/font-manager: Attempt to fix build order bug (D29353) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tobik X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ebb0dd9648ac31174980ee73d160315d81f94478 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: Wed, 07 Apr 2021 04:20:18 -0000 The branch main has been updated by tobik: URL: https://cgit.FreeBSD.org/ports/commit/?id=ebb0dd9648ac31174980ee73d160315d81f94478 commit ebb0dd9648ac31174980ee73d160315d81f94478 Author: Tobias Kortkamp AuthorDate: 2021-04-07 03:39:05 +0000 Commit: Tobias Kortkamp CommitDate: 2021-04-07 04:19:58 +0000 x11-fonts/font-manager: Attempt to fix build order bug (D29353) Uncovered while building with devel/samurai but can probably also happen with ninja eventually. error: Package `Unicode-0.8.5' not found in specified Vala API directories or GObject-Introspection GIR directories samu: subcommand failed http://package23.nyi.freebsd.org/data/114i386-default-foo/2021-04-04_07h39m29s/logs/errors/font-manager-0.8.5.log While here also remove explicit ninja dependency. It is already pulled in through meson. PR: 254678 Obtained from: upstream --- x11-fonts/font-manager/Makefile | 1 - .../files/patch-lib_common_meson.build | 23 ++++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/x11-fonts/font-manager/Makefile b/x11-fonts/font-manager/Makefile index 5e85c418fcf2..e47fa54ee6f5 100644 --- a/x11-fonts/font-manager/Makefile +++ b/x11-fonts/font-manager/Makefile @@ -12,7 +12,6 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= cmake:devel/cmake \ itstool:textproc/itstool \ - ninja:devel/ninja \ valac:lang/vala \ yelp-build:textproc/yelp-tools LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ diff --git a/x11-fonts/font-manager/files/patch-lib_common_meson.build b/x11-fonts/font-manager/files/patch-lib_common_meson.build new file mode 100644 index 000000000000..6f472efdb49e --- /dev/null +++ b/x11-fonts/font-manager/files/patch-lib_common_meson.build @@ -0,0 +1,23 @@ +From 3ad5cc842b90614d8c06d4a4a7428b906a982aea Mon Sep 17 00:00:00 2001 +From: Jerry Casiano +Date: Wed, 24 Mar 2021 17:47:23 -0400 +Subject: [PATCH] - Proper fix for Issue #208 + +--- lib/common/meson.build.orig 2021-03-22 22:35:30 UTC ++++ lib/common/meson.build +@@ -71,7 +71,7 @@ common_vapi = gnome.generate_vapi('font-manager-common + sources: [ + common_gir[0], + unicode_gir[0], +- 'font-manager-common.vala' ++ 'font-manager-common.vala', + ], + vapi_dirs: [ + meson.current_build_dir(), +@@ -87,5 +87,5 @@ common_vapi = gnome.generate_vapi('font-manager-common + 'json-glib-1.0', + 'libxml-2.0', + 'sqlite3', +- 'Unicode-@0@'.format(meson.project_version()) ++ unicode_vapi + ])