[gimp-macos-build/wip/lukaso/tests: 3/3] Remaining items from 299 build.

[Jehan <jehanp src gnome org>]

commit c2a00b823a6743f3208cedc357992a2f2e12e853
Author: Lukas Oberhuber <lukaso gmail com>
Date:   Tue Sep 28 17:28:49 2021 +0000

    Remaining items from 299 build.

 .circleci/config.yml | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)
---
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3a97153..da47329 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,6 +1,6 @@
 version: 2
 jobs:
-  build-gimp-2-10:
+  build-gimp-2-99:
     macos:
         xcode: "13.0.0"
 
@@ -32,8 +32,8 @@ jobs:
             name: Setup JHBuild
             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
+              mkdir -p ~/.config && cp ~/project/jhbuildrc-gtk-osx-gimp ~/.config/jhbuildrc-custom
+              curl https://gitlab.gnome.org/lukaso/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
@@ -63,7 +63,7 @@ jobs:
               - bootstrap-v23
         - run:
             name: Bootstrap
-            command: source ~/.profile && jhbuild build icu55 meta-gtk-osx-freetype meta-gtk-osx-bootstrap 
meta-gtk-osx-core
+            command: source ~/.profile && jhbuild build icu libnsgif meta-gtk-osx-freetype 
meta-gtk-osx-bootstrap meta-gtk-osx-gtk3
         - run:
             name: Cleanup
             command: find  ~/gtk/source -type d -mindepth 1 -maxdepth 1 | xargs -I% rm -rf %/*
@@ -74,15 +74,17 @@ jobs:
         - run:
             name: Build GIMP dependencies (without gegl/babl)
             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
-              source ~/.profile && jhbuild build pycairo pygobject pygtk gtk-mac-integration-python
+              # dependencies from 2.99 build: at-spi2-core build-essential desktop-file-utils ffmpeg 
ghostscript git glib-networking gobject-introspection graphviz graphviz-dev gtk-doc-tools hicolor-icon-theme 
intltool iso-codes libappstream-glib-dev libbz2-dev libdbus-glib-1-dev libexif-dev libgexiv2-dev 
libgirepository1.0-dev libgtk-3-bin libgtk-3-dev libgudev-1.0-dev libjson-glib-dev liblcms2-dev liblzma-dev 
libmng-dev libmypaint-dev libopenexr-dev libpoppler-glib-dev libraw-dev libraw20 librsvg2-dev libspiro-dev 
libsuitesparse-dev libtiff-dev libtiff5-dev libtool libumfpack5 libwebp-dev libwmf-dev libxmu-dev libxpm-dev 
luajit meson mypaint-brushes poppler-data python3 valac xauth xvfb
+              # 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
+              # source ~/.profile && jhbuild build pycairo pygobject pygtk gtk-mac-integration-python
+              source ~/.profile && jhbuild build python3
         - run:
             name: Build all WebKit dependencies
             command: |
-              source ~/.profile && jhbuild build enchant libpsl sqlite vala gnutls
-              source ~/.profile && jhbuild buildone libsoup
+              source ~/.profile && jhbuild build enchant libpsl sqlite vala gnutls libgpg-error
+              source ~/.profile && jhbuild buildone libsoup libgcrypt libwebp
         - run:
             name: Cleanup
             command: find  ~/gtk/source -type d -mindepth 1 -maxdepth 1 | xargs -I% rm -rf %/*
@@ -93,7 +95,7 @@ jobs:
         - run:
             name: Build WebKit v1
             no_output_timeout: 1h
-            command: source ~/.profile && jhbuild buildone webkit
+            command: # source ~/.profile && jhbuild buildone webkit
         - run:
             name: Cleanup
             command: find  ~/gtk/source -type d -mindepth 1 -maxdepth 1 | xargs -I% rm -rf %/*
@@ -110,7 +112,7 @@ jobs:
             # not using --check flag
             command: |
               source ~/.profile
-              jhbuild build gimp
+              jhbuild build gimp299
         #- run:
             #name: Building GIMP help (en) from git
             #command: source ~/.profile && ALL_LINGUAS=en jhbuild build gimp-help-git
@@ -155,4 +157,4 @@ workflows:
   version: 2
   build-different-versions:
     jobs:
-      - build-gimp-2-10
+      - build-gimp-2-99