From 75fd526f0f652de6f1648939e10262bcde6f1a47 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sat, 4 Mar 2023 21:24:11 -0500
Subject: [PATCH] NetworkManager: update to 1.42.2

---
 .../patches/drop-assertion.patch              | 32 -------------------
 srcpkgs/NetworkManager/template               |  4 +--
 2 files changed, 2 insertions(+), 34 deletions(-)
 delete mode 100644 srcpkgs/NetworkManager/patches/drop-assertion.patch

diff --git a/srcpkgs/NetworkManager/patches/drop-assertion.patch b/srcpkgs/NetworkManager/patches/drop-assertion.patch
deleted file mode 100644
index 32d7c5d5f41f..000000000000
--- a/srcpkgs/NetworkManager/patches/drop-assertion.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-# https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/commit/a29eb970c89f12d118830d0ee46cdda2b6cd7f8b
-# Removes type conflict with _assert_fail between glibc and musl, will be in next release
-diff --git a/src/libnm-std-aux/nm-std-aux.h b/src/libnm-std-aux/nm-std-aux.h
-index e556aa4b52a37f2fab9459314726b1b78fc068d9..75703e70b41d22d414af537b0bccc042e4d4ff1b 100644
---- a/src/libnm-std-aux/nm-std-aux.h
-+++ b/src/libnm-std-aux/nm-std-aux.h
-@@ -219,25 +219,6 @@ typedef uint64_t _nm_bitwise nm_be64_t;
- #define NM_MORE_ASSERTS 0
- #endif
- 
--#if NM_MORE_ASSERTS == 0
--/* The string with the assertion check and the function name blows up the
-- * binary size. In production mode, let's drop those, similar to
-- * g_assertion_message_expr.
-- *
-- * Note that <assert.h> can be included multiple times. We can thus
-- * not redefine __assert_fail(...). Instead, just redefine the name
-- * __assert_fail. */
--_nm_noreturn static inline void
--_nm_assert_fail_internal(const char  *assertion,
--                         const char  *file,
--                         unsigned int line,
--                         const char  *function)
--{
--    __assert_fail("<dropped>", file, line, "<unknown-fcn>");
--}
--#define __assert_fail _nm_assert_fail_internal
--#endif
--
- #ifndef NDEBUG
- #define _NM_ASSERT_FAIL_ENABLED 1
- #define _nm_assert_fail(msg)    __assert_fail((msg), __FILE__, __LINE__, __func__)
diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template
index 2096ae3d87e1..61ff7b3f4878 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -1,6 +1,6 @@
 # Template file for 'NetworkManager'
 pkgname=NetworkManager
-version=1.42.0
+version=1.42.2
 revision=1
 build_style=meson
 build_helper="gir qemu"
@@ -35,7 +35,7 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 changelog="https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/raw/nm-1-42/NEWS"
 distfiles="${GNOME_SITE}/NetworkManager/${version%.*}/NetworkManager-${version}.tar.xz"
-checksum=2f6756d507bb6b46716594b67e6fe7491891e1b5b167bbafc5157dfa7753d5b4
+checksum=dcfe9c5c909d38c81ae95ccfe895a328a2a14c11dacfb7f507beb405efce0580
 # TODO: Some tests require network namespaces to run.
 make_check=extended
 lib32disabled=yes