[gimp-macos-build/wip/DesMcG/tests] Redirect the CircleCI build to my repo so I can update modulesets and add patches. Tweak some args n

[Jehan <jehanp src gnome org>]

commit 75f2a898f29b351571bad179029bd47ef18d4335
Author: Des McGuinness <desmondmcguinness gmail com>
Date:   Thu Dec 3 18:33:33 2020 +0000

    Redirect the CircleCI build to my repo so I can update modulesets and add patches. Tweak some args needed 
to build the modules listed.

 .circleci/config.yml   |  2 +-
 jhbuildrc-gtk-osx-gimp | 24 +++++++++++++++++++++---
 2 files changed, 22 insertions(+), 4 deletions(-)
---
diff --git a/.circleci/config.yml b/.circleci/config.yml
index c75fb0b..ad2995e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -33,7 +33,7 @@ jobs:
             command: |
               cd $HOME
               mkdir -p ~/.config && mv ~/project/jhbuildrc-gtk-osx-gimp ~/.config/jhbuildrc-custom
-              curl  https://gitlab.gnome.org/samm-git/gtk-osx/raw/gimp/gtk-osx-setup.sh > gtk-osx-setup.sh
+              curl https://gitlab.gnome.org/DesMcGuinness/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
diff --git a/jhbuildrc-gtk-osx-gimp b/jhbuildrc-gtk-osx-gimp
index 9999ab0..6e6eab1 100644
--- a/jhbuildrc-gtk-osx-gimp
+++ b/jhbuildrc-gtk-osx-gimp
@@ -154,14 +154,32 @@ environ_prepend('OBJCFLAGS', "-O3")
 #
 # os.environ["CC"] = "/usr/bin/gcc-4.0"
 
-# use our modulset
-moduleset = 'https://gitlab.gnome.org/samm-git/gtk-osx/raw/gimp/modulesets-stable/gtk-osx.modules'
+# DJM - use my fork of Alex's fork of the original gtk-osx moduleset <sigh/> so I can add my own patches.
+moduleset = 'https://gitlab.gnome.org/DesMcGuinness/gtk-osx/raw/gimp/modulesets-stable/gtk-osx.modules'
+
+# DJM - since I'm using my own fork, I can fix these overrides "at source" instead of here.
+branches['gtk-doc'] =  'https://ftp.gnome.org/pub/gnome/sources/gtk-doc/1.32/gtk-doc-1.32.tar.xz'
+branches['x265'] = 'https://download.videolan.org/pub/videolan/x265/x265_3.2.1.tar.gz'
 
 # force python 3.6 for the libxml2 to avoid build issues
 module_extra_env['libxml2'] = { "ac_cv_path_PYTHON": "python3.6" }
+
 # meson needs UTF-8 charset for build python scripts to work correctly
 module_extra_env['meson'] = { "LC_ALL": "en_US.UTF-8" }
 
+# DJM - gtk-doc needs PYTHON to be python3, and then creates gtkdoc-rebase with a shebang of $PYTHON, so we 
need to be
+# absolute here, otherwise anything calling gtkdoc-rebase (i.e. the later gtk+ install) will err with  "bad 
interpreter"
+module_extra_env['gtk-doc'] = { 'PYTHON': '/Library/Frameworks/Python.framework/Versions/3.6/bin/python3.6' }
+
+# DJM - Apple's openssl is ancient, and is missing some of the functions included in nettles tests/examples. 
 Disable (for now).
+append_autogenargs('libnettle', '--disable-openssl')
+
+# DJM - the build is not finding libcups for some reason, skip for now
+append_autogenargs("ghostscript", "--disable-cups")
+
+# DJM - c files built from defs are not including all necessary headers - ignore that
+module_extra_env['pygtk'] = { 'CFLAGS' : '-Wno-error=implicit-function-declaration' }
+
 class _cmd_bootstrap_gtk_osx_gimp(jhbuild.commands.base.cmd_build):
     doc = 'Build buildsystem tools not provided by MacOS.'
 
@@ -181,7 +199,7 @@ class _cmd_bootstrap_gtk_osx_gimp(jhbuild.commands.base.cmd_build):
                                           moduleset + '.modules'))):
             config.moduleset = moduleset
         else:
-            config.moduleset = 
'https://gitlab.gnome.org/samm-git/gtk-osx/raw/gimp/modulesets-stable/bootstrap.modules'
+            config.moduleset = 
'https://gitlab.gnome.org/DesMcGuinness/gtk-osx/raw/gimp/modulesets-stable/bootstrap.modules'
 
         args = ['meta-bootstrap']