From 4831766ae6e81420d8196dcf7fdc3a8d9af8bcba Mon Sep 17 00:00:00 2001
From: Alexandros Theodotou <alex@zrythm.org>
Date: Sat, 8 Jan 2022 19:43:56 +0000
Subject: [PATCH] windows-msys: build gtk4 again

---
 windows-msys/PKGBUILD-gtk4-mingw.in |  4 ++--
 windows-msys/meson.build            | 25 ++++++++++++++++++++++---
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/windows-msys/PKGBUILD-gtk4-mingw.in b/windows-msys/PKGBUILD-gtk4-mingw.in
index 0e08344..56324c3 100644
--- a/windows-msys/PKGBUILD-gtk4-mingw.in
+++ b/windows-msys/PKGBUILD-gtk4-mingw.in
@@ -2,9 +2,9 @@
 _realname=gtk4
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-_commit='4.6.0'
+_commit='main'
 pkgver=4.6.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Cairo vector graphics library (mingw-w64)"
 arch=('any')
 url="https://cairographics.org/"
diff --git a/windows-msys/meson.build b/windows-msys/meson.build
index 77e402d..7684041 100644
--- a/windows-msys/meson.build
+++ b/windows-msys/meson.build
@@ -65,6 +65,11 @@ mingw_cairo_pkgbuild = configure_file (
   input: 'PKGBUILD-cairo-mingw.in',
   configuration: windows_msys_conf,
   )
+mingw_gtk4_pkgbuild = configure_file (
+  output: 'PKGBUILD-gtk4-mingw',
+  input: 'PKGBUILD-gtk4-mingw.in',
+  configuration: windows_msys_conf,
+  )
 mingw_libadwaita_pkgbuild = configure_file (
   output: 'PKGBUILD-libadwaita-mingw',
   input: 'PKGBUILD-libadwaita-mingw.in',
@@ -301,11 +306,25 @@ run_target (
   'run-mingw-cairo',
   command: [ 'echo', 'done' ],
   depends: cairo_pkg)
+gtk4_pkg = custom_target (
+  'mingw-gtk4',
+  output: 'gtk4.pkg.tar.zst',
+  input: [ make_mingw_pkg, mingw_gtk4_pkgbuild, ],
+  depends: cairo_pkg,
+  command: make_mingw_pkg_cmd,
+  console: true,
+  install: false,
+  )
+run_target (
+  'run-mingw-gtk4',
+  command: [ 'echo', 'done' ],
+  depends: gtk4_pkg)
 libadwaita_pkg = custom_target (
   'mingw-libadwaita',
   output: 'libadwaita.pkg.tar.zst',
   input: [ make_mingw_pkg, mingw_libadwaita_pkgbuild, ],
   command: make_mingw_pkg_cmd,
+  depends: gtk4_pkg,
   console: true,
   install: false,
   )
@@ -351,19 +370,19 @@ windows_chroot_target = custom_target (
     carla_packages[1],
     lv2_pkg, serd_pkg, sord_pkg,
     sratom_pkg, lilv_pkg, cairo_pkg,
-    libadwaita_pkg,
+    gtk4_pkg, libadwaita_pkg,
     lsp_dsp_lib_pkg, mingw_zrythm_pkg,
     ],
   command: [
     bash, '-c',
     '@INPUT0@ "$1" "$2" "$3" "$4" "$5" "$6" ' +
     '"$7" "$8" "$9" "${10}" "${11}" "${12}" "${13}" ' +
-    '"${14}" "${15}"',
+    '"${14}" "${15}" "${16}"',
     '_ignored',
     '@OUTPUT@', chroot_dir, '@INPUT1@', '@INPUT2@',
     '@INPUT3@', '@INPUT4@', '@INPUT5@', '@INPUT6@',
     '@INPUT7@', '@INPUT8@', '@INPUT9@', '@INPUT10@',
-    '@INPUT11@', '@INPUT12@', '@INPUT13@',
+    '@INPUT11@', '@INPUT12@', '@INPUT13@', '@INPUT14@',
     ],
   console: true,
   install: false,