From 409452d9c56032a58aa3891271438c243ecc5316 Mon Sep 17 00:00:00 2001 From: WangWeiLin-MV <156736127+WangWeiLin-MV@users.noreply.github.com> Date: Tue, 25 Jun 2024 10:53:38 +0800 Subject: [PATCH] [glib] Update to 2.80.0 --- ports/glib/portfile.cmake | 11 ++++++++--- ports/glib/vcpkg.json | 7 +++++-- ports/gtk/portfile.cmake | 2 ++ ports/gtk/vcpkg.json | 6 +++++- ports/gtk3/portfile.cmake | 2 ++ ports/gtk3/vcpkg.json | 6 +++++- ports/libsecret/portfile.cmake | 2 ++ ports/libsecret/vcpkg.json | 5 +++++ ports/libsoup/portfile.cmake | 2 ++ ports/libsoup/vcpkg.json | 6 +++++- versions/baseline.json | 12 ++++++------ versions/g-/glib.json | 5 +++++ versions/g-/gtk.json | 5 +++++ versions/g-/gtk3.json | 5 +++++ versions/l-/libsecret.json | 5 +++++ versions/l-/libsoup.json | 5 +++++ 16 files changed, 72 insertions(+), 14 deletions(-) diff --git a/ports/glib/portfile.cmake b/ports/glib/portfile.cmake index 4cb357409acb8b..333d4405005fca 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 fb456e63e139d2..f365d7ec12ea71 100644 --- a/ports/glib/vcpkg.json +++ b/ports/glib/vcpkg.json @@ -1,7 +1,6 @@ { "name": "glib", - "version": "2.78.4", - "port-version": 3, + "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/ports/gtk/portfile.cmake b/ports/gtk/portfile.cmake index 198ce56aba2b6e..6bdbc0d67a903e 100644 --- a/ports/gtk/portfile.cmake +++ b/ports/gtk/portfile.cmake @@ -49,6 +49,8 @@ else() set(GIR_TOOL_DIR ${CURRENT_HOST_INSTALLED_DIR}) endif() +x_vcpkg_get_python_packages(PYTHON_VERSION "3" PACKAGES packaging) + vcpkg_configure_meson( SOURCE_PATH ${SOURCE_PATH} OPTIONS diff --git a/ports/gtk/vcpkg.json b/ports/gtk/vcpkg.json index fcb9d6f1ff6989..41fc890e8b3baf 100644 --- a/ports/gtk/vcpkg.json +++ b/ports/gtk/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gtk", "version": "4.14.0", - "port-version": 1, + "port-version": 2, "description": "Portable library for creating graphical user interfaces.", "homepage": "https://www.gtk.org/", "license": "LGPL-2.0-only", @@ -51,6 +51,10 @@ "name": "sassc", "host": true }, + { + "name": "vcpkg-get-python-packages", + "host": true + }, { "name": "vcpkg-tool-meson", "host": true diff --git a/ports/gtk3/portfile.cmake b/ports/gtk3/portfile.cmake index 400aefd6ffbef9..a9c27214734105 100644 --- a/ports/gtk3/portfile.cmake +++ b/ports/gtk3/portfile.cmake @@ -42,6 +42,8 @@ else() list(APPEND OPTIONS -Dintrospection=false) endif() +x_vcpkg_get_python_packages(PYTHON_VERSION "3" PACKAGES packaging) + vcpkg_configure_meson( SOURCE_PATH "${SOURCE_PATH}" OPTIONS diff --git a/ports/gtk3/vcpkg.json b/ports/gtk3/vcpkg.json index a7e4151488fe2a..3051df4c953ba8 100644 --- a/ports/gtk3/vcpkg.json +++ b/ports/gtk3/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gtk3", "version": "3.24.38", - "port-version": 1, + "port-version": 2, "description": "Portable library for creating graphical user interfaces.", "homepage": "https://www.gtk.org/", "license": null, @@ -47,6 +47,10 @@ }, "libepoxy", "pango", + { + "name": "vcpkg-get-python-packages", + "host": true + }, { "name": "vcpkg-tool-meson", "host": true diff --git a/ports/libsecret/portfile.cmake b/ports/libsecret/portfile.cmake index 1a3295f8cff953..b7fab59dcb9fcc 100644 --- a/ports/libsecret/portfile.cmake +++ b/ports/libsecret/portfile.cmake @@ -7,6 +7,8 @@ vcpkg_from_gitlab( HEAD_REF master ) +x_vcpkg_get_python_packages(PYTHON_VERSION "3" PACKAGES packaging) + vcpkg_configure_meson( SOURCE_PATH "${SOURCE_PATH}" OPTIONS diff --git a/ports/libsecret/vcpkg.json b/ports/libsecret/vcpkg.json index 0b35e6701ead07..36a9d67d86256c 100644 --- a/ports/libsecret/vcpkg.json +++ b/ports/libsecret/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libsecret", "version": "0.21.4", + "port-version": 1, "description": "libsecret is a GObject-based library for accessing the Secret Service API of the freedesktop.org project, a cross-desktop effort to access passwords, tokens and other types of secrets. libsecret provides a convenient wrapper for these methods so consumers do not have to call the low-level DBus methods.", "homepage": "https://gitlab.gnome.org/GNOME/libsecret/", "license": "LGPL-2.1-or-later", @@ -12,6 +13,10 @@ "host": true }, "libgcrypt", + { + "name": "vcpkg-get-python-packages", + "host": true + }, { "name": "vcpkg-tool-meson", "host": true diff --git a/ports/libsoup/portfile.cmake b/ports/libsoup/portfile.cmake index ded65eda745820..85afc8f9dd389f 100644 --- a/ports/libsoup/portfile.cmake +++ b/ports/libsoup/portfile.cmake @@ -7,6 +7,8 @@ vcpkg_from_gitlab( HEAD_REF main ) +x_vcpkg_get_python_packages(PYTHON_VERSION "3" PACKAGES packaging) + vcpkg_configure_meson( SOURCE_PATH "${SOURCE_PATH}" OPTIONS diff --git a/ports/libsoup/vcpkg.json b/ports/libsoup/vcpkg.json index 0905930f3d6923..d6db114efea8ae 100644 --- a/ports/libsoup/vcpkg.json +++ b/ports/libsoup/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libsoup", "version": "3.4.4", - "port-version": 1, + "port-version": 2, "description": "HTTP Library for GLib", "homepage": "https://libsoup.org", "license": "LGPL-2.0-or-later", @@ -16,6 +16,10 @@ "libpsl", "nghttp2", "sqlite3", + { + "name": "vcpkg-get-python-packages", + "host": true + }, { "name": "vcpkg-tool-meson", "host": true diff --git a/versions/baseline.json b/versions/baseline.json index 88b83b1a922956..9e0d6e0b8d9160 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3125,8 +3125,8 @@ "port-version": 2 }, "glib": { - "baseline": "2.78.4", - "port-version": 3 + "baseline": "2.80.0", + "port-version": 0 }, "glib-networking": { "baseline": "2.78.0", @@ -3286,11 +3286,11 @@ }, "gtk": { "baseline": "4.14.0", - "port-version": 1 + "port-version": 2 }, "gtk3": { "baseline": "3.24.38", - "port-version": 1 + "port-version": 2 }, "gtkmm": { "baseline": "4.14.0", @@ -5026,7 +5026,7 @@ }, "libsecret": { "baseline": "0.21.4", - "port-version": 0 + "port-version": 1 }, "libsercomm": { "baseline": "1.3.2", @@ -5082,7 +5082,7 @@ }, "libsoup": { "baseline": "3.4.4", - "port-version": 1 + "port-version": 2 }, "libspatialindex": { "baseline": "1.9.3", diff --git a/versions/g-/glib.json b/versions/g-/glib.json index b9332fd8912c7e..af2f352277b528 100644 --- a/versions/g-/glib.json +++ b/versions/g-/glib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "eb168152d4f997dd869938d2e7d059fe6c33ab6c", + "version": "2.80.0", + "port-version": 0 + }, { "git-tree": "ca77eedd8dca92c9e6c021316e81b9c7f648b58a", "version": "2.78.4", diff --git a/versions/g-/gtk.json b/versions/g-/gtk.json index e09efb0894156f..ee0d521f4a781e 100644 --- a/versions/g-/gtk.json +++ b/versions/g-/gtk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4a495067527b8d3a9fb57ca5c5b9071acb023860", + "version": "4.14.0", + "port-version": 2 + }, { "git-tree": "4a2c53b5715720e68051e3d26bfa56a83b6c8de0", "version": "4.14.0", diff --git a/versions/g-/gtk3.json b/versions/g-/gtk3.json index f725fc7e2d21d3..9c259fda2f2e61 100644 --- a/versions/g-/gtk3.json +++ b/versions/g-/gtk3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3f7e1dbca7234f124c7b719d56a2b8bbef896ced", + "version": "3.24.38", + "port-version": 2 + }, { "git-tree": "1362bb3978886e043fd12c089f2c1337a4f1adf8", "version": "3.24.38", diff --git a/versions/l-/libsecret.json b/versions/l-/libsecret.json index a6b0fc25ae3a5a..9606de6ba97e9a 100644 --- a/versions/l-/libsecret.json +++ b/versions/l-/libsecret.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "494e68f4aa79bfe1dd961bf6a87e5ebc08413f22", + "version": "0.21.4", + "port-version": 1 + }, { "git-tree": "fe57a1ceea0f28f2945dab68cca4e29358ca5e71", "version": "0.21.4", diff --git a/versions/l-/libsoup.json b/versions/l-/libsoup.json index 3f013f6ac59890..e1fa883d166d59 100644 --- a/versions/l-/libsoup.json +++ b/versions/l-/libsoup.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "84e6217a94836c052bbedc51d44736757fc8516c", + "version": "3.4.4", + "port-version": 2 + }, { "git-tree": "cbe5884e8d78060a81c7d6b52ff1f69f059550d2", "version": "3.4.4",