From 9a80beab78732bbf0fc4a36b44fc1ed6e9743d50 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Wed, 31 Aug 2022 15:18:42 -0400
Subject: [PATCH] NetworkManager: update to 1.40.0

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

diff --git a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
index d3fa6ffe5d9c..6e6220da4ff4 100644
--- a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
+++ b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
@@ -1,10 +1,10 @@
-Reason: Fix crossbuilding GIR
-Upstream: No, not upstreamable since this is very specific to the Void setup
-Index: b/src/libnm-client-impl/meson.build
-===================================================================
+# Reason: Fix crossbuilding GIR
+# Upstream: No, not upstreamable since this is very specific to the Void setup
+diff --git a/src/libnm-client-impl/meson.build b/src/libnm-client-impl/meson.build
+index 46464a6328..27a42f51e6 100644
 --- a/src/libnm-client-impl/meson.build
 +++ b/src/libnm-client-impl/meson.build
-@@ -210,6 +210,16 @@ if enable_introspection
+@@ -219,6 +219,16 @@ if enable_introspection
      ld_library_path = ':' + ld_library_path
    endif
    ld_library_path = meson.current_build_dir() + ld_library_path
@@ -21,7 +21,7 @@ Index: b/src/libnm-client-impl/meson.build
  
    nm_settings_docs_xml_gir = custom_target(
      'nm-settings-docs-gir.xml',
-@@ -219,7 +229,7 @@ if enable_introspection
+@@ -228,7 +238,7 @@ if enable_introspection
        'env',
        'GI_TYPELIB_PATH=' + gi_typelib_path,
        'LD_LIBRARY_PATH=' + ld_library_path,
diff --git a/srcpkgs/NetworkManager/patches/no-gtk-doc.patch b/srcpkgs/NetworkManager/patches/no-gtk-doc.patch
index 87e75aa35106..2cd7cf42b71c 100644
--- a/srcpkgs/NetworkManager/patches/no-gtk-doc.patch
+++ b/srcpkgs/NetworkManager/patches/no-gtk-doc.patch
@@ -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']],
diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template
index 191bbfa1f172..265012f8bcae 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -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"
@@ -25,6 +25,7 @@ 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 gnutls-devel
+ appstream-glib appstream-glib-devel
  $(vopt_if gir 'libgirepository-devel python3-gobject')
  $(vopt_if elogind elogind-devel)"
 depends="dbus iproute2 openresolv wpa_supplicant mobile-broadband-provider-info"
@@ -35,7 +36,7 @@ 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"
 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