diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-03-20 00:40:44 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-03-20 00:40:44 +0000 |
commit | 4cbcc855382a06088e2f016f62cafdbcb7e40665 (patch) | |
tree | 356496503d52354aa6d9f2d36126302fed5f3a73 /gnome-base/gnome-shell | |
parent | fcc5224904648a8e6eb528d7603154160a20022f (diff) |
gentoo resync : 20.03.2022
Diffstat (limited to 'gnome-base/gnome-shell')
-rw-r--r-- | gnome-base/gnome-shell/Manifest | 6 | ||||
-rw-r--r-- | gnome-base/gnome-shell/gnome-shell-40.5-r1.ebuild | 198 | ||||
-rw-r--r-- | gnome-base/gnome-shell/gnome-shell-41.4.ebuild (renamed from gnome-base/gnome-shell/gnome-shell-41.3.ebuild) | 9 |
3 files changed, 7 insertions, 206 deletions
diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest index e78ab204003e..3e4aff219284 100644 --- a/gnome-base/gnome-shell/Manifest +++ b/gnome-base/gnome-shell/Manifest @@ -1,8 +1,6 @@ AUX 40.0-defaults.patch 1412 BLAKE2B e36f7215cf756586479b8bdc71339beb3bbde53ca9745ddc4ef1c3feb59c720e4920e8aa4aadd7912874c386e7495a4b5d554e0d0616db17a81c4ec52a2baa6b SHA512 d82cf1e329d5974755738e29e6366bb10452620021a5db6c2ec63c4ee38e87a65dada34d57026e9510dbffa78c7060ae6f2ccec1739e3026bb0c67dab95f94a9 AUX 40.0-optional-bluetooth.patch 2034 BLAKE2B 9df252dbef229d372bae87ab017d49086090a4194644fc0f7f3dc78226f78fa58cb99d67d4aac2b156894721658c6094aa6609c0da8c707cf0a8dac5a9a404ee SHA512 ec82f1ef7a9123134af2617526c22fa4258413edb6d68acdcd074911b98ed27d2e761904ccd88a364d9064d79bdefd402988bc53e1139f0e54f993c84242f19f AUX 41.3-fix-build-with-meson-0.61.1.patch 3166 BLAKE2B 85378cb7a5ccf02833c409c9c0735d6004d59aa7cb915902b1b518d41235f89b649b353ecefce6228ff42724d6a299c18b3397f7bd584509a06356784871ce48 SHA512 70af8bc42e7a15d68834eed58dd3cac0074e2aa0ccc55c028112b9e06aaf79ffd41a135e1366a1d8131f5acd3857d282cf2471845df7cb301b1de10503e47e1f -DIST gnome-shell-40.5.tar.xz 1871284 BLAKE2B 39c7392541af8a043627fb7aa19b723ee3b36e3d8001a64f34b14a6f23d68d3b160a0abe0f90659c55b99bf898cfdf30d88f62b8e113fc47814a55ef37c58725 SHA512 98bb0321aa9bc9da10ff6262cac802f575e2958600f429d446f3f87ec1ea40c837dd6e2fecae9dab0c2e224d2bf8b434a188ade84d4f480260102dcc80fdc5c9 -DIST gnome-shell-41.3.tar.xz 1897228 BLAKE2B 41cfc32488f7fcc3b0b565f8b63586ff0b2e7573e47d5e858e864ed7744b8cd535872312f4ccbb86fe7dea306f2c1460ce3a9ed93521f5d93bd124ce92634420 SHA512 3ef18f992c55ecb76e55f64306d43a15dc104b372db2faaaae2435d10edbc44bc0b8f9e27d173c0cac11b812c27648517543f210470c07d5dbc1f04ce4d811cc -EBUILD gnome-shell-40.5-r1.ebuild 7078 BLAKE2B 9bfeb5b555aad893675bb684bca8f74dc8a11e5c33d36224d6a4d06114c50906a7f19b9a73c0a659226d531b37c48f6699e0b43ed56a230297c3341d6748e98f SHA512 ec11388291ff13ae28dd92cacb4637560aff548e5153e56734b6c9a13d69c8f81e7ad26cc797c116a46e161e2311c429bb3412e9150b56c968a3d4fde7a06fe9 -EBUILD gnome-shell-41.3.ebuild 7358 BLAKE2B 1842c777a8816e384abc086b337c4e958d906df49bb8370ae5ee6dfb42591f63b7712d2ee5c8493d28ad1bbfc82cccaf6e0e79499b558a0a68407015bf087a41 SHA512 21681efb7eb649bb7813fe82c388df28ad25c7ca7b3080af12448ad7d76c2aabc23c6a315dc40c3ae0599e0cb167763cece3daf72111b532942cb6fc34c2713d +DIST gnome-shell-41.4.tar.xz 1899464 BLAKE2B 202408be8886bb5eb5615328a774993bea8dfe2fb78d304fde2806096ca68eff3fae7d5bdb4972b627cf10192ff76e3d457dc37eaa806cd4ed57d1558c235a48 SHA512 6ed5f215fcf9a1cf450b406620568aeceb3d255e0bb979151ccd2260565748e69825d7f5f7fb0c6768ed584a530599a8dcbc713c1ec12617551ae9df782c5ad7 +EBUILD gnome-shell-41.4.ebuild 7392 BLAKE2B 508fe29d8ea87a2edca732cef755467d6311bc28f14ee15eb5148d871b72e4621c2561c57ce6c3c94e46a40183bed406dbed529ea3481231352d6973a6a4fa2c SHA512 1993d9bf8edeb8d45eb466f5175bf7567805ec62998f2ec0922a7341f83b30dde31f170c16b8ef1e04d43a79ca1d75219bac954ad99b326face76aea23011959 MISC metadata.xml 1051 BLAKE2B 86f9156deb6546719e6bcd09ad609b2837901743dd390f430521226df6b9e8f54387d2c93411d63d0099261ee0463428fb8854ce2c47463b999827b377807d84 SHA512 f6a3efe242c1726508a56506a7817c3beea3cb17fbe37d2d38403bc6f4f1d11fd366b68b5c9c6ce44f200a21d48da6ccfcf07c9758369481376b5882ea872129 diff --git a/gnome-base/gnome-shell/gnome-shell-40.5-r1.ebuild b/gnome-base/gnome-shell/gnome-shell-40.5-r1.ebuild deleted file mode 100644 index 458374b65d6d..000000000000 --- a/gnome-base/gnome-shell/gnome-shell-40.5-r1.ebuild +++ /dev/null @@ -1,198 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{8..10} ) - -inherit gnome.org gnome2-utils meson python-single-r1 virtualx xdg - -DESCRIPTION="Provides core UI functions for the GNOME 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 ~ppc64 ~riscv x86" - -# libXfixes-5.0 needed for pointer barriers and #include <X11/extensions/Xfixes.h> -# FIXME: -# * gstreamer/pipewire support is currently automagic -DEPEND=" - >=gnome-extra/evolution-data-server-3.33.1:= - >=app-crypt/gcr-3.7.5[introspection] - >=dev-libs/glib-2.68:2 - >=dev-libs/gobject-introspection-1.49.1:= - >=dev-libs/gjs-1.65.1 - >=x11-libs/gtk+-3.15.0:3[introspection] - >=x11-wm/mutter-40.0:0/8[introspection] - >=sys-auth/polkit-0.100[introspection] - >=gnome-base/gsettings-desktop-schemas-3.33.1[introspection] - >=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 - >=media-video/pipewire-0.3.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-242 - >=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 - - gui-libs/gtk:4[introspection] - - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/pygobject:3[${PYTHON_USEDEP}] - ') - media-libs/mesa[X(+)] -" -# Runtime-only deps are probably incomplete and approximate. -# Introspection deps generated from inspection of the output of: -# for i in `rg -INUo 'const(?s).*imports.gi' |cut -d= -f1 |cut -c7- |sort -u`; do echo $i ;done |cut -d, -f1 |sort -u -# or -# rg -INUo 'const(?s).*imports.gi' |cut -d= -f1 |cut -c7- | sed -e 's:[{}]::g' | awk '{$1=$1; print}' | awk -F',' '{$1=$1;print}' | tr ' ' '\n' | sort -u | sed -e 's/://g' -# These will give a lot of unnecessary things due to greey matching (TODO), and `(?s).*?` doesn't seem to work as desired. -# Compare with `grep -rhI 'imports.gi.versions' |sort -u` for any SLOT requirements -# Each block: -# 1. Introspection stuff needed via imports.gi (those that build time check may be listed above already) -# 2. gnome-session needed for shutdown/reboot/inhibitors/etc -# 3. Control shell settings -# 4. xdg-utils needed for xdg-open, used by extension tool -# 5. adwaita-icon-theme needed for various icons & arrows (3.26 for new video-joined-displays-symbolic and co icons; review for 3.28+) -# 6. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c # TODO: Review -# 7. IBus is needed for nls integration -# 8. Optional telepathy chat integration -# 9. 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) -# 10. xdg-desktop-portal-gtk for various integration, e.g. #764632 -# 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] - media-libs/graphene[introspection] - >=dev-libs/libgweather-3.26:2[introspection] - x11-libs/pango[introspection] - net-libs/libsoup:2.4[introspection] - >=sys-power/upower-0.99:=[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 - - sys-apps/xdg-desktop-portal-gtk -" -# 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-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.5 ) - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig -" -# These are not needed from tarballs, unless stylesheets or manpage get patched with patchset: -# dev-lang/sassc -# app-text/asciidoc - -PATCHES=( - # Fix automagic gnome-bluetooth dep, bug #398145 - "${FILESDIR}"/40.0-optional-bluetooth.patch - # Change favorites defaults, bug #479918 - "${FILESDIR}"/40.0-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 -} diff --git a/gnome-base/gnome-shell/gnome-shell-41.3.ebuild b/gnome-base/gnome-shell/gnome-shell-41.4.ebuild index 25496f9f35dc..1d1c98f736d5 100644 --- a/gnome-base/gnome-shell/gnome-shell-41.3.ebuild +++ b/gnome-base/gnome-shell/gnome-shell-41.4.ebuild @@ -11,11 +11,12 @@ 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" +IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager systemd telepathy test" REQUIRED_USE="${PYTHON_REQUIRED_USE} ?? ( elogind systemd )" +RESTRICT="!test? ( test )" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" # libXfixes-5.0 needed for pointer barriers and #include <X11/extensions/Xfixes.h> # FIXME: @@ -27,7 +28,7 @@ DEPEND=" >=dev-libs/gobject-introspection-1.49.1:= >=dev-libs/gjs-1.69.2 >=x11-libs/gtk+-3.15.0:3[introspection] - >=x11-wm/mutter-41.0:0/9[introspection] + >=x11-wm/mutter-41.0:0/9[introspection,test?] >=sys-auth/polkit-0.100[introspection] >=gnome-base/gsettings-desktop-schemas-41_alpha[introspection] >=x11-libs/startup-notification-0.11 @@ -139,7 +140,7 @@ PATCHES=( "${FILESDIR}"/40.0-optional-bluetooth.patch # Change favorites defaults, bug #479918 "${FILESDIR}"/40.0-defaults.patch - "${FILESDIR}/${PV}"-fix-build-with-meson-0.61.1.patch + "${FILESDIR}"/41.3-fix-build-with-meson-0.61.1.patch ) src_prepare() { |