From f0317cd9248616eebbf8da52162ffa6fef9bd339 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Sun, 12 Jan 2025 13:32:39 +0100
Subject: [PATCH 1/2] util: Stop special-casing trySpawnCommandLine() parse
 errors

Unlike for plain JS Errors, the `message` property of GLib.Errors
is read-only, so the intent to replace it with a nicer message
triggers an Error itself.

We could create a new GLib.Error with the changed message instead,
but as it turns out, none of the parse errors contain the technical
prefix we want to strip out, so we can simply drop the special-casing
altogether.

This is also consistent with `spawnCommandLine()`, which never
had special treatment of parse errors.

Closes: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/8146
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3593>
(cherry picked from commit 67c5be9c5364cfe9ee2bd00b337582eb1527b939)
---
 js/misc/util.js | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/js/misc/util.js b/js/misc/util.js
index 0dbb97b2ec..517ff5784f 100644
--- a/js/misc/util.js
+++ b/js/misc/util.js
@@ -160,17 +160,7 @@ export function trySpawn(argv) {
  * fails, this will throw an error.
  */
 export function trySpawnCommandLine(commandLine) {
-    let success_, argv;
-
-    try {
-        [success_, argv] = GLib.shell_parse_argv(commandLine);
-    } catch (err) {
-        // Replace "Error invoking GLib.shell_parse_argv: " with
-        // something nicer
-        err.message = err.message.replace(/[^:]*: /, `${_('Could not parse command:')}\n`);
-        throw err;
-    }
-
+    const [, argv] = GLib.shell_parse_argv(commandLine);
     trySpawn(argv);
 }
 
-- 
GitLab


From 19ac7e2b08454dc4faf3130c2e9977065db70a26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Fri, 10 Jan 2025 19:14:04 +0100
Subject: [PATCH 2/2] Bump version to 47.3

Update NEWS.
---
 NEWS                                                | 13 +++++++++++++
 meson.build                                         |  2 +-
 .../metainfo/org.gnome.Extensions.metainfo.xml.in   |  1 +
 subprojects/extensions-app/meson.build              |  2 +-
 subprojects/extensions-tool/meson.build             |  2 +-
 subprojects/shew/meson.build                        |  2 +-
 6 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/NEWS b/NEWS
index 3ff43c5aeb..95cf41da4d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,16 @@
+47.3
+====
+* Fix Escape handling in run dialog [Florian; !3585]
+* Fix custom text-scaling-factor getting reset [Matthijs; !3574]
+* Tweak ibus candidate popover appearance [AuralRay; !3584]
+* Misc. bug fixes and cleanups [Florian, Bilal, Michel, Bartłomiej, Alberto,
+  AsciiWolf, Jakub; !3563, !3547, !3573, !3525, !3572, !3580, !3578, !3576,
+  !3579, !3589, !3587, !3593]
+
+Contributors:
+  AsciiWolf, AuralRay, Michel Dänzer, Bilal Elmoussaoui, Florian Müllner,
+  Bartłomiej Piotrowski, Alberto Ruiz, Jakub Steiner, Matthijs Velsink
+
 47.2
 ====
 * Fix graphical artifacts in partially-rounded buttons [Sebastian; #7996]
diff --git a/meson.build b/meson.build
index 69d5e2a92b..08c1006786 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('gnome-shell', 'c',
-  version: '47.2',
+  version: '47.3',
   meson_version: '>= 0.58.0',
   license: 'GPL-2.0-or-later',
 )
diff --git a/subprojects/extensions-app/data/metainfo/org.gnome.Extensions.metainfo.xml.in b/subprojects/extensions-app/data/metainfo/org.gnome.Extensions.metainfo.xml.in
index 74391d525d..e9635af7d1 100644
--- a/subprojects/extensions-app/data/metainfo/org.gnome.Extensions.metainfo.xml.in
+++ b/subprojects/extensions-app/data/metainfo/org.gnome.Extensions.metainfo.xml.in
@@ -55,6 +55,7 @@
   </description>
 
   <releases>
+    <release version="47.3" date="2025-01-10"/>
     <release version="47.2" date="2024-11-23"/>
     <release version="47.1" date="2024-10-19"/>
     <release version="47.0" date="2024-09-14"/>
diff --git a/subprojects/extensions-app/meson.build b/subprojects/extensions-app/meson.build
index 887cc60b6e..4d5c358c1b 100644
--- a/subprojects/extensions-app/meson.build
+++ b/subprojects/extensions-app/meson.build
@@ -1,5 +1,5 @@
 project('gnome-extensions-app',
-  version: '47.2',
+  version: '47.3',
   meson_version: '>= 0.58.0',
   license: 'GPL-2.0-or-later',
 )
diff --git a/subprojects/extensions-tool/meson.build b/subprojects/extensions-tool/meson.build
index 58de1cc9e1..9ad8ce7d93 100644
--- a/subprojects/extensions-tool/meson.build
+++ b/subprojects/extensions-tool/meson.build
@@ -1,5 +1,5 @@
 project('gnome-extensions-tool', 'c',
-  version: '47.2',
+  version: '47.3',
   meson_version: '>= 0.58.0',
   license: 'GPL-2.0-or-later',
 )
diff --git a/subprojects/shew/meson.build b/subprojects/shew/meson.build
index 1bcb1f2240..a12afd101c 100644
--- a/subprojects/shew/meson.build
+++ b/subprojects/shew/meson.build
@@ -1,5 +1,5 @@
 project('shew', 'c',
-  version: '47.2',
+  version: '47.3',
   meson_version: '>= 0.58.0',
   license: 'LGPL-2.1-or-later',
 )
-- 
GitLab