Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[vcpkg-tool-meson] update meson and see what breaks #23717

Merged
merged 14 commits into from
May 25, 2022
8 changes: 4 additions & 4 deletions ports/gobject-introspection/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@

set(GI_MAJOR_MINOR 1.70)
set(GI_MAJOR_MINOR 1.72)
set(GI_PATCH 0)

vcpkg_download_distfile(ARCHIVE
URLS "https://download.gnome.org/sources/gobject-introspection/${GI_MAJOR_MINOR}/gobject-introspection-${GI_MAJOR_MINOR}.${GI_PATCH}.tar.xz"
FILENAME "gobject-introspection-${GI_MAJOR_MINOR}.${GI_PATCH}.tar.xz"
SHA512 216b376ed423f607e36c723dd6b67975dbfb63c253f2d8bd0b3661e3d69f8c8059cf221db8c5260b0262fad1b7d738f3b2e5fbd51fdbc31e40ccb115c209baf0
SHA512 b8fba2bd12e93776c55228acf3487bef36ee40b1abdc7f681b827780ac94a8bfa1f59b0c30d60fa5a1fea2f610de78b9e52029f411128067808f17eb6374cdc5
)

vcpkg_extract_source_archive_ex(
Expand All @@ -14,15 +14,15 @@ vcpkg_extract_source_archive_ex(
PATCHES
0001-g-ir-tool-template.in.patch
0002-cross-build.patch
python.patch
)

vcpkg_find_acquire_program(PYTHON3)
vcpkg_find_acquire_program(FLEX)
vcpkg_find_acquire_program(BISON)

set(OPTIONS_DEBUG -Dbuild_introspection_data=false)
set(OPTIONS_RELEASE -Dbuild_introspection_data=true)
if(NOT HOST_TRIPLET STREQUAL TARGET_TRIPLET AND
if(VCPKG_CROSSCOMPILING AND
NOT (CMAKE_HOST_WIN32 AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x86"))
list(APPEND OPTIONS_RELEASE -Dgi_cross_use_prebuilt_gi=true)
endif()
Expand Down
29 changes: 29 additions & 0 deletions ports/gobject-introspection/python.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
diff --git a/giscanner/meson.build b/giscanner/meson.build
index e63a5ab78..3d7dc678a 100644
--- a/giscanner/meson.build
+++ b/giscanner/meson.build
@@ -97,11 +97,11 @@ giscanner_lib = static_library('giscanner',
dependencies: [glib_dep, gobject_dep, gio_dep, gmodule_dep],
)

# https://github.com/mesonbuild/meson/issues/4117
if host_machine.system() == 'windows'
+ python_ext_dep = libpython_dep
- python_ext_dep = python.dependency()
else
+ python_ext_dep = libpython_dep
- python_ext_dep = python.dependency().partial_dependency(compile_args: true)
Neumann-A marked this conversation as resolved.
Show resolved Hide resolved
endif

if not python_ext_dep.found()
diff --git a/meson.build b/meson.build
index 2a9d68556..cffe9014c 100644
--- a/meson.build
+++ b/meson.build
@@ -156,4 +156,5 @@ libffi_dep = dependency('libffi',

# python headers
-cc.check_header('Python.h', dependencies: [python.dependency()], required: true)
+libpython_dep = dependency('python-3.10', method : 'pkg-config')
+cc.check_header('Python.h', dependencies: [libpython_dep], required: true)

4 changes: 2 additions & 2 deletions ports/gobject-introspection/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "gobject-introspection",
"version": "1.70.0",
"port-version": 1,
"version": "1.72.0",
"description": "A middleware layer between C libraries (using GObject) and language bindings.",
"homepage": "https://gi.readthedocs.io/en/latest/",
"license": null,
"supports": "!static & (native | (windows & x86))",
"dependencies": [
{
Expand Down
25 changes: 0 additions & 25 deletions ports/vcpkg-tool-meson/fix_linker_detection.patch

This file was deleted.

11 changes: 6 additions & 5 deletions ports/vcpkg-tool-meson/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)

set(program MESON)
set(program_version 0.60.2)
set(program_version 0.62.1)
set(program_name meson)
set(search_names meson meson.py)
set(interpreter PYTHON3)
set(apt_package_name "meson")
set(brew_package_name "meson")
set(ref 5e9b709ad0b34d8ac920dff057a5361080c0889b)
set(ref bb91cea0d66d8d036063dedec1f194d663399cdf)
set(paths_to_search "${CURRENT_PACKAGES_DIR}/tools/meson")
set(download_urls "https://github.com/mesonbuild/meson/archive/${ref}.tar.gz")
set(download_filename "meson-${ref}.tar.gz")
set(download_sha512 5fb89c6b81f75825b6f300039db6dae9d907c81403a8ebe30c7426729d5cb3179e30b9b84d6ed756c2aa39ca34ea681afa0c5cd78835a94c43d5ab25e625abd0)
set(download_sha512 e5888eb35dd4ab5fc0a16143cfbb5a7849f6d705e211a80baf0a8b753e2cf877a4587860a79cad129ec5f3474c12a73558ffe66439b1633d80b8044eceaff2da)
set(supported_on_unix ON)
set(version_command --version)
set(extra_search_args EXACT_VERSION_MATCH)
Expand Down Expand Up @@ -46,10 +46,11 @@ if(NOT "${program}")
file(RENAME "${CURRENT_PACKAGES_DIR}/tools/meson-${ref}" "${CURRENT_PACKAGES_DIR}/tools/meson")
z_vcpkg_apply_patches(
SOURCE_PATH "${CURRENT_PACKAGES_DIR}"
PATCHES meson-intl.patch
fix_linker_detection.patch
PATCHES
meson-intl.patch
)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools/meson/test cases")
configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-port-config.cmake" @ONLY)
endif()

z_vcpkg_find_acquire_program_find_internal("${program}"
Expand Down
1 change: 1 addition & 0 deletions ports/vcpkg-tool-meson/vcpkg-port-config.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
set(MESON_SCRIPT "${CMAKE_CURRENT_LIST_DIR}/../../tools/meson/meson.py")
Neumann-A marked this conversation as resolved.
Show resolved Hide resolved
4 changes: 2 additions & 2 deletions ports/vcpkg-tool-meson/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"name": "vcpkg-tool-meson",
"version": "0.60.2",
"port-version": 2,
"version": "0.62.1",
"description": "Meson build system",
"homepage": "https://github.com/mesonbuild/meson",
"license": "Apache-2.0",
"supports": "native"
}
8 changes: 4 additions & 4 deletions versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -2589,8 +2589,8 @@
"port-version": 0
},
"gobject-introspection": {
"baseline": "1.70.0",
"port-version": 1
"baseline": "1.72.0",
"port-version": 0
},
"google-cloud-cpp": {
"baseline": "1.40.1",
Expand Down Expand Up @@ -7377,8 +7377,8 @@
"port-version": 0
},
"vcpkg-tool-meson": {
"baseline": "0.60.2",
"port-version": 2
"baseline": "0.62.1",
"port-version": 0
},
"vcpkg-tool-mozbuild": {
"baseline": "3.3",
Expand Down
5 changes: 5 additions & 0 deletions versions/g-/gobject-introspection.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "7af27cca9283357e5b7447e5a1c6583afc50c793",
"version": "1.72.0",
"port-version": 0
},
{
"git-tree": "a39c3bd1142fd69e6dba29cf3bd4c7e93b049406",
"version": "1.70.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/v-/vcpkg-tool-meson.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "8f68ec003b976139c3d3b9c97531685cd0973354",
"version": "0.62.1",
"port-version": 0
},
{
"git-tree": "6fe7cf1649af5d90c1e88765411a463cac55e99c",
"version": "0.60.2",
Expand Down