gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-08-06 00:48:18 -07:00
Code Issues Projects Releases Wiki Activity

gnome-base/gnome-shell: bump to 3.28.3

Browse Source 
Includes a huge patchset from upstream gnome-3-28 branch.
Now provides its own onscreen keyboard instead of using caribou.
Requires sassc at build time for CSS generation.
Doesn't need deprecated networkmanager libraries from nm-applet
anymore.

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio@gentoo.org>
This commit is contained in:
Mart Raudsepp
2019-02-28 01:32:08 +02:00
parent 4a66f9332d
commit d96bf40be7
4 changed files with 276 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gnome-base/gnome-shell/Manifest
View File

@@ -1,3 +1,5 @@
DIST gnome-shell-3.24.3.tar.xz 1982088 BLAKE2B 608b3e73d546dea543a23c31a64b03c32f35d118cd79fd0371a9e392377b4dd03bc16413443d643ed604a2fa81c2838939d92ef4c89a54469a8bd83dc9661f8f SHA512 369ed80b975369b79d4ac9b3f1fbd469fdde331e9079d09eeac6398a9b3c349b09f7570dfce1ed6e1cdfaf514b4b40c6038f34b6c3c7928470b2cd65b702ff15
DIST gnome-shell-3.26.2-patchset.tar.xz 55492 BLAKE2B 745b8549f7480b004f4df9b81508c94c9224f77a5a503f45dfda20105e9c305f8cae6ae5e420e597cea9f98899933bb19efd8cf0e9811dc35d0844a3c2920143 SHA512 93a730082e84807c23f4b7e390c2d0fb02d3666fc32241de02b3534cc271b160bd9a6a6a2e908ed5bdde91cef383c1e400b0f7cbf04ac104f7f9758218e635ed
DIST gnome-shell-3.26.2.tar.xz 1405580 BLAKE2B ccbb8ad374931335fdc6e752a7feedcba4fe2b61112404b62bc9711b1736216d46fd6e85c6f06439cae50af86a174359d7df0e111e8db6ffed567e91b4292b14 SHA512 0e13bc7abff2367d24ea748cd69a1879ff14a6755ef27d17cf20cef61bc6d15bf6e9d18362142a2d6462689f64eada833f9bba21ebaac3a33765a5be0ae48d3a
DIST gnome-shell-3.28.3-patchset.tar.xz 30820 BLAKE2B 3402a1c455a5e9d028f6c15ea40db94afb84576643b9bfe9e973a7f375d9f0a22003eab3ccabec0b4b31c31f70ef02ca055c0f62a5c0392529fc375f6cef7029 SHA512 a1da84374dd97bff2546d6ddc5656bade69711d05b4b4f4283df66ebbac566767a509dcbd6db52c28a1915cf873c99b81029128cb2a2b63c325dc3e3340fffb4
DIST gnome-shell-3.28.3.tar.xz 1433388 BLAKE2B 656e2edabef363d779fd339b7158ad3461a05452a2fdad611889d19f272cd98dfbbb39871d10631326b83108678f8a7245c349583eb257e9d7e4827078134ade SHA512 3550a9e59101a96cf04e4a4bc183ac9a447baa72d74e57c3f438764741b4365f8848895c1eb2c4d0af5c7936e38eb8971ef578bbee315e78b9fdcbbe49fdc1e8

28
gnome-base/gnome-shell/files/3.28.3-defaults.patch Normal file
View File

@@ -0,0 +1,28 @@
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>
[Updated to include desktop file renames to reverse DNS]
Signed-off-by: Mart Raudsepp <leio@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', 'org.gnome.Evolution.desktop', 'evolution.desktop', 'rhythmbox.desktop', 'org.gnome.Shotwell', '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

59
gnome-base/gnome-shell/files/3.28.3-optional-bluetooth.patch Normal file
View File

@@ -0,0 +1,59 @@
From 26dbbd15fabd3c35135105720dc821edccb128fa Mon Sep 17 00:00:00 2001
From: Mart Raudsepp <leio@gentoo.org>
Date: Thu, 28 Feb 2019 00:50:19 +0200
Subject: [PATCH] build: Make bluetooth support optional
---
js/misc/meson.build | 2 +-
meson.build | 7 ++++++-
meson_options.txt | 6 ++++++
3 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/js/misc/meson.build b/js/misc/meson.build
index 5a4871762..3c5e02368 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 f38798caf..e1bcd1892 100644
--- a/meson.build
+++ b/meson.build
@@ -92,7 +92,12 @@ ibus_dep = dependency('ibus-1.0', version: ibus_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)
+if get_option('bluetooth')
+ bt_dep = dependency('gnome-bluetooth-1.0', version: bt_req)
+ have_bluetooth = true
+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 65188c7ff..b6d49dfb5 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,3 +1,9 @@
+option('bluetooth',
+ type: 'boolean',
+ value: true,
+ description: 'Enable bluetooth support'
+)
+
option('browser_plugin',
type: 'boolean',
value: true,
--
2.17.0

187
gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild Normal file
View File

@@ -0,0 +1,187 @@
# Copyright 1999-2019 Gentoo Authors
# 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 ~arm ~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.56.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.28.0:0/2[introspection]
>=sys-auth/polkit-0.100[introspection]
>=gnome-base/gsettings-desktop-schemas-3.21.3
>=x11-libs/startup-notification-0.11
>=app-i18n/ibus-1.5.2
bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] )
>=media-libs/gstreamer-0.11.92:1.0
networkmanager? (
>=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-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-lang/sassc
dev-libs/libxslt
>=dev-util/gdbus-codegen-2.45.3
dev-util/glib-utils
>=sys-devel/gettext-0.19.8
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}"/${PV}-defaults.patch
# Fix automagic gnome-bluetooth dep, bug #398145
"${FILESDIR}"/${PV}-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 bluetooth)
$(meson_use nsplugin browser_plugin)
#$(meson_use gtk-doc gtk_doc) # fails in gtkdoc-scangobj call with gtk-doc-1.25 (perl regex parenthesis issue); probably needs newer python-based gtk-doc to work
-Dman=true
$(meson_use networkmanager)
$(meson_use systemd) # 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
# 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
}