gentoo resync : 06.04.2022

3 files changed, 94 insertions, 0 deletions

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 <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
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 <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
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?= <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
+