[glib] debug

microsoft · Jun 26, 2024 · b3c7167 · b3c7167
1 parent 2e7fd31
commit b3c7167
Show file tree

Hide file tree

Showing 13 changed files with 85 additions and 13 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 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(modules: ['packaging'] )
+ # 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(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_IOS)
@@ -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": 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
@@ -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/ports/vcpkg-tool-meson/vcpkg.json b/ports/vcpkg-tool-meson/vcpkg.json
@@ -1,7 +1,7 @@
 {
  "name": "vcpkg-tool-meson",
  "version": "1.3.2",
- "port-version": 7,
+ "port-version": 8,
  "description": "Meson build system",
  "homepage": "https://github.com/mesonbuild/meson",
  "license": "Apache-2.0",

diff --git a/ports/vcpkg-tool-meson/vcpkg_configure_meson.cmake b/ports/vcpkg-tool-meson/vcpkg_configure_meson.cmake
@@ -460,6 +460,12 @@ function(vcpkg_configure_meson)
  ADDITIONAL_PROPERTIES ${arg_ADDITIONAL_PROPERTIES}
  )
 
+ message(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>")
+ message("${MESON}")
+ message("${cmd_args}")
+ message("${arg_SOURCE_PATH}")
+ message("$ENV{PATH}")
+ message("<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<")
  vcpkg_execute_required_process(
  COMMAND ${MESON} setup ${cmd_args} ${arg_SOURCE_PATH}
  WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${suffix_${buildtype}}"

diff --git a/ports/vcpkg-tool-meson/vcpkg_install_meson.cmake b/ports/vcpkg-tool-meson/vcpkg_install_meson.cmake
@@ -30,6 +30,11 @@ function(vcpkg_install_meson)
  vcpkg_add_to_path(PREPEND "${CURRENT_INSTALLED_DIR}/bin")
  endif()
  endif()
+
+ message(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>")
+ message("${NINJA}")
+ message("$ENV{PATH}")
+ message("<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<")
  vcpkg_execute_required_process(
  COMMAND "${NINJA}" install -v
  WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${short_buildtype}"

diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
@@ -1235,8 +1235,6 @@ workflow:x64-uwp=fail
 wpilib:arm-neon-android=fail # requires full c++20 support
 wpilib:arm64-android=fail # requires full c++20 support
 wpilib:x64-android=fail # requires full c++20 support
-x264:arm-neon-android=fail
-x264:arm64-android=fail
 # No xorg-macros available on osx
 xbitmaps:arm-neon-android=fail
 xbitmaps:arm64-android=fail

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -3081,8 +3081,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",
@@ -3242,7 +3242,7 @@
  },
  "gtk": {
  "baseline": "4.10.5",
- "port-version": 2
+ "port-version": 3
  },
  "gtk3": {
  "baseline": "3.24.38",
@@ -9166,7 +9166,7 @@
  },
  "vcpkg-tool-meson": {
  "baseline": "1.3.2",
- "port-version": 7
+ "port-version": 8
  },
  "vcpkg-tool-mozbuild": {
  "baseline": "4.0.2",

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

diff --git a/versions/v-/vcpkg-tool-meson.json b/versions/v-/vcpkg-tool-meson.json
@@ -1,5 +1,10 @@
 {
  "versions": [
+ {
+ "git-tree": "ab13e95bc87f952be87e8f44176bbfe4e5851650",
+ "version": "1.3.2",
+ "port-version": 8
+ },
  {
  "git-tree": "3516ee436fc923a7ac6344886ff394e80ebc6e09",
  "version": "1.3.2",