git: ebb0dd9648ac - main - x11-fonts/font-manager: Attempt to fix build order bug (D29353)

[Tobias Kortkamp]

The branch main has been updated by tobik:

URL: https://cgit.FreeBSD.org/ports/commit/?id=ebb0dd9648ac31174980ee73d160315d81f94478

commit ebb0dd9648ac31174980ee73d160315d81f94478
Author:     Tobias Kortkamp <tobik at FreeBSD.org>
AuthorDate: 2021-04-07 03:39:05 +0000
Commit:     Tobias Kortkamp <tobik at FreeBSD.org>
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 <JerryCasiano at gmail.com>
+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- at 0@'.format(meson.project_version())
++                                        unicode_vapi
+                                     ])