[gimp-macos-build/wip/DesMcG/tests: 1/2] revert CircleCI job to source modules from samm-git and remove refs to my fork

[Jehan <jehanp src gnome org>]

commit a90173b531a5e30453305fce747d55a5608421b6
Author: Des McGuinness <desmondmcguinness gmail com>
Date:   Wed Dec 16 20:13:04 2020 +0000

    revert CircleCI job to source modules from samm-git and remove refs to my fork

 .circleci/config.yml   | 20 ++++++++++----------
 README.md              |  2 --
 jhbuildrc-gtk-osx-gimp |  6 +++---
 3 files changed, 13 insertions(+), 15 deletions(-)
---
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8c6aa80..366ba70 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -27,13 +27,13 @@ jobs:
               echo 'export MACOSX_DEPLOYMENT_TARGET=10.9' >> ~/.profile
         - restore_cache:
             keys:
-              - jhbuild-v9
+              - jhbuild-v10
         - run:
             name: Setup JHBuild
             command: |
               cd $HOME
               mkdir -p ~/.config && mv ~/project/jhbuildrc-gtk-osx-gimp ~/.config/jhbuildrc-custom
-              curl https://gitlab.gnome.org/DesMcGuinness/gtk-osx/raw/gimp/gtk-osx-setup.sh > 
gtk-osx-setup.sh
+              curl https://gitlab.gnome.org/samm-git/gtk-osx/raw/gimp/gtk-osx-setup.sh > gtk-osx-setup.sh
               chmod +x gtk-osx-setup.sh
               echo 'export PATH="$HOME/.cargo/bin:$HOME/.local/bin:$PATH:$HOME/.new_local/bin"' >> ~/.profile
               echo 'export ARCHFLAGS="-arch x86_64"' >> ~/.profile
@@ -46,7 +46,7 @@ jobs:
               - ~/.new_local
               - ~/gtk
               - ~/.config
-            key: jhbuild-v9
+            key: jhbuild-v10
         - run:
             name: Setup gtk-mac-bundler
             command: |
@@ -58,9 +58,9 @@ jobs:
         - restore_cache:
             keys:
               - gimp-2.10.22-v1
-              - webkit-v20
-              - gimp-deps-v9
-              - bootstrap-v19
+              - webkit-v21
+              - gimp-deps-v10
+              - bootstrap-v20
         - run:
             name: Bootstrap
             command: source ~/.profile && jhbuild build icu55 meta-gtk-osx-freetype meta-gtk-osx-bootstrap 
meta-gtk-osx-core
@@ -70,10 +70,10 @@ jobs:
         - save_cache:
             paths:
               - ~/gtk
-            key: bootstrap-v19
+            key: bootstrap-v20
         - run:
             name: Build GIMP dependencies (without gegl/babl)
-            command: | 
+            command: |
               source ~/.profile && jhbuild build suitesparse lcms libunistring gmp libnettle libtasn1 gnutls 
libjpeg readline python glib-networking openjpeg  gtk-mac-integration poppler poppler-data
               source ~/.profile && jhbuild build json-glib p2tc exiv2 gexiv2 ilmbase openexr libwebp 
libcroco librsvg-24 json-c
               source ~/.profile && jhbuild build libmypaint mypaint-brushes libde265 nasm x265 libheif aalib 
shared-mime-info iso-codes libwmf libmng ghostscript
@@ -89,7 +89,7 @@ jobs:
         - save_cache:
             paths:
               - ~/gtk
-            key: gimp-deps-v9
+            key: gimp-deps-v10
         - run:
             name: Build WebKit v1
             no_output_timeout: 1h
@@ -100,7 +100,7 @@ jobs:
         - save_cache:
             paths:
               - ~/gtk
-            key: webkit-v20
+            key: webkit-v21
         - run:
             name: Build and test babl/gegl
             command: source ~/.profile && jhbuild build --check babl gegl
diff --git a/README.md b/README.md
index 82bc51d..da71b33 100644
--- a/README.md
+++ b/README.md
@@ -58,5 +58,3 @@ framework. Probably could be a small Python plugin as [there is a module](https:
 - `gimp-2-10`: gimp-2-10 build
 - `debug`: same as the `master`, but with full debug symbols
 - `hardened-runtime`: singed and notarized package with a hardened runtime enabled
-
-
diff --git a/jhbuildrc-gtk-osx-gimp b/jhbuildrc-gtk-osx-gimp
index 601f9d0..21d1fe2 100644
--- a/jhbuildrc-gtk-osx-gimp
+++ b/jhbuildrc-gtk-osx-gimp
@@ -154,8 +154,8 @@ environ_prepend('OBJCFLAGS', "-O3")
 #
 # os.environ["CC"] = "/usr/bin/gcc-4.0"
 
-# DJM - use my fork (of Alex's fork) of the original gtk-osx moduleset so changes can be applied in his 
absence.
-moduleset = 'https://gitlab.gnome.org/DesMcGuinness/gtk-osx/raw/gimp/modulesets-stable/gtk-osx.modules'
+# use our modulset
+moduleset = 'https://gitlab.gnome.org/samm-git/gtk-osx/raw/gimp/modulesets-stable/gtk-osx.modules'
 
 # force python 3.6 for the libxml2 to avoid build issues
 module_extra_env['libxml2'] = { "ac_cv_path_PYTHON": "python3.6" }
@@ -189,7 +189,7 @@ class _cmd_bootstrap_gtk_osx_gimp(jhbuild.commands.base.cmd_build):
                                           moduleset + '.modules'))):
             config.moduleset = moduleset
         else:
-            config.moduleset = 
'https://gitlab.gnome.org/DesMcGuinness/gtk-osx/raw/gimp/modulesets-stable/bootstrap.modules'
+            config.moduleset = 
'https://gitlab.gnome.org/samm-git/gtk-osx/raw/gimp/modulesets-stable/bootstrap.modules'
 
         args = ['meta-bootstrap']