From 80f67716499767049268b88df9b712f16ab7751a Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Fri, 2 Jul 2021 21:33:20 -0400
Subject: [PATCH] NetworkManager: update to 1.32.2

---
 .../patches/fix-cross-gir.patch               | 25 +++++++++---------
 .../NetworkManager/patches/no-gtk-doc.patch   | 17 ++++++------
 srcpkgs/NetworkManager/template               | 26 +++++++++----------
 3 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
index b78edfac244..d3fa6ffe5d9 100644
--- a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
+++ b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
@@ -1,13 +1,14 @@
 Reason: Fix crossbuilding GIR
 Upstream: No, not upstreamable since this is very specific to the Void setup
-Index: b/libnm/meson.build
+Index: b/src/libnm-client-impl/meson.build
 ===================================================================
---- a/libnm/meson.build
-+++ b/libnm/meson.build
-@@ -274,13 +274,23 @@ if enable_introspection
-     'LD_LIBRARY_PATH=' + ld_library_path,
-   ]
- 
+--- a/src/libnm-client-impl/meson.build
++++ b/src/libnm-client-impl/meson.build
+@@ -210,6 +210,16 @@ if enable_introspection
+     ld_library_path = ':' + ld_library_path
+   endif
+   ld_library_path = meson.current_build_dir() + ld_library_path
++  
 +  if meson.is_cross_build()
 +    qemu_python3_cmd = [
 +      '/usr/bin/qemu-@XBPS_TARGET_QEMU_MACHINE@-static',
@@ -17,13 +18,13 @@ Index: b/libnm/meson.build
 +  else
 +    qemu_python3_cmd = python.path()
 +  endif
-+
+ 
    nm_settings_docs_xml_gir = custom_target(
      'nm-settings-docs-gir.xml',
-     input: libnm_gir[0],
-     output: 'nm-settings-docs-gir.xml',
-     command: [
-       generate_setting_docs_env,
+@@ -219,7 +229,7 @@ if enable_introspection
+       'env',
+       'GI_TYPELIB_PATH=' + gi_typelib_path,
+       'LD_LIBRARY_PATH=' + ld_library_path,
 -      python.path(),
 +      qemu_python3_cmd,
        join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-gir.py'),
diff --git a/srcpkgs/NetworkManager/patches/no-gtk-doc.patch b/srcpkgs/NetworkManager/patches/no-gtk-doc.patch
index 7492b818868..87e75aa3510 100644
--- a/srcpkgs/NetworkManager/patches/no-gtk-doc.patch
+++ b/srcpkgs/NetworkManager/patches/no-gtk-doc.patch
@@ -15,16 +15,15 @@ Index: b/meson.build
  endif
  
  configure_file(
-Index: b/clients/common/meson.build
+Index: b/src/libnmc-setting/meson.build
 ===================================================================
---- a/clients/common/meson.build
-+++ b/clients/common/meson.build
-@@ -28,7 +28,7 @@ libnmc_base_dep = declare_dependency(
-   link_with: libnmc_base,
- )
+--- 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
-   settings_docs_source = custom_target(
-     'settings-docs.h',
-     input: nm_settings_docs_xml_gir,
+   settings_docs_input_xml = custom_target(
+     'settings-docs-input.xml',
+     input: [nm_settings_docs_xml_gir, nm_property_infos_xml['nmcli']],
diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template
index 7af0685be91..a35b51d7b76 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -1,6 +1,6 @@
 # Template file for 'NetworkManager'
 pkgname=NetworkManager
-version=1.30.4
+version=1.32.2
 revision=1
 build_style=meson
 build_helper="gir qemu"
@@ -24,7 +24,7 @@ hostmakedepends="gettext-devel glib-devel libxslt-devel pkg-config
 makedepends="libuuid-devel nss-devel dbus-glib-devel libgudev-devel
  libnl3-devel polkit-devel ppp-devel iptables-devel libcurl-devel
  ModemManager-devel readline-devel libndp-devel newt-devel jansson-devel
- libpsl-devel eudev-libudev-devel mobile-broadband-provider-info
+ libpsl-devel eudev-libudev-devel mobile-broadband-provider-info gnutls-devel
  $(vopt_if gir 'libgirepository-devel python3-gobject')
  $(vopt_if elogind elogind-devel)"
 depends="dbus iproute2 openresolv wpa_supplicant mobile-broadband-provider-info"
@@ -34,7 +34,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6050b724212ea3ce7386113359bea9afa1f679a54f60d999a5999892e672c190
+checksum=701d511067f757d0f92f412c98cdb49a74a6ba69448aabb1beadacbc171e3873
 # TODO: Some tests require network namespaces to run.
 make_check=extended
 lib32disabled=yes
@@ -51,6 +51,16 @@ make_dirs="
 build_options="gir elogind"
 build_options_default="gir elogind"
 
+post_patch() {
+	if [ "$CROSS_BUILD" ]; then
+		# Replace the values from our patch into the system itself
+		vsed -i \
+			-e "s|@XBPS_CROSS_BASE@|${XBPS_CROSS_BASE}|g" \
+			-e "s|@XBPS_TARGET_QEMU_MACHINE@|${XBPS_TARGET_QEMU_MACHINE}|" \
+			src/libnm-client-impl/meson.build
+	fi
+}
+
 pre_check() {
 	# machine-id is a random, non-zero value
 	echo 'dcb30309cd6c8b7cc20383d85a5c7012' > /etc/machine-id
@@ -60,16 +70,6 @@ post_check() {
 	rm /etc/machine-id
 }
 
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		# Replace the values from our patch into the system itself
-		vsed -i \
-			-e "s|@XBPS_CROSS_BASE@|${XBPS_CROSS_BASE}|g" \
-			-e "s|@XBPS_TARGET_QEMU_MACHINE@|${XBPS_TARGET_QEMU_MACHINE}|" \
-			libnm/meson.build
-	fi
-}
-
 post_install() {
 	vinstall ${FILESDIR}/${pkgname}.conf 644 etc/${pkgname}
 	vinstall ${FILESDIR}/50-org.freedesktop.NetworkManager.rules 644 \