commit:     11fe8d4fb3c9edab0b962f39bc9a73fb89d55218
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 12 21:00:15 2020 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sun Jul 12 21:02:54 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11fe8d4f

gnome-base/gnome-shell: bump to 3.36.4

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 gnome-base/gnome-shell/Manifest                  |   1 +
 gnome-base/gnome-shell/files/3.36-defaults.patch |  28 ++++
 gnome-base/gnome-shell/gnome-shell-3.36.4.ebuild | 185 +++++++++++++++++++++++
 3 files changed, 214 insertions(+)

diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index 39314cf9595..ee51ba0ed5a 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -1 +1,2 @@
 DIST gnome-shell-3.34.5.tar.xz 1558672 BLAKE2B 
7b786a35b6b79a4532d9bbb761ee0629cfb18b8c4c151f5958bb9169cae01ddb489a31c9d1a0cfef3ab6dd1f29c449600c1ad9bb11adbae284e86035bec15234
 SHA512 
ef6a70b0b3bb14fedb07c465742fe0d78c96ddd24352fd0babf871336ee404f9823cadea5bd522e388f5b714d33b219c8ff2badaed379b7135dd90de9fca9bc4
+DIST gnome-shell-3.36.4.tar.xz 1774584 BLAKE2B 
92fe544ae743235c673628f2ad82a75f58eaed94547fc3e0728a492cfee22783cb9d820ac55e1e125bf2ce83dadbddece7222eef9bad0891bfc5a7097ddde4bb
 SHA512 
879b1590d516e7e9e1ad066c870023d59cbaaca13e1e77d8b14de302574b3138451c4b8ab0ba1b43aec3e6e03bd147304e8e0e995359b181522a790afc97d450

diff --git a/gnome-base/gnome-shell/files/3.36-defaults.patch 
b/gnome-base/gnome-shell/files/3.36-defaults.patch
new file mode 100644
index 00000000000..0a4746ac46b
--- /dev/null
+++ b/gnome-base/gnome-shell/files/3.36-defaults.patch
@@ -0,0 +1,28 @@
+From 7a671f99b7ef2d5f38be67668aac762764b32a42 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <e...@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 <e...@gentoo.org>
+[Updated to include desktop file renames to reverse DNS and 3.36 changes]
+Signed-off-by: Mart Raudsepp <l...@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>[ 'org.gnome.Epiphany.desktop', 'org.gnome.Geary.desktop', 
'org.gnome.Calendar.desktop', 'org.gnome.Music.desktop', 
'org.gnome.Photos.desktop', 'org.gnome.Nautilus.desktop', 
'org.gnome.Software.desktop' ]</default>
++      <default>[ 'chromium-browser-chromium.desktop', 'firefox.desktop', 
'firefox-bin.desktop', 'org.gnome.Evolution.desktop', 
'org.gnome.Calendar.desktop', 'org.gnome.Music.desktop', 
'org.gnome.Photos.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.36.4.ebuild 
b/gnome-base/gnome-shell/gnome-shell-3.36.4.ebuild
new file mode 100644
index 00000000000..fd3fd1b3ae9
--- /dev/null
+++ b/gnome-base/gnome-shell/gnome-shell-3.36.4.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit gnome.org gnome2-utils meson 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 gtk-doc +ibus +networkmanager 
systemd telepathy"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+       ?? ( elogind systemd )"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+
+# libXfixes-5.0 needed for pointer barriers and #include 
<X11/extensions/Xfixes.h>
+# FIXME:
+#  * gstreamer support is currently automagic
+DEPEND="
+       >=gnome-extra/evolution-data-server-3.33.1:=
+       >=app-crypt/gcr-3.7.5[introspection]
+       >=dev-libs/glib-2.57.2:2
+       >=dev-libs/gobject-introspection-1.49.1:=
+       >=dev-libs/gjs-1.63.2
+       >=x11-libs/gtk+-3.15.0:3[introspection]
+       >=x11-wm/mutter-3.36.0:0/6[introspection]
+       >=sys-auth/polkit-0.100[introspection]
+       >=gnome-base/gsettings-desktop-schemas-3.33.1
+       >=x11-libs/startup-notification-0.11
+       >=app-i18n/ibus-1.5.2
+       >=gnome-base/gnome-desktop-3.35.90:3=[introspection]
+       bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] )
+       >=media-libs/gstreamer-0.11.92:1.0
+       media-libs/gst-plugins-base:1.0
+       networkmanager? (
+               >=net-misc/networkmanager-1.10.4:=[introspection]
+               net-libs/libnma[introspection]
+               >=app-crypt/libsecret-0.18
+               dev-libs/dbus-glib )
+       systemd? ( >=sys-apps/systemd-31
+               >=gnome-base/gnome-desktop-3.34.2:3=[systemd] )
+       elogind? ( >=sys-auth/elogind-237 )
+       app-arch/gnome-autoar
+       dev-libs/json-glib
+
+       >=app-accessibility/at-spi2-atk-2.5.3
+       x11-libs/gdk-pixbuf:2[introspection]
+       dev-libs/libxml2:2
+       x11-libs/libX11
+
+       >=media-sound/pulseaudio-2[glib]
+       >=dev-libs/atk-2[introspection]
+       dev-libs/libical:=
+       >=x11-libs/libXfixes-5.0
+
+       ${PYTHON_DEPS}
+       $(python_gen_cond_dep '
+               dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+       ')
+       media-libs/mesa[X(+)]
+"
+# 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. Cantarell font used in gnome-shell global CSS (if removing this for some 
reason, make sure it's pulled in somehow for non-meta users still too)
+# 11. TODO: semi-optional webkit-gtk[introspection] for captive portal helper
+RDEPEND="${DEPEND}
+       >=sys-apps/accountsservice-0.6.14[introspection]
+       app-accessibility/at-spi2-core:2[introspection]
+       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] )
+       media-fonts/cantarell
+"
+# 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 )
+"
+BDEPEND="
+       dev-lang/sassc
+       dev-libs/libxslt
+       app-text/asciidoc
+       >=dev-util/gdbus-codegen-2.45.3
+       dev-util/glib-utils
+       gtk-doc? ( >=dev-util/gtk-doc-1.17
+               app-text/docbook-xml-dtd:4.3 )
+       >=sys-devel/gettext-0.19.8
+       virtual/pkgconfig
+"
+
+PATCHES=(
+       # Fix automagic gnome-bluetooth dep, bug #398145
+       "${FILESDIR}"/3.34-optional-bluetooth.patch
+       # Change favorites defaults, bug #479918
+       "${FILESDIR}"/3.36-defaults.patch
+)
+
+src_prepare() {
+       xdg_src_prepare
+       # 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 bluetooth)
+               -Dextensions_tool=true
+               -Dextensions_app=true
+               $(meson_use gtk-doc gtk_doc)
+               -Dman=true
+               $(meson_use networkmanager)
+               $(meson_use systemd) # this controls journald integration and 
desktop file user services related property only as of 3.34.4
+               # (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_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
+       # TODO: Is this still the case after various fixed in 3.28 for 
detecting non-working KMS for wayland (to fall back to X)?
+       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
+}

Reply via email to