diff --git a/ports/glib/0005-debug-macos-python.diff b/ports/glib/0005-debug-macos-python.diff new file mode 100644 index 00000000000000..b68d1130b9ca7d --- /dev/null +++ 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 + ++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 ' + python_name = 'python3' + diff --git a/ports/glib/portfile.cmake b/ports/glib/portfile.cmake index 529484ceda12db..27920c52be7344 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 @@ -10,6 +10,7 @@ vcpkg_extract_source_archive(SOURCE_PATH PATCHES use-libiconv-on-windows.patch libintl.patch + 0005-debug-macos-python.diff ) if(APPLE) @@ -39,6 +40,10 @@ 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 @@ -46,10 +51,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 +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 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/ports/gtk/portfile.cmake b/ports/gtk/portfile.cmake index 087899ae39c946..5ccd887b34acc5 100644 --- 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(OUT_PYTHON_VAR PACKAGED_PYTHON_BIN PYTHON_VERSION "3" PACKAGES packaging) +message("$ENV{PATH}") + vcpkg_configure_meson( SOURCE_PATH ${SOURCE_PATH} OPTIONS @@ -80,6 +84,8 @@ vcpkg_configure_meson( sassc='${CURRENT_HOST_INSTALLED_DIR}/tools/sassc/bin/sassc${VCPKG_HOST_EXECUTABLE_SUFFIX}' g-ir-compiler='${CURRENT_HOST_INSTALLED_DIR}/tools/gobject-introspection/g-ir-compiler${VCPKG_HOST_EXECUTABLE_SUFFIX}' g-ir-scanner='${GIR_TOOL_DIR}/tools/gobject-introspection/g-ir-scanner' + python=['${PACKAGED_PYTHON_BIN}','-I'] + python3=['${PACKAGED_PYTHON_BIN}','-I'] ) vcpkg_install_meson(ADD_BIN_TO_PATH) diff --git a/ports/gtk/vcpkg.json b/ports/gtk/vcpkg.json index b7be28664daf3c..f87d3ea2a81502 100644 --- 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 index 1dd7526d01cf2f..f5c30d0caa4ae9 100644 --- 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 index 6bd0221ea64b0b..133ad5f151b956 100644 --- 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 index b86c27035b4104..047cd71e730970 100644 --- a/versions/g-/gtk.json +++ b/versions/g-/gtk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0dfefd0a6fcfbdddd77aac9aebe9658713040dc3", + "version": "4.10.5", + "port-version": 3 + }, { "git-tree": "38a496538cd081a8d64d5b2733cb1f2b4fbae559", "version": "4.10.5",