From fc15760315b4080f9adabd6886b0a08446620330 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 22 Mar 2022 11:30:58 +0100 Subject: [PATCH 01/12] update meson and see what breaks --- ports/vcpkg-tool-meson/portfile.cmake | 16 ++++++++-------- ports/vcpkg-tool-meson/vcpkg.json | 3 +-- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/ports/vcpkg-tool-meson/portfile.cmake b/ports/vcpkg-tool-meson/portfile.cmake index c4a94114651fb7..29a57c4321c9be 100644 --- a/ports/vcpkg-tool-meson/portfile.cmake +++ b/ports/vcpkg-tool-meson/portfile.cmake @@ -5,17 +5,17 @@ set(VCPKG_POLICY_EMPTY_PACKAGE enabled) set(program MESON) -set(program_version 0.60.2) +set(program_version 0.62.0) 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 fb67adf3e6b57d44dad6c943a6081277860350c5) 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 386f99ce39382909c9b55e5bacf2a1aacd804bb7a4e9b7890dd6403e7377d87e840c5d478a6cde8b225aa69a0415134078b661bc712bd1391a7b4044447a163d) set(supported_on_unix ON) set(version_command --version) set(extra_search_args EXACT_VERSION_MATCH) @@ -44,11 +44,11 @@ if(NOT "${program}") WORKING_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools" ) 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 - ) + #z_vcpkg_apply_patches( + # SOURCE_PATH "${CURRENT_PACKAGES_DIR}" + # PATCHES meson-intl.patch + # fix_linker_detection.patch + #) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools/meson/test cases") endif() diff --git a/ports/vcpkg-tool-meson/vcpkg.json b/ports/vcpkg-tool-meson/vcpkg.json index 82a1d87aeb01ff..a809de96bcf0e7 100644 --- a/ports/vcpkg-tool-meson/vcpkg.json +++ b/ports/vcpkg-tool-meson/vcpkg.json @@ -1,7 +1,6 @@ { "name": "vcpkg-tool-meson", - "version": "0.60.2", - "port-version": 2, + "version": "0.62.0", "description": "Meson build system", "homepage": "https://github.com/mesonbuild/meson", "supports": "native" From 3c38ead0d7da165638c6d6c75d5ac84fbb1ef03e Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 22 Mar 2022 16:58:14 +0100 Subject: [PATCH 02/12] include patch again. --- ports/vcpkg-tool-meson/portfile.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ports/vcpkg-tool-meson/portfile.cmake b/ports/vcpkg-tool-meson/portfile.cmake index 29a57c4321c9be..2a4718de53f7c9 100644 --- a/ports/vcpkg-tool-meson/portfile.cmake +++ b/ports/vcpkg-tool-meson/portfile.cmake @@ -44,11 +44,11 @@ if(NOT "${program}") WORKING_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools" ) 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 + z_vcpkg_apply_patches( + SOURCE_PATH "${CURRENT_PACKAGES_DIR}" + PATCHES meson-intl.patch # fix_linker_detection.patch - #) + ) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools/meson/test cases") endif() From 0265cf282bd3ea4cdcfc057663c5bf43c4fea216 Mon Sep 17 00:00:00 2001 From: Neumann-A <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 23 May 2022 14:54:47 +0200 Subject: [PATCH 03/12] update meson to 0.62.1 --- ports/vcpkg-tool-meson/portfile.cmake | 7 ++++--- ports/vcpkg-tool-meson/vcpkg-port-config.cmake | 2 ++ ports/vcpkg-tool-meson/vcpkg.json | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 ports/vcpkg-tool-meson/vcpkg-port-config.cmake diff --git a/ports/vcpkg-tool-meson/portfile.cmake b/ports/vcpkg-tool-meson/portfile.cmake index 2a4718de53f7c9..30e470e595d36e 100644 --- a/ports/vcpkg-tool-meson/portfile.cmake +++ b/ports/vcpkg-tool-meson/portfile.cmake @@ -5,17 +5,17 @@ set(VCPKG_POLICY_EMPTY_PACKAGE enabled) set(program MESON) -set(program_version 0.62.0) +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 fb67adf3e6b57d44dad6c943a6081277860350c5) +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 386f99ce39382909c9b55e5bacf2a1aacd804bb7a4e9b7890dd6403e7377d87e840c5d478a6cde8b225aa69a0415134078b661bc712bd1391a7b4044447a163d) +set(download_sha512 e5888eb35dd4ab5fc0a16143cfbb5a7849f6d705e211a80baf0a8b753e2cf877a4587860a79cad129ec5f3474c12a73558ffe66439b1633d80b8044eceaff2da) set(supported_on_unix ON) set(version_command --version) set(extra_search_args EXACT_VERSION_MATCH) @@ -50,6 +50,7 @@ if(NOT "${program}") # fix_linker_detection.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}" diff --git a/ports/vcpkg-tool-meson/vcpkg-port-config.cmake b/ports/vcpkg-tool-meson/vcpkg-port-config.cmake new file mode 100644 index 00000000000000..587534fba3c50e --- /dev/null +++ b/ports/vcpkg-tool-meson/vcpkg-port-config.cmake @@ -0,0 +1,2 @@ +vcpkg_find_acquire_program(PYTHON3) +set(MESON "${PYTHON3}" "${CMAKE_CURRENT_LIST_DIR}/../../tools/meson/meson.py") diff --git a/ports/vcpkg-tool-meson/vcpkg.json b/ports/vcpkg-tool-meson/vcpkg.json index a809de96bcf0e7..52bee7e6783ae2 100644 --- a/ports/vcpkg-tool-meson/vcpkg.json +++ b/ports/vcpkg-tool-meson/vcpkg.json @@ -1,6 +1,6 @@ { "name": "vcpkg-tool-meson", - "version": "0.62.0", + "version": "0.62.1", "description": "Meson build system", "homepage": "https://github.com/mesonbuild/meson", "supports": "native" From c29feff0741353f81348fc4187bbf2901036e6bb Mon Sep 17 00:00:00 2001 From: Neumann-A <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 23 May 2022 14:57:23 +0200 Subject: [PATCH 04/12] remove old patch --- .../fix_linker_detection.patch | 25 ------------------- ports/vcpkg-tool-meson/portfile.cmake | 4 +-- 2 files changed, 2 insertions(+), 27 deletions(-) delete mode 100644 ports/vcpkg-tool-meson/fix_linker_detection.patch diff --git a/ports/vcpkg-tool-meson/fix_linker_detection.patch b/ports/vcpkg-tool-meson/fix_linker_detection.patch deleted file mode 100644 index 89e6dfa214b850..00000000000000 --- a/ports/vcpkg-tool-meson/fix_linker_detection.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/tools/meson/mesonbuild/compilers/detect.py b/tools/meson/mesonbuild/compilers/detect.py -index 1eacecfa8..74668da1a 100644 ---- a/tools/meson/mesonbuild/compilers/detect.py -+++ b/tools/meson/mesonbuild/compilers/detect.py -@@ -292,7 +292,7 @@ def detect_static_linker(env: 'Environment', compiler: Compiler) -> StaticLinker - linkers = default_linkers - popen_exceptions = {} - for linker in linkers: -- if not {'lib', 'lib.exe', 'llvm-lib', 'llvm-lib.exe', 'xilib', 'xilib.exe'}.isdisjoint(linker): -+ if any(os.path.basename(x) in {'lib', 'lib.exe', 'llvm-lib', 'llvm-lib.exe', 'xilib', 'xilib.exe'} for x in linker): - arg = '/?' - elif not {'ar2000', 'ar2000.exe'}.isdisjoint(linker): - arg = '?' -diff --git a/tools/meson/mesonbuild/linkers/detect.py b/tools/meson/mesonbuild/linkers/detect.py -index 0bfd7083b..323801d9a 100644 ---- a/tools/meson/mesonbuild/linkers/detect.py -+++ b/tools/meson/mesonbuild/linkers/detect.py -@@ -72,6 +72,7 @@ def guess_win_linker(env: 'Environment', compiler: T.List[str], comp_class: T.Ty - override = [] # type: T.List[str] - value = env.lookup_binary_entry(for_machine, comp_class.language + '_ld') - if value is not None: -+ compiler = value - override = comp_class.use_linker_args(value[0]) - check_args += override - diff --git a/ports/vcpkg-tool-meson/portfile.cmake b/ports/vcpkg-tool-meson/portfile.cmake index 30e470e595d36e..ea2a7b2293990c 100644 --- a/ports/vcpkg-tool-meson/portfile.cmake +++ b/ports/vcpkg-tool-meson/portfile.cmake @@ -46,8 +46,8 @@ 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) From 534248ba95c23064d75bef9a41363b43a7464dc5 Mon Sep 17 00:00:00 2001 From: Neumann-A <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 23 May 2022 15:21:14 +0200 Subject: [PATCH 05/12] move to 64bit since 32bit not longer exists. --- scripts/cmake/vcpkg_find_acquire_program.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake index b5be6bbcbad1f8..118485a53ce5d2 100644 --- a/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -181,11 +181,11 @@ function(vcpkg_find_acquire_program program) set(brew_package_name "nasm") set(apt_package_name "nasm") set(download_urls - "https://www.nasm.us/pub/nasm/releasebuilds/${program_version}/win32/nasm-${program_version}-win32.zip" - "https://fossies.org/windows/misc/nasm-${program_version}-win32.zip" + "https://www.nasm.us/pub/nasm/releasebuilds/${program_version}/win64/nasm-${program_version}-win64.zip" + "https://fossies.org/windows/misc/nasm-${program_version}-win64.zip" ) - set(download_filename "nasm-${program_version}-win32.zip") - set(download_sha512 9412b8caa07e15eac8f500f6f8fab9f038d95dc25e0124b08a80645607cf5761225f98546b52eac7b894420d64f26c3cbf22c19cd286bbe583f7c964256c97ed) + set(download_filename "nasm-${program_version}-win64.zip") + set(download_sha512 0d0469f3d475f3d192b9b5b7ee74662cbcb9e02efa0d51839c12cbf6f5de5cd58b32e1d12c9ee4381a63e99a4956e03df7decaf1369e598e0edff19a12629073) elseif(program STREQUAL "YASM") set(program_name yasm) set(program_version 1.3.0.6.g1962) From 630343078520e08724c66225a1db9c0cf2f1230d Mon Sep 17 00:00:00 2001 From: Neumann-A <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 23 May 2022 16:04:20 +0200 Subject: [PATCH 06/12] fix gobject-introspection --- ports/gobject-introspection/portfile.cmake | 8 +++--- ports/gobject-introspection/python.patch | 29 ++++++++++++++++++++++ ports/gobject-introspection/vcpkg.json | 4 +-- ports/vcpkg-tool-meson/vcpkg.json | 1 + 4 files changed, 36 insertions(+), 6 deletions(-) create mode 100644 ports/gobject-introspection/python.patch diff --git a/ports/gobject-introspection/portfile.cmake b/ports/gobject-introspection/portfile.cmake index 56e6be53e79b76..b5ae3bc053499c 100644 --- a/ports/gobject-introspection/portfile.cmake +++ b/ports/gobject-introspection/portfile.cmake @@ -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( @@ -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() diff --git a/ports/gobject-introspection/python.patch b/ports/gobject-introspection/python.patch new file mode 100644 index 00000000000000..5a196ae6525319 --- /dev/null +++ b/ports/gobject-introspection/python.patch @@ -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) + 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) + diff --git a/ports/gobject-introspection/vcpkg.json b/ports/gobject-introspection/vcpkg.json index e7996b9253226a..1da115b5f238e4 100644 --- a/ports/gobject-introspection/vcpkg.json +++ b/ports/gobject-introspection/vcpkg.json @@ -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": [ { diff --git a/ports/vcpkg-tool-meson/vcpkg.json b/ports/vcpkg-tool-meson/vcpkg.json index 52bee7e6783ae2..4863acacaa8aef 100644 --- a/ports/vcpkg-tool-meson/vcpkg.json +++ b/ports/vcpkg-tool-meson/vcpkg.json @@ -3,5 +3,6 @@ "version": "0.62.1", "description": "Meson build system", "homepage": "https://github.com/mesonbuild/meson", + "license": "Apache-2.0", "supports": "native" } From ea8851afd1ceecb1b7e68ade8ce4b48433fdfb7d Mon Sep 17 00:00:00 2001 From: Neumann-A <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 23 May 2022 16:05:22 +0200 Subject: [PATCH 07/12] v db --- versions/baseline.json | 8 ++++---- versions/g-/gobject-introspection.json | 5 +++++ versions/v-/vcpkg-tool-meson.json | 5 +++++ 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index cb04d73b13774e..544839139f5e4c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -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", @@ -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", diff --git a/versions/g-/gobject-introspection.json b/versions/g-/gobject-introspection.json index 16c0cbb1dfbc45..5594257788dd5c 100644 --- a/versions/g-/gobject-introspection.json +++ b/versions/g-/gobject-introspection.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7af27cca9283357e5b7447e5a1c6583afc50c793", + "version": "1.72.0", + "port-version": 0 + }, { "git-tree": "a39c3bd1142fd69e6dba29cf3bd4c7e93b049406", "version": "1.70.0", diff --git a/versions/v-/vcpkg-tool-meson.json b/versions/v-/vcpkg-tool-meson.json index c5143684dbbe85..9c94baf9fa9d5b 100644 --- a/versions/v-/vcpkg-tool-meson.json +++ b/versions/v-/vcpkg-tool-meson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "38efcbab46d63c74437a3cea00ac5f3e48e0809d", + "version": "0.62.1", + "port-version": 0 + }, { "git-tree": "6fe7cf1649af5d90c1e88765411a463cac55e99c", "version": "0.60.2", From 0b4fb5f6d1941612c2a7f37289945d8ec42689d6 Mon Sep 17 00:00:00 2001 From: Neumann-A <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 23 May 2022 17:29:41 +0200 Subject: [PATCH 08/12] revert nasm changes --- scripts/cmake/vcpkg_find_acquire_program.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake index 118485a53ce5d2..b5be6bbcbad1f8 100644 --- a/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -181,11 +181,11 @@ function(vcpkg_find_acquire_program program) set(brew_package_name "nasm") set(apt_package_name "nasm") set(download_urls - "https://www.nasm.us/pub/nasm/releasebuilds/${program_version}/win64/nasm-${program_version}-win64.zip" - "https://fossies.org/windows/misc/nasm-${program_version}-win64.zip" + "https://www.nasm.us/pub/nasm/releasebuilds/${program_version}/win32/nasm-${program_version}-win32.zip" + "https://fossies.org/windows/misc/nasm-${program_version}-win32.zip" ) - set(download_filename "nasm-${program_version}-win64.zip") - set(download_sha512 0d0469f3d475f3d192b9b5b7ee74662cbcb9e02efa0d51839c12cbf6f5de5cd58b32e1d12c9ee4381a63e99a4956e03df7decaf1369e598e0edff19a12629073) + set(download_filename "nasm-${program_version}-win32.zip") + set(download_sha512 9412b8caa07e15eac8f500f6f8fab9f038d95dc25e0124b08a80645607cf5761225f98546b52eac7b894420d64f26c3cbf22c19cd286bbe583f7c964256c97ed) elseif(program STREQUAL "YASM") set(program_name yasm) set(program_version 1.3.0.6.g1962) From 4533c5befaa3227f084ecc43f96d8d2155f09cec Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 23 May 2022 21:04:44 +0200 Subject: [PATCH 09/12] set MESON_SCRIPT instead of MESON. --- ports/vcpkg-tool-meson/vcpkg-port-config.cmake | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ports/vcpkg-tool-meson/vcpkg-port-config.cmake b/ports/vcpkg-tool-meson/vcpkg-port-config.cmake index 587534fba3c50e..65ca8138be29c3 100644 --- a/ports/vcpkg-tool-meson/vcpkg-port-config.cmake +++ b/ports/vcpkg-tool-meson/vcpkg-port-config.cmake @@ -1,2 +1 @@ -vcpkg_find_acquire_program(PYTHON3) -set(MESON "${PYTHON3}" "${CMAKE_CURRENT_LIST_DIR}/../../tools/meson/meson.py") +set(MESON_SCRIPT "${CMAKE_CURRENT_LIST_DIR}/../../tools/meson/meson.py") From 8c9005ec63cd8bb16830cbe751819d7876978215 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 23 May 2022 21:05:07 +0200 Subject: [PATCH 10/12] v db --- versions/v-/vcpkg-tool-meson.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/v-/vcpkg-tool-meson.json b/versions/v-/vcpkg-tool-meson.json index 9c94baf9fa9d5b..a07136a1f50dd3 100644 --- a/versions/v-/vcpkg-tool-meson.json +++ b/versions/v-/vcpkg-tool-meson.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "38efcbab46d63c74437a3cea00ac5f3e48e0809d", + "git-tree": "8f68ec003b976139c3d3b9c97531685cd0973354", "version": "0.62.1", "port-version": 0 }, From 8c804376a6e9bc79f436753d25b9ad16a4942e8b Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Wed, 25 May 2022 08:26:49 +0200 Subject: [PATCH 11/12] apply CR Co-authored-by: Robert Schumacher --- ports/vcpkg-tool-meson/vcpkg-port-config.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/vcpkg-tool-meson/vcpkg-port-config.cmake b/ports/vcpkg-tool-meson/vcpkg-port-config.cmake index 65ca8138be29c3..887c4adbec0c8a 100644 --- a/ports/vcpkg-tool-meson/vcpkg-port-config.cmake +++ b/ports/vcpkg-tool-meson/vcpkg-port-config.cmake @@ -1 +1 @@ -set(MESON_SCRIPT "${CMAKE_CURRENT_LIST_DIR}/../../tools/meson/meson.py") +set(SCRIPT_MESON "${CMAKE_CURRENT_LIST_DIR}/../../tools/meson/meson.py") From b1d9fe6ea4c46d06109843db63f39d58284584aa Mon Sep 17 00:00:00 2001 From: Neumann-A <30894796+Neumann-A@users.noreply.github.com> Date: Wed, 25 May 2022 08:27:16 +0200 Subject: [PATCH 12/12] v db --- versions/v-/vcpkg-tool-meson.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/v-/vcpkg-tool-meson.json b/versions/v-/vcpkg-tool-meson.json index a07136a1f50dd3..54a6ffdeed55d2 100644 --- a/versions/v-/vcpkg-tool-meson.json +++ b/versions/v-/vcpkg-tool-meson.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "8f68ec003b976139c3d3b9c97531685cd0973354", + "git-tree": "e35f24d912749fa1de06cb3cf533028e6f363398", "version": "0.62.1", "port-version": 0 },