git: 5b84a5ddb799 - main - Mk/Uses/gnome.mk: Fix dependencies

The branch main has been updated by tijl:

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

commit 5b84a5ddb7990eafe253deee046f1bf3bbe52c65
Author:     Tijl Coosemans <tijl@FreeBSD.org>
AuthorDate: 2024-06-03 10:29:30 +0000
Commit:     Tijl Coosemans <tijl@FreeBSD.org>
CommitDate: 2024-06-05 14:51:48 +0000

    Mk/Uses/gnome.mk: Fix dependencies
    
    Add or correct dependencies that are pulled in by pkg-config files so
    they don't have to be added in every port Makefile.
    
    PR:             279524
    Reviewed by:    arrowd
---
 Mk/Uses/gnome.mk | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/Mk/Uses/gnome.mk b/Mk/Uses/gnome.mk
index 1628f3b8fb09..6a994f8d5937 100644
--- a/Mk/Uses/gnome.mk
+++ b/Mk/Uses/gnome.mk
@@ -69,7 +69,7 @@ _USE_GNOME_ALL+= atk cairo \
 		libglade2 libgnomecanvas \
 		libgsf libidl librsvg2 \
 		libxml2 libxslt \
-		pango pangox-compat \
+		pango pangoft2 pangox-compat \
 		vte
 
 # GNOME 3 components
@@ -111,7 +111,7 @@ libxml++26_USE_GNOME_IMPL=	glibmm libxml2
 cairo_LIB_DEPENDS=	libcairo.so:graphics/cairo
 
 cairomm_LIB_DEPENDS=	libcairomm-1.0.so:graphics/cairomm
-cairomm_USE_GNOME_IMPL=	cairo libxml++26
+cairomm_USE_GNOME_IMPL=	cairo libsigc++20
 
 gconfmm26_LIB_DEPENDS=		libgconfmm-2.6.so:devel/gconfmm26
 gconfmm26_USE_GNOME_IMPL=	glibmm gconf2
@@ -131,7 +131,7 @@ gtkmm24_LIB_DEPENDS=	libgtkmm-2.4.so:x11-toolkits/gtkmm24
 gtkmm24_USE_GNOME_IMPL=	glibmm cairomm atkmm pangomm gtk20
 
 gtkmm30_LIB_DEPENDS=	libgtkmm-3.0.so:x11-toolkits/gtkmm30
-gtkmm30_USE_GNOME_IMPL=	glibmm cairomm atkmm pangomm gtk30
+gtkmm30_USE_GNOME_IMPL=	atkmm cairomm gdkpixbuf2 glibmm gtk30 pangomm
 
 gtksourceviewmm3_LIB_DEPENDS=		libgtksourceviewmm-3.0.so:x11-toolkits/gtksourceviewmm3
 gtksourceviewmm3_USE_GNOME_IMPL=	gtkmm30 gtksourceview3
@@ -160,9 +160,14 @@ dconf_LIB_DEPENDS=	libdconf.so:devel/dconf
 dconf_RUN_DEPENDS=	dconf:devel/dconf
 dconf_USE_GNOME_IMPL=	glib20
 
-pango_LIB_DEPENDS=	libpango-1.0.so:x11-toolkits/pango
+pango_LIB_DEPENDS=	libharfbuzz.so:print/harfbuzz \
+			libpango-1.0.so:x11-toolkits/pango
 pango_USE_GNOME_IMPL=	glib20
 
+pangoft2_LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
+			libfreetype.so:print/freetype2
+pangoft2_USE_GNOME_IMPL=pango
+
 pangox-compat_LIB_DEPENDS=	libpangox-1.0.so:x11-toolkits/pangox-compat
 pangox-compat_USE_GNOME_IMPL=	glib20 pango
 
@@ -173,14 +178,13 @@ gdkpixbuf2xlib_LIB_DEPENDS=	libgdk_pixbuf_xlib-2.0.so:graphics/gdk-pixbuf2-xlib
 gdkpixbuf2xlib_USE_GNOME_IMPL=	glib20 gdkpixbuf2
 
 gtk-update-icon-cache_RUN_DEPENDS=	gtk-update-icon-cache:graphics/gtk-update-icon-cache
-gtk-update-icon-cache_USE_GNOME_IMPL=	atk pango gdkpixbuf2
 
 gtk20_LIB_DEPENDS=	libgtk-x11-2.0.so:x11-toolkits/gtk20
-gtk20_USE_GNOME_IMPL=	atk pango
+gtk20_USE_GNOME_IMPL=	atk cairo gdkpixbuf2 pangoft2
 GTK2_VERSION=		2.10.0
 
 gtk30_LIB_DEPENDS=	libgtk-3.so:x11-toolkits/gtk30
-gtk30_USE_GNOME_IMPL=	atk pango
+gtk30_USE_GNOME_IMPL=	atk cairo gdkpixbuf2 pango
 GTK3_VERSION=		3.0.0
 
 gtk40_LIB_DEPENDS=	libgtk-4.so:x11-toolkits/gtk40
@@ -241,7 +245,7 @@ librsvg2_BUILD_DEPENDS=	librsvg2>=0:graphics/librsvg2
 librsvg2_LIB_DEPENDS=	librsvg-2.so:graphics/librsvg2
 librsvg2_RUN_DEPENDS=	librsvg2>=0:graphics/librsvg2
 .  endif
-librsvg2_USE_GNOME_IMPL=gdkpixbuf2 pango
+librsvg2_USE_GNOME_IMPL=cairo gdkpixbuf2
 
 nautilus3_LIB_DEPENDS=	libnautilus-extension.so:x11-fm/nautilus
 nautilus3_USE_GNOME_IMPL=gnomedesktop3 libxml2
@@ -307,7 +311,6 @@ libgnomekbd_USE_GNOME_IMPL=	gtk30 libxml2
 
 gvfs_BUILD_DEPENDS=	gvfs>=0:devel/gvfs
 gvfs_RUN_DEPENDS=	gvfs>=0:devel/gvfs
-gvfs_USE_GNOME_IMPL=	glib20
 
 # End component definition section