Skip to content
Snippets Groups Projects
Verified Commit e66a544d authored by Spotlight Deveaux's avatar Spotlight Deveaux :fox:
Browse files

gnome-base/gnome-shell: apply upstream polkit patches

parent 4bf2d871
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 387 additions and 0 deletions
gnome-base/gnome-shell/Manifest 0 → 100644
+ 6
− 0
View file @ e66a544d
AUX 40.0-defaults.patch 1412 BLAKE2B e36f7215cf756586479b8bdc71339beb3bbde53ca9745ddc4ef1c3feb59c720e4920e8aa4aadd7912874c386e7495a4b5d554e0d0616db17a81c4ec52a2baa6b SHA512 d82cf1e329d5974755738e29e6366bb10452620021a5db6c2ec63c4ee38e87a65dada34d57026e9510dbffa78c7060ae6f2ccec1739e3026bb0c67dab95f94a9
AUX 42.0-optional-bluetooth.patch 2032 BLAKE2B 635ba18f5bb5ca0c9f44fe11c2b52652355e1de4647c277524e3f19ef6d57870e75f32b8a2be10eb4e3be4ecf885765b8f0899ab71906f71324795763effa23a SHA512 5fb17c6ffd0486e43b5451747b346e5e9feb3f918f4ef23adc517c43bf61eb5b8850b03022e84848e446de1f0b2145a9dd2b954dde9994e9da176559cd6e48a8
AUX gnome-shell-mr-2296.patch 2188 BLAKE2B 080177eac7fce1544aea33e3ff7c6a93189ff0e1f05814cae709a0c107538fe16d3fcaf6259e798b97a6838ce49ee3ae79b70d9c1c5a9a630699043f6625b29a SHA512 456cdaeb9e468cb5883dbf9dd98934c2fac8ccc507cb96c9a85da7906534fc61bd904dc475307eaa2cd03dbd7898b76dc80358cbdb2627cd73a988c10098f92e
DIST gnome-shell-42.1.tar.xz 1928924 BLAKE2B c8a1aed79a93d713a52ef0161ff9f06c39f7fb9a762086c78505d220e1e8ec43d7a0e376421f912dc91b33da8fd9394c6a233bb2d9d8b361d63ea2ad0406cee6 SHA512 3d27fdbcf5359f631a71b0fa6495fa50e2b43bb2b3c5c0efd740d9a6a88128ae54fe0ba11ea88990ba10ee2fc9f55211d0a21e60beca250bd197535d944d07ed
EBUILD gnome-shell-42.1.ebuild 7462 BLAKE2B 59a9bdb3a35ab98bb417998bacba9fd435b1e08f825840ebc3920738b7cf41c3350bccc881469fcee729df2df37e6e4b801b8d099e278a6b7841671419a6b9c4 SHA512 6efa2b039fd0671234b0bc28d6561e1c93383854d1ff8e224197837ce4ff368b1b9b8af699664032ed9f864cc8a812ddf72dd156e529173159ff47e179bc5c48
MISC metadata.xml 1051 BLAKE2B 86f9156deb6546719e6bcd09ad609b2837901743dd390f430521226df6b9e8f54387d2c93411d63d0099261ee0463428fb8854ce2c47463b999827b377807d84 SHA512 f6a3efe242c1726508a56506a7817c3beea3cb17fbe37d2d38403bc6f4f1d11fd366b68b5c9c6ce44f200a21d48da6ccfcf07c9758369481376b5882ea872129
gnome-base/gnome-shell/files/40.0-defaults.patch 0 → 100644
+ 28
− 0
View file @ e66a544d
From 1179f970e4b165ac6daf22d0e3b61df4879f3438 Mon Sep 17 00:00:00 2001
From: Gilles Dartiguelongue <eva@gentoo.org>
Date: Tue, 10 Dec 2013 23:33:51 +0100
Subject: [PATCH 1/2] Alter list of default applications
Signed-off-by: Gilles Dartiguelongue <eva@gentoo.org>
[Updated to include desktop file renames to reverse DNS and 3.36 changes]
Signed-off-by: Mart Raudsepp <leio@gentoo.org>
---
data/org.gnome.shell.gschema.xml.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/data/org.gnome.shell.gschema.xml.in b/data/org.gnome.shell.gschema.xml.in
index cd6a2356d..6200df11c 100644
--- a/data/org.gnome.shell.gschema.xml.in
+++ b/data/org.gnome.shell.gschema.xml.in
@@ -50,7 +50,7 @@
</description>
</key>
<key name="favorite-apps" type="as">
- <default>[ 'org.gnome.Epiphany.desktop', 'org.gnome.Calendar.desktop', 'org.gnome.Music.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop' ]</default>
+ <default>[ 'chromium-browser-chromium.desktop', 'firefox.desktop', 'firefox-bin.desktop', 'org.gnome.Evolution.desktop', 'org.gnome.Calendar.desktop', 'org.gnome.Music.desktop', 'org.gnome.Photos.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop' ]</default>
<summary>List of desktop file IDs for favorite applications</summary>
<description>
The applications corresponding to these identifiers
--
2.26.2
gnome-base/gnome-shell/files/42.0-optional-bluetooth.patch 0 → 100644
+ 59
− 0
View file @ e66a544d
From d7cfd7bff4f9fa9d8528f72d4275e07551c6b288 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 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
gnome-base/gnome-shell/files/gnome-shell-mr-2296.patch 0 → 100644
+ 65
− 0
View file @ e66a544d
From 1d0a08b5e25fea7b0e792ec9798e68a7c5606a75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Tue, 17 May 2022 15:36:43 +0200
Subject: [PATCH] build: Do not redefine polkit autocleanup
PolkitAgent recently added autocleanup functions itself, so check
for their existence at configure time and only define our own when
they don't exist upstream.
https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/5490
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2296>
---
config.h.meson | 3 +++
meson.build | 7 +++++++
src/shell-polkit-authentication-agent.h | 2 ++
3 files changed, 12 insertions(+)
diff --git a/config.h.meson b/config.h.meson
index b93fda8727..ff355d3062 100644
--- a/config.h.meson
+++ b/config.h.meson
@@ -33,3 +33,6 @@
/* Define if fdwalk is available in libc */
#mesondefine HAVE_FDWALK
+
+/* Define if polkit defines autocleanup functions */
+#mesondefine HAVE_POLKIT_AUTOCLEANUP
diff --git a/meson.build b/meson.build
index 42ec01c566..778a34c6ef 100644
--- a/meson.build
+++ b/meson.build
@@ -169,6 +169,13 @@ cdata.set('HAVE_FDWALK',
cc.has_function('fdwalk')
)
+polkit_has_autocleanup = cc.compiles(
+ '#define POLKIT_AGENT_I_KNOW_API_IS_SUBJECT_TO_CHANGE
+ #include <polkitagent/polkitagent.h>
+ void main(void) { g_autoptr(PolkitAgentListener) agent = NULL; }',
+ dependencies: polkit_dep)
+cdata.set('HAVE_POLKIT_AUTOCLEANUP', polkit_has_autocleanup)
+
buildtype = get_option('buildtype')
if buildtype != 'plain'
all_warnings = [
diff --git a/src/shell-polkit-authentication-agent.h b/src/shell-polkit-authentication-agent.h
index 55b46af110..4f14749563 100644
--- a/src/shell-polkit-authentication-agent.h
+++ b/src/shell-polkit-authentication-agent.h
@@ -14,8 +14,10 @@
G_BEGIN_DECLS
+#ifndef HAVE_POLKIT_AUTOCLEANUP
/* Polkit doesn't have g_autoptr support, thus we have to manually set the autoptr function here */
G_DEFINE_AUTOPTR_CLEANUP_FUNC (PolkitAgentListener, g_object_unref)
+#endif
#define SHELL_TYPE_POLKIT_AUTHENTICATION_AGENT (shell_polkit_authentication_agent_get_type())
--
GitLab
gnome-base/gnome-shell/gnome-shell-42.1.ebuild 0 → 100644
+ 205
− 0
View file @ e66a544d
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
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 <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.71.1
>=x11-libs/gtk+-3.15.0:3[introspection]
>=x11-wm/mutter-42.0:0/10[introspection,test?]
>=sys-auth/polkit-0.100[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
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-4.0.0:4[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.5.26[gtk3,gtk4,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}"/42.0-optional-bluetooth.patch
# Change favorites defaults, bug #479918
"${FILESDIR}"/40.0-defaults.patch
# https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2296
"${FILESDIR}"/gnome-shell-mr-2296.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=(
$(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
}
gnome-base/gnome-shell/metadata.xml 0 → 100644
+ 24
− 0
View file @ e66a544d
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>gnome@gentoo.org</email>
<name>Gentoo GNOME Desktop</name>
</maintainer>
<longdescription>
GNOME Shell provides core user interface functions for the GNOME 3
desktop, like switching to windows and launching applications.
GNOME Shell takes advantage of the capabilities of modern graphics
hardware and introduces innovative user interface concepts to
provide a visually attractive and easy to use experience.
</longdescription>
<use>
<flag name="browser-extension">Ensure the presence of extensions.gnome.org
native connector <pkg>gnome-extra/chrome-gnome-shell</pkg></flag>
<flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for session tracking
and suspend support.</flag>
<flag name="ibus">Enable support for enhanced input methods through
<pkg>app-i18n/ibus</pkg></flag>
<flag name="telepathy">Ensure presence of telepathy chat integration</flag>
</use>
</pkgmetadata>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment