gentoo resync : 29.12.2022

6 files changed, 53 insertions, 237 deletions

diff --git a/gnome-base/gnome-shell/files/40.0-optional-bluetooth.patch b/gnome-base/gnome-shell/files/40.0-optional-bluetooth.patch
deleted file mode 100644
index dba20fe8c093..000000000000
--- a/gnome-base/gnome-shell/files/40.0-optional-bluetooth.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 1ef0033f8148466256b403c9d8c79b9fed1dd343 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Thu, 28 Feb 2019 00:50:19 +0200
-Subject: [PATCH 2/2] 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 2702c3dbc..7a6c831b9 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.set('datadir', datadir)
- jsconf.set('libexecdir', libexecdir)
-diff --git a/meson.build b/meson.build
-index 14b75c1c9..8b1c7a380 100644
---- a/meson.build
-+++ b/meson.build
-@@ -94,7 +94,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-1.0', version: bt_req, required: false)
-+if get_option('bluetooth')
-+  bt_dep = dependency('gnome-bluetooth-1.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 ef76b73c3..41cc0ff9d 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.26.2
-
diff --git a/gnome-base/gnome-shell/files/41.3-fix-build-with-meson-0.61.1.patch b/gnome-base/gnome-shell/files/41.3-fix-build-with-meson-0.61.1.patch
deleted file mode 100644
index ecf212b9794c..000000000000
--- a/gnome-base/gnome-shell/files/41.3-fix-build-with-meson-0.61.1.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-https://gitlab.gnome.org/GNOME/gnome-shell/-/commit/65450a836ee9e0722a2d4c3327f52345eae293c6
-https://bugs.gentoo.org/831921
-
-From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
-Date: Thu, 23 Dec 2021 17:18:16 +0100
-Subject: [PATCH] build: Drop incorrect positional arg
-
-Unlike other targets that take a name, i18n.merge_file() does not.
-
-Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2078>
----
- data/meson.build                                      | 2 +-
- src/calendar-server/meson.build                       | 2 +-
- subprojects/extensions-app/data/meson.build           | 2 +-
- subprojects/extensions-app/data/metainfo/meson.build  | 2 +-
- subprojects/extensions-tool/src/templates/meson.build | 2 +-
- 5 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/data/meson.build b/data/meson.build
-index f924fdf806..76ae45c93a 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -16,7 +16,7 @@ desktopconf.set('bindir', bindir)
- desktopconf.set('systemd_hidden', have_systemd ? 'true' : 'false')
- 
- foreach desktop_file : desktop_files
--  i18n.merge_file('desktop',
-+  i18n.merge_file(
-     input: configure_file(
-       input: desktop_file + '.in.in',
-       output: desktop_file + '.in',
-diff --git a/src/calendar-server/meson.build b/src/calendar-server/meson.build
-index 7363282a59..8b4ef411c8 100644
---- a/src/calendar-server/meson.build
-+++ b/src/calendar-server/meson.build
-@@ -27,7 +27,7 @@ configure_file(
-   install_dir: servicedir
- )
- 
--i18n.merge_file('evolution-calendar.desktop',
-+i18n.merge_file(
-   input: 'evolution-calendar.desktop.in',
-   output: 'evolution-calendar.desktop',
-   po_dir: po_dir,
-diff --git a/subprojects/extensions-app/data/meson.build b/subprojects/extensions-app/data/meson.build
-index d7e7d4001c..4b601e8bd1 100644
---- a/subprojects/extensions-app/data/meson.build
-+++ b/subprojects/extensions-app/data/meson.build
-@@ -14,7 +14,7 @@ desktopconf.set('bindir', bindir)
- desktopconf.set('app_id', app_id)
- desktopconf.set('prgname', prgname)
- 
--i18n.merge_file('desktop',
-+i18n.merge_file(
-   input: configure_file(
-     input: base_id + '.desktop.in.in',
-     output: desktop_file + '.in',
-diff --git a/subprojects/extensions-app/data/metainfo/meson.build b/subprojects/extensions-app/data/metainfo/meson.build
-index c4962c0576..a19bfa80a4 100644
---- a/subprojects/extensions-app/data/metainfo/meson.build
-+++ b/subprojects/extensions-app/data/metainfo/meson.build
-@@ -1,5 +1,5 @@
- metainfo = app_id + '.metainfo.xml'
--i18n.merge_file(metainfo,
-+i18n.merge_file(
-   input: base_id + '.metainfo.xml.in',
-   output: metainfo,
-   po_dir: po_dir,
-diff --git a/subprojects/extensions-tool/src/templates/meson.build b/subprojects/extensions-tool/src/templates/meson.build
-index 670e2bf448..d693bfaddb 100644
---- a/subprojects/extensions-tool/src/templates/meson.build
-+++ b/subprojects/extensions-tool/src/templates/meson.build
-@@ -4,7 +4,7 @@ template_metas = [
- ]
- template_deps = []
- foreach template : template_metas
--  template_deps += i18n.merge_file(template,
-+  template_deps += i18n.merge_file(
-     input: template + '.in',
-     output: template,
-     po_dir: po_dir,
--- 
-GitLab
-
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
deleted file mode 100644
index 8729a6c3e671..000000000000
--- a/gnome-base/gnome-shell/files/41.5-environment-Require-GnomeBluetooth-1.0.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 9ce6756235ba272b8602d50d1f005dc2ef265889 Mon Sep 17 00:00:00 2001
-From: Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
-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: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2015>
----
- 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
deleted file mode 100644
index 3dbb50bb989b..000000000000
--- a/gnome-base/gnome-shell/files/41.5-environment-Require-gnome-desktop-3.0.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 795312b8d5634d3005679b3c1313114e41e538fd Mon Sep 17 00:00:00 2001
-From: Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
-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: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2030>
----
- 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
deleted file mode 100644
index dedd485a2627..000000000000
--- a/gnome-base/gnome-shell/files/41.5-environment-Require-libgweather-3.0.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From f07a40d5eeb1daf6e2d118c548c8314c721d558c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
-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: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2083>
----
- 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/files/42.1-polkit-g_autoptr.patch b/gnome-base/gnome-shell/files/42.1-polkit-g_autoptr.patch
new file mode 100644
index 000000000000..78d3de086260
--- /dev/null
+++ b/gnome-base/gnome-shell/files/42.1-polkit-g_autoptr.patch
@@ -0,0 +1,53 @@
+https://gitlab.gnome.org/GNOME/gnome-shell/-/commit/1d0a08b5e25fea7b0e792ec9798e68a7c5606a75
+https://bugs.gentoo.org/844919
+
+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>
+--- 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
+--- 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 = [
+--- 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