NetworkManager: update to 1.40.0

This commit is contained in:
cinerea0 2022-09-01 10:45:46 -04:00 committed by Michal Vasilek
parent 9a0a84c497
commit e1fe7410ec
2 changed files with 12 additions and 12 deletions

View file

@ -1,10 +1,10 @@
Reason: We only want to build man pages, not development docs
Upstream: An issue has been filed - https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/689
Index: b/meson.build
===================================================================
# 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 996617f4ca..fb4a914470 100644
--- a/meson.build
+++ b/meson.build
@@ -943,10 +943,8 @@ if enable_qt
@@ -952,10 +952,8 @@ if enable_qt
endif
if enable_docs
@ -15,8 +15,8 @@ Index: b/meson.build
endif
configure_file(
Index: b/src/libnmc-setting/meson.build
===================================================================
diff --git a/src/libnmc-setting/meson.build b/src/libnmc-setting/meson.build
index 49314cad2e..376ec4e740 100644
--- a/src/libnmc-setting/meson.build
+++ b/src/libnmc-setting/meson.build
@@ -1,6 +1,6 @@
@ -24,6 +24,6 @@ Index: b/src/libnmc-setting/meson.build
-if enable_docs
+if enable_docs and enable_introspection
assert(enable_introspection, '-Ddocs=true requires -Dintrospection=true')
settings_docs_input_xml = custom_target(
'settings-docs-input.xml',
input: [nm_settings_docs_xml_gir, nm_property_infos_xml['nmcli']],

View file

@ -1,6 +1,6 @@
# Template file for 'NetworkManager'
pkgname=NetworkManager
version=1.38.4
version=1.40.0
revision=1
build_style=meson
build_helper="gir qemu"
@ -19,7 +19,7 @@ configure_args="-Dsystemd_journal=false
-Dsuspend_resume=$(vopt_if elogind elogind upower)
-Dconfig_dhcp_default=internal"
hostmakedepends="gettext-devel glib-devel libxslt-devel pkg-config
intltool dbus-glib-devel docbook-xsl gtk-doc
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 iptables-devel libcurl-devel
@ -33,9 +33,9 @@ short_desc="Network Management daemon"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/NetworkManager"
changelog="https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/raw/nm-1-38/NEWS"
changelog="https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/raw/nm-1-40/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
checksum=841f64d41776aadd92b151f47e50f62be8a0611a9056fe6bf81881024e6a96c5
checksum=aee7e057bc2cca5dab84e41f15f1da8b795eb290747b04cbeee822bad9e9fc03
# TODO: Some tests require network namespaces to run.
make_check=extended
lib32disabled=yes