From 66d8da77ffb2f53528f1dcbc4c14895f3282d799 Mon Sep 17 00:00:00 2001
From: Alex Samorukov <samm@os2.kiev.ua>
Date: Sun, 25 Nov 2018 16:54:45 +0100
Subject: [PATCH 1/3] Fix SDKROOT setup if it is already defined

---
 jhbuildrc-gtk-osx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jhbuildrc-gtk-osx b/jhbuildrc-gtk-osx
index 41ced0a..499a6dc 100644
--- a/jhbuildrc-gtk-osx
+++ b/jhbuildrc-gtk-osx
@@ -229,7 +229,7 @@ def setup_sdk(target=_target, sdk_version=None, architectures=[_default_arch]):
         # developing, and it takes a lot of typing, so define a
         # convenience environment variable:
         environ_append('SDKDIR', sdkdir)
-        environ_append('SDKROOT', sdkdir)
+        os.environ["SDKROOT"] = sdkdir
 
         # Apple Documentation says that "-syslibroot" is the arg to pass to the
         # linker, but we are using the compiler to control the linker, and
-- 
GitLab


From c09d3859393a3d80b999d759c5d0f74c206a2109 Mon Sep 17 00:00:00 2001
From: Alex Samorukov <samm@os2.kiev.ua>
Date: Sun, 25 Nov 2018 16:55:13 +0100
Subject: [PATCH 2/3] Update cmake to 3.12.4

---
 modulesets-stable/bootstrap.modules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modulesets-stable/bootstrap.modules b/modulesets-stable/bootstrap.modules
index e0567aa..f04f484 100644
--- a/modulesets-stable/bootstrap.modules
+++ b/modulesets-stable/bootstrap.modules
@@ -71,7 +71,7 @@
   <!-- cmakes ./configure is picky about invalid flags so we manually set it -->
   <autotools id="cmake" autogen-sh="bootstrap"
              autogen-template="%(srcdir)s/%(autogen-sh)s --prefix=%(prefix)s">
-    <branch repo="cmake" module="v3.10/cmake-3.10.0.tar.gz" version="3.10.0">
+    <branch repo="cmake" module="v3.12/cmake-3.12.4.tar.gz" version="3.12.4">
     </branch>
   </autotools>
 
-- 
GitLab


From 7ab94dfd50f23500549765e3dedf760cc55076e6 Mon Sep 17 00:00:00 2001
From: Alex Samorukov <samm@os2.kiev.ua>
Date: Sun, 25 Nov 2018 16:55:56 +0100
Subject: [PATCH 3/3] Remove [outdated] babl autogenargs

babl is now part of gimp file and works fine with SSE
---
 jhbuildrc-gtk-osx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/jhbuildrc-gtk-osx b/jhbuildrc-gtk-osx
index 499a6dc..80a3660 100644
--- a/jhbuildrc-gtk-osx
+++ b/jhbuildrc-gtk-osx
@@ -327,7 +327,6 @@ def setup_sdk(target=_target, sdk_version=None, architectures=[_default_arch]):
     module_extra_env["pkg-config"] = {'CFLAGS': os.environ['CFLAGS'] + ' -std=gnu89'}
     append_autogenargs('libgcrypt', 'CFLAGS="$CFLAGS -fheinous-gnu-extensions"')
     module_makeargs['liboil'] = 'CFLAGS="$CFLAGS -DHAVE_SYMBOL_UNDERSCORE -fheinous-gnu-extensions"'
-    append_autogenargs('babl', '--disable-sse')
 
     # openssl doesn't understand DESTDIR, but luckily it has its own mechanism.
     module_extra_env['openssl'] = {'INSTALL_PREFIX': os.path.join(prefix, '_jhbuild', 'root-openssl')}
-- 
GitLab