* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-shell/files/, gnome-base/gnome-shell/
@ 2016-04-18 19:43 Ole Reifschneider
0 siblings, 0 replies; 4+ messages in thread
From: Ole Reifschneider @ 2016-04-18 19:43 UTC (permalink / raw
To: gentoo-commits
commit: 06f503acebc148728d4bc4837030b15c8e0bdcde
Author: Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 18 19:42:47 2016 +0000
Commit: Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
CommitDate: Mon Apr 18 19:42:47 2016 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=06f503ac
gnome-base/gnome-shell: Bump version to 3.20.1 and fix nvidia crash
Package-Manager: portage-2.2.28
Manifest-Sign-Key: 0xE9E568677E8B4D42
.../files/gnome-shell-3.20-fix-nvidia-crash.patch | 106 +++++++++++++++++++++
...ell-3.20.0.ebuild => gnome-shell-3.20.1.ebuild} | 4 +
2 files changed, 110 insertions(+)
diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.20-fix-nvidia-crash.patch b/gnome-base/gnome-shell/files/gnome-shell-3.20-fix-nvidia-crash.patch
new file mode 100644
index 0000000..19eda8e
--- /dev/null
+++ b/gnome-base/gnome-shell/files/gnome-shell-3.20-fix-nvidia-crash.patch
@@ -0,0 +1,106 @@
+From 26d339b91744dab5135ee9ea1d46fda62448ad95 Mon Sep 17 00:00:00 2001
+From: Jan de Groot <jgc@archlinux.org>
+Date: Mon, 11 Apr 2016 14:00:33 +0000
+Subject: [PATCH] Initialize framebuffer objects early so clutter will not
+ abort a few operations later.
+
+Checking offscreen for COGL_INVALID_HANDLE is not sufficient, as cogl_offscreen_new_with_texture doesn't initialize framebuffer objects but lets Cogl solve this the lazy way. cogl_offscreen_new_with_texture will never return COGL_INVALID_HANDLE anyways.
+---
+ src/st/st-theme-node-drawing.c | 35 +++++++++++++++++++++++------------
+ src/st/st-theme-node-transition.c | 18 ++++++++++++++++--
+ 2 files changed, 39 insertions(+), 14 deletions(-)
+
+diff --git a/src/st/st-theme-node-drawing.c b/src/st/st-theme-node-drawing.c
+index 1f28ed9..4a6a234 100644
+--- a/src/st/st-theme-node-drawing.c
++++ b/src/st/st-theme-node-drawing.c
+@@ -2247,22 +2247,33 @@ st_theme_node_prerender_shadow (StThemeNodePaintState *state)
+ COGL_TEXTURE_NO_SLICING,
+ COGL_PIXEL_FORMAT_ANY);
+ if (buffer != COGL_INVALID_HANDLE)
+- offscreen = cogl_offscreen_new_with_texture (buffer);
+-
+- if (offscreen != COGL_INVALID_HANDLE)
+ {
+- ClutterActorBox box = { 0, 0, state->box_shadow_width, state->box_shadow_height};
++ CoglError *error = NULL;
++
++ offscreen = cogl_offscreen_new_with_texture (buffer);
++
++ if (cogl_framebuffer_allocate (COGL_FRAMEBUFFER (offscreen), &error))
++ {
++ ClutterActorBox box = { 0, 0, state->box_shadow_width, state->box_shadow_height};
++
++ cogl_framebuffer_orthographic (offscreen, 0, 0,
++ state->box_shadow_width,
++ state->box_shadow_height, 0, 1.0);
++ cogl_framebuffer_clear4f (offscreen, COGL_BUFFER_BIT_COLOR, 0, 0, 0, 0);
+
+- cogl_framebuffer_orthographic (offscreen, 0, 0,
+- state->box_shadow_width,
+- state->box_shadow_height, 0, 1.0);
+- cogl_framebuffer_clear4f (offscreen, COGL_BUFFER_BIT_COLOR, 0, 0, 0, 0);
++ st_theme_node_paint_borders (state, offscreen, &box, 0xFF);
+
+- st_theme_node_paint_borders (state, offscreen, &box, 0xFF);
+- cogl_handle_unref (offscreen);
++ cogl_handle_unref (offscreen);
+
+- state->box_shadow_pipeline = _st_create_shadow_pipeline (st_theme_node_get_box_shadow (node),
+- buffer);
++ state->box_shadow_pipeline = _st_create_shadow_pipeline (st_theme_node_get_box_shadow (node),
++ buffer);
++ }
++ else
++ {
++ cogl_handle_unref (offscreen);
++
++ cogl_error_free (error);
++ }
+ }
+
+ if (buffer != COGL_INVALID_HANDLE)
+diff --git a/src/st/st-theme-node-transition.c b/src/st/st-theme-node-transition.c
+index 1eef17b..f3350a1 100644
+--- a/src/st/st-theme-node-transition.c
++++ b/src/st/st-theme-node-transition.c
+@@ -242,6 +242,8 @@ setup_framebuffers (StThemeNodeTransition *transition,
+ StThemeNodeTransitionPrivate *priv = transition->priv;
+ guint width, height;
+
++ CoglError *catch_error = NULL;
++
+ /* template material to avoid unnecessary shader compilation */
+ static CoglHandle material_template = COGL_INVALID_HANDLE;
+
+@@ -269,13 +271,25 @@ setup_framebuffers (StThemeNodeTransition *transition,
+ if (priv->old_offscreen)
+ cogl_handle_unref (priv->old_offscreen);
+ priv->old_offscreen = cogl_offscreen_new_with_texture (priv->old_texture);
++ if (!cogl_framebuffer_allocate (COGL_FRAMEBUFFER (priv->old_offscreen), &catch_error))
++ {
++ cogl_object_unref (priv->old_offscreen);
++ cogl_error_free (catch_error);
++ priv->old_offscreen = COGL_INVALID_HANDLE;
++ g_return_val_if_fail (priv->old_offscreen != COGL_INVALID_HANDLE, FALSE);
++ }
+
+ if (priv->new_offscreen)
+ cogl_handle_unref (priv->new_offscreen);
+ priv->new_offscreen = cogl_offscreen_new_with_texture (priv->new_texture);
+
+- g_return_val_if_fail (priv->old_offscreen != COGL_INVALID_HANDLE, FALSE);
+- g_return_val_if_fail (priv->new_offscreen != COGL_INVALID_HANDLE, FALSE);
++ if (!cogl_framebuffer_allocate (COGL_FRAMEBUFFER (priv->new_offscreen), &catch_error))
++ {
++ cogl_object_unref (priv->new_offscreen);
++ cogl_error_free (catch_error);
++ priv->new_offscreen = COGL_INVALID_HANDLE;
++ g_return_val_if_fail (priv->new_offscreen != COGL_INVALID_HANDLE, FALSE);
++ }
+
+ if (priv->material == NULL)
+ {
+--
+2.7.1
+
diff --git a/gnome-base/gnome-shell/gnome-shell-3.20.0.ebuild b/gnome-base/gnome-shell/gnome-shell-3.20.1.ebuild
similarity index 97%
rename from gnome-base/gnome-shell/gnome-shell-3.20.0.ebuild
rename to gnome-base/gnome-shell/gnome-shell-3.20.1.ebuild
index af77e1f..66cabaf 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.20.0.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.20.1.ebuild
@@ -131,6 +131,10 @@ src_prepare() {
# https://bugzilla.gnome.org/show_bug.cgi?id=726435
epatch "${FILESDIR}"/${PN}-3.14.0-bluetooth-gold.patch
+ # Fix crash with nvidia-drivers, bug #578216
+ # https://bugzilla.gnome.org/show_bug.cgi?id=764898
+ epatch "${FILESDIR}"/${PN}-3.20-fix-nvidia-crash.patch
+
epatch_user
eautoreconf
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-shell/files/, gnome-base/gnome-shell/
@ 2018-09-19 10:14 Mart Raudsepp
0 siblings, 0 replies; 4+ messages in thread
From: Mart Raudsepp @ 2018-09-19 10:14 UTC (permalink / raw
To: gentoo-commits
commit: f9c67b7c3fb6f1fe8660564c024e7e59b7057902
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 19 10:12:57 2018 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Wed Sep 19 10:12:57 2018 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=f9c67b7c
gnome-base/gnome-shell-3.26.2: revbump with many fixes
* Require correct mutter subslot after fixing mutter-3.26 subslot.
* Fix bluetooth optionality patch to work off of USE=bluetooth, not
USE=networkmanager due to missed option name update in patch.
* Support elogind and get rid of unnecessary openrc-force hacks;
gnome-shell systemd code only handles journald integration - logging
structured data to it itself, instead of plain g_prints and telling
it about launched apps, so they get to log under their own identifier
instead of gnome-session. The -Denable-systemd option only deals with
that, so we can safely just not pass it on non-systemd systems. The
suspend support is handled purely via logind dbus interfaces and is
build unconditionally - at runtime it is conditional on
/run/systemd/seats existing and being accessible, which should be the
case with newer elogind (with relevant bugs fixed) by my quick
research, but I have not tested personally. Don't make a big deal
about lacking suspend and seat inhibition support and just pull in
a logind interface provider (techically this is runtime only, but
not bothering with a separate DEPEND-free RDEPEND block for elogind).
The alternative (to require logind) would be to require one of the
systemd or elogind USE flags instead of at-most-one-of, but this is
runtime optional anyways, so don't block it - user could just build
with systemd and boot with something else, for example, and similarly
not have this work at runtime). Also remove some warns appropriately.
* Build-time depend on systemd with USE=systemd for the aforementioned
journald integration, which needs systemd present at build time already.
* More appropriately use python-single-r1 instead of python-r1 for the two
small python utilities. Hack meson to update to the correct shebang.
* Make telepathy optional - it was made runtime optional in 3.24 already,
and with empathy being in the state it's in, the chat integration is
rather unused on a desktop system.
* Port to direct use of gnoem2-utils, meson and xdg eclasses, as that's
what we'll be able to add to main tree at this point.
* Remove bogus GNOME2_LA_PUNT and GNOME2_EAUTORECONF variables in a
meson-based build.
* Remove questionable glib USE=dbus requirement - if dconf is required,
it should be depended upon directly; but as this is just your typical
GSettings memory vs dconf backend scenario, I don't see why that'd be.
* Remove unnecessary libXtst depend - I can't find any usage of it in
current version (only mentions of caribou using it, which has its own
dep and is optional on-screen keyboard support, gone in newer versions).
* Move dbus-glib depend inside USE=networkmanager, as this legacy thing
is for some reason (instead of GDbus) still used only in a NM specific
source file that doesn't get compiled with USE=-networkmanager afaics.
* Require introspection on nm-applet with USE=networkmanager, as NMGtk
GIR is used.
* Remove bogus mesa-progs depend - no glxinfo/glxgears usages here..
* Remove wrong gtk-doc-am, gnome-common and autoconf-archive build
depends - these are for autotools, not meson..
* Add glib-utils build depend.
* Drop dejavu font depend - I don't think we should be pulling in a
specific font these days for some glyphs; and if we should, then it
probably should be cantarell..
* Require 3.26 for the adwaita-icon-theme dep, as new icons used by
gnome-shell-3.26 are introduced there (at least the monitor configuration
popup icons when the new display configuration keyboard shortcuts are
used).
* Require >=libgweather-3.26 because new API from it is used (the
NO_CAPITALIZATION formatting options stuff for fixing weather information
capitalization below the gnome-shell calendar).
* Require USE=glib on pulseaudio, as libpulse-mainloop-glib is linked to
in a subproject, not just libpulse.
* Install nsplugin in the correct directory for us, instead of just losing
the correct BROWSER_PLUGIN_DIR stuff from autotools version. Upstream has
some sort of meson variable support to apparently try to support
overriding this, but as this isn't an envvar, we actually can't until it's
not properly made a meson_options.txt thing instead - so instead just
change the install path /mozilla components to /nsbrowser as we need.
* Add notes about broken gtk-doc building (with our outdated gtk-doc), but
due to the build failures don't introduce USE=gtk-doc for the time being.
* Simplify the pax-mark logic, as we don't use so old spidermonkey for so
long, and pax-mark stuff is not tested by us. But the old complicated
conditionals don't apply in many cases, so simplify it to just the common
case. Additionally newer spidermonkey (60) will lose jit USE flag and
have that unconditional on arches where it's supported, so these
conditionals will then result in wrong code paths being taken. Therefore
just simplify it to the basics and hope it works and rely on any incoming
bugs about it to modernize this.
* PDEPEND on >=gnome-control-center-3.26 instead of older, as older is
not able to apply display configuration, because mutter 3.26 has a
different dbus API now, which gnome-control-center-3.26 uses directly.
3.24 control-center used GnomeRR API from gnome-desktop, which is still
there (in gnome-desktop-3.26), but does not function with mutter-3.26
due to the dbus interface having been replaced.
Package-Manager: Portage-2.3.49, Repoman-2.3.10
.../files/3.26-optional-bluetooth.patch | 73 ++++++++
.../gnome-shell/gnome-shell-3.26.2-r3.ebuild | 183 +++++++++++++++++++++
gnome-base/gnome-shell/metadata.xml | 10 ++
3 files changed, 266 insertions(+)
diff --git a/gnome-base/gnome-shell/files/3.26-optional-bluetooth.patch b/gnome-base/gnome-shell/files/3.26-optional-bluetooth.patch
new file mode 100644
index 00000000..9f7e5aea
--- /dev/null
+++ b/gnome-base/gnome-shell/files/3.26-optional-bluetooth.patch
@@ -0,0 +1,73 @@
+From 7ca3e1a9d18e6f6154b4479bcd94d420bc69798c Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Mon, 10 Sep 2018 13:17:39 +0200
+Subject: [PATCH] Make bluetooth support optional
+
+https://bugs.gentoo.org/show_bug.cgi?id=398145
+leio: Fixed enable_bluetooth get_option string
+---
+ js/misc/meson.build | 2 +-
+ meson.build | 15 ++++++++++++++-
+ meson_options.txt | 7 +++++++
+ 3 files changed, 22 insertions(+), 2 deletions(-)
+
+diff --git a/js/misc/meson.build b/js/misc/meson.build
+index 20489496c..3071f9dfb 100644
+--- a/js/misc/meson.build
++++ b/js/misc/meson.build
+@@ -3,7 +3,7 @@ jsconf.set('PACKAGE_NAME', meson.project_name())
+ jsconf.set('PACKAGE_VERSION', meson.project_version())
+ jsconf.set('GETTEXT_PACKAGE', meson.project_name())
+ jsconf.set('LIBMUTTER_API_VERSION', mutter_api_version)
+-jsconf.set10('HAVE_BLUETOOTH', bt_dep.found())
++jsconf.set10('HAVE_BLUETOOTH', have_bluetooth)
+ jsconf.set10('HAVE_NETWORKMANAGER', have_networkmanager)
+ jsconf.set('datadir', datadir)
+ jsconf.set('libexecdir', libexecdir)
+diff --git a/meson.build b/meson.build
+index b82c41398..7d342ff61 100644
+--- a/meson.build
++++ b/meson.build
+@@ -91,7 +91,20 @@ startup_dep = dependency('libstartup-notification-1.0', version: startup_req)
+ x11_dep = dependency('x11')
+ schemas_dep = dependency('gsettings-desktop-schemas', version: schemas_req)
+
+-bt_dep = dependency('gnome-bluetooth-1.0', version: bt_req, required: false)
++bt_dep = []
++enable_bluetooth = get_option('enable-bluetooth')
++if enable_bluetooth != 'no'
++ want_bluetooth = enable_bluetooth == 'yes'
++ bt_dep = dependency('gnome-bluetooth-1.0', version: bt_req, required: want_bluetooth)
++ have_bluetooth = bt_dep.found()
++
++ if not have_bluetooth
++ bt_dep = []
++ endif
++else
++ have_bluetooth = false
++endif
++
+ gst_dep = dependency('gstreamer-1.0', version: gst_req, required: false)
+ gst_base_dep = dependency('gstreamer-base-1.0', required: false)
+
+diff --git a/meson_options.txt b/meson_options.txt
+index 18899ffdb..9191f8c0e 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -16,6 +16,13 @@ option('enable-man',
+ description: 'Generate man pages'
+ )
+
++option('enable-bluetooth',
++ type: 'combo',
++ choices: ['yes', 'no', 'auto'],
++ value: 'auto',
++ description: 'Enable bluetooth support'
++)
++
+ option('enable-networkmanager',
+ type: 'combo',
+ choices: ['yes', 'no', 'auto'],
+--
+2.18.0
+
diff --git a/gnome-base/gnome-shell/gnome-shell-3.26.2-r3.ebuild b/gnome-base/gnome-shell/gnome-shell-3.26.2-r3.ebuild
new file mode 100644
index 00000000..8ec8d239
--- /dev/null
+++ b/gnome-base/gnome-shell/gnome-shell-3.26.2-r3.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit gnome.org gnome2-utils meson pax-utils python-single-r1 virtualx xdg
+
+DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="+bluetooth +browser-extension elogind +ibus +networkmanager nsplugin systemd telepathy"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ ?? ( elogind systemd )"
+
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+
+# libXfixes-5.0 needed for pointer barriers and #include <X11/extensions/Xfixes.h>
+# FIXME:
+# * gstreamer support is currently automagic
+COMMON_DEPEND="
+ >=dev-libs/libcroco-0.6.8:0.6
+ >=gnome-extra/evolution-data-server-3.17.2:=
+ >=app-crypt/gcr-3.7.5[introspection]
+ >=gnome-base/gnome-desktop-3.7.90:3=[introspection]
+ >=dev-libs/glib-2.53.0:2
+ >=dev-libs/gobject-introspection-1.49.1:=
+ >=dev-libs/gjs-1.47.0
+ >=x11-libs/gtk+-3.15.0:3[introspection]
+ nsplugin? ( >=dev-libs/json-glib-0.13.2 )
+ >=x11-wm/mutter-3.24.0:0/1[introspection]
+ >=sys-auth/polkit-0.100[introspection]
+ >=gnome-base/gsettings-desktop-schemas-3.21.3
+ >=x11-libs/startup-notification-0.11
+ bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] )
+ >=media-libs/gstreamer-0.11.92:1.0
+ networkmanager? (
+ >=gnome-extra/nm-applet-0.9.8[introspection]
+ >=net-misc/networkmanager-0.9.8:=[introspection]
+ >=app-crypt/libsecret-0.18
+ dev-libs/dbus-glib )
+ systemd? ( >=sys-apps/systemd-31 )
+ elogind? ( >=sys-auth/elogind-237 )
+
+ >=app-accessibility/at-spi2-atk-2.5.3
+ media-libs/libcanberra[gtk3]
+ x11-libs/gdk-pixbuf:2[introspection]
+ dev-libs/libxml2:2
+ >=net-libs/libsoup-2.40:2.4[introspection]
+ x11-libs/libX11
+
+ >=media-sound/pulseaudio-2[glib]
+ >=dev-libs/atk-2[introspection]
+ dev-libs/libical:=
+ >=x11-libs/libXfixes-5.0
+
+ ${PYTHON_DEPS}
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ media-libs/mesa
+"
+# Runtime-only deps are probably incomplete and approximate.
+# Introspection deps generated using:
+# grep -roe "imports.gi.*" gnome-shell-* | cut -f2 -d: | sort | uniq
+# Each block:
+# 1. Introspection stuff needed via imports.gi.*
+# 2. gnome-session needed for shutdown/reboot/inhibitors/etc
+# 3. Control shell settings
+# 4. logind interface needed for suspending support
+# 5. xdg-utils needed for xdg-open, used by extension tool
+# 6. adwaita-icon-theme needed for various icons & arrows (3.26 for new video-joined-displays-symbolic and co icons; review for 3.28+)
+# 7. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c # TODO: Review
+# 8. IBus is needed for nls integration
+# 9. Optional telepathy chat integration
+# 10. TODO: semi-optional webkit-gtk[introspection] for captive portal helper
+RDEPEND="${COMMON_DEPEND}
+ >=sys-apps/accountsservice-0.6.14[introspection]
+ app-accessibility/at-spi2-core:2[introspection]
+ >=app-accessibility/caribou-0.4.8
+ app-misc/geoclue[introspection]
+ >=dev-libs/libgweather-3.26:2[introspection]
+ >=sys-power/upower-0.99:=[introspection]
+ x11-libs/pango[introspection]
+ gnome-base/librsvg:2[introspection]
+
+ >=gnome-base/gnome-session-2.91.91
+ >=gnome-base/gnome-settings-daemon-3.8.3
+
+ x11-misc/xdg-utils
+
+ >=x11-themes/adwaita-icon-theme-3.26
+
+ networkmanager? (
+ net-misc/mobile-broadband-provider-info
+ sys-libs/timezone-data )
+ ibus? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk,introspection] )
+ telepathy? (
+ >=net-im/telepathy-logger-0.2.4[introspection]
+ >=net-libs/telepathy-glib-0.19[introspection] )
+"
+# avoid circular dependency, see bug #546134
+PDEPEND="
+ >=gnome-base/gdm-3.5[introspection]
+ >=gnome-base/gnome-control-center-3.26[bluetooth(+)?,networkmanager(+)?]
+ browser-extension? ( gnome-extra/chrome-gnome-shell )
+"
+DEPEND="${COMMON_DEPEND}
+ dev-libs/libxslt
+ >=dev-util/gdbus-codegen-2.45.3
+ dev-util/glib-utils
+ >=sys-devel/gettext-0.19.6
+ virtual/pkgconfig
+" #gtk-doc? ( >=dev-util/gtk-doc-1.17 )
+
+PATCHES=(
+ # Change favorites defaults, bug #479918
+ "${FILESDIR}"/${PN}-3.22.0-defaults.patch
+ # Fix automagic gnome-bluetooth dep, bug #398145
+ "${FILESDIR}"/3.26-optional-bluetooth.patch
+)
+
+src_prepare() {
+ xdg_src_prepare
+ # We want nsplugins in /usr/$(get_libdir)/nsbrowser/plugins not .../mozilla/plugins
+ sed -e 's/mozilla/nsbrowser/' -i meson.build || die
+ # Hack in correct python shebang
+ sed -e "s:python\.path():'/usr/bin/env ${EPYTHON}':" -i src/meson.build || die
+}
+
+src_configure() {
+ local emesonargs=(
+ $(meson_use nsplugin enable-browser-plugin)
+ #$(meson_use gtk-doc enable-documentation) # fails in gtkdoc-scangobj call with gtk-doc-1.25 (perl regex parenthesis issue); probably needs newer python-based gtk-doc to work
+ -Denable-man=true
+ -Denable-bluetooth=$(usex bluetooth yes no)
+ -Denable-networkmanager=$(usex networkmanager yes no)
+ -Denable-systemd=$(usex systemd yes no) # this controls journald integration only as of 3.26.2 (structured logging and having gnome-shell launched apps use its own identifier instead of gnome-session)
+ # suspend support is runtime optional via /run/systemd/seats presence and org.freedesktop.login1.Manager dbus interface; elogind should provide what's necessary
+ )
+ meson_src_configure
+}
+
+src_install() {
+ meson_src_install
+
+ # Required for gnome-shell on hardened/PaX, bug #398941; FIXME: Is this still relevant?
+ pax-mark m "${ED}usr/bin/gnome-shell"{,-extension-prefs}
+}
+
+src_test() {
+ virtx meson_src_test
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+
+ if ! has_version 'media-libs/gst-plugins-good:1.0' || \
+ ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
+ ewarn "To make use of GNOME Shell's built-in screen recording utility,"
+ ewarn "you need to either install media-libs/gst-plugins-good:1.0"
+ ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
+ ewarn "apps.gnome-shell.recorder/pipeline to what you want to use."
+ fi
+
+ if ! has_version "media-libs/mesa[llvm]"; then
+ elog "llvmpipe is used as fallback when no 3D acceleration"
+ elog "is available. You will need to enable llvm USE for"
+ elog "media-libs/mesa if you do not have hardware 3D setup."
+ fi
+
+ # https://bugs.gentoo.org/show_bug.cgi?id=563084
+ if has_version "x11-drivers/nvidia-drivers[-kms]"; then
+ ewarn "You will need to enable kms support in x11-drivers/nvidia-drivers,"
+ ewarn "otherwise Gnome will fail to start"
+ fi
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
diff --git a/gnome-base/gnome-shell/metadata.xml b/gnome-base/gnome-shell/metadata.xml
index 3d91d2b5..301d00be 100644
--- a/gnome-base/gnome-shell/metadata.xml
+++ b/gnome-base/gnome-shell/metadata.xml
@@ -5,14 +5,24 @@
<email>gnome@gentoo.org</email>
<name>Gentoo GNOME Desktop</name>
</maintainer>
+<longdescription>
+ GNOME Shell provides core user interface functions for the GNOME 3
+ desktop, like switching to windows and launching applications.
+ GNOME Shell takes advantage of the capabilities of modern graphics
+ hardware and introduces innovative user interface concepts to
+ provide a visually attractive and easy to use experience.
+</longdescription>
<use>
<flag name="browser-extension">Ensure the presence of extensions.gnome.org
native connector <pkg>gnome-extra/chrome-gnome-shell</pkg></flag>
+ <flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for session tracking
+ and suspend support.</flag>
<flag name="ibus">Enable support for enhanced input methods through
<pkg>app-i18n/ibus</pkg></flag>
<flag name="openrc-force">Skip systemd dependency (#480336),
enabling this flag will become your setup to be fully
unsupported by upstream and downstream Gnome team. Do not
try to enable it unless completely needed</flag>
+ <flag name="telepathy">Ensure presence of telepathy chat integration</flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-shell/files/, gnome-base/gnome-shell/
@ 2018-09-26 22:14 Mart Raudsepp
0 siblings, 0 replies; 4+ messages in thread
From: Mart Raudsepp @ 2018-09-26 22:14 UTC (permalink / raw
To: gentoo-commits
commit: a6c7879c731370c2ed78aebe2dae65a686cc4136
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 26 22:14:15 2018 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Wed Sep 26 22:14:15 2018 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=a6c7879c
gnome-base/gnome-shell: remove old
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11
.../gnome-shell/files/3.26-bluetooth-flag.patch | 72 --------
.../files/gnome-shell-3.12-bluetooth-flag.patch | 50 ------
.../files/gnome-shell-3.14.0-bluetooth-gold.patch | 31 ----
.../files/gnome-shell-3.14.0-defaults.patch | 25 ---
.../files/gnome-shell-3.20-fix-nvidia-crash.patch | 106 -----------
.../gnome-shell/gnome-shell-3.26.2-r2.ebuild | 194 ---------------------
.../gnome-shell/gnome-shell-3.26.2-r3.ebuild | 183 -------------------
gnome-base/gnome-shell/metadata.xml | 4 -
8 files changed, 665 deletions(-)
diff --git a/gnome-base/gnome-shell/files/3.26-bluetooth-flag.patch b/gnome-base/gnome-shell/files/3.26-bluetooth-flag.patch
deleted file mode 100644
index 65686954..00000000
--- a/gnome-base/gnome-shell/files/3.26-bluetooth-flag.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 7ca3e1a9d18e6f6154b4479bcd94d420bc69798c Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Mon, 10 Sep 2018 13:17:39 +0200
-Subject: [PATCH] Make bluetooth support optional
-
-https://bugs.gentoo.org/show_bug.cgi?id=398145
----
- js/misc/meson.build | 2 +-
- meson.build | 15 ++++++++++++++-
- meson_options.txt | 7 +++++++
- 3 files changed, 22 insertions(+), 2 deletions(-)
-
-diff --git a/js/misc/meson.build b/js/misc/meson.build
-index 20489496c..3071f9dfb 100644
---- a/js/misc/meson.build
-+++ b/js/misc/meson.build
-@@ -3,7 +3,7 @@ jsconf.set('PACKAGE_NAME', meson.project_name())
- jsconf.set('PACKAGE_VERSION', meson.project_version())
- jsconf.set('GETTEXT_PACKAGE', meson.project_name())
- jsconf.set('LIBMUTTER_API_VERSION', mutter_api_version)
--jsconf.set10('HAVE_BLUETOOTH', bt_dep.found())
-+jsconf.set10('HAVE_BLUETOOTH', have_bluetooth)
- jsconf.set10('HAVE_NETWORKMANAGER', have_networkmanager)
- jsconf.set('datadir', datadir)
- jsconf.set('libexecdir', libexecdir)
-diff --git a/meson.build b/meson.build
-index b82c41398..7d342ff61 100644
---- a/meson.build
-+++ b/meson.build
-@@ -91,7 +91,20 @@ startup_dep = dependency('libstartup-notification-1.0', version: startup_req)
- x11_dep = dependency('x11')
- schemas_dep = dependency('gsettings-desktop-schemas', version: schemas_req)
-
--bt_dep = dependency('gnome-bluetooth-1.0', version: bt_req, required: false)
-+bt_dep = []
-+enable_bluetooth = get_option('enable-networkmanager')
-+if enable_bluetooth != 'no'
-+ want_bluetooth = enable_bluetooth == 'yes'
-+ bt_dep = dependency('gnome-bluetooth-1.0', version: bt_req, required: want_bluetooth)
-+ have_bluetooth = bt_dep.found()
-+
-+ if not have_bluetooth
-+ bt_dep = []
-+ endif
-+else
-+ have_bluetooth = false
-+endif
-+
- gst_dep = dependency('gstreamer-1.0', version: gst_req, required: false)
- gst_base_dep = dependency('gstreamer-base-1.0', required: false)
-
-diff --git a/meson_options.txt b/meson_options.txt
-index 18899ffdb..9191f8c0e 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -16,6 +16,13 @@ option('enable-man',
- description: 'Generate man pages'
- )
-
-+option('enable-bluetooth',
-+ type: 'combo',
-+ choices: ['yes', 'no', 'auto'],
-+ value: 'auto',
-+ description: 'Enable bluetooth support'
-+)
-+
- option('enable-networkmanager',
- type: 'combo',
- choices: ['yes', 'no', 'auto'],
---
-2.18.0
-
diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.12-bluetooth-flag.patch b/gnome-base/gnome-shell/files/gnome-shell-3.12-bluetooth-flag.patch
deleted file mode 100644
index 2fa93af2..00000000
--- a/gnome-base/gnome-shell/files/gnome-shell-3.12-bluetooth-flag.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 3c9c3b19fcb212171036e1e57e749411b5fd7d65 Mon Sep 17 00:00:00 2001
-From: Sobhan Mohammadpour <sobhanmohammadpour1@yahoo.fr>
-Date: Thu, 28 Feb 2013 18:48:32 +0330
-Subject: [PATCH 2/3] Make bluetooth support optional
-
-https://bugs.gentoo.org/show_bug.cgi?id=398145
-
-Ed Catmur 2012-01-08 13:46:22 UTC
-libgnome-bluetooth-applet is a private library so they shouldn't be linking
-against it anyway. I tried to work out how to tell libtool to add it to rpath
-but got totally lost.
-
-I'll see if I can work out how to fix the automagic gnome-bluetooth dependency
-so I can at least merge USE=-bluetooth.
----
- configure.ac | 16 +++++++++++++---
- 1 file changed, 13 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 9a30e65..aa710f0 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -138,11 +138,21 @@ AS_IF([test x$enable_browser_plugin = xyes], [
- ])
- AM_CONDITIONAL(BUILD_BROWSER_PLUGIN, test x$enable_browser_plugin = xyes)
-
-+AC_MSG_CHECKING([for bluetooth support])
-+AC_ARG_WITH([bluetooth],
-+ AS_HELP_STRING([--without-bluetooth],
-+ [Build without gnome-bluetooth library (default: auto)]))
-+AS_IF([test "x$with_bluetooth" != "xno"], [
- PKG_CHECK_MODULES(BLUETOOTH, gnome-bluetooth-1.0 >= 3.9.0,
-- [AC_DEFINE([HAVE_BLUETOOTH],[1],[Define if you have libgnome-bluetooth-applet])
-- AC_SUBST([HAVE_BLUETOOTH],[1])],
-+ [AC_DEFINE([HAVE_BLUETOOTH],[1],[Define if you have libgnome-bluetooth-applet])
-+ AC_SUBST([HAVE_BLUETOOTH],[1])
-+ AC_MSG_RESULT([yes])],
- [AC_DEFINE([HAVE_BLUETOOTH],[0])
-- AC_SUBST([HAVE_BLUETOOTH],[0])])
-+ AC_SUBST([HAVE_BLUETOOTH],[0])
-+ AC_MSG_RESULT([no])])
-+], [AC_DEFINE([HAVE_BLUETOOTH],[0])
-+ AC_SUBST([HAVE_BLUETOOTH],[0])
-+ AC_MSG_RESULT([no])])
-
- PKG_CHECK_MODULES(CALENDAR_SERVER, libecal-1.2 >= $LIBECAL_MIN_VERSION libedataserver-1.2 >= $LIBEDATASERVER_MIN_VERSION gio-2.0)
- AC_SUBST(CALENDAR_SERVER_CFLAGS)
---
-1.9.0
-
diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.14.0-bluetooth-gold.patch b/gnome-base/gnome-shell/files/gnome-shell-3.14.0-bluetooth-gold.patch
deleted file mode 100644
index cc2b2e65..00000000
--- a/gnome-base/gnome-shell/files/gnome-shell-3.14.0-bluetooth-gold.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 6b43368c9b10ba112e4272f66c507a0da9cf7e13 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Sat, 15 Mar 2014 17:48:41 -0400
-Subject: [PATCH 3/3] build: Add BLUETOOTH_LIBS to libgnome-shell's libadd for
- ld.gold
-
-For ld.gold, adding BLUETOOTH_LIBS to gnome_shell_LDADD has no effect:
-the libgnome-bluetooth-applet must be linked to the binary that actually
-uses a function from libgnome-bluetooth-applet, i.e. to libgnome-shell.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=726435
----
- src/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index a73eaae..c8fd46f 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -315,7 +315,7 @@ libgnome_shell_base_la_LIBADD = $(libgnome_shell_libadd)
- libgnome_shell_base_la_CPPFLAGS = $(gnome_shell_cflags)
-
- libgnome_shell_la_LDFLAGS = $(libgnome_shell_ldflags)
--libgnome_shell_la_LIBADD = $(GNOME_SHELL_LIBS) $(MUTTER_LIBS) libgnome-shell-base.la
-+libgnome_shell_la_LIBADD = $(GNOME_SHELL_LIBS) $(MUTTER_LIBS) $(BLUETOOTH_LIBS) libgnome-shell-base.la
- libgnome_shell_la_CPPFLAGS = $(MUTTER_CFLAGS) $(gnome_shell_cflags)
-
- ShellMenu-0.1.gir: libgnome-shell-menu.la
---
-2.1.2
-
diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.14.0-defaults.patch b/gnome-base/gnome-shell/files/gnome-shell-3.14.0-defaults.patch
deleted file mode 100644
index b6064225..00000000
--- a/gnome-base/gnome-shell/files/gnome-shell-3.14.0-defaults.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 6b658660e822a550da55c735c826ec75b6c0efee Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Tue, 10 Dec 2013 23:33:51 +0100
-Subject: [PATCH 1/3] Alter list of default applications
-
----
- data/org.gnome.shell.gschema.xml.in.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/data/org.gnome.shell.gschema.xml.in.in b/data/org.gnome.shell.gschema.xml.in.in
-index 92cef3f..9e783bb 100644
---- a/data/org.gnome.shell.gschema.xml.in.in
-+++ b/data/org.gnome.shell.gschema.xml.in.in
-@@ -31,7 +31,7 @@
- </_description>
- </key>
- <key name="favorite-apps" type="as">
-- <default>[ 'epiphany.desktop', 'evolution.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop' ]</default>
-+ <default>[ 'chromium-browser-chromium.desktop', 'firefox.desktop', 'firefox-bin.desktop', 'evolution.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop' ]</default>
- <_summary>List of desktop file IDs for favorite applications</_summary>
- <_description>
- The applications corresponding to these identifiers
---
-2.1.2
-
diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.20-fix-nvidia-crash.patch b/gnome-base/gnome-shell/files/gnome-shell-3.20-fix-nvidia-crash.patch
deleted file mode 100644
index 19eda8e8..00000000
--- a/gnome-base/gnome-shell/files/gnome-shell-3.20-fix-nvidia-crash.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-From 26d339b91744dab5135ee9ea1d46fda62448ad95 Mon Sep 17 00:00:00 2001
-From: Jan de Groot <jgc@archlinux.org>
-Date: Mon, 11 Apr 2016 14:00:33 +0000
-Subject: [PATCH] Initialize framebuffer objects early so clutter will not
- abort a few operations later.
-
-Checking offscreen for COGL_INVALID_HANDLE is not sufficient, as cogl_offscreen_new_with_texture doesn't initialize framebuffer objects but lets Cogl solve this the lazy way. cogl_offscreen_new_with_texture will never return COGL_INVALID_HANDLE anyways.
----
- src/st/st-theme-node-drawing.c | 35 +++++++++++++++++++++++------------
- src/st/st-theme-node-transition.c | 18 ++++++++++++++++--
- 2 files changed, 39 insertions(+), 14 deletions(-)
-
-diff --git a/src/st/st-theme-node-drawing.c b/src/st/st-theme-node-drawing.c
-index 1f28ed9..4a6a234 100644
---- a/src/st/st-theme-node-drawing.c
-+++ b/src/st/st-theme-node-drawing.c
-@@ -2247,22 +2247,33 @@ st_theme_node_prerender_shadow (StThemeNodePaintState *state)
- COGL_TEXTURE_NO_SLICING,
- COGL_PIXEL_FORMAT_ANY);
- if (buffer != COGL_INVALID_HANDLE)
-- offscreen = cogl_offscreen_new_with_texture (buffer);
--
-- if (offscreen != COGL_INVALID_HANDLE)
- {
-- ClutterActorBox box = { 0, 0, state->box_shadow_width, state->box_shadow_height};
-+ CoglError *error = NULL;
-+
-+ offscreen = cogl_offscreen_new_with_texture (buffer);
-+
-+ if (cogl_framebuffer_allocate (COGL_FRAMEBUFFER (offscreen), &error))
-+ {
-+ ClutterActorBox box = { 0, 0, state->box_shadow_width, state->box_shadow_height};
-+
-+ cogl_framebuffer_orthographic (offscreen, 0, 0,
-+ state->box_shadow_width,
-+ state->box_shadow_height, 0, 1.0);
-+ cogl_framebuffer_clear4f (offscreen, COGL_BUFFER_BIT_COLOR, 0, 0, 0, 0);
-
-- cogl_framebuffer_orthographic (offscreen, 0, 0,
-- state->box_shadow_width,
-- state->box_shadow_height, 0, 1.0);
-- cogl_framebuffer_clear4f (offscreen, COGL_BUFFER_BIT_COLOR, 0, 0, 0, 0);
-+ st_theme_node_paint_borders (state, offscreen, &box, 0xFF);
-
-- st_theme_node_paint_borders (state, offscreen, &box, 0xFF);
-- cogl_handle_unref (offscreen);
-+ cogl_handle_unref (offscreen);
-
-- state->box_shadow_pipeline = _st_create_shadow_pipeline (st_theme_node_get_box_shadow (node),
-- buffer);
-+ state->box_shadow_pipeline = _st_create_shadow_pipeline (st_theme_node_get_box_shadow (node),
-+ buffer);
-+ }
-+ else
-+ {
-+ cogl_handle_unref (offscreen);
-+
-+ cogl_error_free (error);
-+ }
- }
-
- if (buffer != COGL_INVALID_HANDLE)
-diff --git a/src/st/st-theme-node-transition.c b/src/st/st-theme-node-transition.c
-index 1eef17b..f3350a1 100644
---- a/src/st/st-theme-node-transition.c
-+++ b/src/st/st-theme-node-transition.c
-@@ -242,6 +242,8 @@ setup_framebuffers (StThemeNodeTransition *transition,
- StThemeNodeTransitionPrivate *priv = transition->priv;
- guint width, height;
-
-+ CoglError *catch_error = NULL;
-+
- /* template material to avoid unnecessary shader compilation */
- static CoglHandle material_template = COGL_INVALID_HANDLE;
-
-@@ -269,13 +271,25 @@ setup_framebuffers (StThemeNodeTransition *transition,
- if (priv->old_offscreen)
- cogl_handle_unref (priv->old_offscreen);
- priv->old_offscreen = cogl_offscreen_new_with_texture (priv->old_texture);
-+ if (!cogl_framebuffer_allocate (COGL_FRAMEBUFFER (priv->old_offscreen), &catch_error))
-+ {
-+ cogl_object_unref (priv->old_offscreen);
-+ cogl_error_free (catch_error);
-+ priv->old_offscreen = COGL_INVALID_HANDLE;
-+ g_return_val_if_fail (priv->old_offscreen != COGL_INVALID_HANDLE, FALSE);
-+ }
-
- if (priv->new_offscreen)
- cogl_handle_unref (priv->new_offscreen);
- priv->new_offscreen = cogl_offscreen_new_with_texture (priv->new_texture);
-
-- g_return_val_if_fail (priv->old_offscreen != COGL_INVALID_HANDLE, FALSE);
-- g_return_val_if_fail (priv->new_offscreen != COGL_INVALID_HANDLE, FALSE);
-+ if (!cogl_framebuffer_allocate (COGL_FRAMEBUFFER (priv->new_offscreen), &catch_error))
-+ {
-+ cogl_object_unref (priv->new_offscreen);
-+ cogl_error_free (catch_error);
-+ priv->new_offscreen = COGL_INVALID_HANDLE;
-+ g_return_val_if_fail (priv->new_offscreen != COGL_INVALID_HANDLE, FALSE);
-+ }
-
- if (priv->material == NULL)
- {
---
-2.7.1
-
diff --git a/gnome-base/gnome-shell/gnome-shell-3.26.2-r2.ebuild b/gnome-base/gnome-shell/gnome-shell-3.26.2-r2.ebuild
deleted file mode 100644
index 84ff9806..00000000
--- a/gnome-base/gnome-shell/gnome-shell-3.26.2-r2.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-GNOME2_EAUTORECONF="yes"
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit gnome-meson multilib pax-utils python-r1 systemd virtualx
-
-DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-IUSE="+bluetooth +browser-extension +ibus +networkmanager nsplugin -openrc-force"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-
-# libXfixes-5.0 needed for pointer barriers
-# FIXME:
-# * gstreamer support is currently automagic
-COMMON_DEPEND="
- >=app-accessibility/at-spi2-atk-2.5.3
- >=dev-libs/atk-2[introspection]
- >=app-crypt/gcr-3.7.5[introspection]
- >=dev-libs/glib-2.53:2[dbus]
- >=dev-libs/gjs-1.47.0
- >=dev-libs/gobject-introspection-1.49.1:=
- dev-libs/libical:=
- >=x11-libs/gtk+-3.15.0:3[introspection]
- >=dev-libs/libcroco-0.6.8:0.6
- >=gnome-base/gnome-desktop-3.7.90:3=[introspection]
- >=gnome-base/gsettings-desktop-schemas-3.21.3
- >=gnome-extra/evolution-data-server-3.17.2:=
- >=media-libs/gstreamer-0.11.92:1.0
- >=net-im/telepathy-logger-0.2.4[introspection]
- >=net-libs/telepathy-glib-0.19[introspection]
- >=sys-auth/polkit-0.100[introspection]
- >=x11-libs/libXfixes-5.0
- x11-libs/libXtst
- >=x11-wm/mutter-3.26.0:0/0[introspection]
- >=x11-libs/startup-notification-0.11
-
- ${PYTHON_DEPS}
- dev-python/pygobject:3[${PYTHON_USEDEP}]
-
- dev-libs/dbus-glib
- dev-libs/libxml2:2
- media-libs/libcanberra[gtk3]
- media-libs/mesa
- >=media-sound/pulseaudio-2
- >=net-libs/libsoup-2.40:2.4[introspection]
- x11-libs/libX11
- x11-libs/gdk-pixbuf:2[introspection]
-
- x11-apps/mesa-progs
-
- bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] )
- networkmanager? (
- >=app-crypt/libsecret-0.18
- >=gnome-extra/nm-applet-0.9.8
- >=net-misc/networkmanager-0.9.8:=[introspection] )
- nsplugin? ( >=dev-libs/json-glib-0.13.2 )
-"
-# Runtime-only deps are probably incomplete and approximate.
-# Introspection deps generated using:
-# grep -roe "imports.gi.*" gnome-shell-* | cut -f2 -d: | sort | uniq
-# Each block:
-# 1. Introspection stuff needed via imports.gi.*
-# 2. gnome-session is needed for gnome-session-quit
-# 3. Control shell settings
-# 4. Systemd needed for suspending support
-# 5. xdg-utils needed for xdg-open, used by extension tool
-# 6. adwaita-icon-theme and dejavu font neeed for various icons & arrows
-# 7. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c
-# 8. IBus is needed for nls integration
-RDEPEND="${COMMON_DEPEND}
- app-accessibility/at-spi2-core:2[introspection]
- >=app-accessibility/caribou-0.4.8
- dev-libs/libgweather:2[introspection]
- >=sys-apps/accountsservice-0.6.14[introspection]
- >=sys-power/upower-0.99:=[introspection]
- x11-libs/pango[introspection]
-
- >=gnome-base/gnome-session-2.91.91
- >=gnome-base/gnome-settings-daemon-3.8.3
-
- !openrc-force? ( >=sys-apps/systemd-31 )
-
- x11-misc/xdg-utils
-
- media-fonts/dejavu
- >=x11-themes/adwaita-icon-theme-3.19.90
-
- networkmanager? (
- net-misc/mobile-broadband-provider-info
- sys-libs/timezone-data )
- ibus? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk,introspection] )
-"
-# avoid circular dependency, see bug #546134
-PDEPEND="
- >=gnome-base/gdm-3.5[introspection]
- >=gnome-base/gnome-control-center-3.8.3[bluetooth(+)?,networkmanager(+)?]
- browser-extension? ( gnome-extra/chrome-gnome-shell )
-"
-DEPEND="${COMMON_DEPEND}
- dev-libs/libxslt
- >=dev-util/gdbus-codegen-2.45.3
- >=dev-util/gtk-doc-am-1.17
- gnome-base/gnome-common
- sys-devel/autoconf-archive
- >=sys-devel/gettext-0.19.6
- virtual/pkgconfig
-"
-
-PATCHES=(
- # Change favorites defaults, bug #479918
- "${FILESDIR}"/${PN}-3.22.0-defaults.patch
- # Fix automagic gnome-bluetooth dep, bug #398145
- "${FILESDIR}"/3.26-bluetooth-flag.patch
-)
-
-src_configure() {
- gnome-meson_src_configure \
- -Denable-man=true \
- -Denable-documentation=false \
- -Denable-systemd=$(usex !openrc-force yes no) \
- -Denable-networkmanager=$(usex networkmanager yes no) \
- $(meson_use nsplugin enable-browser-plugin)
-}
-
-src_test() {
- virtx meson_src_test
-}
-
-src_install() {
- gnome-meson_src_install
- python_replicate_script "${ED}/usr/bin/gnome-shell-extension-tool"
- python_replicate_script "${ED}/usr/bin/gnome-shell-perf-tool"
-
- # Required for gnome-shell on hardened/PaX, bug #398941
- # Future-proof for >=spidermonkey-1.8.7 following polkit's example
- if has_version '<dev-lang/spidermonkey-1.8.7'; then
- pax-mark mr "${ED}usr/bin/gnome-shell"{,-extension-prefs}
- elif has_version '>=dev-lang/spidermonkey-1.8.7[jit]'; then
- pax-mark m "${ED}usr/bin/gnome-shell"{,-extension-prefs}
- # Required for gnome-shell on hardened/PaX #457146 and #457194
- # PaX EMUTRAMP need to be on
- elif has_version '>=dev-libs/libffi-3.0.13[pax_kernel]'; then
- pax-mark E "${ED}usr/bin/gnome-shell"{,-extension-prefs}
- else
- pax-mark m "${ED}usr/bin/gnome-shell"{,-extension-prefs}
- fi
-}
-
-pkg_postinst() {
- gnome-meson_pkg_postinst
-
- if ! has_version 'media-libs/gst-plugins-good:1.0' || \
- ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
- ewarn "To make use of GNOME Shell's built-in screen recording utility,"
- ewarn "you need to either install media-libs/gst-plugins-good:1.0"
- ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
- ewarn "apps.gnome-shell.recorder/pipeline to what you want to use."
- fi
-
- if ! has_version "media-libs/mesa[llvm]"; then
- elog "llvmpipe is used as fallback when no 3D acceleration"
- elog "is available. You will need to enable llvm USE for"
- elog "media-libs/mesa if you do not have hardware 3D setup."
- fi
-
- # https://bugs.gentoo.org/show_bug.cgi?id=563084
- if has_version "x11-drivers/nvidia-drivers[-kms]"; then
- ewarn "You will need to enable kms support in x11-drivers/nvidia-drivers,"
- ewarn "otherwise Gnome will fail to start"
- fi
-
- if ! systemd_is_booted; then
- ewarn "${PN} needs Systemd to be *running* for working"
- ewarn "properly. Please follow this guide to migrate:"
- ewarn "https://wiki.gentoo.org/wiki/Systemd"
- fi
-
- if use openrc-force; then
- ewarn "You are enabling 'openrc-force' USE flag to skip systemd requirement,"
- ewarn "this can lead to unexpected problems and is not supported neither by"
- ewarn "upstream neither by Gnome Gentoo maintainers. If you suffer any problem,"
- ewarn "you will need to disable this USE flag system wide and retest before"
- ewarn "opening any bug report."
- fi
-}
diff --git a/gnome-base/gnome-shell/gnome-shell-3.26.2-r3.ebuild b/gnome-base/gnome-shell/gnome-shell-3.26.2-r3.ebuild
deleted file mode 100644
index 8ec8d239..00000000
--- a/gnome-base/gnome-shell/gnome-shell-3.26.2-r3.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit gnome.org gnome2-utils meson pax-utils python-single-r1 virtualx xdg
-
-DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-IUSE="+bluetooth +browser-extension elogind +ibus +networkmanager nsplugin systemd telepathy"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- ?? ( elogind systemd )"
-
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-
-# libXfixes-5.0 needed for pointer barriers and #include <X11/extensions/Xfixes.h>
-# FIXME:
-# * gstreamer support is currently automagic
-COMMON_DEPEND="
- >=dev-libs/libcroco-0.6.8:0.6
- >=gnome-extra/evolution-data-server-3.17.2:=
- >=app-crypt/gcr-3.7.5[introspection]
- >=gnome-base/gnome-desktop-3.7.90:3=[introspection]
- >=dev-libs/glib-2.53.0:2
- >=dev-libs/gobject-introspection-1.49.1:=
- >=dev-libs/gjs-1.47.0
- >=x11-libs/gtk+-3.15.0:3[introspection]
- nsplugin? ( >=dev-libs/json-glib-0.13.2 )
- >=x11-wm/mutter-3.24.0:0/1[introspection]
- >=sys-auth/polkit-0.100[introspection]
- >=gnome-base/gsettings-desktop-schemas-3.21.3
- >=x11-libs/startup-notification-0.11
- bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] )
- >=media-libs/gstreamer-0.11.92:1.0
- networkmanager? (
- >=gnome-extra/nm-applet-0.9.8[introspection]
- >=net-misc/networkmanager-0.9.8:=[introspection]
- >=app-crypt/libsecret-0.18
- dev-libs/dbus-glib )
- systemd? ( >=sys-apps/systemd-31 )
- elogind? ( >=sys-auth/elogind-237 )
-
- >=app-accessibility/at-spi2-atk-2.5.3
- media-libs/libcanberra[gtk3]
- x11-libs/gdk-pixbuf:2[introspection]
- dev-libs/libxml2:2
- >=net-libs/libsoup-2.40:2.4[introspection]
- x11-libs/libX11
-
- >=media-sound/pulseaudio-2[glib]
- >=dev-libs/atk-2[introspection]
- dev-libs/libical:=
- >=x11-libs/libXfixes-5.0
-
- ${PYTHON_DEPS}
- dev-python/pygobject:3[${PYTHON_USEDEP}]
- media-libs/mesa
-"
-# Runtime-only deps are probably incomplete and approximate.
-# Introspection deps generated using:
-# grep -roe "imports.gi.*" gnome-shell-* | cut -f2 -d: | sort | uniq
-# Each block:
-# 1. Introspection stuff needed via imports.gi.*
-# 2. gnome-session needed for shutdown/reboot/inhibitors/etc
-# 3. Control shell settings
-# 4. logind interface needed for suspending support
-# 5. xdg-utils needed for xdg-open, used by extension tool
-# 6. adwaita-icon-theme needed for various icons & arrows (3.26 for new video-joined-displays-symbolic and co icons; review for 3.28+)
-# 7. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c # TODO: Review
-# 8. IBus is needed for nls integration
-# 9. Optional telepathy chat integration
-# 10. TODO: semi-optional webkit-gtk[introspection] for captive portal helper
-RDEPEND="${COMMON_DEPEND}
- >=sys-apps/accountsservice-0.6.14[introspection]
- app-accessibility/at-spi2-core:2[introspection]
- >=app-accessibility/caribou-0.4.8
- app-misc/geoclue[introspection]
- >=dev-libs/libgweather-3.26:2[introspection]
- >=sys-power/upower-0.99:=[introspection]
- x11-libs/pango[introspection]
- gnome-base/librsvg:2[introspection]
-
- >=gnome-base/gnome-session-2.91.91
- >=gnome-base/gnome-settings-daemon-3.8.3
-
- x11-misc/xdg-utils
-
- >=x11-themes/adwaita-icon-theme-3.26
-
- networkmanager? (
- net-misc/mobile-broadband-provider-info
- sys-libs/timezone-data )
- ibus? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk,introspection] )
- telepathy? (
- >=net-im/telepathy-logger-0.2.4[introspection]
- >=net-libs/telepathy-glib-0.19[introspection] )
-"
-# avoid circular dependency, see bug #546134
-PDEPEND="
- >=gnome-base/gdm-3.5[introspection]
- >=gnome-base/gnome-control-center-3.26[bluetooth(+)?,networkmanager(+)?]
- browser-extension? ( gnome-extra/chrome-gnome-shell )
-"
-DEPEND="${COMMON_DEPEND}
- dev-libs/libxslt
- >=dev-util/gdbus-codegen-2.45.3
- dev-util/glib-utils
- >=sys-devel/gettext-0.19.6
- virtual/pkgconfig
-" #gtk-doc? ( >=dev-util/gtk-doc-1.17 )
-
-PATCHES=(
- # Change favorites defaults, bug #479918
- "${FILESDIR}"/${PN}-3.22.0-defaults.patch
- # Fix automagic gnome-bluetooth dep, bug #398145
- "${FILESDIR}"/3.26-optional-bluetooth.patch
-)
-
-src_prepare() {
- xdg_src_prepare
- # We want nsplugins in /usr/$(get_libdir)/nsbrowser/plugins not .../mozilla/plugins
- sed -e 's/mozilla/nsbrowser/' -i meson.build || die
- # Hack in correct python shebang
- sed -e "s:python\.path():'/usr/bin/env ${EPYTHON}':" -i src/meson.build || die
-}
-
-src_configure() {
- local emesonargs=(
- $(meson_use nsplugin enable-browser-plugin)
- #$(meson_use gtk-doc enable-documentation) # fails in gtkdoc-scangobj call with gtk-doc-1.25 (perl regex parenthesis issue); probably needs newer python-based gtk-doc to work
- -Denable-man=true
- -Denable-bluetooth=$(usex bluetooth yes no)
- -Denable-networkmanager=$(usex networkmanager yes no)
- -Denable-systemd=$(usex systemd yes no) # this controls journald integration only as of 3.26.2 (structured logging and having gnome-shell launched apps use its own identifier instead of gnome-session)
- # suspend support is runtime optional via /run/systemd/seats presence and org.freedesktop.login1.Manager dbus interface; elogind should provide what's necessary
- )
- meson_src_configure
-}
-
-src_install() {
- meson_src_install
-
- # Required for gnome-shell on hardened/PaX, bug #398941; FIXME: Is this still relevant?
- pax-mark m "${ED}usr/bin/gnome-shell"{,-extension-prefs}
-}
-
-src_test() {
- virtx meson_src_test
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_schemas_update
-
- if ! has_version 'media-libs/gst-plugins-good:1.0' || \
- ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
- ewarn "To make use of GNOME Shell's built-in screen recording utility,"
- ewarn "you need to either install media-libs/gst-plugins-good:1.0"
- ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
- ewarn "apps.gnome-shell.recorder/pipeline to what you want to use."
- fi
-
- if ! has_version "media-libs/mesa[llvm]"; then
- elog "llvmpipe is used as fallback when no 3D acceleration"
- elog "is available. You will need to enable llvm USE for"
- elog "media-libs/mesa if you do not have hardware 3D setup."
- fi
-
- # https://bugs.gentoo.org/show_bug.cgi?id=563084
- if has_version "x11-drivers/nvidia-drivers[-kms]"; then
- ewarn "You will need to enable kms support in x11-drivers/nvidia-drivers,"
- ewarn "otherwise Gnome will fail to start"
- fi
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_schemas_update
-}
diff --git a/gnome-base/gnome-shell/metadata.xml b/gnome-base/gnome-shell/metadata.xml
index 301d00be..6f32c6fd 100644
--- a/gnome-base/gnome-shell/metadata.xml
+++ b/gnome-base/gnome-shell/metadata.xml
@@ -19,10 +19,6 @@
and suspend support.</flag>
<flag name="ibus">Enable support for enhanced input methods through
<pkg>app-i18n/ibus</pkg></flag>
- <flag name="openrc-force">Skip systemd dependency (#480336),
- enabling this flag will become your setup to be fully
- unsupported by upstream and downstream Gnome team. Do not
- try to enable it unless completely needed</flag>
<flag name="telepathy">Ensure presence of telepathy chat integration</flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-shell/files/, gnome-base/gnome-shell/
@ 2018-09-28 17:58 Mart Raudsepp
0 siblings, 0 replies; 4+ messages in thread
From: Mart Raudsepp @ 2018-09-28 17:58 UTC (permalink / raw
To: gentoo-commits
commit: 9e6660b64b9f9e71af7be6c8679bb2b131c65917
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 27 21:39:53 2018 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Thu Sep 27 21:39:53 2018 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=9e6660b6
gnome-base/gnome-shell: remove, moved to ::gentoo
.../files/3.26-optional-bluetooth.patch | 73 --------
.../files/gnome-shell-3.22.0-defaults.patch | 26 ---
.../gnome-shell/gnome-shell-3.26.2-r4.ebuild | 186 ---------------------
gnome-base/gnome-shell/metadata.xml | 24 ---
4 files changed, 309 deletions(-)
diff --git a/gnome-base/gnome-shell/files/3.26-optional-bluetooth.patch b/gnome-base/gnome-shell/files/3.26-optional-bluetooth.patch
deleted file mode 100644
index 9f7e5aea..00000000
--- a/gnome-base/gnome-shell/files/3.26-optional-bluetooth.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 7ca3e1a9d18e6f6154b4479bcd94d420bc69798c Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Mon, 10 Sep 2018 13:17:39 +0200
-Subject: [PATCH] Make bluetooth support optional
-
-https://bugs.gentoo.org/show_bug.cgi?id=398145
-leio: Fixed enable_bluetooth get_option string
----
- js/misc/meson.build | 2 +-
- meson.build | 15 ++++++++++++++-
- meson_options.txt | 7 +++++++
- 3 files changed, 22 insertions(+), 2 deletions(-)
-
-diff --git a/js/misc/meson.build b/js/misc/meson.build
-index 20489496c..3071f9dfb 100644
---- a/js/misc/meson.build
-+++ b/js/misc/meson.build
-@@ -3,7 +3,7 @@ jsconf.set('PACKAGE_NAME', meson.project_name())
- jsconf.set('PACKAGE_VERSION', meson.project_version())
- jsconf.set('GETTEXT_PACKAGE', meson.project_name())
- jsconf.set('LIBMUTTER_API_VERSION', mutter_api_version)
--jsconf.set10('HAVE_BLUETOOTH', bt_dep.found())
-+jsconf.set10('HAVE_BLUETOOTH', have_bluetooth)
- jsconf.set10('HAVE_NETWORKMANAGER', have_networkmanager)
- jsconf.set('datadir', datadir)
- jsconf.set('libexecdir', libexecdir)
-diff --git a/meson.build b/meson.build
-index b82c41398..7d342ff61 100644
---- a/meson.build
-+++ b/meson.build
-@@ -91,7 +91,20 @@ startup_dep = dependency('libstartup-notification-1.0', version: startup_req)
- x11_dep = dependency('x11')
- schemas_dep = dependency('gsettings-desktop-schemas', version: schemas_req)
-
--bt_dep = dependency('gnome-bluetooth-1.0', version: bt_req, required: false)
-+bt_dep = []
-+enable_bluetooth = get_option('enable-bluetooth')
-+if enable_bluetooth != 'no'
-+ want_bluetooth = enable_bluetooth == 'yes'
-+ bt_dep = dependency('gnome-bluetooth-1.0', version: bt_req, required: want_bluetooth)
-+ have_bluetooth = bt_dep.found()
-+
-+ if not have_bluetooth
-+ bt_dep = []
-+ endif
-+else
-+ have_bluetooth = false
-+endif
-+
- gst_dep = dependency('gstreamer-1.0', version: gst_req, required: false)
- gst_base_dep = dependency('gstreamer-base-1.0', required: false)
-
-diff --git a/meson_options.txt b/meson_options.txt
-index 18899ffdb..9191f8c0e 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -16,6 +16,13 @@ option('enable-man',
- description: 'Generate man pages'
- )
-
-+option('enable-bluetooth',
-+ type: 'combo',
-+ choices: ['yes', 'no', 'auto'],
-+ value: 'auto',
-+ description: 'Enable bluetooth support'
-+)
-+
- option('enable-networkmanager',
- type: 'combo',
- choices: ['yes', 'no', 'auto'],
---
-2.18.0
-
diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.22.0-defaults.patch b/gnome-base/gnome-shell/files/gnome-shell-3.22.0-defaults.patch
deleted file mode 100644
index b80dbc3a..00000000
--- a/gnome-base/gnome-shell/files/gnome-shell-3.22.0-defaults.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 7a671f99b7ef2d5f38be67668aac762764b32a42 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Tue, 10 Dec 2013 23:33:51 +0100
-Subject: [PATCH 1/2] Alter list of default applications
-
-Signed-off-by: Gilles Dartiguelongue <eva@gentoo.org>
----
- data/org.gnome.shell.gschema.xml.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/data/org.gnome.shell.gschema.xml.in b/data/org.gnome.shell.gschema.xml.in
-index c1e6b21..368c654 100644
---- a/data/org.gnome.shell.gschema.xml.in
-+++ b/data/org.gnome.shell.gschema.xml.in
-@@ -31,7 +31,7 @@
- </description>
- </key>
- <key name="favorite-apps" type="as">
-- <default>[ 'epiphany.desktop', 'evolution.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop' ]</default>
-+ <default>[ 'chromium-browser-chromium.desktop', 'firefox.desktop', 'firefox-bin.desktop', 'evolution.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop' ]</default>
- <summary>List of desktop file IDs for favorite applications</summary>
- <description>
- The applications corresponding to these identifiers
---
-2.10.1
-
diff --git a/gnome-base/gnome-shell/gnome-shell-3.26.2-r4.ebuild b/gnome-base/gnome-shell/gnome-shell-3.26.2-r4.ebuild
deleted file mode 100644
index 91f301b9..00000000
--- a/gnome-base/gnome-shell/gnome-shell-3.26.2-r4.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit gnome.org gnome2-utils meson pax-utils python-single-r1 virtualx xdg
-
-DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell"
-SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-IUSE="+bluetooth +browser-extension elogind +ibus +networkmanager nsplugin systemd telepathy"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- ?? ( elogind systemd )"
-
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-
-# libXfixes-5.0 needed for pointer barriers and #include <X11/extensions/Xfixes.h>
-# FIXME:
-# * gstreamer support is currently automagic
-COMMON_DEPEND="
- >=dev-libs/libcroco-0.6.8:0.6
- >=gnome-extra/evolution-data-server-3.17.2:=
- >=app-crypt/gcr-3.7.5[introspection]
- >=gnome-base/gnome-desktop-3.7.90:3=[introspection]
- >=dev-libs/glib-2.53.0:2
- >=dev-libs/gobject-introspection-1.49.1:=
- >=dev-libs/gjs-1.47.0
- >=x11-libs/gtk+-3.15.0:3[introspection]
- nsplugin? ( >=dev-libs/json-glib-0.13.2 )
- >=x11-wm/mutter-3.24.0:0/1[introspection]
- >=sys-auth/polkit-0.100[introspection]
- >=gnome-base/gsettings-desktop-schemas-3.21.3
- >=x11-libs/startup-notification-0.11
- bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] )
- >=media-libs/gstreamer-0.11.92:1.0
- networkmanager? (
- >=gnome-extra/nm-applet-0.9.8[introspection]
- >=net-misc/networkmanager-0.9.8:=[introspection]
- >=app-crypt/libsecret-0.18
- dev-libs/dbus-glib )
- systemd? ( >=sys-apps/systemd-31 )
- elogind? ( >=sys-auth/elogind-237 )
-
- >=app-accessibility/at-spi2-atk-2.5.3
- media-libs/libcanberra[gtk3]
- x11-libs/gdk-pixbuf:2[introspection]
- dev-libs/libxml2:2
- >=net-libs/libsoup-2.40:2.4[introspection]
- x11-libs/libX11
-
- >=media-sound/pulseaudio-2[glib]
- >=dev-libs/atk-2[introspection]
- dev-libs/libical:=
- >=x11-libs/libXfixes-5.0
-
- ${PYTHON_DEPS}
- dev-python/pygobject:3[${PYTHON_USEDEP}]
- media-libs/mesa
-"
-# Runtime-only deps are probably incomplete and approximate.
-# Introspection deps generated using:
-# grep -roe "imports.gi.*" gnome-shell-* | cut -f2 -d: | sort | uniq
-# Each block:
-# 1. Introspection stuff needed via imports.gi.*
-# 2. gnome-session needed for shutdown/reboot/inhibitors/etc
-# 3. Control shell settings
-# 4. logind interface needed for suspending support
-# 5. xdg-utils needed for xdg-open, used by extension tool
-# 6. adwaita-icon-theme needed for various icons & arrows (3.26 for new video-joined-displays-symbolic and co icons; review for 3.28+)
-# 7. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c # TODO: Review
-# 8. IBus is needed for nls integration
-# 9. Optional telepathy chat integration
-# 10. TODO: semi-optional webkit-gtk[introspection] for captive portal helper
-RDEPEND="${COMMON_DEPEND}
- >=sys-apps/accountsservice-0.6.14[introspection]
- app-accessibility/at-spi2-core:2[introspection]
- >=app-accessibility/caribou-0.4.8
- app-misc/geoclue[introspection]
- >=dev-libs/libgweather-3.26:2[introspection]
- >=sys-power/upower-0.99:=[introspection]
- x11-libs/pango[introspection]
- gnome-base/librsvg:2[introspection]
-
- >=gnome-base/gnome-session-2.91.91
- >=gnome-base/gnome-settings-daemon-3.8.3
-
- x11-misc/xdg-utils
-
- >=x11-themes/adwaita-icon-theme-3.26
-
- networkmanager? (
- net-misc/mobile-broadband-provider-info
- sys-libs/timezone-data )
- ibus? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk,introspection] )
- telepathy? (
- >=net-im/telepathy-logger-0.2.4[introspection]
- >=net-libs/telepathy-glib-0.19[introspection] )
-"
-# avoid circular dependency, see bug #546134
-PDEPEND="
- >=gnome-base/gdm-3.5[introspection]
- >=gnome-base/gnome-control-center-3.26[bluetooth(+)?,networkmanager(+)?]
- browser-extension? ( gnome-extra/chrome-gnome-shell )
-"
-DEPEND="${COMMON_DEPEND}
- dev-libs/libxslt
- >=dev-util/gdbus-codegen-2.45.3
- dev-util/glib-utils
- >=sys-devel/gettext-0.19.6
- virtual/pkgconfig
-" #gtk-doc? ( >=dev-util/gtk-doc-1.17 )
-
-PATCHES=(
- # Patches from gnome-3-26 branch on top of 3.26.2
- "${WORKDIR}"/patches/
- # Change favorites defaults, bug #479918
- "${FILESDIR}"/${PN}-3.22.0-defaults.patch
- # Fix automagic gnome-bluetooth dep, bug #398145
- "${FILESDIR}"/3.26-optional-bluetooth.patch
-)
-
-src_prepare() {
- xdg_src_prepare
- # We want nsplugins in /usr/$(get_libdir)/nsbrowser/plugins not .../mozilla/plugins
- sed -e 's/mozilla/nsbrowser/' -i meson.build || die
- # Hack in correct python shebang
- sed -e "s:python\.path():'/usr/bin/env ${EPYTHON}':" -i src/meson.build || die
-}
-
-src_configure() {
- local emesonargs=(
- $(meson_use nsplugin enable-browser-plugin)
- #$(meson_use gtk-doc enable-documentation) # fails in gtkdoc-scangobj call with gtk-doc-1.25 (perl regex parenthesis issue); probably needs newer python-based gtk-doc to work
- -Denable-man=true
- -Denable-bluetooth=$(usex bluetooth yes no)
- -Denable-networkmanager=$(usex networkmanager yes no)
- -Denable-systemd=$(usex systemd yes no) # this controls journald integration only as of 3.26.2 (structured logging and having gnome-shell launched apps use its own identifier instead of gnome-session)
- # suspend support is runtime optional via /run/systemd/seats presence and org.freedesktop.login1.Manager dbus interface; elogind should provide what's necessary
- )
- meson_src_configure
-}
-
-src_install() {
- meson_src_install
-
- # Required for gnome-shell on hardened/PaX, bug #398941; FIXME: Is this still relevant?
- pax-mark m "${ED}usr/bin/gnome-shell"{,-extension-prefs}
-}
-
-src_test() {
- virtx meson_src_test
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_schemas_update
-
- if ! has_version 'media-libs/gst-plugins-good:1.0' || \
- ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
- ewarn "To make use of GNOME Shell's built-in screen recording utility,"
- ewarn "you need to either install media-libs/gst-plugins-good:1.0"
- ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
- ewarn "apps.gnome-shell.recorder/pipeline to what you want to use."
- fi
-
- if ! has_version "media-libs/mesa[llvm]"; then
- elog "llvmpipe is used as fallback when no 3D acceleration"
- elog "is available. You will need to enable llvm USE for"
- elog "media-libs/mesa if you do not have hardware 3D setup."
- fi
-
- # https://bugs.gentoo.org/show_bug.cgi?id=563084
- if has_version "x11-drivers/nvidia-drivers[-kms]"; then
- ewarn "You will need to enable kms support in x11-drivers/nvidia-drivers,"
- ewarn "otherwise Gnome will fail to start"
- fi
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_schemas_update
-}
diff --git a/gnome-base/gnome-shell/metadata.xml b/gnome-base/gnome-shell/metadata.xml
deleted file mode 100644
index 6f32c6fd..00000000
--- a/gnome-base/gnome-shell/metadata.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>gnome@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
-</maintainer>
-<longdescription>
- GNOME Shell provides core user interface functions for the GNOME 3
- desktop, like switching to windows and launching applications.
- GNOME Shell takes advantage of the capabilities of modern graphics
- hardware and introduces innovative user interface concepts to
- provide a visually attractive and easy to use experience.
-</longdescription>
-<use>
- <flag name="browser-extension">Ensure the presence of extensions.gnome.org
- native connector <pkg>gnome-extra/chrome-gnome-shell</pkg></flag>
- <flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for session tracking
- and suspend support.</flag>
- <flag name="ibus">Enable support for enhanced input methods through
- <pkg>app-i18n/ibus</pkg></flag>
- <flag name="telepathy">Ensure presence of telepathy chat integration</flag>
-</use>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-09-28 17:59 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-09-26 22:14 [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-shell/files/, gnome-base/gnome-shell/ Mart Raudsepp
-- strict thread matches above, loose matches on Subject: below --
2018-09-28 17:58 Mart Raudsepp
2018-09-19 10:14 Mart Raudsepp
2016-04-18 19:43 Ole Reifschneider
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox