From nobody Wed Jun 5 15:18:28 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VvWLr38pPz5NDHw; Wed, 05 Jun 2024 15:18:28 +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 4VvWLr1kKTz46V1; Wed, 5 Jun 2024 15:18:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717600708; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fpTH93NqrcrYbuBaC2KiJOtEI+3wB9EBPL+rGRPjhI0=; b=TbETWBuBW2/EAZWFX48+yWetGrJXNxj1CvqjmkaZBw7XsZ/FQZfJLLclVqjuyt1e6T4oq9 1kalUvSf1yD0CVDjH2vVOTnxqq8i9TZ6hyVHq1wTjEmYgMi0eZpGfYxsYL5Mmgz3/SQQ3w 5Z8ZAscTyFSskhGFznACDNQwCSm6yfRbP7tVlnt4u1C+Ex3VmI8YgfJLHQKUIoiJlZwQ+q rNYQaxJk5zEH+1XfQBCyxwoGpOWptcUJXph8miM8DKbFGjD8Qam0CoK3bpc8ZnUbksuk5J z/hLleEgdPcgBSQPAoWa3N4J5Cy5sO0383/hbuHGM+7E2u8l+0OyBPNqEctlTQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717600708; a=rsa-sha256; cv=none; b=iM6wcYWAFCn1SbNK6i4lu9ZmI6sQwof1v+kjxm4QehYjhGCPLioachOZPBdUEmSbRdIJvn L3vLRnPTlJwUDr+bTCScxkxZ4bJ1xU+GNcNGHqP91E9J2X8sZs+aqE2Y5dcaBLXM7Kztt7 IQ1IUuSiYNQEW+AuXe+dpsFCFlE5NwgXG18L1NYISEoGpCX1WT/DRB2pjVZdEOUjADSD8S JwYGw+AjQMU3V2INvY3ML2OHn2ai0kjP+bgyFErDTroO0Gx+GQZCAuzQKbaug/s5pJhW4a nD+L9kJVDVgzzWAUjt1T5mDNcqOJh6CwBAQ+olhRiikP3W5x291xx3dN/ksNIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717600708; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fpTH93NqrcrYbuBaC2KiJOtEI+3wB9EBPL+rGRPjhI0=; b=fidC+vWCMbkQfT0zY1EfX3h5Flg1Qs09gYJMEFhlNkFIFpT7tqo1wfujGZ6b1bDIvUTlcj htU6zZjg30an5WTqN8ezy514CYIwhQh9KM48yPcpEz3JeLmz+WOxoOqywaB3HlWA/GFO3x /rzc50iRFj1rA2+83PuGAOAv3EgJEVbkVh2Xhwylw6ntcVcsgXdmxodDLq5LOZSsmi9Uag e6vNjRT6nByl3m+SQ74aVeoE182jQLcsZdyBcyXVmHZ/eVaxBBBnZunuwI8ySrSqIiK7Nd YpYsKUgUFws6qAoAyxyn/KbDsu7PwsVG0hmVTmBw07xjqxsQcKXgVbxKvZKkzw== 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 4VvWLr156Qz16ZB; Wed, 5 Jun 2024 15:18:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 455FISrn021420; Wed, 5 Jun 2024 15:18:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 455FIS7q021417; Wed, 5 Jun 2024 15:18:28 GMT (envelope-from git) Date: Wed, 5 Jun 2024 15:18:28 GMT Message-Id: <202406051518.455FIS7q021417@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Tijl Coosemans Subject: git: 5b84a5ddb799 - main - Mk/Uses/gnome.mk: Fix dependencies List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tijl X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5b84a5ddb7990eafe253deee046f1bf3bbe52c65 Auto-Submitted: auto-generated The branch main has been updated by tijl: URL: https://cgit.FreeBSD.org/ports/commit/?id=5b84a5ddb7990eafe253deee046f1bf3bbe52c65 commit 5b84a5ddb7990eafe253deee046f1bf3bbe52c65 Author: Tijl Coosemans AuthorDate: 2024-06-03 10:29:30 +0000 Commit: Tijl Coosemans 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