[glib] update to 2.72.3 (#25853)

* [glib] update to 2.72.3 * update version * add patch * overwrite version * patch name * version * update patch * version
microsoft · Jul 22, 2022 · e347f74 · e347f74
1 parent bded84c
commit e347f74
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 18 deletions.
diff --git a/ports/glib/libintl.patch b/ports/glib/libintl.patch
@@ -1,18 +1,18 @@
 diff --git a/meson.build b/meson.build
-index c418f50b1..e7158c036 100644
+index 7773f56..171d193 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -2048,42 +2048,10 @@ endif
+@@ -2089,42 +2089,10 @@ endif
  # 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 = []
--if cc.has_function('ngettext', args : osx_ldflags)
+-if cc.has_function('ngettext')
 -  have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset')
 -else
 -  # First just find the bare library.
 -  libintl = cc.find_library('intl', required : false)
 -  # The bare library probably won't link without help if it's static.
--  if libintl.found() and not cc.has_function('ngettext', args : osx_ldflags, dependencies : libintl)
+-  if libintl.found() and not cc.has_function('ngettext', dependencies : libintl)
 -     libintl_iconv = cc.find_library('iconv', required : false)
 -     # libintl supports different threading APIs, which may not
 -     # require additional flags, but it defaults to using pthreads if
@@ -22,10 +22,10 @@ index c418f50b1..e7158c036 100644
 -     # also defining the macros with the -pthread flag.
 -     libintl_pthread = cc.find_library('pthread', required : false)
 -     # Try linking with just libiconv.
--     if libintl_iconv.found() and cc.has_function('ngettext', args : osx_ldflags, dependencies : [libintl, libintl_iconv])
+-     if libintl_iconv.found() and cc.has_function('ngettext', dependencies : [libintl, libintl_iconv])
 -       libintl_deps += [libintl_iconv]
 -     # Then also try linking with pthreads.
--     elif libintl_iconv.found() and libintl_pthread.found() and cc.has_function('ngettext', args : osx_ldflags, dependencies : [libintl, libintl_iconv, libintl_pthread])
+-     elif libintl_iconv.found() and libintl_pthread.found() and cc.has_function('ngettext', dependencies : [libintl, libintl_iconv, libintl_pthread])
 -       libintl_deps += [libintl_iconv, libintl_pthread]
 -     else
 -       libintl = disabler()
@@ -37,14 +37,15 @@ index c418f50b1..e7158c036 100644
 -    have_bind_textdomain_codeset = true  # proxy-libintl supports it
 -  else
 -    libintl_deps = [libintl] + libintl_deps
--    have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset', args : osx_ldflags,
-+libintl = dependency('Intl', method:'cmake', required : true)
-+libintl_deps += [libintl]
-+have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset', args : osx_ldflags,
-                                                    dependencies : libintl_deps)
+-    have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset', 
+-                                                   dependencies : libintl_deps)
 -  endif
 -endif
 -
++libintl = dependency('Intl', method:'cmake', required : true)
++libintl_deps += [libintl]
++have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset',
++                                                   dependencies : libintl_deps)												   
  glib_conf.set('HAVE_BIND_TEXTDOMAIN_CODESET', have_bind_textdomain_codeset)
 
  # We require gettext to always be present
diff --git a/ports/glib/portfile.cmake b/ports/glib/portfile.cmake
@@ -4,14 +4,14 @@ if (VCPKG_TARGET_IS_WINDOWS)
     #remove if merged: https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1655
 endif()
 
-set(GLIB_MAJOR_MINOR 2.70)
-set(GLIB_PATCH 5)
+set(GLIB_MAJOR_MINOR 2.72)
+set(GLIB_PATCH 3)
 vcpkg_from_gitlab(
     GITLAB_URL https://gitlab.gnome.org/
     OUT_SOURCE_PATH SOURCE_PATH
     REPO GNOME/glib
     REF "${GLIB_MAJOR_MINOR}.${GLIB_PATCH}"
-    SHA512 69c032358e0a0d88414a97e0bc898b5ce2797839a432b95790d03f108e55a79eee2d51bab5e281cc9469e2a57accc0d2c9bbaa80f9369050534387d1a215dd98
+    SHA512 805100bdd240122e1a74b432d7be7458af5b3b0507d46ed9cb0ce2ed6facf6e7d927b1d869831c9ba21b4a40a6667989ff69fc4f661bd044cb08932184804e79
     PATCHES
         use-libiconv-on-windows.patch
         libintl.patch

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

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -2585,8 +2585,8 @@
       "port-version": 0
     },
     "glib": {
-      "baseline": "2.70.5",
-      "port-version": 2
+      "baseline": "2.72.3",
+      "port-version": 0
     },
     "glibmm": {
       "baseline": "2.70.0",

diff --git a/versions/g-/glib.json b/versions/g-/glib.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "abff8e76676673462462f949844d3369d93be61d",
+      "version": "2.72.3",
+      "port-version": 0
+    },
     {
       "git-tree": "3fc7533aba85394460293d7ba61abc3170323f1d",
       "version": "2.70.5",