From 81b0f6e8c6de0c92bbe387c153afe811825225bb Mon Sep 17 00:00:00 2001
From: WangWeiLin-MV <156736127+WangWeiLin-MV@users.noreply.github.com>
Date: Tue, 19 Mar 2024 18:13:16 +0800
Subject: [PATCH] [gtk][gtk3][libsecret][libsoup] python packaging after
 glib/gdbus-codegen 2.79.0

---
 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       | 5 +++++
 versions/baseline.json         | 8 ++++----
 versions/g-/gtk.json           | 5 +++++
 versions/g-/gtk3.json          | 5 +++++
 versions/l-/libsecret.json     | 5 +++++
 versions/l-/libsoup.json       | 5 +++++
 13 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/ports/gtk/portfile.cmake b/ports/gtk/portfile.cmake
index 9b1f9c9666c8fe..319f17e9ddbf20 100644
--- 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
index b12107437c3db1..b678eb57087f11 100644
--- 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",
@@ -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..9827cf6d4e859a 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) # 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
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..b6c81cd3e1d747 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) # 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
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 392cc7a6cd15c2..e57696795d2acc 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) # 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
index 1974f3b871de29..2a220ea766b30a 100644
--- 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",
@@ -15,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 64aa6ae863c930..fc10827079334c 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3206,11 +3206,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",
@@ -4878,7 +4878,7 @@
     },
     "libsecret": {
       "baseline": "0.21.4",
-      "port-version": 0
+      "port-version": 1
     },
     "libsercomm": {
       "baseline": "1.3.2",
@@ -4930,7 +4930,7 @@
     },
     "libsoup": {
       "baseline": "3.4.4",
-      "port-version": 0
+      "port-version": 1
     },
     "libspatialindex": {
       "baseline": "1.9.3",
diff --git a/versions/g-/gtk.json b/versions/g-/gtk.json
index 055364a533a82a..0a20fe2b37a195 100644
--- a/versions/g-/gtk.json
+++ b/versions/g-/gtk.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a374c95a62087060f7d6f8493b657b51bd73d648",
+      "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
index f725fc7e2d21d3..c6ace062b98321 100644
--- a/versions/g-/gtk3.json
+++ b/versions/g-/gtk3.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "bdddebd147a0eaf18236393ff17b5ff2e81c290c",
+      "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..09c9280352f3da 100644
--- a/versions/l-/libsecret.json
+++ b/versions/l-/libsecret.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "4049279375db32de3d3113f15729ecbf8d32ea1a",
+      "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 3e155374736507..e7d82816444328 100644
--- a/versions/l-/libsoup.json
+++ b/versions/l-/libsoup.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "58082b604b094be48ce1490196f9b0780796de50",
+      "version": "3.4.4",
+      "port-version": 1
+    },
     {
       "git-tree": "967e4400de0619b73df7b3a48e392b36fa4cf6ba",
       "version": "3.4.4",