From 3858e343d3d57b6fcb26b6c6705cdf558d59ba29 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Sat, 9 Mar 2024 13:14:15 +0900 Subject: [PATCH] Update glib Signed-off-by: Benjamin Gilbert --- .github/workflows/direct.yml | 5 ++--- subprojects/glib.wrap | 12 ++++++------ 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/workflows/direct.yml b/.github/workflows/direct.yml index f3f9797b..1227829f 100644 --- a/.github/workflows/direct.yml +++ b/.github/workflows/direct.yml @@ -58,9 +58,8 @@ jobs: brew link --overwrite $formula done brew update - # setuptools needed by glib 2.78 - # https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3740 - brew install meson python-setuptools + # python-packaging needed by glib + brew install meson python-packaging - name: Check out repo uses: actions/checkout@v4 - name: Cache sources diff --git a/subprojects/glib.wrap b/subprojects/glib.wrap index 25305d5c..6e7aee2f 100644 --- a/subprojects/glib.wrap +++ b/subprojects/glib.wrap @@ -1,10 +1,10 @@ [wrap-file] -directory = glib-2.78.4 -source_url = https://download.gnome.org/sources/glib/2.78/glib-2.78.4.tar.xz -source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/glib_2.78.4-1/glib-2.78.4.tar.xz -source_filename = glib-2.78.4.tar.xz -source_hash = 24b8e0672dca120cc32d394bccb85844e732e04fe75d18bb0573b2dbc7548f63 -wrapdb_version = 2.78.4-1 +directory = glib-2.80.0 +source_url = https://download.gnome.org/sources/glib/2.80/glib-2.80.0.tar.xz +source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/glib_2.80.0-1/glib-2.80.0.tar.xz +source_filename = glib-2.80.0.tar.xz +source_hash = 8228a92f92a412160b139ae68b6345bd28f24434a7b5af150ebe21ff587a561d +wrapdb_version = 2.80.0-1 [provide] dependency_names = gthread-2.0, gobject-2.0, gmodule-no-export-2.0, gmodule-export-2.0, gmodule-2.0, glib-2.0, gio-2.0, gio-windows-2.0, gio-unix-2.0