From a94c4f4d445e75b62ca0786594f402e2b6c6ab86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Cerveau?= <scerveau@collabora.com>
Date: Thu, 5 Oct 2023 22:27:52 +0200
Subject: [PATCH] macos: generate the installer building gtk

Using gtk version 4.13.1
---
 .gitlab-ci.yml                                  |  2 +-
 installer/macos/deploy_macos.sh                 | 17 +++++++++++++++--
 .../macos/{brew_setup.sh => package_setup.sh}   | 13 +++++++++++--
 subprojects/gtk.wrap                            |  2 +-
 4 files changed, 28 insertions(+), 6 deletions(-)
 rename installer/macos/{brew_setup.sh => package_setup.sh} (60%)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0446714..e36a965 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -247,7 +247,7 @@ macos installer stable:
     - curl https://sh.rustup.rs -sSf | sh -s -- -y
     - source $HOME/.cargo/env
     # brew install
-    - /bin/bash -c "./installer/macos/brew_setup.sh"
+    - /bin/bash -c "./installer/macos/package_setup.sh"
     - /bin/bash -c "./installer/macos/deploy_macos.sh"
   artifacts:
     name: "MacOS installer"
diff --git a/installer/macos/deploy_macos.sh b/installer/macos/deploy_macos.sh
index 1bb47ae..c8f2975 100755
--- a/installer/macos/deploy_macos.sh
+++ b/installer/macos/deploy_macos.sh
@@ -20,19 +20,32 @@ VERSION="$(cat VERSION)"
 export VERSION
 echo "VERSION=$VERSION"
 
+pip3 install docutils
 
 GSTREAMER_OPTS="
-        -Dforce_fallback_for=gstreamer-1.0,libffi,pcre2 \
+        -Dforce_fallback_for=gstreamer-1.0,libffi,pcre2,gtk \
         -Dgstreamer-1.0:libav=disabled \
         -Dgstreamer-1.0:examples=disabled \
 				-Dgstreamer-1.0:introspection=disabled \
         -Dgstreamer-1.0:rtsp_server=disabled \
         -Dgstreamer-1.0:devtools=disabled \
+        -Dgstreamer-1.0:ges=disabled \
 				-Dgst-plugins-base:tests=disabled \
 				-Dgstreamer-1.0:tests=disabled \
 				-Dgst-plugins-bad:openexr=disabled -Dgstreamer-1.0:gst-examples=disabled \
 				-Dorc:gtk_doc=disabled \
-				-Dgstreamer-1.0:python=disabled"
+				-Dgstreamer-1.0:python=disabled \
+        -Dgtk:gtk_doc=false \
+        -Dgtk:man-pages=true \
+        -Dgtk:introspection=disabled \
+        -Dgtk:build-examples=false \
+        -Dgtkl:build-tests=false \
+        -Dgtk:media-gstreamer=disabled \
+        -Dgtk:x11-backend=false \
+        -Dgtk:macos-backend=true \
+        -Dgtk:print-cups=disabled \
+        "
+
 
 # rebuild app release version
 rm -rf "${TARGETDIR}"
diff --git a/installer/macos/brew_setup.sh b/installer/macos/package_setup.sh
similarity index 60%
rename from installer/macos/brew_setup.sh
rename to installer/macos/package_setup.sh
index 0ce0d20..82dbe32 100755
--- a/installer/macos/brew_setup.sh
+++ b/installer/macos/package_setup.sh
@@ -4,13 +4,22 @@ HOMEBREW_NO_INSTALL_CLEANUP=1
 
 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
 
+brew update
+
 brew install pkg-config
 
 # GTK4 support
-brew install gtk4
+brew install glib
 # brew install cairo libxrandr libxi libxcursor libxdamage libxinerama
 
-brew install npm
+
+/bin/bash -c "$(curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.5/install.sh)"
+
+source ~/.nvm/nvm.sh
+
+nvm install node
+
+nvm install-latest-npm
 
 npm install -g appdmg
 
diff --git a/subprojects/gtk.wrap b/subprojects/gtk.wrap
index ed99789..e1f8f87 100644
--- a/subprojects/gtk.wrap
+++ b/subprojects/gtk.wrap
@@ -2,7 +2,7 @@
 directory=gtk
 url=https://gitlab.gnome.org/GNOME/gtk.git
 push-url=ssh://git@gitlab.gnome.org:GNOME/gtk.git
-revision=4.8.2
+revision=4.13.1
 depth=1
 
 [provide]