From 43c66b6dc3e8fa80ce55d39180c94ad590a9a5d9 Mon Sep 17 00:00:00 2001
From: Robbert van der Helm <mail@robbertvanderhelm.nl>
Date: Thu, 11 Nov 2021 03:02:38 +0100
Subject: [PATCH] Update function2 wrap to 4.2.0 and patch_directory

And switch to wrap-git.
---
 CHANGELOG.md                             |   4 ++++
 meson.build                              |   2 +-
 subprojects/.gitignore                   |   3 +++
 subprojects/function2-patch-4.1.0.tar.xz | Bin 2184 -> 0 bytes
 subprojects/function2-patch/meson.build  |   3 +++
 subprojects/function2.wrap               |  16 ++++++----------
 6 files changed, 17 insertions(+), 11 deletions(-)
 delete mode 100644 subprojects/function2-patch-4.1.0.tar.xz
 create mode 100644 subprojects/function2-patch/meson.build

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1adb4eaa..e6b9970b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,6 +33,10 @@ Versioning](https://semver.org/spec/v2.0.0.html).
   receives timer events while doing offline audio processing, so we now prevent
   that from happening.
 
+### Packaging notes
+
+- The function2 wrap dependency was updated to version 4.2.0.
+
 ## [3.6.0] - 2021-10-15
 
 ### Added
diff --git a/meson.build b/meson.build
index 36334e53..dce11e96 100644
--- a/meson.build
+++ b/meson.build
@@ -228,7 +228,7 @@ boost_dep = dependency('boost', version : '>=1.66', static : with_static_boost)
 # TODO: Meson doesn't have a way to define version ranges, does it? Like
 #       `^>=5.2.0`, `>=5.2.0 && <6.0.0` or `5.2.*`.
 bitsery_dep = dependency('bitsery', version : '>=5.2.0', fallback : ['bitsery', 'bitsery_dep'])
-function2_dep = dependency('function2', version : '>=4.1.0', fallback : ['function2', 'function2_dep'])
+function2_dep = dependency('function2', version : '>=4.2.0', fallback : ['function2', 'function2_dep'])
 threads_dep = dependency('threads')
 tomlplusplus_dep = dependency('tomlplusplus', version : '>=2.1.0', fallback : ['tomlplusplus', 'tomlplusplus_dep'])
 
diff --git a/subprojects/.gitignore b/subprojects/.gitignore
index e557da5e..a5996a79 100644
--- a/subprojects/.gitignore
+++ b/subprojects/.gitignore
@@ -3,3 +3,6 @@
 # The above pattern doesn't match submodules
 /tomlplusplus
 /vst3
+
+# And we obviously don't want to ignore our overlays
+!/function2-patch/*
diff --git a/subprojects/function2-patch-4.1.0.tar.xz b/subprojects/function2-patch-4.1.0.tar.xz
deleted file mode 100644
index 141ec0d3fc8711c79075c927c7438cdc18220809..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2184
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
K000001X)@I+$sP7

diff --git a/subprojects/function2-patch/meson.build b/subprojects/function2-patch/meson.build
new file mode 100644
index 00000000..d871d1c5
--- /dev/null
+++ b/subprojects/function2-patch/meson.build
@@ -0,0 +1,3 @@
+project('function2', 'cpp', version : '4.2.0')
+
+function2_dep = declare_dependency(include_directories : include_directories('include'))
diff --git a/subprojects/function2.wrap b/subprojects/function2.wrap
index e0da7382..7500ee37 100644
--- a/subprojects/function2.wrap
+++ b/subprojects/function2.wrap
@@ -1,11 +1,7 @@
-[wrap-file]
-directory = function2-4.1.0
+[wrap-git]
+url = https://github.com/Naios/function2.git
+# Tag 4.2.0
+revision = 02ca99831de59c7c3a4b834789260253cace0ced
+depth = 1
 
-source_url = https://github.com/Naios/function2/archive/4.1.0.tar.gz
-source_filename = function2-4.1.0.tar.gz
-source_hash = c3aaeaf93bf90c0f4505a18f1094b51fe28881ce202c3bf78ec4efb336c51981
-
-# TODO: Meson 0.55 added patch_directory, so we can just use that instead
-patch_url = file:./subprojects/function2-patch-4.1.0.tar.xz
-patch_filename = function2-patch-4.1.0.tar.xz
-patch_hash = 4b966afd862413ea1f3d96484e74401992ec958f1ee2b4cc161f3cb7c36fe7ba
+patch_directory = subprojects/function2-patch