From 123d262d4c3eadb67edd1d3e95cf5a8ee70658fc Mon Sep 17 00:00:00 2001 From: Duncaen Date: Mon, 13 Jan 2020 02:32:39 +0100 Subject: [PATCH] NetworkManager: fix fix-cross-gir.patch --- .../patches/fix-cross-gir.patch | 26 ++++++++++++++++--- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch index 3591f1a1296..10a2278c46a 100644 --- a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch +++ b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch @@ -11,9 +11,9 @@ Upstream: No, not upstreamable since this is very specific to the Void setup ) test( ---- libnm/meson.build 2019-11-27 21:35:56.964752550 +0100 -+++ - 2019-11-27 21:40:25.516650233 +0100 -@@ -244,7 +244,24 @@ +--- libnm/meson.build.orig Mon Jan 13 02:12:09 2020 ++++ libnm/meson.build Mon Jan 13 02:17:17 2020 +@@ -236,7 +236,24 @@ ) endif @@ -34,8 +34,26 @@ Upstream: No, not upstreamable since this is very specific to the Void setup + qemu_python3_cmd = qemu + ' -L @XBPS_CROSS_BASE@ @XBPS_CROSS_BASE@/bin/python3' + generate_setting_docs = ['sh', '-c', qemu_python3_cmd, join_paths(meson.current_source_dir(), 'generate-setting-docs.py')] + else -+ generate_setting_docs = join_paths(meson.current_source_dir(), 'generate-setting-docs.py') ++ generate_setting_docs = [python.path(), join_paths(meson.current_source_dir(), 'generate-setting-docs.py')] + endif gi_typelib_path = run_command('printenv', 'GI_TYPELIB_PATH').stdout() if gi_typelib_path != '' +@@ -261,7 +278,7 @@ + name, + input: libnm_gir[0], + output: name, +- command: [generate_setting_docs_env, python.path(), generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--output', '@OUTPUT@'], ++ command: [generate_setting_docs_env, generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--output', '@OUTPUT@'], + depends: libnm_gir, + ) + +@@ -270,7 +287,7 @@ + name, + input: [libnm_gir[0], nm_settings_docs_overrides], + output: name, +- command: [generate_setting_docs_env, python.path(), generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT0@', '--overrides', '@INPUT1@', '--output', '@OUTPUT@'], ++ command: [generate_setting_docs_env, generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT0@', '--overrides', '@INPUT1@', '--output', '@OUTPUT@'], + depends: libnm_gir, + ) + endif