From 7dfe323a6f0b281c35409f4c1aeda3e74823cca6 Mon Sep 17 00:00:00 2001 From: Anton Kudriavtsev Date: Tue, 7 Apr 2026 20:42:21 +0300 Subject: [PATCH] NetworkManager: update to 1.56.0. --- .../NetworkManager/files/NetworkManager/run | 2 +- .../patches/fix-cross-gir.patch | 8 +++--- .../NetworkManager/patches/no-gtk-doc.patch | 28 ------------------- srcpkgs/NetworkManager/template | 17 +++++------ 4 files changed, 14 insertions(+), 41 deletions(-) delete mode 100644 srcpkgs/NetworkManager/patches/no-gtk-doc.patch diff --git a/srcpkgs/NetworkManager/files/NetworkManager/run b/srcpkgs/NetworkManager/files/NetworkManager/run index a1a143999ad729..975525c8f60038 100644 --- a/srcpkgs/NetworkManager/files/NetworkManager/run +++ b/srcpkgs/NetworkManager/files/NetworkManager/run @@ -1,4 +1,4 @@ #!/bin/sh exec 2>&1 sv check dbus >/dev/null || exit 1 -exec NetworkManager -n > /dev/null 2>&1 +exec NetworkManager -n >/dev/null 2>&1 diff --git a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch index 644842556535d6..284e1252dc78db 100644 --- a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch +++ b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch @@ -4,7 +4,7 @@ Index: b/src/libnm-client-impl/meson.build =================================================================== --- a/src/libnm-client-impl/meson.build +++ b/src/libnm-client-impl/meson.build -@@ -177,6 +177,16 @@ if enable_introspection +@@ -179,6 +179,16 @@ if enable_introspection endif ld_library_path = meson.current_build_dir() + ld_library_path @@ -21,7 +21,7 @@ Index: b/src/libnm-client-impl/meson.build gen_infos_cmd = files(source_root / 'tools' / 'generate-docs-nm-property-infos.py') gen_gir_cmd = files(source_root / 'tools' / 'generate-docs-nm-settings-docs-gir.py') -@@ -190,7 +200,7 @@ if enable_introspection +@@ -192,7 +202,7 @@ if enable_introspection input: [gen_infos_cmd, libnm_gir[0]] + libnm_core_settings_sources, output: 'nm-property-infos-' + name + '.xml', command: [ @@ -30,12 +30,12 @@ Index: b/src/libnm-client-impl/meson.build gen_infos_cmd, name, '@OUTPUT@', -@@ -206,7 +216,7 @@ if enable_introspection +@@ -208,7 +218,7 @@ if enable_introspection 'env', 'GI_TYPELIB_PATH=' + gi_typelib_path, 'LD_LIBRARY_PATH=' + ld_library_path, - python_path, + qemu_python3_cmd, gen_gir_cmd, - '--lib-path', meson.current_build_dir(), '--gir', libnm_gir[0], + '--output', '@OUTPUT@', diff --git a/srcpkgs/NetworkManager/patches/no-gtk-doc.patch b/srcpkgs/NetworkManager/patches/no-gtk-doc.patch deleted file mode 100644 index fd5e7b3c1b9b1a..00000000000000 --- a/srcpkgs/NetworkManager/patches/no-gtk-doc.patch +++ /dev/null @@ -1,28 +0,0 @@ -# Reason: We only want to build man pages, not development docs -# Upstream: Patch was rejected - https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/689 -diff --git a/meson.build b/meson.build -index 5e26346b207..e3e9e95423e 100644 ---- a/meson.build -+++ b/meson.build -@@ -1009,9 +1009,7 @@ if enable_qt != 'false' - endif - - if enable_docs -- assert(enable_introspection, '-Ddocs=true requires -Dintrospection=true') - subdir('man') -- subdir('docs') - meson.add_dist_script( - 'tools/meson-dist-data.sh', - '--build-root', build_root -diff --git a/src/libnmc-setting/meson.build b/src/libnmc-setting/meson.build -index 4d5079dfb39..8e335b95fbd 100644 ---- a/src/libnmc-setting/meson.build -+++ b/src/libnmc-setting/meson.build -@@ -1,6 +1,6 @@ - # SPDX-License-Identifier: LGPL-2.1-or-later - --if enable_docs -+if enable_docs and enable_introspection - assert(enable_introspection, '-Ddocs=true requires -Dintrospection=true') - - merge_cmd = files(source_root / 'tools' / 'generate-docs-nm-settings-docs-merge.py') diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template index 16a7227914bacc..6b11cd5f4987bc 100644 --- a/srcpkgs/NetworkManager/template +++ b/srcpkgs/NetworkManager/template @@ -1,6 +1,6 @@ # Template file for 'NetworkManager' pkgname=NetworkManager -version=1.50.0 +version=1.56.0 revision=1 build_style=meson build_helper="gir qemu" @@ -13,16 +13,16 @@ configure_args="-Dsystemd_journal=false -Ddhclient=/usr/bin/dhclient -Dkernel_firmware_dir=/usr/lib/firmware -Ddnsmasq=/usr/bin/dnsmasq -Ddbus_conf_dir=/etc/dbus-1/system.d -Ddhcpcd=/usr/bin/dhcpcd -Diptables=/usr/bin/iptables -Dnft=/usr/bin/nft - -Diwd=true -Dudev_dir=/usr/lib/udev -Ddocs=true + -Diwd=true -Dudev_dir=/usr/lib/udev -Ddocs=false -Dman=true $(vopt_bool gir introspection) $(vopt_bool gir vapi) -Dsession_tracking=$(vopt_if elogind elogind no) -Dsuspend_resume=$(vopt_if elogind elogind upower) - -Dconfig_dhcp_default=internal" + -Dconfig_dhcp_default=internal -Dtests=no" hostmakedepends="gettext-devel glib-devel libxslt-devel pkg-config dbus-glib-devel docbook-xsl gtk-doc polkit-devel perl $(vopt_if gir 'vala python3-gobject')" makedepends="libuuid-devel nss-devel dbus-glib-devel libgudev-devel - libnl3-devel polkit-devel ppp-devel libcurl-devel + libnl3-devel polkit-devel ppp-devel libcurl-devel libnvme-devel ModemManager-devel readline-devel libndp-devel newt-devel jansson-devel libpsl-devel eudev-libudev-devel mobile-broadband-provider-info gnutls-devel $(vopt_if gir 'libgirepository-devel python3-gobject') @@ -32,10 +32,10 @@ checkdepends="python3-dbus" short_desc="Network Management daemon" maintainer="Enno Boland " license="GPL-2.0-or-later" -homepage="https://wiki.gnome.org/Projects/NetworkManager" -changelog="https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/raw/nm-1-50/NEWS" -distfiles="${GNOME_SITE}/NetworkManager/${version%.*}/NetworkManager-${version}.tar.xz" -checksum=fc03e7388a656cebc454c5d89481626122b1975d7c26babc64dc7e488faa66e3 +homepage="https://networkmanager.dev" +changelog="https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/raw/nm-1-56/NEWS" +distfiles="https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/releases/${version}/downloads/NetworkManager-${version}.tar.xz" +checksum=59a32d385cc1e7ae26e43798c6f12d07ff6198abd041ec0620b3a08cfc021ccc # TODO: Some tests require network namespaces to run. make_check=extended lib32disabled=yes @@ -90,6 +90,7 @@ libnm_package() { fi } } + NetworkManager-devel_package() { depends="dbus-glib-devel libnm-${version}_${revision}" short_desc+=" - development files"