From e68d405c5d712af4387159df07e226217bdda049 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 6 Apr 2022 22:33:41 +0100 Subject: gentoo resync : 06.04.2022 --- gnome-base/gnome-shell/Manifest | 5 + ....5-environment-Require-GnomeBluetooth-1.0.patch | 35 ++++ ...1.5-environment-Require-gnome-desktop-3.0.patch | 30 +++ .../41.5-environment-Require-libgweather-3.0.patch | 29 +++ gnome-base/gnome-shell/gnome-shell-41.5.ebuild | 208 +++++++++++++++++++++ 5 files changed, 307 insertions(+) create mode 100644 gnome-base/gnome-shell/files/41.5-environment-Require-GnomeBluetooth-1.0.patch create mode 100644 gnome-base/gnome-shell/files/41.5-environment-Require-gnome-desktop-3.0.patch create mode 100644 gnome-base/gnome-shell/files/41.5-environment-Require-libgweather-3.0.patch create mode 100644 gnome-base/gnome-shell/gnome-shell-41.5.ebuild (limited to 'gnome-base/gnome-shell') diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest index 3713d27a872e..cc14c0f9cf06 100644 --- a/gnome-base/gnome-shell/Manifest +++ b/gnome-base/gnome-shell/Manifest @@ -1,9 +1,14 @@ 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 +AUX 41.5-environment-Require-GnomeBluetooth-1.0.patch 1286 BLAKE2B 926168a408e7adfa4f42ad470d0bb657248d90f857fe2650f0349b1355d09b5c962ec31288ad1128c8cc03a05d043208101543fc82c71fd4ddc803360101062f SHA512 cd7a4b39c8478e047841fcb44f4b0efca0187ed1b5a3de336c66c6c3e7c90d33ccdda1fc765f78d6c14f326f03b4abafe59ffa5228feac9e0823b9d6684bd197 +AUX 41.5-environment-Require-gnome-desktop-3.0.patch 1021 BLAKE2B fee68ab772f0dbcba318864c440a7b2c160ce3dc60244848d4307dfdb707d535cf57814cf8baaa4886139e91c87c14741f4de4f03f5eac17e1bf1d2f434cb2ad SHA512 9cd44be2a55b22392f49d0f0d32f930245c6882ccab169806cd3583d77aa5c34357a19fa6587c9ba1b584afd5e752cfe7c647319de8c29b07ac71e07bea0c1b7 +AUX 41.5-environment-Require-libgweather-3.0.patch 1045 BLAKE2B d66eed70ba417590eebe1921e00fba045fa80295f17b432deaee5b823bc5248b4bd35ef6423b5947b2c77a2409675f3ab4ea31cb13f728cd42615e602ac69e4d SHA512 bd86e120203801f9a1a091d7be7adefa94f86fea5af400cd9469a1077ee422470f1e486693518d39e7210f3226b9fdfd6ee34a0e5cdbdee63ceea9d054795c40 AUX 42.0-optional-bluetooth.patch 2032 BLAKE2B 635ba18f5bb5ca0c9f44fe11c2b52652355e1de4647c277524e3f19ef6d57870e75f32b8a2be10eb4e3be4ecf885765b8f0899ab71906f71324795763effa23a SHA512 5fb17c6ffd0486e43b5451747b346e5e9feb3f918f4ef23adc517c43bf61eb5b8850b03022e84848e446de1f0b2145a9dd2b954dde9994e9da176559cd6e48a8 DIST gnome-shell-41.4.tar.xz 1899464 BLAKE2B 202408be8886bb5eb5615328a774993bea8dfe2fb78d304fde2806096ca68eff3fae7d5bdb4972b627cf10192ff76e3d457dc37eaa806cd4ed57d1558c235a48 SHA512 6ed5f215fcf9a1cf450b406620568aeceb3d255e0bb979151ccd2260565748e69825d7f5f7fb0c6768ed584a530599a8dcbc713c1ec12617551ae9df782c5ad7 +DIST gnome-shell-41.5.tar.xz 1899888 BLAKE2B 73491f382413c313956fc6ab878a54d8a881190ee93cac5d334d169636d8dd21557c78719142f717c94463e02c7ca4eaf12a6e4ca6167e48a002ece9379b6d03 SHA512 b638103528413dcfa12d65d0c7add45716d21334294babbadd0a05e3410ca068ae336b28c30eb8811222b9f90e5efdf0d1a6e0a2e3f104b49061bb28333f066e DIST gnome-shell-42.0.tar.xz 1918044 BLAKE2B 742d13ad92795fb71bbe8376a86b8e9a828882288f105f026cf98304ef2e9eae8fb967fa978ec322f5c621303a1798d3490c001bbd63c704b0cddc5db688389d SHA512 39b56d3c09a238d9ca387145fdbddfaa929b124d4006f097b792de2dceb882e50cbce1255b0b4585aea04b522a92a4e7a743367f43a863f95bb6386401e73935 EBUILD gnome-shell-41.4-r1.ebuild 7395 BLAKE2B 3769ab65768b699cf7394ea80a22274279c3d410da4b3d05ceb7f1ce33d9aa41524a0bb4de2a5b11acf9b540cf11c5c9a23c236e4a2df6e41544a74577a37ab7 SHA512 4af8c66e12a16e05e82389a7a28a7e49ae34ed72e68b6ce373a8c223be207f2fdbc007ec9d8fe57b4a53e5612c41f062225fe47d6851cd5481e3d34051cec2da +EBUILD gnome-shell-41.5.ebuild 7610 BLAKE2B 52e2009ac7e4ad24ca062608bd131436d7533f7a228258d6a525521fbe23060fecddcc3823fe696f1f5252abfaad765113bc677894647da92dbfbbae273200bb SHA512 27a9f2200200fba82eb6ff9aabddce02533077aa1d5cb64e3977e49b5d07fa085a00810de0f68db59554589502f8537ff9d34ceab354215aacdd26e9f7442217 EBUILD gnome-shell-42.0.ebuild 7339 BLAKE2B 4601218900ac4c6704401ce87422fd66f1917c593434e1b43f89fa066bb3f94f75a312b6168d94dcd9de165c8ad3fa94dcf036893be72e142b4d820b3ced4a55 SHA512 d51e4861fcd4854b16ce50f4fd23eacc057b6a49d4f92eec2601f91868c57031484feced5c502a7060e66f0f65d8f6da888e5cee5ef8f12503ecbeed7d60c2e5 MISC metadata.xml 1051 BLAKE2B 86f9156deb6546719e6bcd09ad609b2837901743dd390f430521226df6b9e8f54387d2c93411d63d0099261ee0463428fb8854ce2c47463b999827b377807d84 SHA512 f6a3efe242c1726508a56506a7817c3beea3cb17fbe37d2d38403bc6f4f1d11fd366b68b5c9c6ce44f200a21d48da6ccfcf07c9758369481376b5882ea872129 diff --git a/gnome-base/gnome-shell/files/41.5-environment-Require-GnomeBluetooth-1.0.patch b/gnome-base/gnome-shell/files/41.5-environment-Require-GnomeBluetooth-1.0.patch new file mode 100644 index 000000000000..8729a6c3e671 --- /dev/null +++ b/gnome-base/gnome-shell/files/41.5-environment-Require-GnomeBluetooth-1.0.patch @@ -0,0 +1,35 @@ +From 9ce6756235ba272b8602d50d1f005dc2ef265889 Mon Sep 17 00:00:00 2001 +From: Georges Basile Stavracas Neto +Date: Sun, 31 Oct 2021 17:24:58 -0300 +Subject: [PATCH 1/2] environment: Require GnomeBluetooth 1.0 + +libgnome-bluetooth will start to offer a 2.0 library version +depending on GTK4. Given that GNOME Shell already depends on +GTK3, it cannot use this next version of gnome-bluetooth. And +since GJS will automatically try and use the latest version +available of any library, Shell must specify it wants 1.0 +explicitly. + +Add a required GnomeBluetooth version number when importing it +for the status indicator. + +Part-of: +--- + js/ui/environment.js | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/js/ui/environment.js b/js/ui/environment.js +index ef53e6022..e906fa6c6 100644 +--- a/js/ui/environment.js ++++ b/js/ui/environment.js +@@ -6,6 +6,7 @@ const Config = imports.misc.config; + imports.gi.versions.Clutter = Config.LIBMUTTER_API_VERSION; + imports.gi.versions.Gio = '2.0'; + imports.gi.versions.GdkPixbuf = '2.0'; ++imports.gi.versions.GnomeBluetooth = '1.0'; + imports.gi.versions.Gtk = '3.0'; + imports.gi.versions.Soup = '3.0'; + imports.gi.versions.TelepathyGLib = '0.12'; +-- +2.34.1 + diff --git a/gnome-base/gnome-shell/files/41.5-environment-Require-gnome-desktop-3.0.patch b/gnome-base/gnome-shell/files/41.5-environment-Require-gnome-desktop-3.0.patch new file mode 100644 index 000000000000..3dbb50bb989b --- /dev/null +++ b/gnome-base/gnome-shell/files/41.5-environment-Require-gnome-desktop-3.0.patch @@ -0,0 +1,30 @@ +From 795312b8d5634d3005679b3c1313114e41e538fd Mon Sep 17 00:00:00 2001 +From: Georges Basile Stavracas Neto +Date: Thu, 11 Nov 2021 16:20:39 -0300 +Subject: [PATCH 2/2] environment: Require gnome-desktop 3.0 + +Pretty much the exact same case of 9ce6756235. + +libgnome-desktop saw a major version bump, and we have to +stick with 3.0 for a while. + +Part-of: +--- + js/ui/environment.js | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/js/ui/environment.js b/js/ui/environment.js +index e906fa6c6..cb254e319 100644 +--- a/js/ui/environment.js ++++ b/js/ui/environment.js +@@ -7,6 +7,7 @@ imports.gi.versions.Clutter = Config.LIBMUTTER_API_VERSION; + imports.gi.versions.Gio = '2.0'; + imports.gi.versions.GdkPixbuf = '2.0'; + imports.gi.versions.GnomeBluetooth = '1.0'; ++imports.gi.versions.GnomeDesktop = '3.0'; + imports.gi.versions.Gtk = '3.0'; + imports.gi.versions.Soup = '3.0'; + imports.gi.versions.TelepathyGLib = '0.12'; +-- +2.34.1 + diff --git a/gnome-base/gnome-shell/files/41.5-environment-Require-libgweather-3.0.patch b/gnome-base/gnome-shell/files/41.5-environment-Require-libgweather-3.0.patch new file mode 100644 index 000000000000..dedd485a2627 --- /dev/null +++ b/gnome-base/gnome-shell/files/41.5-environment-Require-libgweather-3.0.patch @@ -0,0 +1,29 @@ +From f07a40d5eeb1daf6e2d118c548c8314c721d558c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Florian=20M=C3=BCllner?= +Date: Wed, 5 Jan 2022 02:42:49 +0100 +Subject: [PATCH] environment: Require libgweather 3.0 + +GWeather did a major version bump on its main branch, so it is +now possible that multiple versions are installed in parallel, +and we should explicitly pick the one we are using. + +Part-of: +--- + js/ui/environment.js | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/js/ui/environment.js b/js/ui/environment.js +index cb254e319..ad2b8e4f2 100644 +--- a/js/ui/environment.js ++++ b/js/ui/environment.js +@@ -9,6 +9,7 @@ imports.gi.versions.GdkPixbuf = '2.0'; + imports.gi.versions.GnomeBluetooth = '1.0'; + imports.gi.versions.GnomeDesktop = '3.0'; + imports.gi.versions.Gtk = '3.0'; ++imports.gi.versions.GWeather = '3.0'; + imports.gi.versions.Soup = '3.0'; + imports.gi.versions.TelepathyGLib = '0.12'; + imports.gi.versions.TelepathyLogger = '0.2'; +-- +2.34.1 + diff --git a/gnome-base/gnome-shell/gnome-shell-41.5.ebuild b/gnome-base/gnome-shell/gnome-shell-41.5.ebuild new file mode 100644 index 000000000000..06c3d23b7f72 --- /dev/null +++ b/gnome-base/gnome-shell/gnome-shell-41.5.ebuild @@ -0,0 +1,208 @@ +# 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 test" +REQUIRED_USE="${PYTHON_REQUIRED_USE} + ?? ( elogind systemd )" +RESTRICT="!test? ( test )" + +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" + +# libXfixes-5.0 needed for pointer barriers and #include +# 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.69.2 + >=x11-libs/gtk+-3.15.0:3[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 + >=app-i18n/ibus-1.5.19 + >=gnome-base/gnome-desktop-3.35.90:3=[introspection] + bluetooth? ( >=net-wireless/gnome-bluetooth-3.9:2=[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 greedy 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 + "${FILESDIR}"/41.3-fix-build-with-meson-0.61.1.patch + + # From upstream + "${FILESDIR}"/${PV}-environment-Require-GnomeBluetooth-1.0.patch + "${FILESDIR}"/${PV}-environment-Require-gnome-desktop-3.0.patch + "${FILESDIR}"/${PV}-environment-Require-libgweather-3.0.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 test tests) + $(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 + -Dsoup2=true # libslot SLOT needs to match with what libgweather is using + ) + meson_src_configure +} + +src_test() { + gnome2_environment_reset # Avoid dconf that looks at XDG_DATA_DIRS, which can sandbox fail if flatpak is installed + 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 +} -- cgit v1.2.3