git: 28a6ddab5efd - main - Prepare removal of libgnome (part2)
Baptiste Daroussin
bapt at FreeBSD.org
Sat May 1 13:26:17 UTC 2021
The branch main has been updated by bapt:
URL: https://cgit.FreeBSD.org/ports/commit/?id=28a6ddab5efdad6f3bcdc1d5825e4c180f08f8d4
commit 28a6ddab5efdad6f3bcdc1d5825e4c180f08f8d4
Author: Baptiste Daroussin <bapt at FreeBSD.org>
AuthorDate: 2021-05-01 13:23:35 +0000
Commit: Baptiste Daroussin <bapt at FreeBSD.org>
CommitDate: 2021-05-01 13:26:11 +0000
Prepare removal of libgnome (part2)
Remove all the libgnome optional dependencies
---
net-p2p/eiskaltdcpp-gtk/Makefile | 6 +-----
x11-toolkits/guile-gnome-platform/Makefile | 16 ++++------------
x11-toolkits/guile-gnome-platform/pkg-plist | 13 -------------
3 files changed, 5 insertions(+), 30 deletions(-)
diff --git a/net-p2p/eiskaltdcpp-gtk/Makefile b/net-p2p/eiskaltdcpp-gtk/Makefile
index 2838f87d8d91..c3f921b1c922 100644
--- a/net-p2p/eiskaltdcpp-gtk/Makefile
+++ b/net-p2p/eiskaltdcpp-gtk/Makefile
@@ -22,9 +22,8 @@ OPTIONS_DEFINE= LIBNOTIFY FREE_SPACE
OPTIONS_DEFAULT= LIBNOTIFY FREE_SPACE GTK2 NOSOUND
OPTIONS_SINGLE= GTK SOUND
OPTIONS_SINGLE_GTK= GTK2 GTK3
-OPTIONS_SINGLE_SOUND= NOSOUND LIBGNOME2 LIBCANBERRA
+OPTIONS_SINGLE_SOUND= NOSOUND LIBCANBERRA
NOSOUND_DESC= Disable sound notification support
-LIBGNOME2_DESC= Sound notification support via libgnome
LIBCANBERRA_DESC= Sound notification support via libcanberra
LIBNOTIFY_DESC= Popup notification support
FREE_SPACE_DESC=Free space bar in status panel
@@ -36,9 +35,6 @@ CMAKE_ARGS+= -DINSTALL_DATA:BOOL=OFF
NOSOUND_CMAKE_ON= -DUSE_LIBGNOME2:BOOL=OFF -DUSE_LIBCANBERRA:BOOL=OFF
-LIBGNOME2_USE= gnome=libgnome
-LIBGNOME2_CMAKE_ON= -DUSE_LIBGNOME2:BOOL=ON -DUSE_LIBCANBERRA:BOOL=OFF
-
LIBCANBERRA_LIB_DEPENDS=libcanberra-gtk.so:audio/libcanberra
LIBCANBERRA_CMAKE_ON= -DUSE_LIBGNOME2:BOOL=OFF -DUSE_LIBCANBERRA:BOOL=ON
diff --git a/x11-toolkits/guile-gnome-platform/Makefile b/x11-toolkits/guile-gnome-platform/Makefile
index 5f76536b8a5e..85ac0942eeab 100644
--- a/x11-toolkits/guile-gnome-platform/Makefile
+++ b/x11-toolkits/guile-gnome-platform/Makefile
@@ -1,6 +1,6 @@
PORTNAME= guile-gnome-platform
DISTVERSION= 2.16.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits
MASTER_SITES= GNU/guile-gnome/${PORTNAME}
@@ -15,7 +15,7 @@ LIB_DEPENDS= libguile-2.2.so:lang/guile2 \
libgwrap-guile-runtime.so:devel/g-wrap \
libffi.so:devel/libffi
-# A note on flavors: LIBGNOME, GCONF pull in very long
+# A note on flavors: GCONF pull in very long
# dependency lists including things like spidermonkey and samba, which
# is rather overkill if you just want to do GUI tools. So make "lite"
# the default.
@@ -42,11 +42,11 @@ DATADIR= ${PREFIX}/share/guile-gnome-2
INFO= guile-gnome-glib guile-gnome-gobject
-OPTIONS_DEFINE= ATK CAIRO CANVAS GCONF GLADE GTK2 LIBGNOME PANGO
+OPTIONS_DEFINE= ATK CAIRO CANVAS GCONF GLADE GTK2 PANGO
OPTIONS_DEFAULT=ATK CAIRO CANVAS GLADE GTK2 PANGO
.if ${FLAVOR} == full
-OPTIONS_SLAVE= ATK CAIRO CANVAS GCONF GLADE GTK2 LIBGNOME PANGO
+OPTIONS_SLAVE= ATK CAIRO CANVAS GCONF GLADE GTK2 PANGO
.endif
OPTIONS_SUB= yes
@@ -54,7 +54,6 @@ OPTIONS_SUB= yes
# other options have descriptions provided by ports/Mk/*
ATK_DESC= GNOME accessibility toolkit (ATK)
CANVAS_DESC= GNOMECanvas Graphics library
-LIBGNOME_DESC= libgnome support
ATK_USE= gnome=atk
ATK_CONFIGURE_WITH= atk
@@ -89,13 +88,6 @@ GTK2_USE= gnome=gtk20,gdkpixbuf2
GTK2_CONFIGURE_WITH= gtk pixbuf
GTK2_INFO= guile-gnome-gtk guile-gnome-gdk
-# This dependency is brought in from libgnome's pkgconf, but
-# not accounted for by Uses/gnome
-LIBGNOME_LIB_DEPENDS= libpopt.so:devel/popt
-LIBGNOME_USE= gnome=libgnome
-LIBGNOME_CONFIGURE_WITH=libgnome
-LIBGNOME_INFO= guile-gnome-libgnome
-
PANGO_USE= gnome=pango
PANGO_CONFIGURE_WITH= pango
PANGO_INFO= guile-gnome-pango
diff --git a/x11-toolkits/guile-gnome-platform/pkg-plist b/x11-toolkits/guile-gnome-platform/pkg-plist
index b10321debfb8..a680bfccc739 100644
--- a/x11-toolkits/guile-gnome-platform/pkg-plist
+++ b/x11-toolkits/guile-gnome-platform/pkg-plist
@@ -35,12 +35,6 @@ lib/guile-gnome-2/libgw-guile-gnome-gobject.so.0.0.0
%%GLADE%%lib/guile-gnome-2/libgw-guile-gnome-libglade.so
%%GLADE%%lib/guile-gnome-2/libgw-guile-gnome-libglade.so.0
%%GLADE%%lib/guile-gnome-2/libgw-guile-gnome-libglade.so.0.0.0
-%%LIBGNOME%%lib/guile-gnome-2/libgw-guile-gnome-libgnome.so
-%%LIBGNOME%%lib/guile-gnome-2/libgw-guile-gnome-libgnome.so.0
-%%LIBGNOME%%lib/guile-gnome-2/libgw-guile-gnome-libgnome.so.0.0.0
-%%LIBGNOMEUI%%lib/guile-gnome-2/libgw-guile-gnome-libgnomeui.so
-%%LIBGNOMEUI%%lib/guile-gnome-2/libgw-guile-gnome-libgnomeui.so.0
-%%LIBGNOMEUI%%lib/guile-gnome-2/libgw-guile-gnome-libgnomeui.so.0.0.0
%%PANGO%%lib/guile-gnome-2/libgw-guile-gnome-pango.so
%%PANGO%%lib/guile-gnome-2/libgw-guile-gnome-pango.so.0
%%PANGO%%lib/guile-gnome-2/libgw-guile-gnome-pango.so.0.0.0
@@ -53,7 +47,6 @@ lib/libguile-gnome-gobject-2.so.0.0.0
libdata/pkgconfig/guile-gnome-defs-2.pc
libdata/pkgconfig/guile-gnome-glib-2.pc
%%GTK2%%libdata/pkgconfig/guile-gnome-gtk-2.pc
-%%LIBGNOMEUI%%libdata/pkgconfig/guile-gnome-libgnomeui-2.pc
%%ATK%%%%DATADIR%%/gnome/atk.scm
%%CANVAS%%%%DATADIR%%/gnome/canvas.scm
%%DATADIR%%/gnome/contrib/delay-tree-model.scm
@@ -107,8 +100,6 @@ libdata/pkgconfig/guile-gnome-glib-2.pc
%%GCONF%%%%DATADIR%%/gnome/gconf.scm
%%GLADE%%%%DATADIR%%/gnome/glade.scm
%%DATADIR%%/gnome/glib.scm
-%%LIBGNOMEUI%%%%DATADIR%%/gnome/gnome-ui.scm
-%%LIBGNOME%%%%DATADIR%%/gnome/gnome.scm
%%DATADIR%%/gnome/gobject.scm
%%DATADIR%%/gnome/gobject/config.scm
%%DATADIR%%/gnome/gobject/defs-support.scm
@@ -145,10 +136,6 @@ libdata/pkgconfig/guile-gnome-glib-2.pc
%%GTK2%%%%DATADIR%%/gnome/gw/gtk.scm
%%GLADE%%%%DATADIR%%/gnome/gw/libglade-spec.scm
%%GLADE%%%%DATADIR%%/gnome/gw/libglade.scm
-%%LIBGNOME%%%%DATADIR%%/gnome/gw/libgnome-spec.scm
-%%LIBGNOME%%%%DATADIR%%/gnome/gw/libgnome.scm
-%%LIBGNOMEUI%%%%DATADIR%%/gnome/gw/libgnomeui-spec.scm
-%%LIBGNOMEUI%%%%DATADIR%%/gnome/gw/libgnomeui.scm
%%PANGO%%%%DATADIR%%/gnome/gw/pango-spec.scm
%%PANGO%%%%DATADIR%%/gnome/gw/pango.scm
%%PANGO%%%%CAIRO%%%%DATADIR%%/gnome/gw/pangocairo-spec.scm
More information about the dev-commits-ports-all
mailing list