Move gnome-shell and mutter development to git.

Rather than having one big opaque patch with no change history citadel
changes will be developed on a git branch.

meta-citadel/classes/external-tree.bbclass

@@ -0,0 +1,33 @@
+
+S = "${WORKDIR}${@source_path(d)}"
+SRC_URI = "${@source_uri(d)}"
+
+
+def source_path(d):
+    var = d.getVar("EXTERNAL_TREE_VAR")
+    tree_path = d.getVar(var)
+
+    if tree_path:
+        return tree_path
+    else:
+        return "/git"
+
+def source_uri(d):
+    var = d.getVar("EXTERNAL_TREE_VAR")
+    tree_path = d.getVar(var)
+
+    if tree_path:
+        return "file://" + tree_path
+    else:
+        return d.getVar("GIT_URI")
+
+# Set debug build if $EXTERNAL_TREE_VAR is set for faster builds
+DEBUG_BUILD = "${@debug_build(d)}"
+
+def debug_build(d):
+    var = d.getVar("EXTERNAL_TREE_VAR")
+    tree_path = d.getVar(var)
+    if tree_path:
+        return "1"
+    else:
+        return "0"

meta-citadel/conf/local.conf.sample

@@ -215,3 +215,7 @@ INHERIT+="toaster buildhistory"
 #
 # CITADEL_TOOLS_PATH = "/home/user/citadel-tools"
 #
+# Same as above for GNOME Shell and Mutter:
+#
+# CITADEL_GNOME_SHELL_PATH = "/home/user/citadel-gnome/gnome-shell"
+# CITADEL_MUTTER_PATH = "/home/user/citadel-gnome/mutter"

meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-Disabled-calendar-events-from-user-session.patch

@@ -1,22 +0,0 @@
-From ac70fbe1edeef149c55d5779008429aec9945b76 Mon Sep 17 00:00:00 2001
-From: Bruce Leidl <bruce@subgraph.com>
-Date: Tue, 5 Oct 2021 11:17:47 +0000
-Subject: [PATCH] Disabled calendar events from user session
-
----
- js/ui/sessionMode.js | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/js/ui/sessionMode.js b/js/ui/sessionMode.js
-index afcd67c..b686efb 100644
---- a/js/ui/sessionMode.js
-+++ b/js/ui/sessionMode.js
-@@ -71,7 +71,7 @@ const _modes = {
- 
-     'user': {
-         hasOverview: true,
--        showCalendarEvents: true,
-+        showCalendarEvents: false,
-         showWelcomeDialog: true,
-         allowSettings: true,
-         allowExtensions: true,

meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-Disabled-calendar-events-from-user-session.patch.old

@@ -1,22 +0,0 @@
-From a2ea7fac46ea2b6599df0095223627b17181f390 Mon Sep 17 00:00:00 2001
-From: xSmurf <xsmurf@users.noreply.github.com>
-Date: Wed, 14 Nov 2018 01:47:43 -0500
-Subject: [PATCH] Disabled calendar events from user session...
-
----
- js/ui/sessionMode.js | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/js/ui/sessionMode.js b/js/ui/sessionMode.js
-index 2136e94..3f35ab2 100644
---- a/js/ui/sessionMode.js
-+++ b/js/ui/sessionMode.js
-@@ -69,7 +69,7 @@ const _modes = {
- 
-     'user': {
-         hasOverview: true,
--        showCalendarEvents: true,
-+        showCalendarEvents: false,
-         allowSettings: true,
-         allowExtensions: true,
-         allowScreencast: true,

meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-Patch-gnome-shell-to-disable-logging-out.patch

@@ -1,24 +0,0 @@
-From 3fb6b84dc41a0c4abfa5b493635ee6a2c4abd0f8 Mon Sep 17 00:00:00 2001
-From: David McKinney <mckinney@subgraph.com>
-Date: Sun, 14 Apr 2019 18:57:03 +0000
-Subject: [PATCH] Patch gnome-shell to disable logging out
-
----
- js/misc/systemActions.js | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/js/misc/systemActions.js b/js/misc/systemActions.js
-index aa79bfe..4036783 100644
---- a/js/misc/systemActions.js
-+++ b/js/misc/systemActions.js
-@@ -361,8 +361,8 @@ const SystemActions = GObject.registerClass({
- 
-     _updateLogout() {
-         let user = this._userManager.get_user(GLib.get_user_name());
--
--        let allowLogout = !this._lockdownSettings.get_boolean(DISABLE_LOG_OUT_KEY);
-+        // Disable allowLogout globally in gnome-shell
-+        let allowLogout = false;
-         let alwaysShow = global.settings.get_boolean(ALWAYS_SHOW_LOG_OUT_KEY);
-         let systemAccount = user.system_account;
-         let localAccount = user.local_account;

meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-Remove-calendar-server-fix-build.patch

@@ -1,100 +0,0 @@
-From 9d4edfc419cdb2868a6a69bf1ed4565478789a35 Mon Sep 17 00:00:00 2001
-From: David McKinney <mckinney@subgraph.com>
-Date: Wed, 8 Jul 2020 14:07:06 +0000
-Subject: [PATCH] Remove calendar server, fix build
-
----
- js/dbusServices/meson.build               |  2 +-
- meson.build                               | 10 +++++-----
- src/meson.build                           |  2 +-
- subprojects/extensions-app/js/meson.build |  2 +-
- subprojects/extensions-app/meson.build    |  2 +-
- 5 files changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/js/dbusServices/meson.build b/js/dbusServices/meson.build
-index 68e8bd1..16efaeb 100644
---- a/js/dbusServices/meson.build
-+++ b/js/dbusServices/meson.build
-@@ -27,7 +27,7 @@ foreach service, dir : dbus_services
- 
-   serviceconf = configuration_data()
-   serviceconf.set('service', service)
--  serviceconf.set('gjs', gjs.path())
-+  serviceconf.set('gjs', gjs)
-   serviceconf.set('pkgdatadir', pkgdatadir)
- 
-   configure_file(
-diff --git a/meson.build b/meson.build
-index 58f66cd..1dc4729 100644
---- a/meson.build
-+++ b/meson.build
-@@ -19,8 +19,8 @@ cogl_pango_pc = 'mutter-cogl-pango-' + mutter_api_version
- libmutter_pc = 'libmutter-' + mutter_api_version
- libmutter_test_pc = 'libmutter-test-' + mutter_api_version
- 
--ecal_req = '>= 3.33.1'
--eds_req = '>= 3.33.1'
-+#ecal_req = '>= 3.33.1'
-+#eds_req = '>= 3.33.1'
- gcr_req = '>= 3.7.5'
- gio_req = '>= 2.56.0'
- gi_req = '>= 1.49.1'
-@@ -72,8 +72,8 @@ else
- endif
- 
- atk_bridge_dep = dependency('atk-bridge-2.0')
--ecal_dep = dependency('libecal-2.0', version: ecal_req)
--eds_dep = dependency('libedataserver-1.2', version: eds_req)
-+#ecal_dep = dependency('libecal-2.0', version: ecal_req)
-+#eds_dep = dependency('libedataserver-1.2', version: eds_req)
- gcr_dep = dependency('gcr-base-3', version: gcr_req)
- gdk_x11_dep = dependency('gdk-x11-3.0')
- gdk_pixbuf_dep = dependency('gdk-pixbuf-2.0')
-@@ -139,7 +139,7 @@ endif
- 
- mutter_typelibdir = mutter_dep.get_pkgconfig_variable('typelibdir')
- python = find_program('python3')
--gjs = find_program('gjs')
-+gjs = '/usr/bin/gjs'
- 
- cc = meson.get_compiler('c')
- 
-diff --git a/src/meson.build b/src/meson.build
-index 53b8b52..5fa9fdf 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -1,7 +1,7 @@
- service_data = configuration_data()
- service_data.set('libexecdir', libexecdir)
- 
--subdir('calendar-server')
-+#subdir('calendar-server')
- subdir('hotplug-sniffer')
- subdir('st')
- subdir('tray')
-diff --git a/subprojects/extensions-app/js/meson.build b/subprojects/extensions-app/js/meson.build
-index f311db6..8f7bba4 100644
---- a/subprojects/extensions-app/js/meson.build
-+++ b/subprojects/extensions-app/js/meson.build
-@@ -9,7 +9,7 @@ endif
- launcherconf.set('prefix', prefix)
- launcherconf.set('libdir', libdir)
- launcherconf.set('pkgdatadir', pkgdatadir)
--launcherconf.set('gjs', gjs.path())
-+launcherconf.set('gjs', gjs)
- 
- configure_file(
-   input: prgname + '.in',
-diff --git a/subprojects/extensions-app/meson.build b/subprojects/extensions-app/meson.build
-index 6143eef..a619f63 100644
---- a/subprojects/extensions-app/meson.build
-+++ b/subprojects/extensions-app/meson.build
-@@ -44,7 +44,7 @@ localedir = join_paths(datadir, 'locale')
- metainfodir = join_paths(datadir, 'metainfo')
- servicedir = join_paths(datadir, 'dbus-1', 'services')
- 
--gjs = find_program('gjs')
-+gjs = '/usr/bin/gjs'
- appstream_util = find_program('appstream-util', required: false)
- desktop_file_validate = find_program('desktop-file-validate', required: false)
- 

meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-Remove-log-out-label-from-power-off-in-status-UI.patch

@@ -1,22 +0,0 @@
-From 5e5da06bd97175bed4a2719e5e67a5b2b51e4efc Mon Sep 17 00:00:00 2001
-From: David McKinney <mckinney@subgraph.com>
-Date: Fri, 12 Feb 2021 13:58:36 +0000
-Subject: [PATCH] Remove log out label from power off in status UI
-
----
- js/ui/status/system.js | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/js/ui/status/system.js b/js/ui/status/system.js
-index 6f71109..b96780c 100644
---- a/js/ui/status/system.js
-+++ b/js/ui/status/system.js
-@@ -113,7 +113,7 @@ class Indicator extends PanelMenu.SystemIndicator {
-             bindFlags);
- 
-         this._sessionSubMenu = new PopupMenu.PopupSubMenuMenuItem(
--            _('Power Off / Log Out'), true);
-+            _('Power Off'), true);
-         this._sessionSubMenu.icon.icon_name = 'system-shutdown-symbolic';
- 
-         item = new PopupMenu.PopupMenuItem(_('Suspend'));

meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-do-not-use-python-path-from-build-environment.patch

@@ -1,30 +0,0 @@
-From 4398d05df199e3c63d1af8de0774582d430368d5 Mon Sep 17 00:00:00 2001
-From: brl <bruce@subgraph.com>
-Date: Sun, 24 Dec 2017 17:44:02 -0500
-Subject: [PATCH] do not use python path from build environment
-
----
- src/gnome-shell-extension-tool.in | 2 +-
- src/gnome-shell-perf-tool.in      | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/gnome-shell-extension-tool.in b/src/gnome-shell-extension-tool.in
-index fb3d0d8..8da34ff 100755
---- a/src/gnome-shell-extension-tool.in
-+++ b/src/gnome-shell-extension-tool.in
-@@ -1,4 +1,4 @@
--#!@PYTHON@
-+#!/usr/bin/env python3
- # -*- mode: Python; indent-tabs-mode: nil; -*-
- 
- import subprocess
-diff --git a/src/gnome-shell-perf-tool.in b/src/gnome-shell-perf-tool.in
-index a1b5d59..163a5b9 100755
---- a/src/gnome-shell-perf-tool.in
-+++ b/src/gnome-shell-perf-tool.in
-@@ -1,4 +1,4 @@
--#!@PYTHON@
-+#!/usr/bin/env python3
- # -*- mode: Python; indent-tabs-mode: nil; -*-
- 
- import datetime

meta-gnome/recipes-gnome/gnome-shell/gnome-shell_41.1.bb

@@ -5,22 +5,15 @@ REQUIRED_DISTRO_FEATURES = "x11 systemd pam"
 
 ERROR_QA_remove = "unknown-configure-option"
 
+SRCREV = "d85bd654a3c830a8c3982286c1876321c96faf7d"
+
+EXTERNAL_TREE_VAR="CITADEL_GNOME_SHELL_PATH"
+GIT_URI = "gitsm://github.com/brl/gnome-shell.git;branch=citadel;protocol=https"
 
 GNOMEBASEBUILDCLASS = "meson"
-inherit gnomebase gsettings gettext gobject-introspection gobject-introspection-data features_check bash-completion
 
-def gnome_verdir(v):
+inherit gnomebase gsettings gettext gobject-introspection gobject-introspection-data features_check bash-completion external-tree
-    return oe.utils.trim_version(v, 1)
 
-SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \
-           file://0001-do-not-use-python-path-from-build-environment.patch \
-           file://0001-Remove-calendar-server-fix-build.patch \
-           file://0001-Remove-log-out-label-from-power-off-in-status-UI.patch \
-           file://0001-Disabled-calendar-events-from-user-session.patch \
-           file://0002-Citadel-Gnome-Shell-changes.patch \
-           "
-
-SRC_URI[archive.sha256sum] = "5f742456dfe00605c0f090a3728ca62797bc49e50af852bbd7285da1a0517ff6"
 
 
 DEPENDS = " \

meta-gnome/recipes-gnome/mutter/mutter/0001-Fix-libmutter_dep-in-meson.build-for-Citadel-builds.patch

@@ -1,21 +0,0 @@
-From fa052377263464109035564b17cfa2aa76e35016 Mon Sep 17 00:00:00 2001
-From: David McKinney <mckinney@subgraph.com>
-Date: Fri, 12 Feb 2021 13:53:31 +0000
-Subject: [PATCH] Fix libmutter_dep in meson.build for Citadel builds
-
----
- src/meson.build | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/meson.build b/src/meson.build
-index e7c99ca..8fe484e 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -955,6 +955,7 @@ libmutter = shared_library(libmutter_name,
- libmutter_dep = declare_dependency(
-   link_with: libmutter,
-   include_directories: mutter_includes,
-+  sources: mutter_built_sources,
-   dependencies: [
-     libmutter_cogl_dep,
-     libmutter_clutter_dep,

meta-gnome/recipes-gnome/mutter/mutter_41.1.bb

@@ -37,19 +37,14 @@ DEPENDS = " \
 
 RDEPENDS_${PN} += " xserver-xorg-xwayland zenity"
 
+SRCREV = "7cab502754edef977215bdfc9f8dfa0849a426f3"
+
+EXTERNAL_TREE_VAR="CITADEL_MUTTER_PATH"
+GIT_URI = "git://github.com/brl/mutter.git;branch=citadel;protocol=https"
+
 GNOMEBASEBUILDCLASS = "meson"
 
-inherit gnomebase gsettings gobject-introspection gettext upstream-version-is-even features_check
+inherit gnomebase gsettings gobject-introspection gettext upstream-version-is-even features_check external-tree
-
-def gnome_verdir(v):
-    return oe.utils.trim_version(v, 1)
-
-SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \
-           file://0001-Fix-libmutter_dep-in-meson.build-for-Citadel-builds.patch \
-           file://0001-Citadel-changes-to-Mutter.patch \
-           "
-
-SRC_URI[archive.sha256sum] = "58e63fd0bc43f35134f21313aff4aebf92c829d6df4dc99a044a1e376691e3f3"
 
 # x11 is still mandatory - see meson.build
 REQUIRED_DISTRO_FEATURES = "x11 systemd"