From d251422af6ffc32a6bc4d1dc9f2b3e1cfbf3096f Mon Sep 17 00:00:00 2001
From: Khaled Hosny <khaled@aliftype.com>
Date: Wed, 2 Oct 2024 21:23:42 +0300
Subject: [PATCH 1/2] [meson] Update wrap files

Except for googletest as newer versions require C++14.
---
 subprojects/freetype2.wrap     | 13 +++++++------
 subprojects/google-brotli.wrap | 17 +++++++++--------
 subprojects/zlib.wrap          | 17 +++++++++--------
 3 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/subprojects/freetype2.wrap b/subprojects/freetype2.wrap
index ec4da37a..acad6f48 100644
--- a/subprojects/freetype2.wrap
+++ b/subprojects/freetype2.wrap
@@ -1,10 +1,11 @@
 [wrap-file]
-directory = freetype-2.12.1
-source_url = https://download.savannah.gnu.org/releases/freetype/freetype-2.12.1.tar.xz
-source_filename = freetype-2.12.1.tar.xz
-source_hash = 4766f20157cc4cf0cd292f80bf917f92d1c439b243ac3018debf6b9140c41a7f
-wrapdb_version = 2.12.1-1
+directory = freetype-2.13.3
+source_url = https://download.savannah.gnu.org/releases/freetype/freetype-2.13.3.tar.xz
+source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/freetype2_2.13.3-1/freetype-2.13.3.tar.xz
+source_filename = freetype-2.13.3.tar.xz
+source_hash = 0550350666d427c74daeb85d5ac7bb353acba5f76956395995311a9c6f063289
+wrapdb_version = 2.13.3-1
 
 [provide]
 freetype2 = freetype_dep
-
+freetype = freetype_dep
diff --git a/subprojects/google-brotli.wrap b/subprojects/google-brotli.wrap
index 736be021..9c55682a 100644
--- a/subprojects/google-brotli.wrap
+++ b/subprojects/google-brotli.wrap
@@ -1,14 +1,15 @@
 [wrap-file]
-directory = brotli-1.0.9
-source_url = https://github.com/google/brotli/archive/v1.0.9.tar.gz
-source_filename = v1.0.9.tar.gz
-source_hash = f9e8d81d0405ba66d181529af42a3354f838c939095ff99930da6aa9cdf6fe46
-patch_filename = google-brotli_1.0.9-1_patch.zip
-patch_url = https://wrapdb.mesonbuild.com/v2/google-brotli_1.0.9-1/get_patch
-patch_hash = 11135edf60bdf155b075cb6cf80dcc743bdcbfc5b8c48c327e717b279db447a1
+directory = brotli-1.1.0
+source_url = https://github.com/google/brotli/archive/v1.1.0.tar.gz
+source_filename = v1.1.0.tar.gz
+source_hash = e720a6ca29428b803f4ad165371771f5398faba397edf6778837a18599ea13ff
+patch_filename = google-brotli_1.1.0-1_patch.zip
+patch_url = https://wrapdb.mesonbuild.com/v2/google-brotli_1.1.0-1/get_patch
+patch_hash = 6826873a148c670d90a80715a7083284da7e19d59cda6a135fae6774411914dc
+source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/google-brotli_1.1.0-1/v1.1.0.tar.gz
+wrapdb_version = 1.1.0-1
 
 [provide]
 libbrotlicommon = brotli_common_dep
 libbrotlidec = brotli_decoder_dep
 libbrotlienc = brotli_encoder_dep
-
diff --git a/subprojects/zlib.wrap b/subprojects/zlib.wrap
index 3c7b5757..aa14de17 100644
--- a/subprojects/zlib.wrap
+++ b/subprojects/zlib.wrap
@@ -1,12 +1,13 @@
 [wrap-file]
-directory = zlib-1.2.12
-source_url = http://zlib.net/fossils/zlib-1.2.12.tar.gz
-source_filename = zlib-1.2.12.tar.gz
-source_hash = 91844808532e5ce316b3c010929493c0244f3d37593afd6de04f71821d5136d9
-patch_filename = zlib_1.2.12-1_patch.zip
-patch_url = https://wrapdb.mesonbuild.com/v2/zlib_1.2.12-1/get_patch
-patch_hash = 8ec8344f3fe7b06ad4be768fd416694bc56cb4545ce78b0f1c18b3e72b3ec936
+directory = zlib-1.3.1
+source_url = http://zlib.net/fossils/zlib-1.3.1.tar.gz
+source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/zlib_1.3.1-1/zlib-1.3.1.tar.gz
+source_filename = zlib-1.3.1.tar.gz
+source_hash = 9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23
+patch_filename = zlib_1.3.1-1_patch.zip
+patch_url = https://wrapdb.mesonbuild.com/v2/zlib_1.3.1-1/get_patch
+patch_hash = e79b98eb24a75392009cec6f99ca5cdca9881ff20bfa174e8b8926d5c7a47095
+wrapdb_version = 1.3.1-1
 
 [provide]
 zlib = zlib_dep
-

From 38911e8815c42b06e13dd96d645b5a05f1cc1bd5 Mon Sep 17 00:00:00 2001
From: Khaled Hosny <khaled@aliftype.com>
Date: Wed, 2 Oct 2024 21:42:28 +0300
Subject: [PATCH 2/2] =?UTF-8?q?[meson]=20Disable=20FreeType=20dependencies?=
 =?UTF-8?q?=20we=20don=E2=80=99t=20need?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 meson.build | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index c2ce03ba..89348ec9 100644
--- a/meson.build
+++ b/meson.build
@@ -28,7 +28,9 @@ if get_option('colr-cycle-check')
   conf.set('OTS_COLR_CYCLE_CHECK', 1)
 endif
 
-freetype = dependency('freetype2', required: false)
+freetype = dependency('freetype2', required: false,
+  default_options: ['harfbuzz=disabled', 'brotli=disabled', 'zlib=disabled', 'bzip2=disabled']
+)
 if freetype.found()
   conf.set('HAVE_FREETYPE', 1)
 endif