[glib] Update to 2.80.0

microsoft · May 7, 2024 · ed9ff01 · ed9ff01
1 parent 28b1cf6
commit ed9ff01
Show file tree

Hide file tree

Showing 16 changed files with 56 additions and 13 deletions.
diff --git 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,17 +39,19 @@ 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
     ADDITIONAL_BINARIES
         ${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
@@ -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/ports/gtk/portfile.cmake b/ports/gtk/portfile.cmake
@@ -45,6 +45,8 @@ else()
     set(GIR_TOOL_DIR ${CURRENT_HOST_INSTALLED_DIR})
 endif()
 
+x_vcpkg_get_python_packages(PYTHON_VERSION "3" PACKAGES packaging) # after glib/gdbus-codegen 2.79.0
+
 vcpkg_configure_meson(
     SOURCE_PATH ${SOURCE_PATH}
     OPTIONS

diff --git a/ports/gtk/vcpkg.json b/ports/gtk/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "gtk",
   "version": "4.10.5",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Portable library for creating graphical user interfaces.",
   "homepage": "https://www.gtk.org/",
   "license": "LGPL-2.0-only",

diff --git 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) # after glib/gdbus-codegen 2.79.0
+
 vcpkg_configure_meson(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS

diff --git 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,

diff --git 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) # after glib/gdbus-codegen 2.79.0
+
 vcpkg_configure_meson(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS

diff --git 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",

diff --git 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) # after glib/gdbus-codegen 2.79.0
+
 vcpkg_configure_meson(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS

diff --git a/ports/libsoup/vcpkg.json b/ports/libsoup/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "libsoup",
   "version": "3.4.4",
+  "port-version": 1,
   "description": "HTTP Library for GLib",
   "homepage": "https://libsoup.org",
   "license": "LGPL-2.0-or-later",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -3069,8 +3069,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",
@@ -3226,11 +3226,11 @@
     },
     "gtk": {
       "baseline": "4.10.5",
-      "port-version": 1
+      "port-version": 2
     },
     "gtk3": {
       "baseline": "3.24.38",
-      "port-version": 1
+      "port-version": 2
     },
     "gtkmm": {
       "baseline": "4.10.0",
@@ -4918,7 +4918,7 @@
     },
     "libsecret": {
       "baseline": "0.21.4",
-      "port-version": 0
+      "port-version": 1
     },
     "libsercomm": {
       "baseline": "1.3.2",
@@ -4970,7 +4970,7 @@
     },
     "libsoup": {
       "baseline": "3.4.4",
-      "port-version": 0
+      "port-version": 1
     },
     "libspatialindex": {
       "baseline": "1.9.3",

diff --git 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",

diff --git a/versions/g-/gtk.json b/versions/g-/gtk.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a490e279de5064f035072b3bbee3b590215d2141",
+      "version": "4.10.5",
+      "port-version": 2
+    },
     {
       "git-tree": "814624705f6cc11a3468d9c3418bc20521b6b207",
       "version": "4.10.5",

diff --git a/versions/g-/gtk3.json b/versions/g-/gtk3.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e41bbc7eafd1ac4362dd2e4dddbc4181eb7dd62f",
+      "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
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "977f09bd05ea928f8a70cf6ec34ccfe56dcc18c1",
+      "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
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "3795c0003c2a183a68ed9f7e998c570e86c2e9f7",
+      "version": "3.4.4",
+      "port-version": 1
+    },
     {
       "git-tree": "967e4400de0619b73df7b3a48e392b36fa4cf6ba",
       "version": "3.4.4",