From acb478dcbb1c318dc53866644eca0a1a0f07dcb3 Mon Sep 17 00:00:00 2001
From: "Schaich, Alonso" <alonsoschaich@fastmail.fm>
Date: Thu, 12 Oct 2023 17:02:11 +0900
Subject: [PATCH 1/2] [glib] update to 2.78.0 (microsoft/vcpkg#34438)

---
 ports/glib/fix-build-race-on-gio.patch      | 24 ---------------------
 ports/glib/libintl.patch                    |  8 +++----
 ports/glib/portfile.cmake                   |  4 ++--
 ports/glib/suppress-libelf-dependency.patch | 12 +++++++++++
 ports/glib/vcpkg.json                       |  2 +-
 5 files changed, 19 insertions(+), 31 deletions(-)
 delete mode 100644 ports/glib/fix-build-race-on-gio.patch
 create mode 100644 ports/glib/suppress-libelf-dependency.patch

diff --git a/ports/glib/fix-build-race-on-gio.patch b/ports/glib/fix-build-race-on-gio.patch
deleted file mode 100644
index 2d2c01b1bb3107..00000000000000
--- a/ports/glib/fix-build-race-on-gio.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/gio/kqueue/meson.build b/gio/kqueue/meson.build
-index 7447e56..f3e573f 100644
---- a/gio/kqueue/meson.build
-+++ b/gio/kqueue/meson.build
-@@ -10,6 +10,7 @@ kqueue_lib = static_library('kqueue',
-   include_directories : [configinc, glibinc],
-   dependencies : [
-     gioenumtypes_dep,
-+    libglib_dep,
-     gmodule_inc_dep,
-   ],
-   gnu_symbol_visibility : 'hidden',
-diff --git a/gio/win32/meson.build b/gio/win32/meson.build
-index 08be6b0..6699f10 100644
---- a/gio/win32/meson.build
-+++ b/gio/win32/meson.build
-@@ -13,6 +13,7 @@ giowin32_lib = static_library('giowin32',
-   dependencies : [
-     libintl,
-     gioenumtypes_dep,
-+    libglib_dep,
-     gmodule_inc_dep,
-   ],
-   gnu_symbol_visibility : 'hidden',
diff --git a/ports/glib/libintl.patch b/ports/glib/libintl.patch
index 6e966aab2d2b0a..e62c5667218c7f 100644
--- a/ports/glib/libintl.patch
+++ b/ports/glib/libintl.patch
@@ -1,14 +1,14 @@
 diff --git a/meson.build b/meson.build
-index f44fa2d4e..d465253af 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -2088,9 +2088,9 @@
+@@ -2134,10 +2135,10 @@ libz_dep = dependency('zlib')
  # proxy-libintl subproject.
  # FIXME: glib-gettext.m4 has much more checks to detect broken/uncompatible
  # implementations. This could be extended if issues are found in some platforms.
 -libintl_deps = []
--libintl = dependency('intl', required: false, allow_fallback: false)
--if libintl.found()
+ libintl_prefix = '#include <libintl.h>'
+-libintl = dependency('intl', required: false)
+-if libintl.found() and libintl.type_name() != 'internal'
 +libintl = dependency('Intl', method:'cmake', required: true)
 +libintl_deps = [libintl]
 +if false
diff --git a/ports/glib/portfile.cmake b/ports/glib/portfile.cmake
index c36828c4438f86..bc4fe0601efe44 100644
--- a/ports/glib/portfile.cmake
+++ b/ports/glib/portfile.cmake
@@ -2,7 +2,7 @@ string(REGEX MATCH "^([0-9]*[.][0-9]*)" GLIB_MAJOR_MINOR "${VERSION}")
 vcpkg_download_distfile(GLIB_ARCHIVE
     URLS "https://download.gnome.org/sources/glib/${GLIB_MAJOR_MINOR}/glib-${VERSION}.tar.xz"
     FILENAME "glib-${VERSION}.tar.xz"
-    SHA512 190a98e9a0ebb802a31b511e95725ed1fec9d750aed6bd87f14f3047d1f1d79458be3fa954fd6eb9af9f481a8deeaae73c95c990f5aa002a4b1166372ed4c4f1
+    SHA512 3d06890002f4b13f831c83fbb70cfce529f9750e30888619e4d6277116be15d106379a03143412cf4b2a289c0cbdbbc299ecf17284fbffc06c791ecf7556c765
 )
 
 vcpkg_extract_source_archive(SOURCE_PATH
@@ -10,7 +10,7 @@ vcpkg_extract_source_archive(SOURCE_PATH
     PATCHES
         use-libiconv-on-windows.patch
         libintl.patch
-        fix-build-race-on-gio.patch # https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3512
+        suppress-libelf-dependency.patch
 )
 
 if(APPLE)
diff --git a/ports/glib/suppress-libelf-dependency.patch b/ports/glib/suppress-libelf-dependency.patch
new file mode 100644
index 00000000000000..cf14dd5771e466
--- /dev/null
+++ b/ports/glib/suppress-libelf-dependency.patch
@@ -0,0 +1,12 @@
+diff --git a/gio/meson.build b/gio/meson.build
+--- a/gio/meson.build
++++ b/gio/meson.build
+@@ -935,7 +935,7 @@ endif
+ # Dependencies used by executables below
+ have_libelf = false
+ libelf = dependency('libelf', version : '>= 0.8.12', required : false)
+-if libelf.found()
++if false
+   have_libelf = true
+ else
+   # This fallback is necessary on *BSD. elfutils isn't the only libelf
diff --git a/ports/glib/vcpkg.json b/ports/glib/vcpkg.json
index 01f38b57d3c5ee..da1c7406f5d19a 100644
--- a/ports/glib/vcpkg.json
+++ b/ports/glib/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "glib",
-  "version": "2.76.5",
+  "version": "2.78.0",
   "description": "Portable, general-purpose utility library.",
   "homepage": "https://developer.gnome.org/glib/",
   "license": "LGPL-2.1-or-later",

From d4ea96db8c19e5111b3b5c0e3ce75d5b04a3ca20 Mon Sep 17 00:00:00 2001
From: "Schaich, Alonso" <alonsoschaich@fastmail.fm>
Date: Thu, 12 Oct 2023 17:05:30 +0900
Subject: [PATCH 2/2] [glib] regenerate versions (microsoft/vcpkg#34438)

---
 versions/baseline.json | 2 +-
 versions/g-/glib.json  | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/versions/baseline.json b/versions/baseline.json
index 77e54f501f0cf2..49afa200aca3c0 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2933,7 +2933,7 @@
       "port-version": 2
     },
     "glib": {
-      "baseline": "2.76.5",
+      "baseline": "2.78.0",
       "port-version": 0
     },
     "glibmm": {
diff --git a/versions/g-/glib.json b/versions/g-/glib.json
index ee968bfb39b576..b856f49bf3766f 100644
--- a/versions/g-/glib.json
+++ b/versions/g-/glib.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "cd9adf35a5c743b40cedce00c43542980f338229",
+      "version": "2.78.0",
+      "port-version": 0
+    },
     {
       "git-tree": "4ae4475a91c8ec7f156e5904da9f0c3f02224cdc",
       "version": "2.76.5",