From 7a2362b6191a0b06f1469d2332bb8453867d2535 Mon Sep 17 00:00:00 2001
From: Youssef Abukwaik <youssef.adnan@gmail.com>
Date: Sat, 8 Dec 2018 16:31:04 -0800
Subject: [PATCH] osx: Further optimizations, show GTK spinner when working

---
 osx/build_app.sh     |  2 +-
 osx/build_env.sh     |  2 ++
 osx/jhbuildrc-custom | 12 +++++-------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/osx/build_app.sh b/osx/build_app.sh
index 48525f4eb..4eca03539 100755
--- a/osx/build_app.sh
+++ b/osx/build_app.sh
@@ -38,6 +38,7 @@ echo "[Pango]\nModuleFiles=./etc/pango/pango.modules\n" > $RES/etc/pango/pangorc
 # gdk-pixbuf
 rsync -r -t $INSTROOT/lib/gdk-pixbuf-2.0 $RES/lib
 gdk-pixbuf-query-loaders |perl -i -pe 's/^[^#].*\/(lib\/.*")$/"..\/Resources\/$1/' > $RES/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
+(cd $MAIN/Contents && ln -sf Resources/lib .)
 
 # GTK themes
 mkdir -p $RES/share/themes
@@ -140,7 +141,6 @@ done
 #done
 popd
 
-
 # Create the dmg file..
 hdiutil create -size 250m -fs HFS+ -volname "Meld Merge" myimg.dmg
 hdiutil attach myimg.dmg
diff --git a/osx/build_env.sh b/osx/build_env.sh
index 65797f6f7..a9c2d51fd 100755
--- a/osx/build_env.sh
+++ b/osx/build_env.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+trap "exit" INT
+
 export MACOSX_DEPLOYMENT_TARGET=10.9
 export PATH=$HOME/.local/bin:$HOME/gtk/inst/bin:$PATH
 
diff --git a/osx/jhbuildrc-custom b/osx/jhbuildrc-custom
index d78227b25..b7011abd5 100644
--- a/osx/jhbuildrc-custom
+++ b/osx/jhbuildrc-custom
@@ -6,13 +6,11 @@ checkoutroot = os.path.expanduser("~/Source/gtk")
 setup_sdk(target="10.9", sdk_version="native", architectures=["x86_64"])
 _gtk_osx_use_jhbuild_python = True
 
-# custom CFLAGS / environment pieces for the build
-# os.environ['CFLAGS'] = '-Wall -g -O0'
-
 os.environ["CC"] = "/usr/local/bin/ccache /usr/bin/clang"
 os.environ["CXX"] = "/usr/local/bin/ccache /usr/bin/clang++"
-os.environ['CFLAGS'] = '-O2'
-os.environ["CXXFLAGS"] = "-std=c++11 -stdlib=libc++ -O2"
+environ_prepend('CFLAGS', "-O3")
+environ_prepend('CXXFLAGS', "-std=c++11 -stdlib=libc++ -O3")
+environ_prepend('OBJCFLAGS', "-O3")
 os.environ["MACOSX_DEPLOYMENT_TARGET"] = "10.9"
 os.environ["DYLD_FALLBACK_LIBRARY_PATH"] = "@executable_path/../Frameworks/:@executable_path/../Resources/lib"
 
@@ -68,12 +66,12 @@ global autogenargs
 autogenargs = autogenargs + ' --disable-documentation --disable-docs --enable-introspection --enable-gtk-doc=no --enable-gtk-doc-html=no --enable-gtk-doc-pdf=no'
 # autogenargs += ' --cache-file=' + checkoutroot + '/autoconf-cache '
 
-module_autogenargs['gettext-tools'] = 'CFLAGS=-O0'
+module_autogenargs['gettext-tools'] = 'CFLAGS=-O'
 module_autogenargs['yelp'] = '--disable-Werror'
 module_autogenargs['zlib']= ''# + autogenargs
 module_autogenargs['librsvg'] = autogenargs
 module_autogenargs['glib'] = autogenargs
-module_autogenargs['gdk-pixbuf'] = '--with-included-loaders ' + autogenargs
+module_autogenargs['gdk-pixbuf'] = '--with-included-loaders --enable-relocations ' + autogenargs
 module_autogenargs['pygobject3'] = '--disable-docs  --enable-cairo '
 #module_autogenargs['gtk-quartz-engine'] = 'CFLAGS=-Wuninitialized ' + autogenargs
 module_autogenargs['cairo'] = '--disable-full-testing --enable-ft --enable-fc --enable-quartz-image --enable-quartz-font --enable-quartz  --enable-png --enable-svg --enable-tee --enable-xml --enable-gobject --enable-pthread --disable-valgrind --disable-gtk-doc ' + autogenargs