Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[glib] update to 2.78.0 #34439

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 0 additions & 24 deletions ports/glib/fix-build-race-on-gio.patch

This file was deleted.

8 changes: 4 additions & 4 deletions ports/glib/libintl.patch
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions ports/glib/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ 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
ARCHIVE "${GLIB_ARCHIVE}"
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)
Expand Down
12 changes: 12 additions & 0 deletions ports/glib/suppress-libelf-dependency.patch
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion ports/glib/vcpkg.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -2933,7 +2933,7 @@
"port-version": 2
},
"glib": {
"baseline": "2.76.5",
"baseline": "2.78.0",
"port-version": 0
},
"glibmm": {
Expand Down
5 changes: 5 additions & 0 deletions versions/g-/glib.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "cd9adf35a5c743b40cedce00c43542980f338229",
"version": "2.78.0",
"port-version": 0
},
{
"git-tree": "4ae4475a91c8ec7f156e5904da9f0c3f02224cdc",
"version": "2.76.5",
Expand Down