From 0a0042c4b58bb2340ab9199a148ec2edfe0e3792 Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Thu, 16 Feb 2023 13:48:26 +0100
Subject: [PATCH 1/2] Thu Feb 16 01:48:26 PM CET 2023

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a701888..913eb3a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,8 +22,8 @@ Images:
           - mint21
           - fedora37
           - fedora36
-#          - macos-x86_64
-#          - macos-aarch64
+          - macos-x86_64
+          - macos-aarch64
           - dind
   script:
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD registry.gitlab.com

From 5aa415ad6aa99f795799a8c994c71464ff93005c Mon Sep 17 00:00:00 2001
From: stanzabird <bert@stanzabird.nl>
Date: Thu, 16 Feb 2023 13:17:59 +0000
Subject: [PATCH 2/2] let's just try this for now

---
 assets/macos.Dockerfile | 2 +-
 assets/macos.mozconfig  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/assets/macos.Dockerfile b/assets/macos.Dockerfile
index c397fd6..6fe3750 100644
--- a/assets/macos.Dockerfile
+++ b/assets/macos.Dockerfile
@@ -44,7 +44,7 @@ RUN cp -r cctools /root/.mozbuild
 RUN cp -r sysroot-wasm32-wasi /root/.mozbuild
 ## RUN cp -r clang /root/.mozbuild
 RUN cp -r dmg /root/.mozbuild
-RUN cp -r hfsplus-tools /root/.mozbuild
+# RUN cp -r hfsplus-tools /root/.mozbuild
 RUN pip install testresources pycairo
 WORKDIR ..
 RUN rm -rf librewolf-$version-$source_release librewolf-$version-$source_release.source.tar.gz
diff --git a/assets/macos.mozconfig b/assets/macos.mozconfig
index 180e0d9..4fef1be 100644
--- a/assets/macos.mozconfig
+++ b/assets/macos.mozconfig
@@ -22,7 +22,7 @@ export HOST_CC="$CROSS/clang/bin/clang"
 export HOST_CXX="$CROSS/clang/bin/clang++"
 
 # These are needed for packaging.
-export MKFSHFS="$CROSS/hfsplus-tools/newfs_hfs"
+# export MKFSHFS="$CROSS/hfsplus-tools/newfs_hfs"
 export DMG_TOOL="$CROSS/dmg/dmg"
 export HFS_TOOL="$CROSS/dmg/hfsplus"