Totally rework dependencies to (almost) align with the core and world
elements of gnome-build-meta.
This commit is contained in:
ajacoutot
parent
d67b36415e
commit
a023d32524
@ -1,45 +1,27 @@
|
||||
# $OpenBSD: Makefile,v 1.160 2019/01/06 14:58:56 ajacoutot Exp $
|
||||
# $OpenBSD: Makefile,v 1.161 2019/01/17 20:23:21 ajacoutot Exp $
|
||||
|
||||
COMMENT-main= GNOME desktop meta-package (base installation)
|
||||
COMMENT-extras= GNOME desktop meta-package (full installation)
|
||||
COMMENT-main= GNOME desktop meta-package (core installation)
|
||||
COMMENT-extras= GNOME desktop meta-package (world installation)
|
||||
|
||||
# sync with gnome-desktop version
|
||||
V= 3.30.2
|
||||
PKGNAME= gnome-${V}
|
||||
|
||||
PKGNAME-main= gnome-${V}
|
||||
PKGNAME-extras= gnome-extras-${V}
|
||||
|
||||
REVISION-extras= 0
|
||||
REVISION-main= 0
|
||||
REVISION-extras= 1
|
||||
|
||||
MAINTAINER= Jasper Lievisse Adriaanse <jasper@openbsd.org>, \
|
||||
Antoine Jacoutot <ajacoutot@openbsd.org>
|
||||
|
||||
MULTI_PACKAGES= -main -extras
|
||||
|
||||
# XXX should be a RUN_DEPENDS of x11/gnome/{libgnome-keyring,libsecret} but that
|
||||
# would create dependency loops:
|
||||
# libsecret -> gnome-keyring -> pinentry -> libsecret
|
||||
# libsecret -> gnome-keyring -> gcr -> gnupg2 -> pinentry -> gcr
|
||||
# org.freedesktop.secrets
|
||||
# (XXX add "gnome-keyring-*|ksecretsservice-*" when implemented)
|
||||
RUN_DEPENDS-main += x11/gnome/keyring
|
||||
|
||||
# remove when we don't use gtk+2 apps in GNOME
|
||||
# Gtk-Message: Failed to load module "canberra-gtk-module"
|
||||
RUN_DEPENDS-main += audio/libcanberra,-gtk
|
||||
|
||||
# sync with gnome-desktop version
|
||||
RUN_DEPENDS-main += x11/gnome/desktop=${V}
|
||||
|
||||
# minimal dependencies for a working desktop
|
||||
RUN_DEPENDS-main += x11/gnome/control-center \
|
||||
x11/gnome/nautilus \
|
||||
x11/gnome/session \
|
||||
x11/gnome/terminal
|
||||
|
||||
# gnome-classic.session
|
||||
RUN_DEPENDS-main += x11/gnome/shell-extensions
|
||||
|
||||
# GNOME spooler is CUPS (gnome-printers-panel in gnome-control-center)
|
||||
# add gtk+{2,3}-cups so that gtkprint() can see native CUPS printers;
|
||||
# add gtk+3-cloudprint, gnome-online-accounts is already a dependency
|
||||
@ -47,60 +29,100 @@ RUN_DEPENDS-main += x11/gtk+2,-cups
|
||||
RUN_DEPENDS-main += x11/gtk+3,-cups
|
||||
RUN_DEPENDS-main += x11/gtk+3,-cloudprint
|
||||
|
||||
# add commonly used utilities
|
||||
RUN_DEPENDS-main += x11/gnome/calculator \
|
||||
x11/gnome/eog \
|
||||
x11/gnome/file-roller \
|
||||
x11/gnome/gedit \
|
||||
x11/xdg-user-dirs-gtk
|
||||
|
||||
# former gnome-utils (minus baobab which is in -extras)
|
||||
RUN_DEPENDS-main += x11/gnome/dictionary \
|
||||
x11/gnome/font-viewer \
|
||||
x11/gnome/screenshot
|
||||
|
||||
# gnome-initial-setup (welcome-tour), gnome-getting-started-docs
|
||||
RUN_DEPENDS-main += x11/gnome/initial-setup
|
||||
|
||||
# we already depend on samba, libgdata and gnome-online-accounts
|
||||
RUN_DEPENDS-main += x11/gnome/gvfs,-goa, \
|
||||
x11/gnome/gvfs,-google, \
|
||||
x11/gnome/gvfs,-smb,
|
||||
RUN_DEPENDS-main += x11/gnome/gvfs,-goa,
|
||||
RUN_DEPENDS-main += x11/gnome/gvfs,-google,
|
||||
RUN_DEPENDS-main += x11/gnome/gvfs,-smb,
|
||||
|
||||
# "Make it fancy!"
|
||||
RUN_DEPENDS-main += x11/gnome/bijiben \
|
||||
# create "well known" user directories and default gtk bookmarks file
|
||||
RUN_DEPENDS-main += x11/xdg-user-dirs-gtk
|
||||
|
||||
################################################################################
|
||||
# https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/master/elements/core.bst
|
||||
################################################################################
|
||||
|
||||
# https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/master/elements/core/meta-gnome-core-shell.bst
|
||||
RUN_DEPENDS-main += devel/gsettings-desktop-schemas \
|
||||
net/glib2-networking \
|
||||
x11/gnome/adwaita-icon-theme \
|
||||
x11/gnome/backgrounds \
|
||||
x11/gnome/color-manager \
|
||||
x11/gnome/control-center \
|
||||
x11/gnome/desktop=${V} \
|
||||
x11/gnome/getting-started-docs \
|
||||
x11/gnome/gdm \
|
||||
x11/gnome/gvfs \
|
||||
x11/gnome/initial-setup \
|
||||
x11/gnome/keyring \
|
||||
x11/gnome/menus \
|
||||
x11/gnome/session \
|
||||
x11/gnome/settings-daemon \
|
||||
x11/gnome/shell \
|
||||
x11/gnome/shell-extensions \
|
||||
x11/gnome/themes-extra \
|
||||
x11/gnome/user-docs \
|
||||
x11/gnome/mousetweaks \
|
||||
x11/gnome/mutter \
|
||||
x11/gnome/orca \
|
||||
x11/gnome/sushi
|
||||
|
||||
# https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/master/elements/core/meta-gnome-core-utilities.bst
|
||||
RUN_DEPENDS-main += x11/gnome/calculator \
|
||||
x11/gnome/calendar \
|
||||
x11/gnome/characters \
|
||||
x11/gnome/clocks \
|
||||
x11/gnome/contacts \
|
||||
x11/gnome/documents \
|
||||
x11/gnome/eog-plugins \
|
||||
x11/gnome/gedit-plugins \
|
||||
x11/gnome/grilo-plugins \
|
||||
x11/gnome/eog \
|
||||
evince-*-!light:graphics/evince \
|
||||
x11/gnome/file-roller \
|
||||
x11/gnome/font-viewer \
|
||||
x11/gnome/gedit \
|
||||
x11/gnome/maps \
|
||||
x11/gnome/music \
|
||||
x11/gnome/nautilus-sendto \
|
||||
x11/gnome/nautilus \
|
||||
x11/gnome/photos \
|
||||
x11/gnome/seahorse \
|
||||
x11/gnome/seahorse-nautilus \
|
||||
x11/gnome/seahorse-sharing \
|
||||
x11/gnome/sushi \
|
||||
x11/gnome/themes-extra \
|
||||
x11/gnome/todo \
|
||||
x11/gnome/tracker-miners \
|
||||
x11/gnome/tweaks \
|
||||
x11/gnome/usage \
|
||||
x11/gnome/screenshot \
|
||||
x11/gnome/terminal \
|
||||
x11/gnome/totem \
|
||||
x11/gnome/weather
|
||||
# replacement for gnome-system-monitor
|
||||
RUN_DEPENDS-main += x11/gnome/usage
|
||||
|
||||
RUN_DEPENDS-extras += STEM-=${V}:${BASE_PKGPATH},-main \
|
||||
audio/rhythmbox \
|
||||
graphics/simple-scan \
|
||||
################################################################################
|
||||
# https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/master/elements/core-deps.bst
|
||||
################################################################################
|
||||
RUN_DEPENDS-main += x11/gnome/grilo-plugins \
|
||||
x11/gnome/online-accounts \
|
||||
x11/gnome/online-miners \
|
||||
x11/gnome/tracker-miners
|
||||
|
||||
################################################################################
|
||||
# https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/master/elements/world.bst
|
||||
################################################################################
|
||||
|
||||
RUN_DEPENDS-extras += inputmethods/ibus-anthy \
|
||||
mail/evolution \
|
||||
mail/evolution-rss \
|
||||
sysutils/deja-dup \
|
||||
net/gupnp/igd \
|
||||
x11/gnome/bijiben \
|
||||
x11/gnome/builder \
|
||||
x11/gnome/code-assistance \
|
||||
x11/gnome/dconf-editor \
|
||||
x11/gnome/devel-docs \
|
||||
x11/gnome/devhelp \
|
||||
x11/gnome/dictionary \
|
||||
x11/gnome/documents \
|
||||
x11/gnome/nautilus-sendto \
|
||||
x11/gnome/todo \
|
||||
x11/gnome/tweaks
|
||||
|
||||
# moved from core
|
||||
RUN_DEPENDS-extras += graphics/simple-scan \
|
||||
www/epiphany \
|
||||
x11/gnome/baobab \
|
||||
x11/gnome/characters \
|
||||
x11/gnome/system-monitor \
|
||||
x11/gnome/totem \
|
||||
x11/gnome/vinagre
|
||||
x11/gnome/system-monitor
|
||||
|
||||
# depends on -main
|
||||
RUN_DEPENDS-extras += STEM-=${V}:${BASE_PKGPATH},-main
|
||||
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1 +1,2 @@
|
||||
The GNOME desktop, full installation.
|
||||
The GNOME desktop, world installation:
|
||||
https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/master/elements/world.bst
|
||||
|
||||
@ -1 +1,3 @@
|
||||
The GNOME desktop, standard installation.
|
||||
The GNOME desktop, core installation:
|
||||
https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/master/elements/core.bst
|
||||
https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/master/elements/core-deps.bst
|
||||
|
||||
Loading…
Reference in New Issue
Block a user