From acf34cb86be38d3601273c231058d3fda627e618 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 4 Dec 2022 09:02:03 +0000 Subject: gentoo auto-resync : 04:12:2022 - 09:02:03 --- gnome-base/gnome-shell/Manifest | 5 - .../files/42.0-optional-bluetooth.patch | 59 ------ gnome-base/gnome-shell/gnome-shell-42.4-r4.ebuild | 210 --------------------- gnome-base/gnome-shell/gnome-shell-43.0.ebuild | 183 ------------------ 4 files changed, 457 deletions(-) delete mode 100644 gnome-base/gnome-shell/files/42.0-optional-bluetooth.patch delete mode 100644 gnome-base/gnome-shell/gnome-shell-42.4-r4.ebuild delete mode 100644 gnome-base/gnome-shell/gnome-shell-43.0.ebuild (limited to 'gnome-base/gnome-shell') diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest index e46320e65c8e..f367a5bd50e1 100644 --- a/gnome-base/gnome-shell/Manifest +++ b/gnome-base/gnome-shell/Manifest @@ -1,11 +1,6 @@ AUX 40.0-defaults.patch 1412 BLAKE2B e36f7215cf756586479b8bdc71339beb3bbde53ca9745ddc4ef1c3feb59c720e4920e8aa4aadd7912874c386e7495a4b5d554e0d0616db17a81c4ec52a2baa6b SHA512 d82cf1e329d5974755738e29e6366bb10452620021a5db6c2ec63c4ee38e87a65dada34d57026e9510dbffa78c7060ae6f2ccec1739e3026bb0c67dab95f94a9 -AUX 42.0-optional-bluetooth.patch 2032 BLAKE2B 635ba18f5bb5ca0c9f44fe11c2b52652355e1de4647c277524e3f19ef6d57870e75f32b8a2be10eb4e3be4ecf885765b8f0899ab71906f71324795763effa23a SHA512 5fb17c6ffd0486e43b5451747b346e5e9feb3f918f4ef23adc517c43bf61eb5b8850b03022e84848e446de1f0b2145a9dd2b954dde9994e9da176559cd6e48a8 -DIST gnome-shell-42.4.tar.xz 1928776 BLAKE2B cd986668683a8c57b69ca6b84351d6988d5dde5b96c780ea79109db3f3cd0d032883019dd07bf6e4ea678a549fe95ea99b29e9f9b6efc8d4231fcd4cd2fa3159 SHA512 f06f390cdb55b5b5871bbd35dfc3b0057fbc79d4dcb2334b34bfa198ec46a1880de99097e42ed9052b3183266dd017457f6a9a07fc3c517277551295478cb340 DIST gnome-shell-42.5.tar.xz 1930668 BLAKE2B 0442ef92588e9891082c024d1e3b4ddb105a01ef5b7913ac8f1d2cac1af1c2ae8efd18184c511c554e41d8c0540c8712b7ef39ba1a9cac8c6c9336bb7b4cb320 SHA512 575559b99161b7045b04fc100cde719bbca83d90f78b673acc2189f3bb5104fd14f40da7d19611b154976f1c006e0dc2ff8cc124dc816da765c933fdda0624d9 -DIST gnome-shell-43.0.tar.xz 1945812 BLAKE2B 1d0ef32324e66ca4ffcdf7d6470247f50cb80f86a4ba647d44b9bc956477f5d6899b54d63024f69bb1432b90d3cc46855424c2c463ff2bdfcd96d56f5cdc52f2 SHA512 6f3609c8bac923f052d51fce44a448dba997cac543331b56229f46b56e8770de9370deb7759d4bf0e7385794232715b9b34e41f90dd1da30e88d5cfbf3f095eb DIST gnome-shell-43.1.tar.xz 1947824 BLAKE2B d03bf5e970a92762724e5e1ab534e610f73b1c4af48b42fd676304f0d75808fcf5ba21ab9b9a0503cc2a806b826340d7d441da4b3ce51b881ffd4cb08132ae86 SHA512 1e41f0ce38b285aca1f9189fdb50e4d409232554da73e9c08e21b5888d35bad3e2bf4a47e93fdf20798ea6f63864223088b78cab7c63fc1105cd955701ea2e81 -EBUILD gnome-shell-42.4-r4.ebuild 7514 BLAKE2B c0a28ffb318797d8df272ea0cce0233da48fdd990f28b5be50c446910047bdb8454ff56861888d8a025b4633cd76fc524b88e38770f67e94ec119610c56b8f38 SHA512 7b122fbb501a2598a7c5db027e0d101e5c0357dc5ba4992ef310bbe324f4df0927bbc9c4ee3adc937c0024f90b05a99796402824b7fe1ea84d34fd717a819130 EBUILD gnome-shell-42.5-r2.ebuild 7512 BLAKE2B 38c7c58e13fb94ed45205192c6da4b6f98c0bd9bd7f0b3e05cf873904e3560b5018885fdfc84f0c799a92fcc5d2314c07f1797a4dce02b29e72883eee5ac40ef SHA512 a27b74b05f7a9540eecf73fce261fd0434c8d86a321a7d53db7b11c496892b7be55f671e2d2edfacec25c8638308bc74f264e45b589f6d52e04328560941704a -EBUILD gnome-shell-43.0.ebuild 6451 BLAKE2B 8b50ba4e49cfd516935db134bc54838d65698fb31bd99b205c35d6aabafbaac10b67eb4b7eb63ab949b39cc08bc06860d63c90a7dc8237e22e162ad0a684e21f SHA512 49102bf162ed5285ccac2718d40f84bd53788d9343ab73b941cc78c336e53a7c39ab0052c34a61b45ee9bf1a030580e3bba432b22cd455e9e127c3868f75a213 EBUILD gnome-shell-43.1.ebuild 6433 BLAKE2B 621e39f822dfa659dbedaebcdf8eb3985565b3648646522458227f7ad455068bae108c016133236f04ce4c496c4cf725009a893e9b5f6e6aaafdf95fdbd92b27 SHA512 41ffd85589ecbb2e59a7364631eabfc51c435004916db3418c218371a974790b68aa6d679866b5ae63130d7336a6b2b13e4582ef1216b6291ea7a4d16c7e6194 MISC metadata.xml 1187 BLAKE2B 112179de090fbd712f5af966853e0837f7b0cdd78e377fce9c8d3c6078e17ac98acfaabf93dfc738a45fb78a94f82903f5d8609bdd7f3769877e6ac24a5424a1 SHA512 f679fd454c50795c347235ebab1ce8b2e070c4afd797ce574226dee7aae25991a00e2c98000b11178f8aa943af1be8652b585937f8cab41ef349b6ee7b897d05 diff --git a/gnome-base/gnome-shell/files/42.0-optional-bluetooth.patch b/gnome-base/gnome-shell/files/42.0-optional-bluetooth.patch deleted file mode 100644 index c7fe07dd69de..000000000000 --- a/gnome-base/gnome-shell/files/42.0-optional-bluetooth.patch +++ /dev/null @@ -1,59 +0,0 @@ -From d7cfd7bff4f9fa9d8528f72d4275e07551c6b288 Mon Sep 17 00:00:00 2001 -From: Mart Raudsepp -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 582562711..ec9c62645 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.set10('HAVE_SOUP2', have_soup2) - jsconf.set('datadir', datadir) -diff --git a/meson.build b/meson.build -index 8d7478f9b..79d340840 100644 ---- a/meson.build -+++ b/meson.build -@@ -93,7 +93,12 @@ x11_dep = dependency('x11') - schemas_dep = dependency('gsettings-desktop-schemas', version: schemas_req) - gnome_desktop_dep = dependency('gnome-desktop-3.0', version: gnome_desktop_req) - --bt_dep = dependency('gnome-bluetooth-3.0', version: bt_req, required: false) -+if get_option('bluetooth') -+ bt_dep = dependency('gnome-bluetooth-3.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) - pipewire_dep = dependency('libpipewire-0.3', required: false) -diff --git a/meson_options.txt b/meson_options.txt -index f0f2ecf6c..85fc58ea4 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -1,3 +1,9 @@ -+option('bluetooth', -+ type: 'boolean', -+ value: true, -+ description: 'Enable bluetooth support' -+) -+ - option('extensions_tool', - type: 'boolean', - value: true, --- -2.34.1 - diff --git a/gnome-base/gnome-shell/gnome-shell-42.4-r4.ebuild b/gnome-base/gnome-shell/gnome-shell-42.4-r4.ebuild deleted file mode 100644 index 69c46d9d3274..000000000000 --- a/gnome-base/gnome-shell/gnome-shell-42.4-r4.ebuild +++ /dev/null @@ -1,210 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_{8..11} ) - -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 https://gitlab.gnome.org/GNOME/gnome-shell" - -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:0=[introspection] - >=dev-libs/glib-2.68:2 - >=dev-libs/gobject-introspection-1.49.1:= - >=dev-libs/gjs-1.71.1[cairo] - >=x11-libs/gtk+-3.15.0:3[introspection] - >=x11-wm/mutter-42.0:0/10[introspection,test?] - >=sys-auth/polkit-0.120_p20220509[introspection] - >=gnome-base/gsettings-desktop-schemas-42_beta[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=[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:2 - x11-libs/gdk-pixbuf:2[introspection] - dev-libs/libxml2:2 - x11-libs/libX11 - - >=media-libs/libpulse-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-gnome for various integration, e.g. #764632 -# 11. TODO: semi-optional webkit-gtk[introspection] for captive portal helper -# -DEPEND=" - >=gnome-extra/evolution-data-server-3.33.1:= - >=app-crypt/gcr-3.90.0:4=[introspection] - >=dev-libs/glib-2.68:2 - >=dev-libs/gobject-introspection-1.49.1:= - >=dev-libs/gjs-1.73.1[cairo] - >=x11-libs/gtk+-3.15.0:3[introspection] - >=x11-wm/mutter-43.0:0/11[introspection,test?] - >=sys-auth/polkit-0.120_p20220509[introspection] - >=gnome-base/gsettings-desktop-schemas-42_beta[introspection] - >=x11-libs/startup-notification-0.11 - >=app-i18n/ibus-1.5.19 - >=gnome-base/gnome-desktop-3.35.90:3=[introspection] - 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:2 - x11-libs/gdk-pixbuf:2[introspection] - dev-libs/libxml2:2 - x11-libs/libX11 - - >=media-libs/libpulse-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. 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) -# 9. xdg-desktop-portal-gtk for various integration, e.g. #764632 -# 10. 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] - x11-libs/pango[introspection] - net-libs/libsoup:3.0[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.5.26[gtk3,gtk4,introspection] ) - media-fonts/cantarell - - sys-apps/xdg-desktop-portal-gnome -" -# avoid circular dependency, see bug #546134 -PDEPEND=" - >=gnome-base/gdm-3.5[introspection(+)] - >=gnome-base/gnome-control-center-3.26[networkmanager(+)?] -" -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 - test? ( x11-wm/mutter[test] ) -" -# These are not needed from tarballs, unless stylesheets or manpage get patched with patchset: -# dev-lang/sassc -# app-text/asciidoc - -PATCHES=( - # Change favorites defaults, bug #479918 - "${FILESDIR}"/40.0-defaults.patch -) - -src_prepare() { - default - xdg_environment_reset - # Hack in correct python shebang - sed -e "s:python\.full_path():'/usr/bin/env ${EPYTHON}':" -i src/meson.build || die -} - -src_configure() { - local emesonargs=( - -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=false - ) - 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/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 - - optfeature "Bluetooth integration" gnome-base/gnome-control-center[bluetooth] net-wireless/gnome-bluetooth:3[introspection] - optfeature "Browser extension integration" gnome-extra/gnome-browser-connector - optfeature "Screencast/capture support" media-video/pipewire media-libs/gstreamer[introspection] media-libs/gst-plugins-base[introspection] media-libs/gst-plugins-good media-plugins/gst-plugins-vpx - optfeature "Weather support" dev-libs/libgweather:4[introspection] -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} -- cgit v1.2.3