From 1b98ec70f4e1850c3bb570a000a3c58f6e61bc39 Mon Sep 17 00:00:00 2001
From: Andoni Morales Alastruey <ylatuya@gmail.com>
Date: Wed, 25 Oct 2023 16:19:22 +0200
Subject: [PATCH] csharp: update gtk-sharp subproject

bindinator is now part of gtk-sharp and the submodule is no longer
needed.
---
 subprojects/bindinator.wrap                             | 4 ----
 subprojects/gstreamer-sharp/meson.build                 | 5 ++---
 subprojects/gstreamer-sharp/subprojects/bindinator.wrap | 4 ----
 subprojects/gstreamer-sharp/subprojects/gtk-sharp.wrap  | 5 ++++-
 subprojects/gtk-sharp.wrap                              | 7 +++++--
 5 files changed, 11 insertions(+), 14 deletions(-)
 delete mode 100644 subprojects/bindinator.wrap
 delete mode 100644 subprojects/gstreamer-sharp/subprojects/bindinator.wrap

diff --git a/subprojects/bindinator.wrap b/subprojects/bindinator.wrap
deleted file mode 100644
index 8220055639..0000000000
--- a/subprojects/bindinator.wrap
+++ /dev/null
@@ -1,4 +0,0 @@
-[wrap-git]
-directory=bindinator
-url=https://github.com/GLibSharp/bindinator.git
-revision=c29b965e5ee4a9bd7fcf6b8f4d78dba6c9cbe6ac
diff --git a/subprojects/gstreamer-sharp/meson.build b/subprojects/gstreamer-sharp/meson.build
index d34c9b418e..15e10aae39 100644
--- a/subprojects/gstreamer-sharp/meson.build
+++ b/subprojects/gstreamer-sharp/meson.build
@@ -158,9 +158,8 @@ custom_target('GstSharp-nuget',
 subdir('samples')
 subdir('Tests')
 
-bindinator = subproject('bindinator', default_options: ['gapi_fixup=@0@'.format(gapi_fixup)])
-if bindinator.get_variable('found')
-    bindinate = bindinator.get_variable('bindinate')
+bindinate = find_program('bindinate', required: false)
+if bindinate.found()
     env = environment()
     env.set('GI_TYPELIB_PATH', join_paths(meson.global_source_root(), 'girs'))
     merge_with = '--merge-with=GstApp-1.0,GstAudio-1.0,GstBase-1.0,GstController-1.0,GstNet-1.0,GstPbutils-1.0,GstRtp-1.0,GstRtsp-1.0,GstSdp-1.0,GstTag-1.0,GstVideo-1.0,GstWebRTC-1.0'
diff --git a/subprojects/gstreamer-sharp/subprojects/bindinator.wrap b/subprojects/gstreamer-sharp/subprojects/bindinator.wrap
deleted file mode 100644
index c407526ba8..0000000000
--- a/subprojects/gstreamer-sharp/subprojects/bindinator.wrap
+++ /dev/null
@@ -1,4 +0,0 @@
-[wrap-git]
-directory=bindinator
-url=https://github.com/GLibSharp/bindinator.git
-revision=master
diff --git a/subprojects/gstreamer-sharp/subprojects/gtk-sharp.wrap b/subprojects/gstreamer-sharp/subprojects/gtk-sharp.wrap
index 0edce1cfbd..2562a12d3d 100644
--- a/subprojects/gstreamer-sharp/subprojects/gtk-sharp.wrap
+++ b/subprojects/gstreamer-sharp/subprojects/gtk-sharp.wrap
@@ -1,4 +1,7 @@
 [wrap-git]
 directory=gtk-sharp
 url=https://github.com/GLibSharp/GtkSharp.git
-revision=4c85f1479cf2e0dc056c0d288785e5a1d7251cb1
+revision=4a7912d43de52e91795a06cba145386b26f113bd
+
+[provide]
+program_names = bindinate
diff --git a/subprojects/gtk-sharp.wrap b/subprojects/gtk-sharp.wrap
index c9fa006bc9..34026e2ea7 100644
--- a/subprojects/gtk-sharp.wrap
+++ b/subprojects/gtk-sharp.wrap
@@ -1,4 +1,7 @@
 [wrap-git]
 directory=gtk-sharp
-url=https://github.com/gtk-sharp/gtk-sharp.git
-revision=3.22.2
+url=https://github.com/GLibSharp/GtkSharp.git
+revision=786f531be6c2285c8fe5d00163a4aa28e912f528
+
+[provide]
+program_names = bindinate