[glib] Fix build failures (#31034)

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
microsoft · Apr 26, 2023 · 0be3552 · 0be3552
1 parent 210e4ad
commit 0be3552
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 1 deletion.
diff --git a/ports/glib/portfile.cmake b/ports/glib/portfile.cmake
@@ -4,12 +4,18 @@ vcpkg_download_distfile(GLIB_ARCHIVE
     FILENAME "glib-${VERSION}.tar.xz"
     SHA512 7ab8740925fa4ed2d860a35544c475ae905df5fa7fc0cc64ffa8c543df6073794e44c8ff39e3e1de1d677016ef9d27e9bc709d2505d13090faa8d6c47cd64bd0
 )
+vcpkg_download_distfile(GLIB_MR_3386
+    URLS "https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3386.diff"
+    FILENAME "glib-mr-3386.diff"
+    SHA512 cb67e8908a7cb6f945d019da1bf56f504b9c2131a832bcdfbdc61c973c89efd8e4380d5d67f83e229998da1e8579f3ff87b7695a3318eee9613d1ab1168bd0db
+)
 
 vcpkg_extract_source_archive(SOURCE_PATH
     ARCHIVE "${GLIB_ARCHIVE}"
     PATCHES
         use-libiconv-on-windows.patch
         libintl.patch
+        ${GLIB_MR_3386}
 )
 
 vcpkg_list(SET OPTIONS)

diff --git a/ports/glib/vcpkg.json b/ports/glib/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "glib",
   "version": "2.76.1",
+  "port-version": 1,
   "description": "Portable, general-purpose utility library.",
   "homepage": "https://developer.gnome.org/glib/",
   "license": "LGPL-2.1-or-later",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -2814,7 +2814,7 @@
     },
     "glib": {
       "baseline": "2.76.1",
-      "port-version": 0
+      "port-version": 1
     },
     "glibmm": {
       "baseline": "2.76.0",

diff --git a/versions/g-/glib.json b/versions/g-/glib.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "82258d825872b8c0987fe62b759b7602edbed17b",
+      "version": "2.76.1",
+      "port-version": 1
+    },
     {
       "git-tree": "c44e4f3f2265fbdb713b8fecc8dd15418d99021e",
       "version": "2.76.1",