[glib] debug macos python

microsoft · May 16, 2024 · 6c2f819 · 6c2f819
1 parent 28c4ec8
commit 6c2f819
Show file tree

Hide file tree

Showing 8 changed files with 67 additions and 9 deletions.
diff --git a/ports/glib/0005-debug-macos-python.diff b/ports/glib/0005-debug-macos-python.diff
@@ -0,0 +1,29 @@
+diff --git a/gio/gdbus-2.0/codegen/utils.py b/gio/gdbus-2.0/codegen/utils.py
+index 08f1ba9..81af2f4 100644
+--- a/gio/gdbus-2.0/codegen/utils.py
++++ b/gio/gdbus-2.0/codegen/utils.py
+@@ -19,6 +19,11 @@
+ #
+ # Author: David Zeuthen <davidz@redhat.com>
+
++import sys
++print('====debug macos python')
++print(sys.executable)
++print(sys.path)
++
+ import packaging.version
+ import os
+ import sys
+diff --git a/meson.build b/meson.build
+index a400965..576a939 100644
+--- a/meson.build
++++ b/meson.build
+@@ -2420,7 +2420,7 @@ endif
+
+ glib_conf.set('HAVE_PROC_SELF_CMDLINE', have_proc_self_cmdline)
+
+-python = import('python').find_installation(modules: ['packaging'])
++python = import('python').find_installation()
+ # used for '#!/usr/bin/env <name>'
+ python_name = 'python3'
+
diff --git a/ports/glib/portfile.cmake b/ports/glib/portfile.cmake
@@ -2,14 +2,15 @@ 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
     ARCHIVE "${GLIB_ARCHIVE}"
     PATCHES
         use-libiconv-on-windows.patch
         libintl.patch
+        0005-debug-macos-python.diff
 )
 
 if(APPLE)
@@ -39,17 +40,21 @@ if(VCPKG_HOST_IS_WINDOWS)
     vcpkg_list(APPEND ADDITIONAL_BINARIES "sh = ['${CMAKE_COMMAND}', '-E', 'false']")
 endif()
 
+message("$ENV{PATH}")
+x_vcpkg_get_python_packages(PYTHON_VERSION "3" PACKAGES packaging)
+message("$ENV{PATH}")
+
 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 +77,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
@@ -48,6 +48,10 @@ else()
     set(GIR_TOOL_DIR ${CURRENT_HOST_INSTALLED_DIR})
 endif()
 
+message("$ENV{PATH}")
+x_vcpkg_get_python_packages(PYTHON_VERSION "3" PACKAGES packaging)
+message("$ENV{PATH}")
+
 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": 2,
+  "port-version": 3,
   "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/versions/baseline.json b/versions/baseline.json
@@ -3077,8 +3077,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",
@@ -3234,7 +3234,7 @@
     },
     "gtk": {
       "baseline": "4.10.5",
-      "port-version": 2
+      "port-version": 3
     },
     "gtk3": {
       "baseline": "3.24.38",

diff --git a/versions/g-/glib.json b/versions/g-/glib.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "960494283ca7ad2657bb8f6471b4157ed8d5209f",
+      "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": "0dc835770c38c5e23114841e422aeca6cfe5367b",
+      "version": "4.10.5",
+      "port-version": 3
+    },
     {
       "git-tree": "38a496538cd081a8d64d5b2733cb1f2b4fbae559",
       "version": "4.10.5",