From b9b5f9ad2a96c8d20f8472bd72dc3e289822cae6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Mon, 12 Feb 2024 12:00:05 +0100
Subject: [PATCH 1/2] ci: Include subprojects in tarball

jasmine-gjs isn't widely available in distributions, so instead
of adding an obscure build dependency, include the subproject
in the tarball.

The --include-subprojects flag only applies to subprojects that
are used in the build, so we do not bundle gi-docgen that is
provided in the mutter image.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3164>
---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5cf096de6..68dfba2eb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -287,7 +287,7 @@ dist:
     - sudo meson install -C mutter/build
     - mkdir -m 700 $XDG_RUNTIME_DIR
   script:
-    - dbus-run-session xvfb-run meson dist -C build
+    - dbus-run-session xvfb-run meson dist -C build --include-subprojects
   rules:
     - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
       changes:

From 52fd93196c1c61b34a571c9d7940fda22576e1c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Sun, 30 Jun 2024 00:34:50 +0200
Subject: [PATCH 2/2] Bump version to 46.3.1

Update NEWS.
---
 NEWS                                                       | 7 +++++++
 meson.build                                                | 2 +-
 .../data/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, 12 insertions(+), 4 deletions(-)

diff --git a/NEWS b/NEWS
index 8dd4ec968..e95174e86 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,10 @@
+46.3.1
+======
+* Fix including gvc source in tarball [Florian; !3164]
+
+Contributors:
+  Florian Müllner
+
 46.3
 ====
 * Fix rendering artifacts of some rounded borders [Jonas D.; !3354]
diff --git a/meson.build b/meson.build
index 1c760d2de..923a5228e 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('gnome-shell', 'c',
-  version: '46.3',
+  version: '46.3.1',
   meson_version: '>= 0.58.0',
   license: 'GPLv2+'
 )
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 177cda41c..045c67a22 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
@@ -54,6 +54,7 @@
   </description>
 
   <releases>
+    <release version="46.3.1" date="2024-06-29"/>
     <release version="46.3" date="2024-06-29"/>
     <release version="46.2" date="2024-05-25"/>
     <release version="46.1" date="2024-04-20">
diff --git a/subprojects/extensions-app/meson.build b/subprojects/extensions-app/meson.build
index 89d2685b4..8b5ef8510 100644
--- a/subprojects/extensions-app/meson.build
+++ b/subprojects/extensions-app/meson.build
@@ -1,5 +1,5 @@
 project('gnome-extensions-app',
-  version: '46.3',
+  version: '46.3.1',
   meson_version: '>= 0.58.0',
   license: 'GPLv2+'
 )
diff --git a/subprojects/extensions-tool/meson.build b/subprojects/extensions-tool/meson.build
index bdc7e43c8..67affd46b 100644
--- a/subprojects/extensions-tool/meson.build
+++ b/subprojects/extensions-tool/meson.build
@@ -1,5 +1,5 @@
 project('gnome-extensions-tool', 'c',
-  version: '46.3',
+  version: '46.3.1',
   meson_version: '>= 0.58.0',
   license: 'GPLv2+'
 )
diff --git a/subprojects/shew/meson.build b/subprojects/shew/meson.build
index e1a77d2f2..2f34fb20b 100644
--- a/subprojects/shew/meson.build
+++ b/subprojects/shew/meson.build
@@ -1,5 +1,5 @@
 project('shew', 'c',
-  version: '46.3',
+  version: '46.3.1',
   meson_version: '>= 0.58.0',
   license: 'LGPLv2+',
 )