From 5a9eaadb961d8a35214dd523307e357e5ef6e532 Mon Sep 17 00:00:00 2001 From: Bharat Date: Tue, 13 Aug 2024 16:18:24 +0530 Subject: [PATCH 1/4] add dependency: Add Gom as dependency for Gom demo ref #https://github.com/workbenchdev/demos/pull/200 --- build-aux/re.sonny.Workbench.Devel.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/build-aux/re.sonny.Workbench.Devel.json b/build-aux/re.sonny.Workbench.Devel.json index 3f731a2fd..64f3d18b9 100644 --- a/build-aux/re.sonny.Workbench.Devel.json +++ b/build-aux/re.sonny.Workbench.Devel.json @@ -48,6 +48,16 @@ "modules/python-python-lsp-server.json", "modules/python-ruff.json", "modules/python-python-lsp-ruff.json", + { + "name": "gom", + "buildsystem": "meson", + "sources": [ + { + "type": "git", + "url": "https://gitlab.gnome.org/GNOME/gom.git" + } + ] + }, { "name": "Workbench", "buildsystem": "meson", From 4a40fe9d9b86e6fca31337f53c1c528e16349313 Mon Sep 17 00:00:00 2001 From: Bharat Date: Tue, 13 Aug 2024 16:25:39 +0530 Subject: [PATCH 2/4] minor change: fix alignment --- build-aux/re.sonny.Workbench.Devel.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/build-aux/re.sonny.Workbench.Devel.json b/build-aux/re.sonny.Workbench.Devel.json index 64f3d18b9..77024969b 100644 --- a/build-aux/re.sonny.Workbench.Devel.json +++ b/build-aux/re.sonny.Workbench.Devel.json @@ -49,14 +49,14 @@ "modules/python-ruff.json", "modules/python-python-lsp-ruff.json", { - "name": "gom", - "buildsystem": "meson", - "sources": [ - { - "type": "git", - "url": "https://gitlab.gnome.org/GNOME/gom.git" - } - ] + "name": "gom", + "buildsystem": "meson", + "sources": [ + { + "type": "git", + "url": "https://gitlab.gnome.org/GNOME/gom.git" + } + ] }, { "name": "Workbench", From b939d5fd99f39c23dc0b9e88d7b52551d077bd95 Mon Sep 17 00:00:00 2001 From: Bharat Date: Tue, 13 Aug 2024 18:13:06 +0530 Subject: [PATCH 3/4] minor change: add commit and tag --- build-aux/re.sonny.Workbench.Devel.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build-aux/re.sonny.Workbench.Devel.json b/build-aux/re.sonny.Workbench.Devel.json index 77024969b..19cc9a8df 100644 --- a/build-aux/re.sonny.Workbench.Devel.json +++ b/build-aux/re.sonny.Workbench.Devel.json @@ -54,7 +54,9 @@ "sources": [ { "type": "git", - "url": "https://gitlab.gnome.org/GNOME/gom.git" + "url": "https://gitlab.gnome.org/GNOME/gom.git", + "commit": "814fdbf0e0f352e067c6118af5f7454b41e9ef49", + "tag": "0.5.3" } ] }, From 1193ea6788608e8811e8199ade47f3f83188958a Mon Sep 17 00:00:00 2001 From: Bharat Date: Tue, 13 Aug 2024 23:31:16 +0530 Subject: [PATCH 4/4] minor changes: create gom.json for dependencies remove redundant use in devel --- build-aux/modules/gom.json | 11 +++++++++++ build-aux/re.sonny.Workbench.Devel.json | 12 ------------ 2 files changed, 11 insertions(+), 12 deletions(-) create mode 100644 build-aux/modules/gom.json diff --git a/build-aux/modules/gom.json b/build-aux/modules/gom.json new file mode 100644 index 000000000..81c82de6b --- /dev/null +++ b/build-aux/modules/gom.json @@ -0,0 +1,11 @@ +{ + "name": "gom", + "buildsystem": "meson", + "sources": [ + { + "type": "archive", + "url": "https://download.gnome.org/sources/gom/0.5/gom-0.5.3.tar.xz", + "sha256": "814fdbf0e0f352e067c6118af5f7454b41e9ef49" + } + ] +} diff --git a/build-aux/re.sonny.Workbench.Devel.json b/build-aux/re.sonny.Workbench.Devel.json index 19cc9a8df..3f731a2fd 100644 --- a/build-aux/re.sonny.Workbench.Devel.json +++ b/build-aux/re.sonny.Workbench.Devel.json @@ -48,18 +48,6 @@ "modules/python-python-lsp-server.json", "modules/python-ruff.json", "modules/python-python-lsp-ruff.json", - { - "name": "gom", - "buildsystem": "meson", - "sources": [ - { - "type": "git", - "url": "https://gitlab.gnome.org/GNOME/gom.git", - "commit": "814fdbf0e0f352e067c6118af5f7454b41e9ef49", - "tag": "0.5.3" - } - ] - }, { "name": "Workbench", "buildsystem": "meson",