From 0414b1b32a7896e5ab61edb42d698cdf6d7d8854 Mon Sep 17 00:00:00 2001 From: WangWeiLin-MV <156736127+WangWeiLin-MV@users.noreply.github.com> Date: Fri, 15 Mar 2024 16:06:58 +0800 Subject: [PATCH] [glib] Update to 2.80.0 --- ports/glib/portfile.cmake | 11 ++++++++--- ports/glib/vcpkg.json | 7 +++++-- versions/baseline.json | 4 ++-- versions/g-/glib.json | 5 +++++ 4 files changed, 20 insertions(+), 7 deletions(-) diff --git a/ports/glib/portfile.cmake b/ports/glib/portfile.cmake index 529484ceda12db..6c08081cbbe029 100644 --- a/ports/glib/portfile.cmake +++ b/ports/glib/portfile.cmake @@ -2,7 +2,7 @@ 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 6f3a06e10e7373a2dbf0688512de4126472fb73cbec488b7983b5ffecff09c64d7e1ca462f892e8f215d3d277d103ca802bad7ef0bd0f91edf26fc6ce67187b6 + SHA512 1514d62aeb4c4a1a1048ae0f84f7db7f0dbf355772b2dadf6a34ec547045b163a5e28331b096e7616fe3c9c19bed98025a0202b05073f5d7ee901d0efaffe143 ) vcpkg_extract_source_archive(SOURCE_PATH @@ -39,6 +39,8 @@ if(VCPKG_HOST_IS_WINDOWS) vcpkg_list(APPEND ADDITIONAL_BINARIES "sh = ['${CMAKE_COMMAND}', '-E', 'false']") endif() +x_vcpkg_get_python_packages(PYTHON_VERSION "3" PACKAGES packaging) + vcpkg_configure_meson( SOURCE_PATH "${SOURCE_PATH}" LANGUAGES C CXX OBJC OBJCXX @@ -46,10 +48,10 @@ vcpkg_configure_meson( ${ADDITIONAL_BINARIES} OPTIONS ${OPTIONS} - -Dgtk_doc=false + -Ddocumentation=false -Dinstalled_tests=false -Dlibelf=disabled - -Dman=false + -Dman-pages=disabled -Dtests=false -Dxattr=false ) @@ -72,6 +74,9 @@ endforeach() set(GLIB_TOOLS gapplication gdbus + gi-compile-repository + gi-decompile-typelib + gi-inspect-typelib gio gio-querymodules glib-compile-resources diff --git a/ports/glib/vcpkg.json b/ports/glib/vcpkg.json index 55272615e3985a..f365d7ec12ea71 100644 --- a/ports/glib/vcpkg.json +++ b/ports/glib/vcpkg.json @@ -1,7 +1,6 @@ { "name": "glib", - "version": "2.78.4", - "port-version": 1, + "version": "2.80.0", "description": "Portable, general-purpose utility library.", "homepage": "https://developer.gnome.org/glib/", "license": "LGPL-2.1-or-later", @@ -12,6 +11,10 @@ "libffi", "libiconv", "pcre2", + { + "name": "vcpkg-get-python-packages", + "host": true + }, { "name": "vcpkg-tool-meson", "host": true diff --git a/versions/baseline.json b/versions/baseline.json index 2fe7c659f807d9..c391388c885be1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3049,8 +3049,8 @@ "port-version": 2 }, "glib": { - "baseline": "2.78.4", - "port-version": 1 + "baseline": "2.80.0", + "port-version": 0 }, "glib-networking": { "baseline": "2.78.0", diff --git a/versions/g-/glib.json b/versions/g-/glib.json index 6bd0221ea64b0b..d3149ea97d10c7 100644 --- a/versions/g-/glib.json +++ b/versions/g-/glib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "36bb1943093ddba7be00f7e10b9f38de1a039c16", + "version": "2.80.0", + "port-version": 0 + }, { "git-tree": "d73077209c5fcb5a0340baf7d8ba76d128c1ab27", "version": "2.78.4",