Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 1 May 2021 12:58:32 GMT
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: eaec3af05908 - main - Mk/*: cleanup leftovers from ancient removal
Message-ID:  <202105011258.141CwWru026668@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by bapt:

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

commit eaec3af05908b6ffe7835ee1ab1d7362f93ca826
Author:     Baptiste Daroussin <bapt@FreeBSD.org>
AuthorDate: 2021-05-01 12:55:18 +0000
Commit:     Baptiste Daroussin <bapt@FreeBSD.org>
CommitDate: 2021-05-01 12:58:26 +0000

    Mk/*: cleanup leftovers from ancient removal
---
 Mk/Scripts/qa.sh |  4 ----
 Mk/Uses/gnome.mk | 11 ++---------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/Mk/Scripts/qa.sh b/Mk/Scripts/qa.sh
index 3d5fc12d6598..afc4f53d5a87 100644
--- a/Mk/Scripts/qa.sh
+++ b/Mk/Scripts/qa.sh
@@ -373,12 +373,10 @@ proxydeps_suggest_uses() {
 		${pkg} = "audio/gsound" -o \
 		${pkg} = "x11-toolkits/gtk20" -o \
 		${pkg} = "x11-toolkits/gtk30" -o \
-		${pkg} = "www/gtkhtml3" -o \
 		${pkg} = "www/gtkhtml4" -o \
 		${pkg} = "x11-toolkits/gtkmm20" -o \
 		${pkg} = "x11-toolkits/gtkmm24" -o \
 		${pkg} = "x11-toolkits/gtkmm30" -o \
-		${pkg} = "x11-toolkits/gtksourceview" -o \
 		${pkg} = "x11-toolkits/gtksourceview2" -o \
 		${pkg} = "x11-toolkits/gtksourceview3" -o \
 		${pkg} = "x11-toolkits/gtksourceviewmm3" -o \
@@ -391,8 +389,6 @@ proxydeps_suggest_uses() {
 		${pkg} = "graphics/libgnomecanvas" -o \
 		${pkg} = "x11/libgnomekbd" -o \
 		${pkg} = "devel/libgsf" -o \
-		${pkg} = "www/libgtkhtml" -o \
-		${pkg} = "x11-toolkits/libgtksourceviewmm" -o \
 		${pkg} = "graphics/librsvg2" -o \
 		${pkg} = "devel/libsigc++12" -o \
 		${pkg} = "devel/libsigc++20" -o \
diff --git a/Mk/Uses/gnome.mk b/Mk/Uses/gnome.mk
index 7a6df427dab7..9e5e31e176ef 100644
--- a/Mk/Uses/gnome.mk
+++ b/Mk/Uses/gnome.mk
@@ -71,7 +71,7 @@ _USE_GNOME_ALL= intlhack intltool introspection \
 # GNOME 2 components
 _USE_GNOME_ALL+= atk cairo \
 		gdkpixbuf2 gconf2 glib20 \
-		gnomevfs2 gtk-update-icon-cache gtk20 gtkhtml3 \
+		gnomevfs2 gtk-update-icon-cache gtk20 \
 		gtksharp20 gtksourceview2 gvfs libartlgpl2 libbonobo \
 		libglade2 libgnome \
 		libgnomecanvas \
@@ -89,8 +89,7 @@ _USE_GNOME_ALL+=dconf evolutiondataserver3 gnomecontrolcenter3 gnomedesktop3 \
 
 # C++ bindings
 _USE_GNOME_ALL+=atkmm cairomm gconfmm26 glibmm gtkmm24 \
-		gtkmm30 gtksourceviewmm3 libgdamm5 \
-		libgtksourceviewmm libxml++26 libsigc++20 \
+		gtkmm30 gtksourceviewmm3 libgdamm5 libxml++26 libsigc++20 \
 		pangomm
 
 # glib-mkenums often fails with C locale
@@ -148,9 +147,6 @@ gtksourceviewmm3_USE_GNOME_IMPL=	gtkmm30 gtksourceview3
 libgdamm5_LIB_DEPENDS=		libgdamm-5.0.so:databases/libgdamm5
 libgdamm5_USE_GNOME_IMPL=	libgda5 glibmm
 
-libgtksourceviewmm_LIB_DEPENDS=		libgtksourceviewmm-2.0.so:x11-toolkits/libgtksourceviewmm
-libgtksourceviewmm_USE_GNOME_IMPL=	gtksourceview2 gtkmm24
-
 libsigc++20_LIB_DEPENDS=	libsigc-2.0.so:devel/libsigc++20
 
 pangomm_LIB_DEPENDS=	libpangomm-1.4.so:x11-toolkits/pangomm
@@ -301,9 +297,6 @@ intlhack_PRE_PATCH=	${FIND} ${WRKSRC} -name "intltool-merge.in" | ${XARGS} ${FRA
 			's/DATADIRNAME=lib/DATADIRNAME=share/'
 intlhack_USE_GNOME_IMPL=intltool
 
-gtkhtml3_LIB_DEPENDS=	libgtkhtml-3.14.so:www/gtkhtml3
-gtkhtml3_USE_GNOME_IMPL=libglade2
-
 gtkhtml4_LIB_DEPENDS=	libgtkhtml-4.0.so:www/gtkhtml4
 gtkhtml4_USE_GNOME_IMPL=gtk30 libxml2
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202105011258.141CwWru026668>