[glib] Update to 2.86.2 (#48443)

This commit is contained in:
Kai Pastor
2025-11-26 23:24:41 +01:00
committed by GitHub
parent 8c077366d8
commit 4b883d018d
6 changed files with 22 additions and 15 deletions

View File

@@ -1,11 +1,10 @@
diff --git a/meson.build b/meson.build
index 5677fa8..6407c64 100644
--- a/meson.build
+++ b/meson.build
@@ -2134,10 +2135,10 @@ libz_dep = dependency('zlib')
# proxy-libintl subproject.
# FIXME: glib-gettext.m4 has much more checks to detect broken/uncompatible
@@ -2307,8 +2307,9 @@ endif
# implementations. This could be extended if issues are found in some platforms.
-libintl_deps = []
libintl_deps = []
libintl_prefix = '#include <libintl.h>'
-libintl = dependency('intl', required: false)
-if libintl.found() and libintl.type_name() != 'internal'

View File

@@ -1,9 +1,13 @@
# vcpkg_from_* is not used because the project uses submodules.
string(REGEX MATCH "^([0-9]*[.][0-9]*)" GLIB_MAJOR_MINOR "${VERSION}")
# https://github.com/GNOME/glib/blob/main/SECURITY.md#supported-versions
if(NOT GLIB_MAJOR_MINOR MATCHES "[02468]\$")
message("${Z_VCPKG_BACKCOMPAT_MESSAGE_LEVEL}" "glib ${GLIB_MAJOR_MINOR} is a not a \"stable release series\".")
endif()
# vcpkg_from_* is not used because the project uses submodules.
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 430928d7d7a442fc3927ca943f2569035fe8768768a0ebc6720ae1ef152b56fc5f8d4215d21b4828cc2f39a8632c907ed2c52a0c8566da1c533a2e049a1a121f
SHA512 b9ef7ea7e1eeff142a8ab76fb0552331fd642133a31505e2939f57d7d9c5ec86dcefddc725c715925a42c348d71e2a8bf2eb399150108199b6daeca2761e08d6
)
vcpkg_extract_source_archive(SOURCE_PATH
@@ -19,7 +23,7 @@ if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_IOS)
endif()
vcpkg_list(SET OPTIONS)
if (selinux IN_LIST FEATURES)
if ("selinux" IN_LIST FEATURES)
if(NOT EXISTS "/usr/include/selinux")
message(WARNING "SELinux was not found in its typical system location. Your build may fail. You can install SELinux with \"apt-get install selinux libselinux1-dev\".")
endif()
@@ -28,7 +32,7 @@ else()
list(APPEND OPTIONS -Dselinux=disabled)
endif()
if (libmount IN_LIST FEATURES)
if ("libmount" IN_LIST FEATURES)
list(APPEND OPTIONS -Dlibmount=enabled)
else()
list(APPEND OPTIONS -Dlibmount=disabled)

View File

@@ -1,5 +1,5 @@
diff --git a/glib/gconvert.c b/glib/gconvert.c
index 829fe38de..e01ad8884 100644
index 53b2065..3e29bee 100644
--- a/glib/gconvert.c
+++ b/glib/gconvert.c
@@ -33,7 +33,8 @@
@@ -13,10 +13,10 @@ index 829fe38de..e01ad8884 100644
#include "gconvert.h"
diff --git a/meson.build b/meson.build
index d465253af..34ce69e4d 100644
index f30ca58..5677fa8 100644
--- a/meson.build
+++ b/meson.build
@@ -2038,7 +2038,8 @@ glibconfig_conf.set10('G_HAVE_GROWING_STACK', growing_stack)
@@ -2233,7 +2233,8 @@ glibconfig_conf.set10('G_HAVE_GROWING_STACK', growing_stack)
if host_system == 'windows'
# We have a #include "win_iconv.c" in gconvert.c on Windows, so we don't need
# any external library for it

View File

@@ -1,7 +1,6 @@
{
"name": "glib",
"version": "2.84.2",
"port-version": 2,
"version": "2.86.2",
"description": "Portable, general-purpose utility library.",
"homepage": "https://developer.gnome.org/glib/",
"license": "LGPL-2.1-or-later",

View File

@@ -3353,8 +3353,8 @@
"port-version": 2
},
"glib": {
"baseline": "2.84.2",
"port-version": 2
"baseline": "2.86.2",
"port-version": 0
},
"glib-networking": {
"baseline": "2.78.0",

View File

@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "02461ea73953c9dac6b43b89d20daf4e8280e1c7",
"version": "2.86.2",
"port-version": 0
},
{
"git-tree": "d3aabce5c1a06d3dde0a6fce2f795eeb37fc4d15",
"version": "2.84.2",