From d7e24ee28d004f30e2310dd514a52f211bb3e24b Mon Sep 17 00:00:00 2001
From: Alexandros Theodotou <alex@zrythm.org>
Date: Thu, 11 Nov 2021 10:30:37 +0000
Subject: [PATCH] fix mac build

---
 meson.build                      | 9 ++++++++-
 src/gui/widgets/left_dock_edge.c | 2 ++
 src/zrythm_app.c                 | 1 +
 subprojects/gdk-pixbuf.wrap      | 8 ++------
 subprojects/harfbuzz.wrap        | 7 ++++---
 subprojects/json-glib.wrap       | 5 +++++
 6 files changed, 22 insertions(+), 10 deletions(-)
 create mode 100644 subprojects/json-glib.wrap

diff --git a/meson.build b/meson.build
index 9f83c812d..35ce78968 100644
--- a/meson.build
+++ b/meson.build
@@ -958,6 +958,13 @@ lilv_dep = dependency (
   fallback: ['lilv', 'lilv_dep'],
   static: all_static)
 
+json_glib_dep = dependency (
+  'json-glib-1.0',
+  fallback: ['json-glib', 'json_glib_dep'],
+  default_options: [
+    'introspection=disabled', 'gtk_doc=disabled',
+    'tests=false',])
+
 # fftw
 fftw3_deps = [
   dependency (
@@ -1243,7 +1250,7 @@ zrythm_deps = [
   xxhash_dep,
   vamp_deps,
   dependency ('libcurl'),
-  dependency ('json-glib-1.0'),
+  json_glib_dep,
 
   libm,
 ]
diff --git a/src/gui/widgets/left_dock_edge.c b/src/gui/widgets/left_dock_edge.c
index f36c8ff60..91f8e66de 100644
--- a/src/gui/widgets/left_dock_edge.c
+++ b/src/gui/widgets/left_dock_edge.c
@@ -160,6 +160,8 @@ static void
 left_dock_edge_widget_init (
   LeftDockEdgeWidget * self)
 {
+  g_type_ensure (FOLDABLE_NOTEBOOK_WIDGET_TYPE);
+
   gtk_widget_init_template (GTK_WIDGET (self));
 
   const int min_width = 160;
diff --git a/src/zrythm_app.c b/src/zrythm_app.c
index 65e24dbb8..ff8582487 100644
--- a/src/zrythm_app.c
+++ b/src/zrythm_app.c
@@ -1852,6 +1852,7 @@ add_option_entries (
         "AppImage runtime path",
         "PATH" },
 #endif
+      NULL,
     };
 
   g_application_add_main_option_entries (
diff --git a/subprojects/gdk-pixbuf.wrap b/subprojects/gdk-pixbuf.wrap
index 4186784ff..7727a9a8c 100644
--- a/subprojects/gdk-pixbuf.wrap
+++ b/subprojects/gdk-pixbuf.wrap
@@ -1,6 +1,2 @@
-[wrap-file]
-directory = gdk-pixbuf-2.42.6
-
-source_url = https://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/2.42/gdk-pixbuf-2.42.6.tar.xz
-source_filename = gdk-pixbuf-2.42.6.tar.xz
-source_hash = c4a6b75b7ed8f58ca48da830b9fa00ed96d668d3ab4b1f723dcf902f78bde77f
+[wrap-redirect]
+filename = gtk-acf6d47b6fc8e7240ee19108809c7e148da8214c/subprojects/gdk-pixbuf.wrap
diff --git a/subprojects/harfbuzz.wrap b/subprojects/harfbuzz.wrap
index cc0a89d69..10b770d42 100644
--- a/subprojects/harfbuzz.wrap
+++ b/subprojects/harfbuzz.wrap
@@ -1,5 +1,6 @@
 [wrap-git]
 directory=harfbuzz
-url=https://github.com/centricular/harfbuzz.git
-push-url=git@github.com:centricular/harfbuzz.git
-revision=meson
+url=https://github.com/harfbuzz/harfbuzz.git
+push-url=git@github.com:harfbuzz/harfbuzz.git
+revision=main
+depth=1
diff --git a/subprojects/json-glib.wrap b/subprojects/json-glib.wrap
new file mode 100644
index 000000000..4bc8a028c
--- /dev/null
+++ b/subprojects/json-glib.wrap
@@ -0,0 +1,5 @@
+[wrap-git]
+directory=json-glib
+url=https://gitlab.gnome.org/GNOME/json-glib
+revision=master
+depth=1