diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-09-08 01:07:24 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-09-08 01:07:24 +0100 |
commit | e3cf2c86fca1750343c1885311f857f185ee4f2d (patch) | |
tree | d9d1fbc20509d4c90f57fb2d9e1459bc8034c831 /gnome-base/gnome-shell | |
parent | f1af93971b7490792d8541bc790e0d8c6d787059 (diff) |
gentoo resync : 08.09.2019
Diffstat (limited to 'gnome-base/gnome-shell')
-rw-r--r-- | gnome-base/gnome-shell/Manifest | 4 | ||||
-rw-r--r-- | gnome-base/gnome-shell/files/3.32-optional-bluetooth.patch | 59 | ||||
-rw-r--r-- | gnome-base/gnome-shell/gnome-shell-3.32.2.ebuild | 186 |
3 files changed, 249 insertions, 0 deletions
diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest index e39efa4977cd..178dc5d48a2d 100644 --- a/gnome-base/gnome-shell/Manifest +++ b/gnome-base/gnome-shell/Manifest @@ -1,10 +1,14 @@ AUX 3.26-optional-bluetooth.patch 2406 BLAKE2B b747c9d5cdbefbec8c045e24502bcb57b45b14151264cbad31e9ce96ff8320ed140c327e10fb72878da8638af93f63871d523176b18979756937ff5219eb52c6 SHA512 d1f4ce36c705be4669b336f736172f29b4b8f373b146fff4a27bb84cfdde3ec989253b92cb0eaa881e98d7f3267db4954ea9413b75c01c65bcc6e54ce32c14c7 AUX 3.28.3-defaults.patch 1385 BLAKE2B d7e0495aadec7fa042086b5219cc34906f9333a446484e63d90932551d09f469e66cc5da43040a2bf955ecdb3d2beca0e1dba435dd7c309bbc78a1b7aba7f43b SHA512 190a9a61b164373e1f2528b96eca0312a7884651ee44212f686e5752430197b2644b67550dc41ed10684cccd0e8a0d870cfdeddf8582d57de637f7dad11d0124 +AUX 3.32-optional-bluetooth.patch 1935 BLAKE2B b1f21039e4567a82c83d3a8886703e0094e63be1a1a9af61f6ba28a4db106a2ebf8ea93dd89212fc68e9b20d9979724997d10272ba49de7c7760d1b22788f45d SHA512 edb3d948b67c3210b5e1cd4065a41552e64d63da3c43d52b397c925321445fe67cb23e4f58ab8a7168f5d47fc543da6bf8dc5772e6d3c7f3320e8637397830c3 AUX gnome-shell-3.22.0-defaults.patch 1228 BLAKE2B 9bb49d830c2bbc36123ca8fdddc02d4b750a5ffd174fa653ead26a75dc9478be4b5a39c31a004a3897655aae097c23f511d6bb494b0aede51fea74294be3fcf6 SHA512 f350324af68de8f7ae9dab609fdb81e272f9d545a125f3da85d9f06e4a0de09f857517d6c7a585ff1ea3b56f4d51b049cbeb62c39472d61d45026331104c5af5 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.30.2-r2-patchset.tar.xz 41852 BLAKE2B f854a42b0ba0be8019487edfc1a0e73d11d406537ffe288d1a5d81e9a512b8fb02e6af466fbe4d0d0e8644aa6f57cad1d381b5e873223749c88d1dccdae72b9e SHA512 c0c935206048c961e70f319b67133dcf0f5253c2283aefd6283db910950f8cd645888f6a6b7bbbfc620a023e0b5ae85394e5f5ce0fb2ff120b18ab7640f9859e DIST gnome-shell-3.30.2.tar.xz 1439556 BLAKE2B 547ccf5571ea431d15c6430619640bd497a381191cad56bbf1a5c9992c5df47eb48527cc2749ea4d417cbe5fd7cc2acb44915ee35d3d89cd386541f19d743877 SHA512 5cdf2b9a4dc9dbcc75d76020a01b953ae3922d5820b692d1bc1cf62daf1f00d04b95d6ec076920563f555115c4f4ad11a019e4523a353ef4dd2189a5240239c6 +DIST gnome-shell-3.32.2-patchset.tar.xz 23540 BLAKE2B 363989a630faa7538ccbf9765a1ccc5995fb4584b00a603ef11e48fee970a6d9791ed1fa92e2344e56cd8c282c9a22779cb8e50e7ec6637e0efda1ccc36579a4 SHA512 e854ba9fd864101009528d94cb310be10495db225380c353b76cd61b082a88f1f89035a0708cd386d1738001cf9949b4a8b8b8d7b1d2675068e01fecb35738c7 +DIST gnome-shell-3.32.2.tar.xz 1454372 BLAKE2B 9da7e17d4e47e187fa2285c6cf942cc8dc955e388179d2ad1fe8036c2908e217fc47d8b1515fc3cf6973e2083de8c350b55912782b9adbcf1b6cc37c7a3a9ae2 SHA512 7d8b25aa75149f096033a8b44d7f6f8d17ddadfcd8f5bb1915652423fe9d9db14902e674508f16fe5c6e7cbe956cde8349ec779c24c46f32b0a346755876bc46 EBUILD gnome-shell-3.26.2-r4.ebuild 6619 BLAKE2B 7cc3d4d3c2d17e346ad23ec782d767807412f239a8967b37774b778e02598a933cb53ef44482877683109bb561369db5db461dc76acab9d3913b6296eee3ec3f SHA512 af24928be65b87b78b1442ef7f26551f7ed163388ea27edf35046e4e73ab454440af692d9c1bcb2a37e5366000d1988173225d68af3c19f0721255bdba2a2cfa EBUILD gnome-shell-3.30.2-r2.ebuild 6508 BLAKE2B 13e62512e73230a914f333b73cfb3be82f0672b49c1b72c8ff37ec9f82299c30bc84ad5c63722062a15e80412588b31f9090253986f14b7d909a365f11005196 SHA512 f7f4c841e65f5ebcb57774f2d2e511d6bbd16d15fd5562c3fa934ea9cba749330ebaf3c2dcdbab0347614e10c823ffe5416aab041eafcaf3cb2685c92bf71fe6 +EBUILD gnome-shell-3.32.2.ebuild 6360 BLAKE2B 59d9e8f6968430670ec4ca04b6abae0fb0b1f04347bafd9468a72bd660ae8e9b559b9353ddf7fb2e2f724c4a8ece557085c5397ad75d4d90d734ac0cca41d7f3 SHA512 1f7943aa2acb8b81c37732d94e39b73575e59e46d85528f169a918474122e18cb6b030bbd9a502e6170daff0da967f5ea56a364dcf11a20bb5ca9c872e269ed6 MISC metadata.xml 1050 BLAKE2B cf97e536a47f3b023e118a818bbc34af63500d2ea94bbc71201d2ce18aa6e473673cb28a47245de24b7bad9a174a6dda6b46c300518521c8ea0662e88e95627d SHA512 50c1d4c3eacb89b77bc49b4f236bba9d9041ef047392d5bda19e85b0c935709a095a388b1625a2c77c66145758e9b4ab77a202aa6cdd2b86f262c5b56e428b06 diff --git a/gnome-base/gnome-shell/files/3.32-optional-bluetooth.patch b/gnome-base/gnome-shell/files/3.32-optional-bluetooth.patch new file mode 100644 index 000000000000..c7637046c013 --- /dev/null +++ b/gnome-base/gnome-shell/files/3.32-optional-bluetooth.patch @@ -0,0 +1,59 @@ +From 77518c23dd1ce3d000d5667b4d903af095939f7c 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 21a80bcc8..c76afaa9c 100644 +--- a/meson.build ++++ b/meson.build +@@ -95,7 +95,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 853ca98dc..33f76379b 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -1,3 +1,9 @@ ++option('bluetooth', ++ type: 'boolean', ++ value: true, ++ description: 'Enable bluetooth support' ++) ++ + option('gtk_doc', + type: 'boolean', + value: false, +-- +2.20.1 + diff --git a/gnome-base/gnome-shell/gnome-shell-3.32.2.ebuild b/gnome-base/gnome-shell/gnome-shell-3.32.2.ebuild new file mode 100644 index 000000000000..52c198b7fd66 --- /dev/null +++ b/gnome-base/gnome-shell/gnome-shell-3.32.2.ebuild @@ -0,0 +1,186 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{5,6,7} ) + +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/${PF}-patchset.tar.xz" + +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 ~ppc ~ppc64 ~x86" + +# libXfixes-5.0 needed for pointer barriers and #include <X11/extensions/Xfixes.h> +# FIXME: +# * gstreamer support is currently automagic +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.57.2:2 + >=dev-libs/gobject-introspection-1.49.1:= + >=dev-libs/gjs-1.54.0 + >=x11-libs/gtk+-3.15.0:3[introspection] + >=x11-wm/mutter-3.32.0:0/4[introspection] + >=sys-auth/polkit-0.100[introspection] + >=gnome-base/gsettings-desktop-schemas-3.27.90 + >=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 + media-libs/gst-plugins-base:1.0 + networkmanager? ( + >=net-misc/networkmanager-1.10.4:=[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 + 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} + dev-python/pygobject:3[${PYTHON_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 + >=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=( + # Patches from gnome-3-32 branch on top of 3.32.2 + "${WORKDIR}"/patches/ + # Fix automagic gnome-bluetooth dep, bug #398145 + "${FILESDIR}"/3.32-optional-bluetooth.patch + # Change favorites defaults, bug #479918 + "${FILESDIR}"/3.28.3-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) + $(meson_use gtk-doc gtk_doc) + -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 +} |