wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-06-05 06:33:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

NetworkManager: update to 1.48.4

Browse source
This commit is contained in:
cinerea0 2024-07-24 12:48:50 -04:00 • committed by cinerea0
parent 799c5a77d8
commit 163bb54e2e
3 changed files with 18 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4,7 +4,7 @@ Index: b/src/libnm-client-impl/meson.build
=================================================================== ===================================================================
--- a/src/libnm-client-impl/meson.build --- a/src/libnm-client-impl/meson.build
+++ b/src/libnm-client-impl/meson.build +++ b/src/libnm-client-impl/meson.build
@@ -178,6 +178,16 @@ if enable_introspection @@ -177,6 +177,16 @@ if enable_introspection
endif endif
ld_library_path = meson.current_build_dir() + ld_library_path ld_library_path = meson.current_build_dir() + ld_library_path
@ -13,28 +13,28 @@ Index: b/src/libnm-client-impl/meson.build
+ '/usr/bin/qemu-@XBPS_TARGET_QEMU_MACHINE@-static', + '/usr/bin/qemu-@XBPS_TARGET_QEMU_MACHINE@-static',
+ '-L', '@XBPS_CROSS_BASE@', + '-L', '@XBPS_CROSS_BASE@',
+ '@XBPS_CROSS_BASE@/usr/bin/python3' + '@XBPS_CROSS_BASE@/usr/bin/python3'
+ ] + ]
+ else + else
+ qemu_python3_cmd = python.path() + qemu_python3_cmd = python_path
+ endif + endif
+ +
gen_infos_cmd = join_paths(meson.source_root(), 'tools', 'generate-docs-nm-property-infos.py') gen_infos_cmd = files(source_root / 'tools' / 'generate-docs-nm-property-infos.py')
gen_gir_cmd = join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-gir.py') gen_gir_cmd = files(source_root / 'tools' / 'generate-docs-nm-settings-docs-gir.py')
@@ -191,7 +201,7 @@ if enable_introspection @@ -190,7 +200,7 @@ if enable_introspection
input: [gen_infos_cmd, libnm_gir[0]] + libnm_core_settings_sources, input: [gen_infos_cmd, libnm_gir[0]] + libnm_core_settings_sources,
output: 'nm-property-infos-' + name + '.xml', output: 'nm-property-infos-' + name + '.xml',
command: [ command: [
- python.path(), - python_path,
+ qemu_python3_cmd, + qemu_python3_cmd,
gen_infos_cmd, gen_infos_cmd,
name, name,
'@OUTPUT@', '@OUTPUT@',
@@ -207,7 +217,7 @@ if enable_introspection @@ -206,7 +216,7 @@ if enable_introspection
'env', 'env',
'GI_TYPELIB_PATH=' + gi_typelib_path, 'GI_TYPELIB_PATH=' + gi_typelib_path,
'LD_LIBRARY_PATH=' + ld_library_path, 'LD_LIBRARY_PATH=' + ld_library_path,
- python.path(), - python_path,
+ qemu_python3_cmd, + qemu_python3_cmd,
gen_gir_cmd, gen_gir_cmd,
'--lib-path', meson.current_build_dir(), '--lib-path', meson.current_build_dir(),

9
srcpkgs/NetworkManager/patches/no-gtk-doc.patch
View file

@ -1,22 +1,21 @@
# Reason: We only want to build man pages, not development docs # Reason: We only want to build man pages, not development docs
# Upstream: Patch was rejected - https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/689 # Upstream: Patch was rejected - https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/689
diff --git a/meson.build b/meson.build diff --git a/meson.build b/meson.build
index 1cc11d0dfdc..b25b9d93554 100644 index 5e26346b207..e3e9e95423e 100644
--- a/meson.build --- a/meson.build
+++ b/meson.build +++ b/meson.build
@@ -977,10 +977,8 @@ if enable_qt @@ -1009,9 +1009,7 @@ if enable_qt != 'false'
endif endif
if enable_docs if enable_docs
- assert(enable_introspection, '-Ddocs=true requires -Dintrospection=true') - assert(enable_introspection, '-Ddocs=true requires -Dintrospection=true')
assert(meson.version().version_compare('>= 0.49.0'), '-Ddocs requires meson >= 0.49')
subdir('man') subdir('man')
- subdir('docs') - subdir('docs')
meson.add_dist_script( meson.add_dist_script(
'tools/meson-dist-data.sh', 'tools/meson-dist-data.sh',
'--build-root', build_root '--build-root', build_root
diff --git a/src/libnmc-setting/meson.build b/src/libnmc-setting/meson.build diff --git a/src/libnmc-setting/meson.build b/src/libnmc-setting/meson.build
index 7fb460dc331..fadc90f01f8 100644 index 4d5079dfb39..8e335b95fbd 100644
--- a/src/libnmc-setting/meson.build --- a/src/libnmc-setting/meson.build
+++ b/src/libnmc-setting/meson.build +++ b/src/libnmc-setting/meson.build
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
@ -26,4 +25,4 @@ index 7fb460dc331..fadc90f01f8 100644
+if enable_docs and enable_introspection +if enable_docs and enable_introspection
assert(enable_introspection, '-Ddocs=true requires -Dintrospection=true') assert(enable_introspection, '-Ddocs=true requires -Dintrospection=true')
merge_cmd = join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-merge.py') merge_cmd = files(source_root / 'tools' / 'generate-docs-nm-settings-docs-merge.py')

10
srcpkgs/NetworkManager/template
View file

@ -1,7 +1,7 @@
# Template file for 'NetworkManager' # Template file for 'NetworkManager'
pkgname=NetworkManager pkgname=NetworkManager
version=1.46.0 version=1.48.4
revision=2 revision=1
build_style=meson build_style=meson
build_helper="gir qemu" build_helper="gir qemu"
configure_args="-Dsystemd_journal=false configure_args="-Dsystemd_journal=false
@ -33,9 +33,9 @@ short_desc="Network Management daemon"
maintainer="Enno Boland <gottox@voidlinux.org>" maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later" license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/NetworkManager" homepage="https://wiki.gnome.org/Projects/NetworkManager"
changelog="https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/raw/nm-1-46/NEWS" changelog="https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/raw/nm-1-48/NEWS"
distfiles="${GNOME_SITE}/NetworkManager/${version%.*}/NetworkManager-${version}.tar.xz" distfiles="${GNOME_SITE}/NetworkManager/${version%.*}/NetworkManager-${version}.tar.xz"
checksum=722649e25362693b334371473802a729b0ec9ee283375096905f868808e74068 checksum=f25f35fe2ea1a473f7d184ccc72c8d4adc9705926fe4f3a7a3c8549941f56b03
# TODO: Some tests require network namespaces to run. # TODO: Some tests require network namespaces to run.
make_check=extended make_check=extended
lib32disabled=yes lib32disabled=yes
@ -60,7 +60,7 @@ post_patch() {
-e "s|@XBPS_TARGET_QEMU_MACHINE@|${XBPS_TARGET_QEMU_MACHINE}|" \ -e "s|@XBPS_TARGET_QEMU_MACHINE@|${XBPS_TARGET_QEMU_MACHINE}|" \
src/libnm-client-impl/meson.build src/libnm-client-impl/meson.build
# https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/955 # https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/955
vsed -e "s#jansson_dep.get_pkgconfig_variable('libdir')#'${XBPS_CROSS_BASE}/usr/lib'#" \ vsed -e "s#jansson_dep.get_variable(pkgconfig: 'libdir')#'${XBPS_CROSS_BASE}/usr/lib'#" \
-i meson.build -i meson.build
fi fi
} }