Skip to content

Commit 5b350f5

Browse files
committed
NetworkManager: update to 1.56.0.
1 parent 32910f7 commit 5b350f5

4 files changed

Lines changed: 17 additions & 17 deletions

File tree

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#!/bin/sh
22
exec 2>&1
33
sv check dbus >/dev/null || exit 1
4-
exec NetworkManager -n > /dev/null 2>&1
4+
exec NetworkManager -n >/dev/null 2>&1

srcpkgs/NetworkManager/patches/fix-cross-gir.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Index: b/src/libnm-client-impl/meson.build
44
===================================================================
55
--- a/src/libnm-client-impl/meson.build
66
+++ b/src/libnm-client-impl/meson.build
7-
@@ -177,6 +177,16 @@ if enable_introspection
7+
@@ -179,6 +179,16 @@ if enable_introspection
88
endif
99
ld_library_path = meson.current_build_dir() + ld_library_path
1010

@@ -21,7 +21,7 @@ Index: b/src/libnm-client-impl/meson.build
2121
gen_infos_cmd = files(source_root / 'tools' / 'generate-docs-nm-property-infos.py')
2222
gen_gir_cmd = files(source_root / 'tools' / 'generate-docs-nm-settings-docs-gir.py')
2323

24-
@@ -190,7 +200,7 @@ if enable_introspection
24+
@@ -192,7 +202,7 @@ if enable_introspection
2525
input: [gen_infos_cmd, libnm_gir[0]] + libnm_core_settings_sources,
2626
output: 'nm-property-infos-' + name + '.xml',
2727
command: [
@@ -30,12 +30,12 @@ Index: b/src/libnm-client-impl/meson.build
3030
gen_infos_cmd,
3131
name,
3232
'@OUTPUT@',
33-
@@ -206,7 +216,7 @@ if enable_introspection
33+
@@ -208,7 +218,7 @@ if enable_introspection
3434
'env',
3535
'GI_TYPELIB_PATH=' + gi_typelib_path,
3636
'LD_LIBRARY_PATH=' + ld_library_path,
3737
- python_path,
3838
+ qemu_python3_cmd,
3939
gen_gir_cmd,
40-
'--lib-path', meson.current_build_dir(),
4140
'--gir', libnm_gir[0],
41+
'--output', '@OUTPUT@',

srcpkgs/NetworkManager/patches/no-gtk-doc.patch

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,20 @@
11
# Reason: We only want to build man pages, not development docs
22
# Upstream: Patch was rejected - https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/689
33
diff --git a/meson.build b/meson.build
4-
index 5e26346b207..e3e9e95423e 100644
4+
index f6a5c59040..033570b92b 100644
55
--- a/meson.build
66
+++ b/meson.build
7-
@@ -1009,9 +1009,7 @@ if enable_qt != 'false'
7+
@@ -1051,8 +1051,6 @@ if enable_docs or enable_man
8+
subdir('man')
89
endif
9-
1010
if enable_docs
1111
- assert(enable_introspection, '-Ddocs=true requires -Dintrospection=true')
12-
subdir('man')
1312
- subdir('docs')
1413
meson.add_dist_script(
1514
'tools/meson-dist-data.sh',
1615
'--build-root', build_root
1716
diff --git a/src/libnmc-setting/meson.build b/src/libnmc-setting/meson.build
18-
index 4d5079dfb39..8e335b95fbd 100644
17+
index 4d5079dfb3..8e335b95fb 100644
1918
--- a/src/libnmc-setting/meson.build
2019
+++ b/src/libnmc-setting/meson.build
2120
@@ -1,6 +1,6 @@

srcpkgs/NetworkManager/template

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Template file for 'NetworkManager'
22
pkgname=NetworkManager
3-
version=1.50.0
3+
version=1.56.0
44
revision=1
55
build_style=meson
66
build_helper="gir qemu"
@@ -17,12 +17,12 @@ configure_args="-Dsystemd_journal=false
1717
$(vopt_bool gir introspection) $(vopt_bool gir vapi)
1818
-Dsession_tracking=$(vopt_if elogind elogind no)
1919
-Dsuspend_resume=$(vopt_if elogind elogind upower)
20-
-Dconfig_dhcp_default=internal"
20+
-Dconfig_dhcp_default=internal -Dtests=no"
2121
hostmakedepends="gettext-devel glib-devel libxslt-devel pkg-config
2222
dbus-glib-devel docbook-xsl gtk-doc polkit-devel perl
2323
$(vopt_if gir 'vala python3-gobject')"
2424
makedepends="libuuid-devel nss-devel dbus-glib-devel libgudev-devel
25-
libnl3-devel polkit-devel ppp-devel libcurl-devel
25+
libnl3-devel polkit-devel ppp-devel libcurl-devel libnvme-devel
2626
ModemManager-devel readline-devel libndp-devel newt-devel jansson-devel
2727
libpsl-devel eudev-libudev-devel mobile-broadband-provider-info gnutls-devel
2828
$(vopt_if gir 'libgirepository-devel python3-gobject')
@@ -32,10 +32,10 @@ checkdepends="python3-dbus"
3232
short_desc="Network Management daemon"
3333
maintainer="Enno Boland <gottox@voidlinux.org>"
3434
license="GPL-2.0-or-later"
35-
homepage="https://wiki.gnome.org/Projects/NetworkManager"
36-
changelog="https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/raw/nm-1-50/NEWS"
37-
distfiles="${GNOME_SITE}/NetworkManager/${version%.*}/NetworkManager-${version}.tar.xz"
38-
checksum=fc03e7388a656cebc454c5d89481626122b1975d7c26babc64dc7e488faa66e3
35+
homepage="https://networkmanager.dev"
36+
changelog="https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/raw/nm-1-56/NEWS"
37+
distfiles="https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/releases/${version}/downloads/NetworkManager-${version}.tar.xz"
38+
checksum=59a32d385cc1e7ae26e43798c6f12d07ff6198abd041ec0620b3a08cfc021ccc
3939
# TODO: Some tests require network namespaces to run.
4040
make_check=extended
4141
lib32disabled=yes
@@ -90,6 +90,7 @@ libnm_package() {
9090
fi
9191
}
9292
}
93+
9394
NetworkManager-devel_package() {
9495
depends="dbus-glib-devel libnm-${version}_${revision}"
9596
short_desc+=" - development files"

0 commit comments

Comments
 (0)