diff options
Diffstat (limited to 'gnome-base/gnome-shell')
| -rw-r--r-- | gnome-base/gnome-shell/Manifest | 6 | ||||
| -rw-r--r-- | gnome-base/gnome-shell/files/3.28.3-fix-gtk-doc-meson.patch | 59 | ||||
| -rw-r--r-- | gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild | 193 | ||||
| -rw-r--r-- | gnome-base/gnome-shell/gnome-shell-3.30.2.ebuild | 2 |
4 files changed, 2 insertions, 258 deletions
diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest index fdb65e7b1b81..5e1be3c6bdf7 100644 --- a/gnome-base/gnome-shell/Manifest +++ b/gnome-base/gnome-shell/Manifest @@ -1,6 +1,5 @@ AUX 3.26-optional-bluetooth.patch 2406 BLAKE2B b747c9d5cdbefbec8c045e24502bcb57b45b14151264cbad31e9ce96ff8320ed140c327e10fb72878da8638af93f63871d523176b18979756937ff5219eb52c6 SHA512 d1f4ce36c705be4669b336f736172f29b4b8f373b146fff4a27bb84cfdde3ec989253b92cb0eaa881e98d7f3267db4954ea9413b75c01c65bcc6e54ce32c14c7 AUX 3.28.3-defaults.patch 1385 BLAKE2B d7e0495aadec7fa042086b5219cc34906f9333a446484e63d90932551d09f469e66cc5da43040a2bf955ecdb3d2beca0e1dba435dd7c309bbc78a1b7aba7f43b SHA512 190a9a61b164373e1f2528b96eca0312a7884651ee44212f686e5752430197b2644b67550dc41ed10684cccd0e8a0d870cfdeddf8582d57de637f7dad11d0124 -AUX 3.28.3-fix-gtk-doc-meson.patch 1782 BLAKE2B 3e24c4ab1ea43a86ed97bd57bfaa8e232af3578e062695aaaff7e80e2a233e728fee3a10833dce3c23a4eeaeee24cc6fa407bec899d75c911391423c033e27e8 SHA512 d7999f1e1d2c8b6ce781a9e4bf7184d9ca5a40ea15bc3418fcbcd0d004a8c187bd2948eb6d80c47a16d1d4c235f423c09c31fa5fc5e13958ab32512d5a7b59ab AUX 3.28.3-optional-bluetooth.patch 1941 BLAKE2B 1985b337fc0e51cbc836814802530f0de4c418e8f47beef6e718fd6a5febb6a8ee877fb962688676235b40f8716431a3fd88e7cfd7b0a6b53928445376460bd6 SHA512 7e565ad411944c7eea542cd91f09583c892f6eb529900f9a07455298b8c1e318a4d726d3db250a36818ccf362c46ee788f5b2062fa0aebb7d7501ab5b597186f AUX gnome-shell-3.12-bluetooth-flag.patch 1894 BLAKE2B a53360d103faf25aa605cd5c73eeb892ce667f57313fbd90bdcf176151158b1389ba49becd4421d825e5d63d4dcb0a2e99618f3558de87f0afe2b46851a353f0 SHA512 dc18e16e2de667bef09d66acd68fbe0f4d8c0fd1725b352b0f9f4032e43481f2655b1812ffa6f8ae8441b215a372c27f5e1035b7eceeeb22ee18b1a256e79f80 AUX gnome-shell-3.22.0-defaults.patch 1228 BLAKE2B 9bb49d830c2bbc36123ca8fdddc02d4b750a5ffd174fa653ead26a75dc9478be4b5a39c31a004a3897655aae097c23f511d6bb494b0aede51fea74294be3fcf6 SHA512 f350324af68de8f7ae9dab609fdb81e272f9d545a125f3da85d9f06e4a0de09f857517d6c7a585ff1ea3b56f4d51b049cbeb62c39472d61d45026331104c5af5 @@ -8,12 +7,9 @@ AUX gnome-shell-3.22.0-gir-build-fix.patch 882 BLAKE2B 62a816accf06abd182d138132 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 DIST gnome-shell-3.30.2-patchset.tar.xz 39864 BLAKE2B 61c02e5ae87ab24f30d28865f4444f20e32fef63eefbfc1134bf0582eb25933700902aad08176fd2011781262552385bcb3ffaf35fc2d7a060c09ba0d27cb9a8 SHA512 8ad976c05488a6b7447d29105a566d0bb975c8e0798be18c1dc07295c51a27578274e611da4979397fc6c4da538f6d9f48072e043829a63faf87a781518ee531 DIST gnome-shell-3.30.2.tar.xz 1439556 BLAKE2B 547ccf5571ea431d15c6430619640bd497a381191cad56bbf1a5c9992c5df47eb48527cc2749ea4d417cbe5fd7cc2acb44915ee35d3d89cd386541f19d743877 SHA512 5cdf2b9a4dc9dbcc75d76020a01b953ae3922d5820b692d1bc1cf62daf1f00d04b95d6ec076920563f555115c4f4ad11a019e4523a353ef4dd2189a5240239c6 EBUILD gnome-shell-3.24.3.ebuild 6629 BLAKE2B 9442d16e86abde07688dfd2a4ac82c88063ed5a0f103b64dc0491a4dafd89cc5b5ef4cf4c25b233749afca00af191f5aa7055e3c255535c2c1eb1842c2bec166 SHA512 059cba2b4b010241c6715579904df48ad58426d2037466b3540165dd78674ef258cec2bc338881c72f4d18eb0f83c69801cc7a056dc03d46f14a9add15f4a24f EBUILD gnome-shell-3.26.2-r4.ebuild 6615 BLAKE2B 30ea1dc614bc95f373a596c190553bab87ab2e0a491fa7e34ddceb9e831a461e6047c89ef8ef0e82473b26cbc9699d088b9afdd0abdbeda5561e0a3bf4a0f460 SHA512 24c2e0fbe7e904f55a8a089ff6faf4a1b68c9a9fa31379da79a2491fd5eb1e1f8e8161c68b49856d47366b68bfc2de329025abf3d80aed6045e62d7cdff94d0d -EBUILD gnome-shell-3.28.3.ebuild 6715 BLAKE2B f521e2b681eb3e9d9827b0b9677135ccaa61c15e3884fc5903e545351a356747ce627acb20f89958090dd60c5257dced28f408a4a9ec672f66e33667465a7707 SHA512 53eef0b66407b2a7295e3813a2daebf17c34d35ef9db1ee5bc6422a47b3934b1090bc20f1b21e28bbe7cb5ae1205a4b9b5e2ba4cbe0b462e37f98294bcfd6d92 -EBUILD gnome-shell-3.30.2.ebuild 6571 BLAKE2B e1bfece5a9448323b79815a3375e9ee4ab16d04130f4598f00cdada8ff6fde44837c44e7a193b2ed57d24c76182f75a0d666d6923b36fb72d081b9abe8eb33ee SHA512 b298210f004ebc8e1feafcd7daa56ba0c794ad460e80d1e3322ece0305a88407fe689aa81617e0fc11b1b4d221caa63e1de1fdeced56874531455b2df47ec16a +EBUILD gnome-shell-3.30.2.ebuild 6571 BLAKE2B c518507942af74dfa56d68fc67c75797f925c36ca69bedc240640b5a91a6a26995743489aadff998386394b04fcf991a0163040c8c8501e7acc85270e2c5a3b6 SHA512 5921abd8cf4b2df53db64123339ac134c51db2d397e95a58216601038417ef7e90210baf77a9707cdc9c822464c2f35a5eae41a76426dcf74b3ec06a7a5bf6e5 MISC metadata.xml 1279 BLAKE2B 4c69dd1979038f6231f4877e5070b7b833377197e5030c97dff5d8d2e36d2dce1510254b97b4d7b9255a64c556d9795c515aea9b21091de3bde6b8499346df9b SHA512 caa5a580e349cfab441bac8f648866618b76528e5bcc0baa6cbe32853bb56786aa0b7cc309ab6515d6a298b5bcdf45ea0360a26c28e64543afb558479ff219c3 diff --git a/gnome-base/gnome-shell/files/3.28.3-fix-gtk-doc-meson.patch b/gnome-base/gnome-shell/files/3.28.3-fix-gtk-doc-meson.patch deleted file mode 100644 index 9948b163009e..000000000000 --- a/gnome-base/gnome-shell/files/3.28.3-fix-gtk-doc-meson.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 9f4aa6ebf2193bb19dd8012de7699fce35681078 Mon Sep 17 00:00:00 2001 -From: Pascal Nowack <Pascal.Nowack@gmx.de> -Date: Mon, 6 Aug 2018 14:21:02 +0200 -Subject: [PATCH] build: Fix build with meson >= 47.0 - -With meson >= 47.0, building gnome-shell will fail -when --rebuild-types is used as an option for gtk-doc, -so stop using that option and bump the meson requirement. - -https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/191 ---- - docs/reference/shell/meson.build | 3 +-- - docs/reference/st/meson.build | 3 +-- - meson.build | 2 +- - 3 files changed, 3 insertions(+), 5 deletions(-) - -diff --git a/docs/reference/shell/meson.build b/docs/reference/shell/meson.build -index 1469ed422..a32d6a58a 100644 ---- a/docs/reference/shell/meson.build -+++ b/docs/reference/shell/meson.build -@@ -50,8 +50,7 @@ gnome.gtkdoc('shell', - join_paths(meson.build_root(), 'src') - ], - scan_args: [ -- '--ignore-headers=' + ' '.join(private_headers + exclude_directories), -- '--rebuild-types' -+ '--ignore-headers=' + ' '.join(private_headers + exclude_directories) - ], - install: true - ) -diff --git a/docs/reference/st/meson.build b/docs/reference/st/meson.build -index fe89b53d4..3e9e9ab7c 100644 ---- a/docs/reference/st/meson.build -+++ b/docs/reference/st/meson.build -@@ -17,8 +17,7 @@ gnome.gtkdoc('st', - ], - scan_args: [ - '--ignore-headers=' + ' '.join(private_headers), -- '--rebuild-sections', -- '--rebuild-types' -+ '--rebuild-sections' - ], - install: true - ) -diff --git a/meson.build b/meson.build -index 03b9d52a8..e33a76183 100644 ---- a/meson.build -+++ b/meson.build -@@ -1,6 +1,6 @@ - project('gnome-shell', 'c', - version: '3.28.3', -- meson_version: '>= 0.42.0', -+ meson_version: '>= 0.47.0', - license: 'GPLv2+' - ) - --- -2.17.0 - diff --git a/gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild b/gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild deleted file mode 100644 index 9931a77b08bc..000000000000 --- a/gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild +++ /dev/null @@ -1,193 +0,0 @@ -# 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 gtk-doc +ibus +networkmanager nsplugin systemd telepathy" -REQUIRED_USE="${PYTHON_REQUIRED_USE} - ?? ( elogind systemd )" - -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~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 - <dev-libs/gjs-1.53 - >=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. 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="${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] ) - 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 ) -" -DEPEND="${COMMON_DEPEND} - 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 ) - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig -" - -PATCHES=( - # Patches from gnome-3-28 branch on top of 3.28.3 - "${WORKDIR}"/patches/ - # Change favorites defaults, bug #479918 - "${FILESDIR}"/${PV}-defaults.patch - # Fix automagic gnome-bluetooth dep, bug #398145 - "${FILESDIR}"/${PV}-optional-bluetooth.patch - # Fix gtk-doc build with >=meson-0.47 - "${FILESDIR}"/${PV}-fix-gtk-doc-meson.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) - -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 -} diff --git a/gnome-base/gnome-shell/gnome-shell-3.30.2.ebuild b/gnome-base/gnome-shell/gnome-shell-3.30.2.ebuild index 49ce9e97ba32..54d8d3fd4fc6 100644 --- a/gnome-base/gnome-shell/gnome-shell-3.30.2.ebuild +++ b/gnome-base/gnome-shell/gnome-shell-3.30.2.ebuild @@ -28,7 +28,7 @@ COMMON_DEPEND=" >=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.47.0 + >=dev-libs/gjs-1.54.0 >=x11-libs/gtk+-3.15.0:3[introspection] nsplugin? ( >=dev-libs/json-glib-0.13.2 ) >=x11-wm/mutter-3.30.1:0/3[introspection] |