From 8370906edf7bcbd9f38e25a12e05e863c5f177a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Mon, 2 Dec 2024 18:22:08 +0100 Subject: [PATCH] Update to 47.2 Resolves: https://issues.redhat.com/browse/RHEL-69588 --- .gitignore | 1 + ...lude-status-icons-in-classic-session.patch | 14 ++++----- ...0001-Add-gesture-inhibitor-extension.patch | 30 +++++++++++-------- ...sions-0002-Add-classification-banner.patch | 10 +++---- ...extensions-0003-Add-heads-up-display.patch | 8 ++--- ...sions-0004-Add-custom-menu-extension.patch | 10 +++---- gnome-shell-extensions.spec | 2 +- sources | 2 +- 8 files changed, 42 insertions(+), 35 deletions(-) diff --git a/.gitignore b/.gitignore index 1471fb2..772885f 100644 --- a/.gitignore +++ b/.gitignore @@ -181,3 +181,4 @@ /gnome-shell-extensions-47.rc.tar.xz /gnome-shell-extensions-47.0.tar.xz /gnome-shell-extensions-47.1.tar.xz +/gnome-shell-extensions-47.2.tar.xz diff --git a/0001-Include-status-icons-in-classic-session.patch b/0001-Include-status-icons-in-classic-session.patch index b803e90..f3a35cd 100644 --- a/0001-Include-status-icons-in-classic-session.patch +++ b/0001-Include-status-icons-in-classic-session.patch @@ -1,4 +1,4 @@ -From 09d8a56d61abd5aab39a54312f180ad431605a3f Mon Sep 17 00:00:00 2001 +From b373d600104d6a5c4984521d934c5d02af3a2b99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Fri, 23 Feb 2018 16:56:46 +0100 Subject: [PATCH] Include status-icons in classic session @@ -8,25 +8,25 @@ Subject: [PATCH] Include status-icons in classic session 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build -index 9ecd0923..e759012d 100644 +index d092830f..14143501 100644 --- a/meson.build +++ b/meson.build -@@ -34,6 +34,7 @@ classic_extensions = [ +@@ -35,6 +35,7 @@ classic_extensions = [ 'apps-menu', 'places-menu', 'launch-new-instance', + 'status-icons', - 'window-list' + 'window-list', ] -@@ -44,7 +45,6 @@ default_extensions += [ +@@ -45,7 +46,6 @@ default_extensions += [ 'heads-up-display', 'light-style', 'screenshot-window-sizer', - 'status-icons', 'system-monitor', 'windowsNavigator', - 'workspace-indicator' + 'workspace-indicator', -- -2.46.0 +2.47.1 diff --git a/extra-extensions-0001-Add-gesture-inhibitor-extension.patch b/extra-extensions-0001-Add-gesture-inhibitor-extension.patch index ff54b6c..1b31c76 100644 --- a/extra-extensions-0001-Add-gesture-inhibitor-extension.patch +++ b/extra-extensions-0001-Add-gesture-inhibitor-extension.patch @@ -1,4 +1,4 @@ -From cfa4c600830902bbf4027f1bbee7c6e394a84432 Mon Sep 17 00:00:00 2001 +From 3de025618170bde16ab5e0bd7928ce387aa75350 Mon Sep 17 00:00:00 2001 From: Carlos Garnacho Date: Thu, 28 Jan 2021 00:06:12 +0100 Subject: [PATCH 1/5] Add gesture-inhibitor extension @@ -9,8 +9,8 @@ This extension may disable default GNOME Shell gestures. extensions/gesture-inhibitor/meson.build | 8 ++ extensions/gesture-inhibitor/metadata.json.in | 12 +++ ...l.extensions.gesture-inhibitor.gschema.xml | 25 ++++++ - meson.build | 1 + - 5 files changed, 125 insertions(+) + meson.build | 7 +- + 5 files changed, 130 insertions(+), 1 deletion(-) create mode 100644 extensions/gesture-inhibitor/extension.js create mode 100644 extensions/gesture-inhibitor/meson.build create mode 100644 extensions/gesture-inhibitor/metadata.json.in @@ -165,17 +165,23 @@ index 00000000..b06d027a + + diff --git a/meson.build b/meson.build -index 0d458a00..49d36c46 100644 +index 873da7bd..f21d0410 100644 --- a/meson.build +++ b/meson.build -@@ -51,6 +51,7 @@ default_extensions += [ - all_extensions = default_extensions - all_extensions += [ - 'auto-move-windows', -+ 'gesture-inhibitor', - 'native-window-placement', - 'user-theme' +@@ -50,7 +50,12 @@ default_extensions += [ ] + + all_extensions = default_extensions +-all_extensions += ['auto-move-windows', 'native-window-placement', 'user-theme'] ++all_extensions += [ ++ 'auto-move-windows', ++ 'gesture-inhibitor', ++ 'native-window-placement', ++ 'user-theme', ++] + + enabled_extensions = get_option('enable_extensions') + -- -2.46.0 +2.47.1 diff --git a/extra-extensions-0002-Add-classification-banner.patch b/extra-extensions-0002-Add-classification-banner.patch index 90c66f6..e6b4b5f 100644 --- a/extra-extensions-0002-Add-classification-banner.patch +++ b/extra-extensions-0002-Add-classification-banner.patch @@ -1,4 +1,4 @@ -From 83dbd799013fc52ba79ec449286434a78c04c1f8 Mon Sep 17 00:00:00 2001 +From a30e0f7d6e93eb84f0864574b0da9816c0bbec83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Thu, 2 Dec 2021 19:39:50 +0100 Subject: [PATCH 2/5] Add classification-banner @@ -463,17 +463,17 @@ index 00000000..fb6a697e +.classification-message { font-weight: bold; } +.classification-banner { font-size: 0.9em; } diff --git a/meson.build b/meson.build -index 49d36c46..2e49d72f 100644 +index f21d0410..0f12b451 100644 --- a/meson.build +++ b/meson.build -@@ -51,6 +51,7 @@ default_extensions += [ +@@ -52,6 +52,7 @@ default_extensions += [ all_extensions = default_extensions all_extensions += [ 'auto-move-windows', + 'classification-banner', 'gesture-inhibitor', 'native-window-placement', - 'user-theme' + 'user-theme', -- -2.46.0 +2.47.1 diff --git a/extra-extensions-0003-Add-heads-up-display.patch b/extra-extensions-0003-Add-heads-up-display.patch index fd8ef57..9995ee0 100644 --- a/extra-extensions-0003-Add-heads-up-display.patch +++ b/extra-extensions-0003-Add-heads-up-display.patch @@ -1,4 +1,4 @@ -From c2864f8358f3c5c317f5f5e209c9a099fbbf9b23 Mon Sep 17 00:00:00 2001 +From 7b2627e3110daa4cb98a67a94f7ffa7361569003 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Tue, 24 Aug 2021 15:03:57 -0400 Subject: [PATCH 3/5] Add heads-up-display @@ -850,10 +850,10 @@ index 00000000..a1a34e3f + text-align: center; +} diff --git a/meson.build b/meson.build -index 2e49d72f..ab30c7a3 100644 +index 0f12b451..da36032b 100644 --- a/meson.build +++ b/meson.build -@@ -40,6 +40,7 @@ classic_extensions = [ +@@ -41,6 +41,7 @@ classic_extensions = [ default_extensions = classic_extensions default_extensions += [ 'drive-menu', @@ -874,5 +874,5 @@ index 447465a1..b7cb8a7c 100644 extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml extensions/places-menu/extension.js -- -2.46.0 +2.47.1 diff --git a/extra-extensions-0004-Add-custom-menu-extension.patch b/extra-extensions-0004-Add-custom-menu-extension.patch index 11aff1b..d05215b 100644 --- a/extra-extensions-0004-Add-custom-menu-extension.patch +++ b/extra-extensions-0004-Add-custom-menu-extension.patch @@ -1,4 +1,4 @@ -From f8d1ecf33fa58de64023f7431cd4d3e66e1abfe8 Mon Sep 17 00:00:00 2001 +From 9eb73513d7d31fd193e15c53f79c7e3a6aee71da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Thu, 12 Jan 2023 19:43:52 +0100 Subject: [PATCH 4/5] Add custom-menu extension @@ -703,17 +703,17 @@ index 00000000..054f639b +"url": "@url@" +} diff --git a/meson.build b/meson.build -index ab30c7a3..c698dc14 100644 +index da36032b..175cc73f 100644 --- a/meson.build +++ b/meson.build -@@ -53,6 +53,7 @@ all_extensions = default_extensions +@@ -54,6 +54,7 @@ all_extensions = default_extensions all_extensions += [ 'auto-move-windows', 'classification-banner', + 'custom-menu', 'gesture-inhibitor', 'native-window-placement', - 'user-theme' + 'user-theme', -- -2.46.0 +2.47.1 diff --git a/gnome-shell-extensions.spec b/gnome-shell-extensions.spec index de77c41..4f6dedd 100644 --- a/gnome-shell-extensions.spec +++ b/gnome-shell-extensions.spec @@ -12,7 +12,7 @@ %endif Name: gnome-shell-extensions -Version: 47.1 +Version: 47.2 Release: %autorelease Summary: Modify and extend GNOME Shell functionality and behavior diff --git a/sources b/sources index 24b71f9..77f7447 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-shell-extensions-47.1.tar.xz) = f825d67000204117cc088f7ef74eab6ea7d49c6360ff124eeeb4d4c66028e74fddc04ff4fd19bc1f9c68bbd6e478be0b5527119c605722be1037e3e8e5ea844e +SHA512 (gnome-shell-extensions-47.2.tar.xz) = 5049bce8f7a90d32da9e1e3c7586a14cb23bf1b259e302002b89de48db547b51bcff3935a489db3c57b2c30e948f6897426c661043630c335c248e5883816d83