moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

NetworkManager: fix fix-cross-gir.patch

Browse source
This commit is contained in:
Duncaen 2020-01-13 02:32:39 +01:00
parent ace2be68b5
commit 123d262d4c
No known key found for this signature in database
GPG key ID: 335C1D17EC3D6E35
1 changed files with 22 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

26
srcpkgs/NetworkManager/patches/fix-cross-gir.patch
View file

@ -11,9 +11,9 @@ Upstream: No, not upstreamable since this is very specific to the Void setup
) )
test( test(
--- libnm/meson.build 2019-11-27 21:35:56.964752550 +0100 --- libnm/meson.build.orig Mon Jan 13 02:12:09 2020
+++ - 2019-11-27 21:40:25.516650233 +0100 +++ libnm/meson.build Mon Jan 13 02:17:17 2020
@@ -244,7 +244,24 @@ @@ -236,7 +236,24 @@
) )
endif 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' + 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')] + generate_setting_docs = ['sh', '-c', qemu_python3_cmd, join_paths(meson.current_source_dir(), 'generate-setting-docs.py')]
+ else + 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 + endif
gi_typelib_path = run_command('printenv', 'GI_TYPELIB_PATH').stdout() gi_typelib_path = run_command('printenv', 'GI_TYPELIB_PATH').stdout()
if gi_typelib_path != '' 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