Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] NetworkManager: update to 1.31.1
@ 2021-03-09  3:41 cinerea0
  2021-03-09  3:50 ` cinerea0
                   ` (71 more replies)
  0 siblings, 72 replies; 73+ messages in thread
From: cinerea0 @ 2021-03-09  3:41 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1591 bytes --]

There is a new pull request by cinerea0 against master on the void-packages repository

https://github.com/cinerea0/void-packages nm
https://github.com/void-linux/void-packages/pull/29342

NetworkManager: update to 1.31.1
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/29342.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nm-29342.patch --]
[-- Type: text/x-diff, Size: 14274 bytes --]

From ceba21eeb68574c2b1bb8520c13cb300445df554 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Mon, 8 Mar 2021 22:37:59 -0500
Subject: [PATCH] NetworkManager: update to 1.31.1

---
 .../patches/fix-cross-gir.patch               | 67 ++++++-------------
 .../patches/fix-musl-linux-header.diff        | 15 -----
 .../patches/fix-musl-linux-header.patch       | 19 ++++++
 .../NetworkManager/patches/musl-basic.patch   | 26 +++----
 .../patches/musl-fix-includes.patch           | 48 +------------
 .../patches/musl-network-support.patch        | 21 ++----
 .../patches/musl-use-srand48.patch            | 40 -----------
 srcpkgs/NetworkManager/template               | 14 ++--
 8 files changed, 69 insertions(+), 181 deletions(-)
 delete mode 100644 srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff
 create mode 100644 srcpkgs/NetworkManager/patches/fix-musl-linux-header.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-use-srand48.patch

diff --git a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
index c283d4dc1059..c0b4344b1c15 100644
--- a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
+++ b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
@@ -1,52 +1,29 @@
 Reason: Fix crossbuilding GIR
 Upstream: No, not upstreamable since this is very specific to the Void setup
-diff --git clients/common/meson.build clients/common/meson.build
-index afa257b..50b53e7 100644
---- clients/common/meson.build
-+++ clients/common/meson.build
-@@ -35,7 +35,7 @@ if enable_introspection
-     settings_docs,
-     input: nm_property_docs,
-     output: settings_docs,
--    command: [xsltproc, '--output', '@OUTPUT@', join_paths(meson.current_source_dir(), 'settings-docs.xsl'), '@INPUT@'],
-+    command: [xsltproc, '--output', '@OUTPUT@', join_paths(meson.current_source_dir(), 'settings-docs.xsl'), join_paths(meson.current_source_dir(), '..', '..', '@INPUT@')],
-   )
- 
-   test(
-diff --git libnm/meson.build libnm/meson.build
-index 51ca46d..f14d861 100644
---- libnm/meson.build
-+++ libnm/meson.build
-@@ -236,7 +236,13 @@ if enable_introspection
-     )
-   endif
- 
--  generate_setting_docs = join_paths(meson.current_source_dir(), 'generate-setting-docs.py')
+--- libnm/meson.build.orig	2020-12-28 16:03:30.641850261 +0100
++++ libnm/meson.build	2020-12-28 16:31:54.932136481 +0100
+@@ -276,6 +276,14 @@
+     'GI_TYPELIB_PATH=' + gi_typelib_path,
+     'LD_LIBRARY_PATH=' + ld_library_path,
+   ]
++  
 +  if meson.is_cross_build()
 +    qemu = '/usr/bin/qemu-@XBPS_TARGET_QEMU_MACHINE@-static'
-+    qemu_python3_cmd = qemu + ' -L @XBPS_CROSS_BASE@ @XBPS_CROSS_BASE@/usr/bin/python3'
-+    generate_setting_docs = ['sh', '-c', qemu_python3_cmd, join_paths(meson.current_source_dir(), 'generate-setting-docs.py')]
++    qemu_python3_cmd = qemu + ' -L @XBPS_CROSS_BASE@ @XBPS_CROSS_BASE@/bin/python3'
++    generate_setting_docs = ['sh', '-c', qemu_python3_cmd, join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-gir.py')]
 +  else
-+    generate_setting_docs = [python.path(), join_paths(meson.current_source_dir(), 'generate-setting-docs.py')]
++    generate_setting_docs = [python.path(), join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-gir.py')]
 +  endif
  
-   gi_typelib_path = run_command('printenv', 'GI_TYPELIB_PATH').stdout()
-   if gi_typelib_path != ''
-@@ -261,7 +267,7 @@ if enable_introspection
-     name,
-     input: libnm_gir[0],
-     output: name,
--    command: [generate_setting_docs_env, python.path(), generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--output', '@OUTPUT@'],
-+    command: [generate_setting_docs_env, generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--output', '@OUTPUT@'],
-     depends: libnm_gir,
-   )
- 
-@@ -270,7 +276,7 @@ if enable_introspection
-     name,
-     input: [libnm_gir[0], nm_settings_docs_overrides],
-     output: name,
--    command: [generate_setting_docs_env, python.path(), generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT0@', '--overrides', '@INPUT1@', '--output', '@OUTPUT@'],
-+    command: [generate_setting_docs_env, generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT0@', '--overrides', '@INPUT1@', '--output', '@OUTPUT@'],
-     depends: libnm_gir,
-   )
- endif
+   nm_settings_docs_xml_gir = custom_target(
+     'nm-settings-docs-gir.xml',
+@@ -283,8 +291,7 @@
+     output: 'nm-settings-docs-gir.xml',
+     command: [
+       generate_setting_docs_env,
+-      python.path(),
+-      join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-gir.py'),
++      generate_setting_docs,
+       '--lib-path', meson.current_build_dir(),
+       '--gir', '@INPUT@',
+       '--output', '@OUTPUT@'
diff --git a/srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff b/srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff
deleted file mode 100644
index 511759214a97..000000000000
--- a/srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git src/systemd/src/libsystemd-network/sd-dhcp6-client.c src/systemd/src/libsystemd-network/sd-dhcp6-client.c
-index f67a45bd2..ec11fa605 100644
---- src/systemd/src/libsystemd-network/sd-dhcp6-client.c
-+++ src/systemd/src/libsystemd-network/sd-dhcp6-client.c
-@@ -8,8 +8,10 @@
- #include <errno.h>
- #include <string.h>
- #include <sys/ioctl.h>
-+#ifdef __GLIBC__
- #include <linux/if_arp.h>
- #include <linux/if_infiniband.h>
-+#endif
- 
- #include "sd-dhcp6-client.h"
- 
diff --git a/srcpkgs/NetworkManager/patches/fix-musl-linux-header.patch b/srcpkgs/NetworkManager/patches/fix-musl-linux-header.patch
new file mode 100644
index 000000000000..97f119c3427f
--- /dev/null
+++ b/srcpkgs/NetworkManager/patches/fix-musl-linux-header.patch
@@ -0,0 +1,19 @@
+--- src/core/systemd/src/libsystemd-network/sd-dhcp6-client.c.orig	2021-02-18 12:23:41.000000000 -0500
++++ src/core/systemd/src/libsystemd-network/sd-dhcp6-client.c	2021-03-08 19:02:10.811793995 -0500
+@@ -7,12 +7,10 @@
+ 
+ #include <errno.h>
+ #include <sys/ioctl.h>
+-#if 0 /* NM_IGNORED */
+-#include <linux/if_arp.h>
+-#else /* NM_IGNORED */
+-#include <net/if_arp.h>
+-#endif /* NM_IGNORED */
+-#include <linux/if_infiniband.h>
++#ifdef __GLIBC__
++#include <linux/if_arp.h>
++#include <linux/if_infiniband.h>
++#endif
+ 
+ #include "sd-dhcp6-client.h"
+ 
diff --git a/srcpkgs/NetworkManager/patches/musl-basic.patch b/srcpkgs/NetworkManager/patches/musl-basic.patch
index 63ea93ada585..51a4653de774 100644
--- a/srcpkgs/NetworkManager/patches/musl-basic.patch
+++ b/srcpkgs/NetworkManager/patches/musl-basic.patch
@@ -1,22 +1,22 @@
 Usual fix for musl libc
---- shared/systemd/src/basic/stdio-util.h.orig
-+++ shared/systemd/src/basic/stdio-util.h
-@@ -19,7 +19,9 @@
-   along with systemd; If not, see <http://www.gnu.org/licenses/>.
- ***/
+--- shared/systemd/src/basic/stdio-util.h.orig	2021-02-18 12:23:41.000000000 -0500
++++ shared/systemd/src/basic/stdio-util.h	2021-03-08 19:18:44.268093394 -0500
+@@ -1,9 +1,9 @@
+ /* SPDX-License-Identifier: LGPL-2.1-or-later */
+ #pragma once
  
+-#if 0 /* NM_IGNORED */
+-#include <printf.h>
+-#endif /* NM_IGNORED */
 +#if defined(__GLIBC__)
- #include <printf.h>
++#include <printf.h>
 +#endif
  #include <stdarg.h>
  #include <stdio.h>
  #include <sys/types.h>
- 
---- shared/systemd/src/basic/sort-util.h	2019-06-09 17:02:48.895695896 +0200
-+++ shared/systemd/src/basic/sort-util.h	2019-06-09 17:03:27.564199937 +0200
-@@ -5,6 +5,12 @@
- 
+@@ -11,6 +11,12 @@
  #include "macro.h"
+ #include "memory-util.h"
  
 +#if !defined(__GLIBC__)
 +typedef int (*__compar_fn_t) (const void*, const void*);
@@ -24,6 +24,6 @@ Usual fix for musl libc
 +typedef int (*__compar_d_fn_t) (const void *, const void *, void *);
 +#endif
 +
- void *xbsearch_r(const void *key, const void *base, size_t nmemb, size_t size,
-                  __compar_d_fn_t compar, void *arg);
+ #define snprintf_ok(buf, len, fmt, ...) \
+         ((size_t) snprintf(buf, len, fmt, __VA_ARGS__) < (len))
  
diff --git a/srcpkgs/NetworkManager/patches/musl-fix-includes.patch b/srcpkgs/NetworkManager/patches/musl-fix-includes.patch
index 95ffb2d354ea..6b2460e0a10a 100644
--- a/srcpkgs/NetworkManager/patches/musl-fix-includes.patch
+++ b/srcpkgs/NetworkManager/patches/musl-fix-includes.patch
@@ -1,19 +1,5 @@
---- src/devices/nm-device.c.orig	2019-12-17 08:59:49.000000000 +0100
-+++ src/devices/nm-device.c	2020-01-06 17:29:08.678242168 +0100
-@@ -17,7 +17,11 @@
- #include <arpa/inet.h>
- #include <fcntl.h>
- #include <linux/if_addr.h>
-+#if defined(__GLIBC__)
- #include <linux/if_arp.h>
-+#else
-+#include <linux/if.h>
-+#endif
- #include <linux/rtnetlink.h>
- #include <linux/pkt_sched.h>
- 
---- src/nm-manager.c.orig	2020-01-06 17:29:08.682242177 +0100
-+++ src/nm-manager.c	2020-01-06 17:30:50.378482034 +0100
+--- src/core/nm-manager.c.orig	2021-02-18 12:23:41.000000000 -0500
++++ src/core/nm-manager.c	2021-03-08 19:32:39.592516963 -0500
 @@ -15,6 +15,7 @@
  #include <sys/stat.h>
  #include <sys/sendfile.h>
@@ -22,33 +8,3 @@
  
  #include "nm-glib-aux/nm-c-list.h"
  
---- src/platform/nm-linux-platform.c.orig	2019-12-17 08:59:49.000000000 +0100
-+++ src/platform/nm-linux-platform.c	2020-01-06 17:29:08.686242186 +0100
-@@ -6,6 +6,7 @@
- #include "nm-default.h"
- 
- #include "nm-linux-platform.h"
-+#include "wpan/nm-wpan-utils.h"
- 
- #include <arpa/inet.h>
- #include <dlfcn.h>
-@@ -14,7 +15,11 @@
- #include <libudev.h>
- #include <linux/fib_rules.h>
- #include <linux/ip.h>
-+#if defined(__GLIBC__)
- #include <linux/if_arp.h>
-+#else
-+#include <linux/if.h>
-+#endif
- #include <linux/if_bridge.h>
- #include <linux/if_link.h>
- #include <linux/if_tun.h>
-@@ -44,7 +49,6 @@
- #include "nm-platform-private.h"
- #include "wifi/nm-wifi-utils.h"
- #include "wifi/nm-wifi-utils-wext.h"
--#include "wpan/nm-wpan-utils.h"
- #include "nm-glib-aux/nm-io-utils.h"
- #include "nm-udev-aux/nm-udev-utils.h"
- 
diff --git a/srcpkgs/NetworkManager/patches/musl-network-support.patch b/srcpkgs/NetworkManager/patches/musl-network-support.patch
index 0fb63f067b17..098525d6bf1a 100644
--- a/srcpkgs/NetworkManager/patches/musl-network-support.patch
+++ b/srcpkgs/NetworkManager/patches/musl-network-support.patch
@@ -1,20 +1,6 @@
---- libnm-core/nm-utils.h.orig
-+++ libnm-core/nm-utils.h
-@@ -30,7 +30,11 @@
- #include <netinet/in.h>
- 
- /* For ETH_ALEN and INFINIBAND_ALEN */
-+#if defined(__GLIBC__)
- #include <linux/if_ether.h>
-+#else
-+#define ETH_ALEN	6		/* Octets in one ethernet addr	 */
-+#endif
- #include <linux/if_infiniband.h>
- 
- #include "nm-core-enum-types.h"
---- src/platform/wifi/nm-wifi-utils.h.orig
-+++ src/platform/wifi/nm-wifi-utils.h
-@@ -22,7 +22,11 @@
+--- src/core/platform/wifi/nm-wifi-utils.h.orig	2021-02-18 12:23:41.000000000 -0500
++++ src/core/platform/wifi/nm-wifi-utils.h	2021-03-08 19:52:14.450642457 -0500
+@@ -7,7 +7,11 @@
  #ifndef __WIFI_UTILS_H__
  #define __WIFI_UTILS_H__
  
@@ -25,6 +11,7 @@
 +#endif
  
  #include "nm-dbus-interface.h"
+ #include "nm-setting-wireless.h"
  
 --- shared/systemd/src/basic/socket-util.h	2019-03-16 15:41:33.287235649 +0100
 +++ shared/systemd/src/basic/socket-util.h	2019-03-16 15:42:24.273912106 +0100
diff --git a/srcpkgs/NetworkManager/patches/musl-use-srand48.patch b/srcpkgs/NetworkManager/patches/musl-use-srand48.patch
deleted file mode 100644
index 43b689f3bad1..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-use-srand48.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- shared/n-dhcp4/src/n-dhcp4-c-probe.c.orig	2020-01-06 15:35:10.128600647 +0100
-+++ shared/n-dhcp4/src/n-dhcp4-c-probe.c	2020-01-06 15:39:41.446240531 +0100
-@@ -362,7 +362,12 @@ static void n_dhcp4_client_probe_config_
-         seed16v[1] = (u64 >> 16) ^ (u64 >>  0);
-         seed16v[2] = (u64 >> 32) ^ (u64 >> 16);
- 
-+#ifdef __GLIBC__
-         r = seed48_r(seed16v, &config->entropy);
-+#else
-+        r = 0;
-+        seed48(seed16v);
-+#endif
-         c_assert(!r);
- }
- 
-@@ -379,7 +384,12 @@ uint32_t n_dhcp4_client_probe_config_get
-         long int result;
-         int r;
- 
-+#ifdef __GLIBC__
-         r = mrand48_r(&config->entropy, &result);
-+#else
-+        r = 0;
-+        result = mrand48();
-+#endif
-         c_assert(!r);
- 
-         return result;
---- shared/n-dhcp4/src/n-dhcp4-private.h.orig	2020-01-06 15:41:31.941501136 +0100
-+++ shared/n-dhcp4/src/n-dhcp4-private.h	2020-01-06 15:41:55.341556325 +0100
-@@ -267,7 +267,9 @@ struct NDhcp4ClientProbeConfig {
-         bool inform_only;
-         bool init_reboot;
-         struct in_addr requested_ip;
-+#ifdef __GLIBC__
-         struct drand48_data entropy;    /* entropy pool */
-+#endif
-         uint64_t ms_start_delay;        /* max ms to wait before starting probe */
-         NDhcp4ClientProbeOption *options[UINT8_MAX + 1];
-         int8_t request_parameters[UINT8_MAX + 1];
diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template
index e482bba98de7..b4528827608c 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -1,9 +1,7 @@
 # Template file for 'NetworkManager'
-# when updating to 1.24 or newer, drop the compat
-# patch in gnome-control-center and rebuild it
 pkgname=NetworkManager
-version=1.22.10
-revision=2
+version=1.31.1
+revision=1
 build_style=meson
 build_helper="gir qemu"
 configure_args="-Dpolkit_agent=true -Dsystemd_journal=false
@@ -35,7 +33,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=2b29ccc1531ba7ebba95a97f40c22b963838e8b6833745efe8e6fb71fd8fca77
+checksum=4c5cba0c00d50b70d92bd1dabd693d9931827bd4007e142e2ca2781c8d7985f1
 lib32disabled=yes
 conf_files="/etc/${pkgname}/${pkgname}.conf"
 make_dirs="
@@ -68,6 +66,12 @@ pre_configure() {
 	fi
 }
 
+do_check() {
+	if [ "$XBPS_CHECK_PKGS" = full ]; then
+		ninja -C build test
+	fi
+}
+
 post_install() {
 	vinstall ${FILESDIR}/${pkgname}.conf 644 etc/${pkgname}
 	vinstall ${FILESDIR}/50-org.freedesktop.NetworkManager.rules 644 \

^ permalink raw reply	[flat|nested] 73+ messages in thread

* Re: NetworkManager: update to 1.31.1
  2021-03-09  3:41 [PR PATCH] NetworkManager: update to 1.31.1 cinerea0
@ 2021-03-09  3:50 ` cinerea0
  2021-03-09  4:37 ` [PR PATCH] [Updated] " cinerea0
                   ` (70 subsequent siblings)
  71 siblings, 0 replies; 73+ messages in thread
From: cinerea0 @ 2021-03-09  3:50 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 318 bytes --]

New comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/29342#issuecomment-793341658

Comment:
Some changes here have been taken from #27502. When I manage to get this to build correctly, I'll update gnome-control-center and add it to this PR because of the compat patch.

^ permalink raw reply	[flat|nested] 73+ messages in thread

* Re: [PR PATCH] [Updated] NetworkManager: update to 1.31.1
  2021-03-09  3:41 [PR PATCH] NetworkManager: update to 1.31.1 cinerea0
  2021-03-09  3:50 ` cinerea0
@ 2021-03-09  4:37 ` cinerea0
  2021-03-09  5:07 ` NetworkManager: update to 1.31.1, gnome-control-center: drop NM compat patch cinerea0
                   ` (69 subsequent siblings)
  71 siblings, 0 replies; 73+ messages in thread
From: cinerea0 @ 2021-03-09  4:37 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1596 bytes --]

There is an updated pull request by cinerea0 against master on the void-packages repository

https://github.com/cinerea0/void-packages nm
https://github.com/void-linux/void-packages/pull/29342

NetworkManager: update to 1.31.1
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/29342.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nm-29342.patch --]
[-- Type: text/x-diff, Size: 17145 bytes --]

From ceba21eeb68574c2b1bb8520c13cb300445df554 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Mon, 8 Mar 2021 22:37:59 -0500
Subject: [PATCH 1/2] NetworkManager: update to 1.31.1

---
 .../patches/fix-cross-gir.patch               | 67 ++++++-------------
 .../patches/fix-musl-linux-header.diff        | 15 -----
 .../patches/fix-musl-linux-header.patch       | 19 ++++++
 .../NetworkManager/patches/musl-basic.patch   | 26 +++----
 .../patches/musl-fix-includes.patch           | 48 +------------
 .../patches/musl-network-support.patch        | 21 ++----
 .../patches/musl-use-srand48.patch            | 40 -----------
 srcpkgs/NetworkManager/template               | 14 ++--
 8 files changed, 69 insertions(+), 181 deletions(-)
 delete mode 100644 srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff
 create mode 100644 srcpkgs/NetworkManager/patches/fix-musl-linux-header.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-use-srand48.patch

diff --git a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
index c283d4dc105..c0b4344b1c1 100644
--- a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
+++ b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
@@ -1,52 +1,29 @@
 Reason: Fix crossbuilding GIR
 Upstream: No, not upstreamable since this is very specific to the Void setup
-diff --git clients/common/meson.build clients/common/meson.build
-index afa257b..50b53e7 100644
---- clients/common/meson.build
-+++ clients/common/meson.build
-@@ -35,7 +35,7 @@ if enable_introspection
-     settings_docs,
-     input: nm_property_docs,
-     output: settings_docs,
--    command: [xsltproc, '--output', '@OUTPUT@', join_paths(meson.current_source_dir(), 'settings-docs.xsl'), '@INPUT@'],
-+    command: [xsltproc, '--output', '@OUTPUT@', join_paths(meson.current_source_dir(), 'settings-docs.xsl'), join_paths(meson.current_source_dir(), '..', '..', '@INPUT@')],
-   )
- 
-   test(
-diff --git libnm/meson.build libnm/meson.build
-index 51ca46d..f14d861 100644
---- libnm/meson.build
-+++ libnm/meson.build
-@@ -236,7 +236,13 @@ if enable_introspection
-     )
-   endif
- 
--  generate_setting_docs = join_paths(meson.current_source_dir(), 'generate-setting-docs.py')
+--- libnm/meson.build.orig	2020-12-28 16:03:30.641850261 +0100
++++ libnm/meson.build	2020-12-28 16:31:54.932136481 +0100
+@@ -276,6 +276,14 @@
+     'GI_TYPELIB_PATH=' + gi_typelib_path,
+     'LD_LIBRARY_PATH=' + ld_library_path,
+   ]
++  
 +  if meson.is_cross_build()
 +    qemu = '/usr/bin/qemu-@XBPS_TARGET_QEMU_MACHINE@-static'
-+    qemu_python3_cmd = qemu + ' -L @XBPS_CROSS_BASE@ @XBPS_CROSS_BASE@/usr/bin/python3'
-+    generate_setting_docs = ['sh', '-c', qemu_python3_cmd, join_paths(meson.current_source_dir(), 'generate-setting-docs.py')]
++    qemu_python3_cmd = qemu + ' -L @XBPS_CROSS_BASE@ @XBPS_CROSS_BASE@/bin/python3'
++    generate_setting_docs = ['sh', '-c', qemu_python3_cmd, join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-gir.py')]
 +  else
-+    generate_setting_docs = [python.path(), join_paths(meson.current_source_dir(), 'generate-setting-docs.py')]
++    generate_setting_docs = [python.path(), join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-gir.py')]
 +  endif
  
-   gi_typelib_path = run_command('printenv', 'GI_TYPELIB_PATH').stdout()
-   if gi_typelib_path != ''
-@@ -261,7 +267,7 @@ if enable_introspection
-     name,
-     input: libnm_gir[0],
-     output: name,
--    command: [generate_setting_docs_env, python.path(), generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--output', '@OUTPUT@'],
-+    command: [generate_setting_docs_env, generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--output', '@OUTPUT@'],
-     depends: libnm_gir,
-   )
- 
-@@ -270,7 +276,7 @@ if enable_introspection
-     name,
-     input: [libnm_gir[0], nm_settings_docs_overrides],
-     output: name,
--    command: [generate_setting_docs_env, python.path(), generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT0@', '--overrides', '@INPUT1@', '--output', '@OUTPUT@'],
-+    command: [generate_setting_docs_env, generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT0@', '--overrides', '@INPUT1@', '--output', '@OUTPUT@'],
-     depends: libnm_gir,
-   )
- endif
+   nm_settings_docs_xml_gir = custom_target(
+     'nm-settings-docs-gir.xml',
+@@ -283,8 +291,7 @@
+     output: 'nm-settings-docs-gir.xml',
+     command: [
+       generate_setting_docs_env,
+-      python.path(),
+-      join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-gir.py'),
++      generate_setting_docs,
+       '--lib-path', meson.current_build_dir(),
+       '--gir', '@INPUT@',
+       '--output', '@OUTPUT@'
diff --git a/srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff b/srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff
deleted file mode 100644
index 511759214a9..00000000000
--- a/srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git src/systemd/src/libsystemd-network/sd-dhcp6-client.c src/systemd/src/libsystemd-network/sd-dhcp6-client.c
-index f67a45bd2..ec11fa605 100644
---- src/systemd/src/libsystemd-network/sd-dhcp6-client.c
-+++ src/systemd/src/libsystemd-network/sd-dhcp6-client.c
-@@ -8,8 +8,10 @@
- #include <errno.h>
- #include <string.h>
- #include <sys/ioctl.h>
-+#ifdef __GLIBC__
- #include <linux/if_arp.h>
- #include <linux/if_infiniband.h>
-+#endif
- 
- #include "sd-dhcp6-client.h"
- 
diff --git a/srcpkgs/NetworkManager/patches/fix-musl-linux-header.patch b/srcpkgs/NetworkManager/patches/fix-musl-linux-header.patch
new file mode 100644
index 00000000000..97f119c3427
--- /dev/null
+++ b/srcpkgs/NetworkManager/patches/fix-musl-linux-header.patch
@@ -0,0 +1,19 @@
+--- src/core/systemd/src/libsystemd-network/sd-dhcp6-client.c.orig	2021-02-18 12:23:41.000000000 -0500
++++ src/core/systemd/src/libsystemd-network/sd-dhcp6-client.c	2021-03-08 19:02:10.811793995 -0500
+@@ -7,12 +7,10 @@
+ 
+ #include <errno.h>
+ #include <sys/ioctl.h>
+-#if 0 /* NM_IGNORED */
+-#include <linux/if_arp.h>
+-#else /* NM_IGNORED */
+-#include <net/if_arp.h>
+-#endif /* NM_IGNORED */
+-#include <linux/if_infiniband.h>
++#ifdef __GLIBC__
++#include <linux/if_arp.h>
++#include <linux/if_infiniband.h>
++#endif
+ 
+ #include "sd-dhcp6-client.h"
+ 
diff --git a/srcpkgs/NetworkManager/patches/musl-basic.patch b/srcpkgs/NetworkManager/patches/musl-basic.patch
index 63ea93ada58..51a4653de77 100644
--- a/srcpkgs/NetworkManager/patches/musl-basic.patch
+++ b/srcpkgs/NetworkManager/patches/musl-basic.patch
@@ -1,22 +1,22 @@
 Usual fix for musl libc
---- shared/systemd/src/basic/stdio-util.h.orig
-+++ shared/systemd/src/basic/stdio-util.h
-@@ -19,7 +19,9 @@
-   along with systemd; If not, see <http://www.gnu.org/licenses/>.
- ***/
+--- shared/systemd/src/basic/stdio-util.h.orig	2021-02-18 12:23:41.000000000 -0500
++++ shared/systemd/src/basic/stdio-util.h	2021-03-08 19:18:44.268093394 -0500
+@@ -1,9 +1,9 @@
+ /* SPDX-License-Identifier: LGPL-2.1-or-later */
+ #pragma once
  
+-#if 0 /* NM_IGNORED */
+-#include <printf.h>
+-#endif /* NM_IGNORED */
 +#if defined(__GLIBC__)
- #include <printf.h>
++#include <printf.h>
 +#endif
  #include <stdarg.h>
  #include <stdio.h>
  #include <sys/types.h>
- 
---- shared/systemd/src/basic/sort-util.h	2019-06-09 17:02:48.895695896 +0200
-+++ shared/systemd/src/basic/sort-util.h	2019-06-09 17:03:27.564199937 +0200
-@@ -5,6 +5,12 @@
- 
+@@ -11,6 +11,12 @@
  #include "macro.h"
+ #include "memory-util.h"
  
 +#if !defined(__GLIBC__)
 +typedef int (*__compar_fn_t) (const void*, const void*);
@@ -24,6 +24,6 @@ Usual fix for musl libc
 +typedef int (*__compar_d_fn_t) (const void *, const void *, void *);
 +#endif
 +
- void *xbsearch_r(const void *key, const void *base, size_t nmemb, size_t size,
-                  __compar_d_fn_t compar, void *arg);
+ #define snprintf_ok(buf, len, fmt, ...) \
+         ((size_t) snprintf(buf, len, fmt, __VA_ARGS__) < (len))
  
diff --git a/srcpkgs/NetworkManager/patches/musl-fix-includes.patch b/srcpkgs/NetworkManager/patches/musl-fix-includes.patch
index 95ffb2d354e..6b2460e0a10 100644
--- a/srcpkgs/NetworkManager/patches/musl-fix-includes.patch
+++ b/srcpkgs/NetworkManager/patches/musl-fix-includes.patch
@@ -1,19 +1,5 @@
---- src/devices/nm-device.c.orig	2019-12-17 08:59:49.000000000 +0100
-+++ src/devices/nm-device.c	2020-01-06 17:29:08.678242168 +0100
-@@ -17,7 +17,11 @@
- #include <arpa/inet.h>
- #include <fcntl.h>
- #include <linux/if_addr.h>
-+#if defined(__GLIBC__)
- #include <linux/if_arp.h>
-+#else
-+#include <linux/if.h>
-+#endif
- #include <linux/rtnetlink.h>
- #include <linux/pkt_sched.h>
- 
---- src/nm-manager.c.orig	2020-01-06 17:29:08.682242177 +0100
-+++ src/nm-manager.c	2020-01-06 17:30:50.378482034 +0100
+--- src/core/nm-manager.c.orig	2021-02-18 12:23:41.000000000 -0500
++++ src/core/nm-manager.c	2021-03-08 19:32:39.592516963 -0500
 @@ -15,6 +15,7 @@
  #include <sys/stat.h>
  #include <sys/sendfile.h>
@@ -22,33 +8,3 @@
  
  #include "nm-glib-aux/nm-c-list.h"
  
---- src/platform/nm-linux-platform.c.orig	2019-12-17 08:59:49.000000000 +0100
-+++ src/platform/nm-linux-platform.c	2020-01-06 17:29:08.686242186 +0100
-@@ -6,6 +6,7 @@
- #include "nm-default.h"
- 
- #include "nm-linux-platform.h"
-+#include "wpan/nm-wpan-utils.h"
- 
- #include <arpa/inet.h>
- #include <dlfcn.h>
-@@ -14,7 +15,11 @@
- #include <libudev.h>
- #include <linux/fib_rules.h>
- #include <linux/ip.h>
-+#if defined(__GLIBC__)
- #include <linux/if_arp.h>
-+#else
-+#include <linux/if.h>
-+#endif
- #include <linux/if_bridge.h>
- #include <linux/if_link.h>
- #include <linux/if_tun.h>
-@@ -44,7 +49,6 @@
- #include "nm-platform-private.h"
- #include "wifi/nm-wifi-utils.h"
- #include "wifi/nm-wifi-utils-wext.h"
--#include "wpan/nm-wpan-utils.h"
- #include "nm-glib-aux/nm-io-utils.h"
- #include "nm-udev-aux/nm-udev-utils.h"
- 
diff --git a/srcpkgs/NetworkManager/patches/musl-network-support.patch b/srcpkgs/NetworkManager/patches/musl-network-support.patch
index 0fb63f067b1..098525d6bf1 100644
--- a/srcpkgs/NetworkManager/patches/musl-network-support.patch
+++ b/srcpkgs/NetworkManager/patches/musl-network-support.patch
@@ -1,20 +1,6 @@
---- libnm-core/nm-utils.h.orig
-+++ libnm-core/nm-utils.h
-@@ -30,7 +30,11 @@
- #include <netinet/in.h>
- 
- /* For ETH_ALEN and INFINIBAND_ALEN */
-+#if defined(__GLIBC__)
- #include <linux/if_ether.h>
-+#else
-+#define ETH_ALEN	6		/* Octets in one ethernet addr	 */
-+#endif
- #include <linux/if_infiniband.h>
- 
- #include "nm-core-enum-types.h"
---- src/platform/wifi/nm-wifi-utils.h.orig
-+++ src/platform/wifi/nm-wifi-utils.h
-@@ -22,7 +22,11 @@
+--- src/core/platform/wifi/nm-wifi-utils.h.orig	2021-02-18 12:23:41.000000000 -0500
++++ src/core/platform/wifi/nm-wifi-utils.h	2021-03-08 19:52:14.450642457 -0500
+@@ -7,7 +7,11 @@
  #ifndef __WIFI_UTILS_H__
  #define __WIFI_UTILS_H__
  
@@ -25,6 +11,7 @@
 +#endif
  
  #include "nm-dbus-interface.h"
+ #include "nm-setting-wireless.h"
  
 --- shared/systemd/src/basic/socket-util.h	2019-03-16 15:41:33.287235649 +0100
 +++ shared/systemd/src/basic/socket-util.h	2019-03-16 15:42:24.273912106 +0100
diff --git a/srcpkgs/NetworkManager/patches/musl-use-srand48.patch b/srcpkgs/NetworkManager/patches/musl-use-srand48.patch
deleted file mode 100644
index 43b689f3bad..00000000000
--- a/srcpkgs/NetworkManager/patches/musl-use-srand48.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- shared/n-dhcp4/src/n-dhcp4-c-probe.c.orig	2020-01-06 15:35:10.128600647 +0100
-+++ shared/n-dhcp4/src/n-dhcp4-c-probe.c	2020-01-06 15:39:41.446240531 +0100
-@@ -362,7 +362,12 @@ static void n_dhcp4_client_probe_config_
-         seed16v[1] = (u64 >> 16) ^ (u64 >>  0);
-         seed16v[2] = (u64 >> 32) ^ (u64 >> 16);
- 
-+#ifdef __GLIBC__
-         r = seed48_r(seed16v, &config->entropy);
-+#else
-+        r = 0;
-+        seed48(seed16v);
-+#endif
-         c_assert(!r);
- }
- 
-@@ -379,7 +384,12 @@ uint32_t n_dhcp4_client_probe_config_get
-         long int result;
-         int r;
- 
-+#ifdef __GLIBC__
-         r = mrand48_r(&config->entropy, &result);
-+#else
-+        r = 0;
-+        result = mrand48();
-+#endif
-         c_assert(!r);
- 
-         return result;
---- shared/n-dhcp4/src/n-dhcp4-private.h.orig	2020-01-06 15:41:31.941501136 +0100
-+++ shared/n-dhcp4/src/n-dhcp4-private.h	2020-01-06 15:41:55.341556325 +0100
-@@ -267,7 +267,9 @@ struct NDhcp4ClientProbeConfig {
-         bool inform_only;
-         bool init_reboot;
-         struct in_addr requested_ip;
-+#ifdef __GLIBC__
-         struct drand48_data entropy;    /* entropy pool */
-+#endif
-         uint64_t ms_start_delay;        /* max ms to wait before starting probe */
-         NDhcp4ClientProbeOption *options[UINT8_MAX + 1];
-         int8_t request_parameters[UINT8_MAX + 1];
diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template
index e482bba98de..b4528827608 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -1,9 +1,7 @@
 # Template file for 'NetworkManager'
-# when updating to 1.24 or newer, drop the compat
-# patch in gnome-control-center and rebuild it
 pkgname=NetworkManager
-version=1.22.10
-revision=2
+version=1.31.1
+revision=1
 build_style=meson
 build_helper="gir qemu"
 configure_args="-Dpolkit_agent=true -Dsystemd_journal=false
@@ -35,7 +33,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=2b29ccc1531ba7ebba95a97f40c22b963838e8b6833745efe8e6fb71fd8fca77
+checksum=4c5cba0c00d50b70d92bd1dabd693d9931827bd4007e142e2ca2781c8d7985f1
 lib32disabled=yes
 conf_files="/etc/${pkgname}/${pkgname}.conf"
 make_dirs="
@@ -68,6 +66,12 @@ pre_configure() {
 	fi
 }
 
+do_check() {
+	if [ "$XBPS_CHECK_PKGS" = full ]; then
+		ninja -C build test
+	fi
+}
+
 post_install() {
 	vinstall ${FILESDIR}/${pkgname}.conf 644 etc/${pkgname}
 	vinstall ${FILESDIR}/50-org.freedesktop.NetworkManager.rules 644 \

From a995768f9586d82e322017580e0342914bb4f380 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Mon, 8 Mar 2021 23:36:44 -0500
Subject: [PATCH 2/2] gnome-control-center: drop NM compat patch

---
 .../gnome-control-center/patches/nm122.patch  | 38 -------------------
 srcpkgs/gnome-control-center/template         |  2 +-
 2 files changed, 1 insertion(+), 39 deletions(-)
 delete mode 100644 srcpkgs/gnome-control-center/patches/nm122.patch

diff --git a/srcpkgs/gnome-control-center/patches/nm122.patch b/srcpkgs/gnome-control-center/patches/nm122.patch
deleted file mode 100644
index 833fed3968e..00000000000
--- a/srcpkgs/gnome-control-center/patches/nm122.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 4159f984bd351caf6f0e1adbd90feeb85ab252f4 Mon Sep 17 00:00:00 2001
-From: Daniel Kolesa <daniel@octaforge.org>
-Date: Wed, 16 Sep 2020 22:02:04 +0200
-Subject: [PATCH] restore compatibility with networkmanager 1.22
-
-drop this patch and rebuild gnome-control-center when updating nm
----
- panels/network/net-device-wifi.c | 7 -------
- 1 file changed, 7 deletions(-)
-
-diff --git panels/network/net-device-wifi.c panels/network/net-device-wifi.c
-index cb86e5b..d63c57c 100644
---- panels/network/net-device-wifi.c
-+++ panels/network/net-device-wifi.c
-@@ -1180,11 +1180,6 @@ nm_client_on_permission_change (NetDeviceWifi *self) {
-         NMClientPermissionResult perm;
-         NMDeviceWifiCapabilities caps;
- 
--        if (nm_client_get_permissions_state (self->client) != NM_TERNARY_TRUE) {
--                /* permissions aren't ready yet */
--                return;
--        }
--
-         /* only enable the button if the user can create a hotspot */
-         perm = nm_client_get_permission_result (self->client, NM_CLIENT_PERMISSION_WIFI_SHARE_OPEN);
-         caps = nm_device_wifi_get_capabilities (NM_DEVICE_WIFI (self->device));
-@@ -1227,8 +1222,6 @@ net_device_wifi_new (CcPanel *panel, NMClient *client, NMDevice *device)
-                                  G_CALLBACK (ap_activated), self, G_CONNECT_SWAPPED);
-         g_signal_connect_object (list, "configure",
-                                  G_CALLBACK (show_details_for_row), self, G_CONNECT_SWAPPED);
--        g_signal_connect_object (client, "notify",
--                                 G_CALLBACK(nm_client_on_permission_change), self, G_CONNECT_SWAPPED);
- 
-         nm_client_on_permission_change(self);
- 
--- 
-2.28.0
-
diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index 7d4a2dc5c47..bedd46bc0dc 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-control-center'
 pkgname=gnome-control-center
 version=3.38.4
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Dcheese=$(vopt_if cheese true false)"

^ permalink raw reply	[flat|nested] 73+ messages in thread

* Re: NetworkManager: update to 1.31.1, gnome-control-center: drop NM compat patch
  2021-03-09  3:41 [PR PATCH] NetworkManager: update to 1.31.1 cinerea0
  2021-03-09  3:50 ` cinerea0
  2021-03-09  4:37 ` [PR PATCH] [Updated] " cinerea0
@ 2021-03-09  5:07 ` cinerea0
  2021-03-09  9:04 ` FollieHiyuki
                   ` (68 subsequent siblings)
  71 siblings, 0 replies; 73+ messages in thread
From: cinerea0 @ 2021-03-09  5:07 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 249 bytes --]

New comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/29342#issuecomment-793403684

Comment:
That's interesting, I didn't have any errors when building gnome-control-center on my x86_64-glibc machine.

^ permalink raw reply	[flat|nested] 73+ messages in thread

* Re: NetworkManager: update to 1.31.1, gnome-control-center: drop NM compat patch
  2021-03-09  3:41 [PR PATCH] NetworkManager: update to 1.31.1 cinerea0
                   ` (2 preceding siblings ...)
  2021-03-09  5:07 ` NetworkManager: update to 1.31.1, gnome-control-center: drop NM compat patch cinerea0
@ 2021-03-09  9:04 ` FollieHiyuki
  2021-03-15 16:28 ` NetworkManager: update to 1.31.1 cinerea0
                   ` (67 subsequent siblings)
  71 siblings, 0 replies; 73+ messages in thread
From: FollieHiyuki @ 2021-03-09  9:04 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 320 bytes --]

New comment by FollieHiyuki on void-packages repository

https://github.com/void-linux/void-packages/pull/29342#issuecomment-793584605

Comment:
> /usr/bin/ld: /tmp/test-wifi-panel-text.ojS9Hb.ltrans0.ltrans.o: in function `nm_client_on_permission_change':

Probably because of root privilege in the build environment

^ permalink raw reply	[flat|nested] 73+ messages in thread

* Re: NetworkManager: update to 1.31.1
  2021-03-09  3:41 [PR PATCH] NetworkManager: update to 1.31.1 cinerea0
                   ` (3 preceding siblings ...)
  2021-03-09  9:04 ` FollieHiyuki
@ 2021-03-15 16:28 ` cinerea0
  2021-03-15 16:55 ` [PR REVIEW] " ericonr
                   ` (66 subsequent siblings)
  71 siblings, 0 replies; 73+ messages in thread
From: cinerea0 @ 2021-03-15 16:28 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 191 bytes --]

New comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/29342#issuecomment-799558818

Comment:
@ericonr Could you please take a look at this PR?

^ permalink raw reply	[flat|nested] 73+ messages in thread

* Re: [PR REVIEW] NetworkManager: update to 1.31.1
  2021-03-09  3:41 [PR PATCH] NetworkManager: update to 1.31.1 cinerea0
                   ` (4 preceding siblings ...)
  2021-03-15 16:28 ` NetworkManager: update to 1.31.1 cinerea0
@ 2021-03-15 16:55 ` ericonr
  2021-03-15 16:55 ` ericonr
                   ` (65 subsequent siblings)
  71 siblings, 0 replies; 73+ messages in thread
From: ericonr @ 2021-03-15 16:55 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 202 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/29342#discussion_r594511164

Comment:
You can just set `make_check=extended` in the template.

^ permalink raw reply	[flat|nested] 73+ messages in thread

* Re: [PR REVIEW] NetworkManager: update to 1.31.1
  2021-03-09  3:41 [PR PATCH] NetworkManager: update to 1.31.1 cinerea0
                   ` (5 preceding siblings ...)
  2021-03-15 16:55 ` [PR REVIEW] " ericonr
@ 2021-03-15 16:55 ` ericonr
  2021-03-15 17:04 ` ericonr
                   ` (64 subsequent siblings)
  71 siblings, 0 replies; 73+ messages in thread
From: ericonr @ 2021-03-15 16:55 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 337 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/29342#discussion_r594513071

Comment:
I'm just a tad confused because I believe our cross base directories are missing the `/bin -> /usr/bin` symlink, so switching to `XBPS_CROSS_BASE/bin/python3` shouldn't exactly be working...

^ permalink raw reply	[flat|nested] 73+ messages in thread

* Re: NetworkManager: update to 1.31.1
  2021-03-09  3:41 [PR PATCH] NetworkManager: update to 1.31.1 cinerea0
                   ` (6 preceding siblings ...)
  2021-03-15 16:55 ` ericonr
@ 2021-03-15 17:04 ` ericonr
  2021-03-16  2:56 ` [PR PATCH] [Updated] " cinerea0
                   ` (63 subsequent siblings)
  71 siblings, 0 replies; 73+ messages in thread
From: ericonr @ 2021-03-15 17:04 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 498 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/29342#issuecomment-799585136

Comment:
Hm https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/tags claims that 1.31.1 is a development release? Not sure how this works.

And I think 1.30.2 should work on musl cleanly: https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/pipelines/283142 and https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/530

^ permalink raw reply	[flat|nested] 73+ messages in thread

* Re: [PR PATCH] [Updated] NetworkManager: update to 1.31.1
  2021-03-09  3:41 [PR PATCH] NetworkManager: update to 1.31.1 cinerea0
                   ` (7 preceding siblings ...)
  2021-03-15 17:04 ` ericonr
@ 2021-03-16  2:56 ` cinerea0
  2021-03-16  3:23 ` [PR REVIEW] " cinerea0
                   ` (62 subsequent siblings)
  71 siblings, 0 replies; 73+ messages in thread
From: cinerea0 @ 2021-03-16  2:56 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1611 bytes --]

There is an updated pull request by cinerea0 against master on the void-packages repository

https://github.com/cinerea0/void-packages nm
https://github.com/void-linux/void-packages/pull/29342

NetworkManager: update to 1.31.1
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->

Closes #27502

A patch file from https://github.com/void-linux/void-packages/pull/29342.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nm-29342.patch --]
[-- Type: text/x-diff, Size: 16442 bytes --]

From 460820f73fc35929226bd6be55464ca05511cc01 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Mon, 15 Mar 2021 22:55:17 -0400
Subject: [PATCH] NetworkManager: update to 1.30.2

---
 .../patches/fix-cross-gir.patch               | 67 ++++++-------------
 .../patches/fix-musl-linux-header.diff        | 15 -----
 .../patches/fix-musl-qsort_r.patch            | 16 -----
 .../NetworkManager/patches/musl-basic.patch   | 29 --------
 .../patches/musl-fix-includes.patch           | 54 ---------------
 .../patches/musl-network-support.patch        | 42 ------------
 .../patches/musl-process-util.patch           | 40 -----------
 .../patches/musl-use-srand48.patch            | 40 -----------
 srcpkgs/NetworkManager/template               | 18 ++---
 9 files changed, 28 insertions(+), 293 deletions(-)
 delete mode 100644 srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff
 delete mode 100644 srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-basic.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-fix-includes.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-network-support.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-process-util.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-use-srand48.patch

diff --git a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
index c283d4dc1059..c0b4344b1c15 100644
--- a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
+++ b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
@@ -1,52 +1,29 @@
 Reason: Fix crossbuilding GIR
 Upstream: No, not upstreamable since this is very specific to the Void setup
-diff --git clients/common/meson.build clients/common/meson.build
-index afa257b..50b53e7 100644
---- clients/common/meson.build
-+++ clients/common/meson.build
-@@ -35,7 +35,7 @@ if enable_introspection
-     settings_docs,
-     input: nm_property_docs,
-     output: settings_docs,
--    command: [xsltproc, '--output', '@OUTPUT@', join_paths(meson.current_source_dir(), 'settings-docs.xsl'), '@INPUT@'],
-+    command: [xsltproc, '--output', '@OUTPUT@', join_paths(meson.current_source_dir(), 'settings-docs.xsl'), join_paths(meson.current_source_dir(), '..', '..', '@INPUT@')],
-   )
- 
-   test(
-diff --git libnm/meson.build libnm/meson.build
-index 51ca46d..f14d861 100644
---- libnm/meson.build
-+++ libnm/meson.build
-@@ -236,7 +236,13 @@ if enable_introspection
-     )
-   endif
- 
--  generate_setting_docs = join_paths(meson.current_source_dir(), 'generate-setting-docs.py')
+--- libnm/meson.build.orig	2020-12-28 16:03:30.641850261 +0100
++++ libnm/meson.build	2020-12-28 16:31:54.932136481 +0100
+@@ -276,6 +276,14 @@
+     'GI_TYPELIB_PATH=' + gi_typelib_path,
+     'LD_LIBRARY_PATH=' + ld_library_path,
+   ]
++  
 +  if meson.is_cross_build()
 +    qemu = '/usr/bin/qemu-@XBPS_TARGET_QEMU_MACHINE@-static'
-+    qemu_python3_cmd = qemu + ' -L @XBPS_CROSS_BASE@ @XBPS_CROSS_BASE@/usr/bin/python3'
-+    generate_setting_docs = ['sh', '-c', qemu_python3_cmd, join_paths(meson.current_source_dir(), 'generate-setting-docs.py')]
++    qemu_python3_cmd = qemu + ' -L @XBPS_CROSS_BASE@ @XBPS_CROSS_BASE@/bin/python3'
++    generate_setting_docs = ['sh', '-c', qemu_python3_cmd, join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-gir.py')]
 +  else
-+    generate_setting_docs = [python.path(), join_paths(meson.current_source_dir(), 'generate-setting-docs.py')]
++    generate_setting_docs = [python.path(), join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-gir.py')]
 +  endif
  
-   gi_typelib_path = run_command('printenv', 'GI_TYPELIB_PATH').stdout()
-   if gi_typelib_path != ''
-@@ -261,7 +267,7 @@ if enable_introspection
-     name,
-     input: libnm_gir[0],
-     output: name,
--    command: [generate_setting_docs_env, python.path(), generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--output', '@OUTPUT@'],
-+    command: [generate_setting_docs_env, generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--output', '@OUTPUT@'],
-     depends: libnm_gir,
-   )
- 
-@@ -270,7 +276,7 @@ if enable_introspection
-     name,
-     input: [libnm_gir[0], nm_settings_docs_overrides],
-     output: name,
--    command: [generate_setting_docs_env, python.path(), generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT0@', '--overrides', '@INPUT1@', '--output', '@OUTPUT@'],
-+    command: [generate_setting_docs_env, generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT0@', '--overrides', '@INPUT1@', '--output', '@OUTPUT@'],
-     depends: libnm_gir,
-   )
- endif
+   nm_settings_docs_xml_gir = custom_target(
+     'nm-settings-docs-gir.xml',
+@@ -283,8 +291,7 @@
+     output: 'nm-settings-docs-gir.xml',
+     command: [
+       generate_setting_docs_env,
+-      python.path(),
+-      join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-gir.py'),
++      generate_setting_docs,
+       '--lib-path', meson.current_build_dir(),
+       '--gir', '@INPUT@',
+       '--output', '@OUTPUT@'
diff --git a/srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff b/srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff
deleted file mode 100644
index 511759214a97..000000000000
--- a/srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git src/systemd/src/libsystemd-network/sd-dhcp6-client.c src/systemd/src/libsystemd-network/sd-dhcp6-client.c
-index f67a45bd2..ec11fa605 100644
---- src/systemd/src/libsystemd-network/sd-dhcp6-client.c
-+++ src/systemd/src/libsystemd-network/sd-dhcp6-client.c
-@@ -8,8 +8,10 @@
- #include <errno.h>
- #include <string.h>
- #include <sys/ioctl.h>
-+#ifdef __GLIBC__
- #include <linux/if_arp.h>
- #include <linux/if_infiniband.h>
-+#endif
- 
- #include "sd-dhcp6-client.h"
- 
diff --git a/srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch b/srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch
deleted file mode 100644
index f89eac778502..000000000000
--- a/srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git shared/systemd/src/basic/sort-util.h shared/systemd/src/basic/sort-util.h
-index e029f8646..168735087 100644
---- shared/systemd/src/basic/sort-util.h
-+++ shared/systemd/src/basic/sort-util.h
-@@ -60,7 +60,11 @@ static inline void qsort_r_safe(void *base, size_t nmemb, size_t size, __compar_
-                 return;
- 
-         assert(base);
-+#ifdef __GLIBC__
-         qsort_r(base, nmemb, size, compar, userdata);
-+#else
-+        g_qsort_with_data(base, nmemb, size, compar, userdata);
-+#endif
- }
- 
- #define typesafe_qsort_r(p, n, func, userdata)                          \
diff --git a/srcpkgs/NetworkManager/patches/musl-basic.patch b/srcpkgs/NetworkManager/patches/musl-basic.patch
deleted file mode 100644
index 63ea93ada585..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-basic.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Usual fix for musl libc
---- shared/systemd/src/basic/stdio-util.h.orig
-+++ shared/systemd/src/basic/stdio-util.h
-@@ -19,7 +19,9 @@
-   along with systemd; If not, see <http://www.gnu.org/licenses/>.
- ***/
- 
-+#if defined(__GLIBC__)
- #include <printf.h>
-+#endif
- #include <stdarg.h>
- #include <stdio.h>
- #include <sys/types.h>
- 
---- shared/systemd/src/basic/sort-util.h	2019-06-09 17:02:48.895695896 +0200
-+++ shared/systemd/src/basic/sort-util.h	2019-06-09 17:03:27.564199937 +0200
-@@ -5,6 +5,12 @@
- 
- #include "macro.h"
- 
-+#if !defined(__GLIBC__)
-+typedef int (*__compar_fn_t) (const void*, const void*);
-+typedef __compar_fn_t comparison_fn_t;
-+typedef int (*__compar_d_fn_t) (const void *, const void *, void *);
-+#endif
-+
- void *xbsearch_r(const void *key, const void *base, size_t nmemb, size_t size,
-                  __compar_d_fn_t compar, void *arg);
- 
diff --git a/srcpkgs/NetworkManager/patches/musl-fix-includes.patch b/srcpkgs/NetworkManager/patches/musl-fix-includes.patch
deleted file mode 100644
index 95ffb2d354ea..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-fix-includes.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- src/devices/nm-device.c.orig	2019-12-17 08:59:49.000000000 +0100
-+++ src/devices/nm-device.c	2020-01-06 17:29:08.678242168 +0100
-@@ -17,7 +17,11 @@
- #include <arpa/inet.h>
- #include <fcntl.h>
- #include <linux/if_addr.h>
-+#if defined(__GLIBC__)
- #include <linux/if_arp.h>
-+#else
-+#include <linux/if.h>
-+#endif
- #include <linux/rtnetlink.h>
- #include <linux/pkt_sched.h>
- 
---- src/nm-manager.c.orig	2020-01-06 17:29:08.682242177 +0100
-+++ src/nm-manager.c	2020-01-06 17:30:50.378482034 +0100
-@@ -15,6 +15,7 @@
- #include <sys/stat.h>
- #include <sys/sendfile.h>
- #include <limits.h>
-+#include <asm/types.h>
- 
- #include "nm-glib-aux/nm-c-list.h"
- 
---- src/platform/nm-linux-platform.c.orig	2019-12-17 08:59:49.000000000 +0100
-+++ src/platform/nm-linux-platform.c	2020-01-06 17:29:08.686242186 +0100
-@@ -6,6 +6,7 @@
- #include "nm-default.h"
- 
- #include "nm-linux-platform.h"
-+#include "wpan/nm-wpan-utils.h"
- 
- #include <arpa/inet.h>
- #include <dlfcn.h>
-@@ -14,7 +15,11 @@
- #include <libudev.h>
- #include <linux/fib_rules.h>
- #include <linux/ip.h>
-+#if defined(__GLIBC__)
- #include <linux/if_arp.h>
-+#else
-+#include <linux/if.h>
-+#endif
- #include <linux/if_bridge.h>
- #include <linux/if_link.h>
- #include <linux/if_tun.h>
-@@ -44,7 +49,6 @@
- #include "nm-platform-private.h"
- #include "wifi/nm-wifi-utils.h"
- #include "wifi/nm-wifi-utils-wext.h"
--#include "wpan/nm-wpan-utils.h"
- #include "nm-glib-aux/nm-io-utils.h"
- #include "nm-udev-aux/nm-udev-utils.h"
- 
diff --git a/srcpkgs/NetworkManager/patches/musl-network-support.patch b/srcpkgs/NetworkManager/patches/musl-network-support.patch
deleted file mode 100644
index 0fb63f067b17..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-network-support.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- libnm-core/nm-utils.h.orig
-+++ libnm-core/nm-utils.h
-@@ -30,7 +30,11 @@
- #include <netinet/in.h>
- 
- /* For ETH_ALEN and INFINIBAND_ALEN */
-+#if defined(__GLIBC__)
- #include <linux/if_ether.h>
-+#else
-+#define ETH_ALEN	6		/* Octets in one ethernet addr	 */
-+#endif
- #include <linux/if_infiniband.h>
- 
- #include "nm-core-enum-types.h"
---- src/platform/wifi/nm-wifi-utils.h.orig
-+++ src/platform/wifi/nm-wifi-utils.h
-@@ -22,7 +22,11 @@
- #ifndef __WIFI_UTILS_H__
- #define __WIFI_UTILS_H__
- 
-+#if defined(__GLIBC__)
- #include <net/ethernet.h>
-+#else /* musl libc */
-+#define ETH_ALEN	6		/* Octets in one ethernet addr	 */
-+#endif
- 
- #include "nm-dbus-interface.h"
- 
---- shared/systemd/src/basic/socket-util.h	2019-03-16 15:41:33.287235649 +0100
-+++ shared/systemd/src/basic/socket-util.h	2019-03-16 15:42:24.273912106 +0100
-@@ -12,6 +12,11 @@
- #include <sys/socket.h>
- #include <sys/types.h>
- #include <sys/un.h>
-+#if !defined(__GLIBC__)
-+/* SIOCGSTAMPNS from linux/asm-generic.h 
-+ * for src/systemd/src/libsystemd-network/sd-lldp.c */
-+#include <linux/sockios.h>
-+#endif
- 
- #include "macro.h"
- #include "missing_socket.h"
diff --git a/srcpkgs/NetworkManager/patches/musl-process-util.patch b/srcpkgs/NetworkManager/patches/musl-process-util.patch
deleted file mode 100644
index e406de1da850..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-process-util.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- shared/systemd/src/basic/process-util.c
-+++ shared/systemd/src/basic/process-util.c
-@@ -21,6 +21,9 @@
- #include <sys/wait.h>
- #include <syslog.h>
- #include <unistd.h>
-+#ifndef __GLIBC__
-+#include <pthread.h>
-+#endif
- #if 0 /* NM_IGNORED */
- #if HAVE_VALGRIND_VALGRIND_H
- #include <valgrind/valgrind.h>
-@@ -1168,11 +1171,13 @@ void reset_cached_pid(void) {
-         cached_pid = CACHED_PID_UNSET;
- }
- 
-+#ifdef __GLIBC__
- /* We use glibc __register_atfork() + __dso_handle directly here, as they are not included in the glibc
-  * headers. __register_atfork() is mostly equivalent to pthread_atfork(), but doesn't require us to link against
-  * libpthread, as it is part of glibc anyway. */
- extern int __register_atfork(void (*prepare) (void), void (*parent) (void), void (*child) (void), void *dso_handle);
- extern void* __dso_handle _weak_;
-+#endif
- 
- pid_t getpid_cached(void) {
-         static bool installed = false;
-@@ -1201,7 +1206,12 @@ pid_t getpid_cached(void) {
-                          * only half-documented (glibc doesn't document it but LSB does — though only superficially)
-                          * we'll check for errors only in the most generic fashion possible. */
- 
--                        if (__register_atfork(NULL, NULL, reset_cached_pid, __dso_handle) != 0) {
-+                        #ifdef __GLIBC__
-+                            if (__register_atfork(NULL, NULL, reset_cached_pid, __dso_handle) != 0) {
-+                        #else
-+                            if (pthread_atfork(NULL, NULL, reset_cached_pid) != 0) {
-+                        #endif
-+
-                                 /* OOM? Let's try again later */
-                                 cached_pid = CACHED_PID_UNSET;
-                                 return new_pid;
diff --git a/srcpkgs/NetworkManager/patches/musl-use-srand48.patch b/srcpkgs/NetworkManager/patches/musl-use-srand48.patch
deleted file mode 100644
index 43b689f3bad1..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-use-srand48.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- shared/n-dhcp4/src/n-dhcp4-c-probe.c.orig	2020-01-06 15:35:10.128600647 +0100
-+++ shared/n-dhcp4/src/n-dhcp4-c-probe.c	2020-01-06 15:39:41.446240531 +0100
-@@ -362,7 +362,12 @@ static void n_dhcp4_client_probe_config_
-         seed16v[1] = (u64 >> 16) ^ (u64 >>  0);
-         seed16v[2] = (u64 >> 32) ^ (u64 >> 16);
- 
-+#ifdef __GLIBC__
-         r = seed48_r(seed16v, &config->entropy);
-+#else
-+        r = 0;
-+        seed48(seed16v);
-+#endif
-         c_assert(!r);
- }
- 
-@@ -379,7 +384,12 @@ uint32_t n_dhcp4_client_probe_config_get
-         long int result;
-         int r;
- 
-+#ifdef __GLIBC__
-         r = mrand48_r(&config->entropy, &result);
-+#else
-+        r = 0;
-+        result = mrand48();
-+#endif
-         c_assert(!r);
- 
-         return result;
---- shared/n-dhcp4/src/n-dhcp4-private.h.orig	2020-01-06 15:41:31.941501136 +0100
-+++ shared/n-dhcp4/src/n-dhcp4-private.h	2020-01-06 15:41:55.341556325 +0100
-@@ -267,7 +267,9 @@ struct NDhcp4ClientProbeConfig {
-         bool inform_only;
-         bool init_reboot;
-         struct in_addr requested_ip;
-+#ifdef __GLIBC__
-         struct drand48_data entropy;    /* entropy pool */
-+#endif
-         uint64_t ms_start_delay;        /* max ms to wait before starting probe */
-         NDhcp4ClientProbeOption *options[UINT8_MAX + 1];
-         int8_t request_parameters[UINT8_MAX + 1];
diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template
index e482bba98de7..614beaeb2bb6 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -1,9 +1,9 @@
 # Template file for 'NetworkManager'
-# when updating to 1.24 or newer, drop the compat
-# patch in gnome-control-center and rebuild it
+# when updating, drop 'nm122.patch' in gnome-control-center and rebuild it
+# if it builds, revbump it without the patch
 pkgname=NetworkManager
-version=1.22.10
-revision=2
+version=1.30.2
+revision=1
 build_style=meson
 build_helper="gir qemu"
 configure_args="-Dpolkit_agent=true -Dsystemd_journal=false
@@ -35,16 +35,10 @@ 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=2b29ccc1531ba7ebba95a97f40c22b963838e8b6833745efe8e6fb71fd8fca77
+checksum=0c8e80e77877860e4a4e6ab4a0f7cdc1186e356b65b042a751897188b88944d2
 lib32disabled=yes
 conf_files="/etc/${pkgname}/${pkgname}.conf"
-make_dirs="
- /etc/NetworkManager/system-connections 0755 root root
- /etc/NetworkManager/dispatcher.d/pre-up.d 0750 root root
- /etc/NetworkManager/dispatcher.d/pre-down.d 0750 root root
- /etc/NetworkManager/VPN 0755 root root
- /var/lib/NetworkManager 0755 root root
-"
+make_check=extended
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)

^ permalink raw reply	[flat|nested] 73+ messages in thread

* Re: [PR REVIEW] NetworkManager: update to 1.31.1
  2021-03-09  3:41 [PR PATCH] NetworkManager: update to 1.31.1 cinerea0
                   ` (8 preceding siblings ...)
  2021-03-16  2:56 ` [PR PATCH] [Updated] " cinerea0
@ 2021-03-16  3:23 ` cinerea0
  2021-03-16  3:33 ` cinerea0
                   ` (61 subsequent siblings)
  71 siblings, 0 replies; 73+ messages in thread
From: cinerea0 @ 2021-03-16  3:23 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 154 bytes --]

New review comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/29342#discussion_r594834498

Comment:
Fixed.

^ permalink raw reply	[flat|nested] 73+ messages in thread

* Re: [PR REVIEW] NetworkManager: update to 1.31.1
  2021-03-09  3:41 [PR PATCH] NetworkManager: update to 1.31.1 cinerea0
                   ` (9 preceding siblings ...)
  2021-03-16  3:23 ` [PR REVIEW] " cinerea0
@ 2021-03-16  3:33 ` cinerea0
  2021-03-16  3:40 ` cinerea0
                   ` (60 subsequent siblings)
  71 siblings, 0 replies; 73+ messages in thread
From: cinerea0 @ 2021-03-16  3:33 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 366 bytes --]

New review comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/29342#discussion_r594837710

Comment:
I have no idea why it works. The fix-cross-gir patch I've submitted here is an altered version of the one being worked on in the PR linked above with all of the sections dealing with deleted or changed files taken out.

^ permalink raw reply	[flat|nested] 73+ messages in thread

* Re: NetworkManager: update to 1.31.1
  2021-03-09  3:41 [PR PATCH] NetworkManager: update to 1.31.1 cinerea0
                   ` (10 preceding siblings ...)
  2021-03-16  3:33 ` cinerea0
@ 2021-03-16  3:40 ` cinerea0
  2021-03-19 18:10 ` [PR PATCH] [Updated] NetworkManager: update to 1.30.2 cinerea0
                   ` (59 subsequent siblings)
  71 siblings, 0 replies; 73+ messages in thread
From: cinerea0 @ 2021-03-16  3:40 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 404 bytes --]

New comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/29342#issuecomment-799920543

Comment:
@ericonr I forgot that odd-numbered minor releases from NetworkManager are development releases, good catch! As for v1.30.2, I'm testing it right now and it appears to work fine, and you were correct that it builds fine on musl without any musl-specific patches.

^ permalink raw reply	[flat|nested] 73+ messages in thread

* Re: [PR PATCH] [Updated] NetworkManager: update to 1.30.2
  2021-03-09  3:41 [PR PATCH] NetworkManager: update to 1.31.1 cinerea0
                   ` (11 preceding siblings ...)
  2021-03-16  3:40 ` cinerea0
@ 2021-03-19 18:10 ` cinerea0
  2021-03-19 18:22 ` cinerea0
                   ` (58 subsequent siblings)
  71 siblings, 0 replies; 73+ messages in thread
From: cinerea0 @ 2021-03-19 18:10 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1611 bytes --]

There is an updated pull request by cinerea0 against master on the void-packages repository

https://github.com/cinerea0/void-packages nm
https://github.com/void-linux/void-packages/pull/29342

NetworkManager: update to 1.30.2
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->

Closes #27502

A patch file from https://github.com/void-linux/void-packages/pull/29342.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nm-29342.patch --]
[-- Type: text/x-diff, Size: 17077 bytes --]

From a2dafb45c60473181452a6962fc9465306ebdc90 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Fri, 19 Mar 2021 14:09:43 -0400
Subject: [PATCH] NetworkManager: update to 1.30.2

---
 .../patches/fix-cross-gir.patch               | 67 ++++++-------------
 .../patches/fix-musl-linux-header.diff        | 15 -----
 .../patches/fix-musl-qsort_r.patch            | 16 -----
 .../NetworkManager/patches/musl-basic.patch   | 29 --------
 .../patches/musl-fix-includes.patch           | 54 ---------------
 .../patches/musl-network-support.patch        | 42 ------------
 .../patches/musl-process-util.patch           | 40 -----------
 .../patches/musl-use-srand48.patch            | 40 -----------
 srcpkgs/NetworkManager/template               | 22 ++----
 9 files changed, 29 insertions(+), 296 deletions(-)
 delete mode 100644 srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff
 delete mode 100644 srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-basic.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-fix-includes.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-network-support.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-process-util.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-use-srand48.patch

diff --git a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
index c283d4dc1059..c0b4344b1c15 100644
--- a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
+++ b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
@@ -1,52 +1,29 @@
 Reason: Fix crossbuilding GIR
 Upstream: No, not upstreamable since this is very specific to the Void setup
-diff --git clients/common/meson.build clients/common/meson.build
-index afa257b..50b53e7 100644
---- clients/common/meson.build
-+++ clients/common/meson.build
-@@ -35,7 +35,7 @@ if enable_introspection
-     settings_docs,
-     input: nm_property_docs,
-     output: settings_docs,
--    command: [xsltproc, '--output', '@OUTPUT@', join_paths(meson.current_source_dir(), 'settings-docs.xsl'), '@INPUT@'],
-+    command: [xsltproc, '--output', '@OUTPUT@', join_paths(meson.current_source_dir(), 'settings-docs.xsl'), join_paths(meson.current_source_dir(), '..', '..', '@INPUT@')],
-   )
- 
-   test(
-diff --git libnm/meson.build libnm/meson.build
-index 51ca46d..f14d861 100644
---- libnm/meson.build
-+++ libnm/meson.build
-@@ -236,7 +236,13 @@ if enable_introspection
-     )
-   endif
- 
--  generate_setting_docs = join_paths(meson.current_source_dir(), 'generate-setting-docs.py')
+--- libnm/meson.build.orig	2020-12-28 16:03:30.641850261 +0100
++++ libnm/meson.build	2020-12-28 16:31:54.932136481 +0100
+@@ -276,6 +276,14 @@
+     'GI_TYPELIB_PATH=' + gi_typelib_path,
+     'LD_LIBRARY_PATH=' + ld_library_path,
+   ]
++  
 +  if meson.is_cross_build()
 +    qemu = '/usr/bin/qemu-@XBPS_TARGET_QEMU_MACHINE@-static'
-+    qemu_python3_cmd = qemu + ' -L @XBPS_CROSS_BASE@ @XBPS_CROSS_BASE@/usr/bin/python3'
-+    generate_setting_docs = ['sh', '-c', qemu_python3_cmd, join_paths(meson.current_source_dir(), 'generate-setting-docs.py')]
++    qemu_python3_cmd = qemu + ' -L @XBPS_CROSS_BASE@ @XBPS_CROSS_BASE@/bin/python3'
++    generate_setting_docs = ['sh', '-c', qemu_python3_cmd, join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-gir.py')]
 +  else
-+    generate_setting_docs = [python.path(), join_paths(meson.current_source_dir(), 'generate-setting-docs.py')]
++    generate_setting_docs = [python.path(), join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-gir.py')]
 +  endif
  
-   gi_typelib_path = run_command('printenv', 'GI_TYPELIB_PATH').stdout()
-   if gi_typelib_path != ''
-@@ -261,7 +267,7 @@ if enable_introspection
-     name,
-     input: libnm_gir[0],
-     output: name,
--    command: [generate_setting_docs_env, python.path(), generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--output', '@OUTPUT@'],
-+    command: [generate_setting_docs_env, generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--output', '@OUTPUT@'],
-     depends: libnm_gir,
-   )
- 
-@@ -270,7 +276,7 @@ if enable_introspection
-     name,
-     input: [libnm_gir[0], nm_settings_docs_overrides],
-     output: name,
--    command: [generate_setting_docs_env, python.path(), generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT0@', '--overrides', '@INPUT1@', '--output', '@OUTPUT@'],
-+    command: [generate_setting_docs_env, generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT0@', '--overrides', '@INPUT1@', '--output', '@OUTPUT@'],
-     depends: libnm_gir,
-   )
- endif
+   nm_settings_docs_xml_gir = custom_target(
+     'nm-settings-docs-gir.xml',
+@@ -283,8 +291,7 @@
+     output: 'nm-settings-docs-gir.xml',
+     command: [
+       generate_setting_docs_env,
+-      python.path(),
+-      join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-gir.py'),
++      generate_setting_docs,
+       '--lib-path', meson.current_build_dir(),
+       '--gir', '@INPUT@',
+       '--output', '@OUTPUT@'
diff --git a/srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff b/srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff
deleted file mode 100644
index 511759214a97..000000000000
--- a/srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git src/systemd/src/libsystemd-network/sd-dhcp6-client.c src/systemd/src/libsystemd-network/sd-dhcp6-client.c
-index f67a45bd2..ec11fa605 100644
---- src/systemd/src/libsystemd-network/sd-dhcp6-client.c
-+++ src/systemd/src/libsystemd-network/sd-dhcp6-client.c
-@@ -8,8 +8,10 @@
- #include <errno.h>
- #include <string.h>
- #include <sys/ioctl.h>
-+#ifdef __GLIBC__
- #include <linux/if_arp.h>
- #include <linux/if_infiniband.h>
-+#endif
- 
- #include "sd-dhcp6-client.h"
- 
diff --git a/srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch b/srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch
deleted file mode 100644
index f89eac778502..000000000000
--- a/srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git shared/systemd/src/basic/sort-util.h shared/systemd/src/basic/sort-util.h
-index e029f8646..168735087 100644
---- shared/systemd/src/basic/sort-util.h
-+++ shared/systemd/src/basic/sort-util.h
-@@ -60,7 +60,11 @@ static inline void qsort_r_safe(void *base, size_t nmemb, size_t size, __compar_
-                 return;
- 
-         assert(base);
-+#ifdef __GLIBC__
-         qsort_r(base, nmemb, size, compar, userdata);
-+#else
-+        g_qsort_with_data(base, nmemb, size, compar, userdata);
-+#endif
- }
- 
- #define typesafe_qsort_r(p, n, func, userdata)                          \
diff --git a/srcpkgs/NetworkManager/patches/musl-basic.patch b/srcpkgs/NetworkManager/patches/musl-basic.patch
deleted file mode 100644
index 63ea93ada585..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-basic.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Usual fix for musl libc
---- shared/systemd/src/basic/stdio-util.h.orig
-+++ shared/systemd/src/basic/stdio-util.h
-@@ -19,7 +19,9 @@
-   along with systemd; If not, see <http://www.gnu.org/licenses/>.
- ***/
- 
-+#if defined(__GLIBC__)
- #include <printf.h>
-+#endif
- #include <stdarg.h>
- #include <stdio.h>
- #include <sys/types.h>
- 
---- shared/systemd/src/basic/sort-util.h	2019-06-09 17:02:48.895695896 +0200
-+++ shared/systemd/src/basic/sort-util.h	2019-06-09 17:03:27.564199937 +0200
-@@ -5,6 +5,12 @@
- 
- #include "macro.h"
- 
-+#if !defined(__GLIBC__)
-+typedef int (*__compar_fn_t) (const void*, const void*);
-+typedef __compar_fn_t comparison_fn_t;
-+typedef int (*__compar_d_fn_t) (const void *, const void *, void *);
-+#endif
-+
- void *xbsearch_r(const void *key, const void *base, size_t nmemb, size_t size,
-                  __compar_d_fn_t compar, void *arg);
- 
diff --git a/srcpkgs/NetworkManager/patches/musl-fix-includes.patch b/srcpkgs/NetworkManager/patches/musl-fix-includes.patch
deleted file mode 100644
index 95ffb2d354ea..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-fix-includes.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- src/devices/nm-device.c.orig	2019-12-17 08:59:49.000000000 +0100
-+++ src/devices/nm-device.c	2020-01-06 17:29:08.678242168 +0100
-@@ -17,7 +17,11 @@
- #include <arpa/inet.h>
- #include <fcntl.h>
- #include <linux/if_addr.h>
-+#if defined(__GLIBC__)
- #include <linux/if_arp.h>
-+#else
-+#include <linux/if.h>
-+#endif
- #include <linux/rtnetlink.h>
- #include <linux/pkt_sched.h>
- 
---- src/nm-manager.c.orig	2020-01-06 17:29:08.682242177 +0100
-+++ src/nm-manager.c	2020-01-06 17:30:50.378482034 +0100
-@@ -15,6 +15,7 @@
- #include <sys/stat.h>
- #include <sys/sendfile.h>
- #include <limits.h>
-+#include <asm/types.h>
- 
- #include "nm-glib-aux/nm-c-list.h"
- 
---- src/platform/nm-linux-platform.c.orig	2019-12-17 08:59:49.000000000 +0100
-+++ src/platform/nm-linux-platform.c	2020-01-06 17:29:08.686242186 +0100
-@@ -6,6 +6,7 @@
- #include "nm-default.h"
- 
- #include "nm-linux-platform.h"
-+#include "wpan/nm-wpan-utils.h"
- 
- #include <arpa/inet.h>
- #include <dlfcn.h>
-@@ -14,7 +15,11 @@
- #include <libudev.h>
- #include <linux/fib_rules.h>
- #include <linux/ip.h>
-+#if defined(__GLIBC__)
- #include <linux/if_arp.h>
-+#else
-+#include <linux/if.h>
-+#endif
- #include <linux/if_bridge.h>
- #include <linux/if_link.h>
- #include <linux/if_tun.h>
-@@ -44,7 +49,6 @@
- #include "nm-platform-private.h"
- #include "wifi/nm-wifi-utils.h"
- #include "wifi/nm-wifi-utils-wext.h"
--#include "wpan/nm-wpan-utils.h"
- #include "nm-glib-aux/nm-io-utils.h"
- #include "nm-udev-aux/nm-udev-utils.h"
- 
diff --git a/srcpkgs/NetworkManager/patches/musl-network-support.patch b/srcpkgs/NetworkManager/patches/musl-network-support.patch
deleted file mode 100644
index 0fb63f067b17..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-network-support.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- libnm-core/nm-utils.h.orig
-+++ libnm-core/nm-utils.h
-@@ -30,7 +30,11 @@
- #include <netinet/in.h>
- 
- /* For ETH_ALEN and INFINIBAND_ALEN */
-+#if defined(__GLIBC__)
- #include <linux/if_ether.h>
-+#else
-+#define ETH_ALEN	6		/* Octets in one ethernet addr	 */
-+#endif
- #include <linux/if_infiniband.h>
- 
- #include "nm-core-enum-types.h"
---- src/platform/wifi/nm-wifi-utils.h.orig
-+++ src/platform/wifi/nm-wifi-utils.h
-@@ -22,7 +22,11 @@
- #ifndef __WIFI_UTILS_H__
- #define __WIFI_UTILS_H__
- 
-+#if defined(__GLIBC__)
- #include <net/ethernet.h>
-+#else /* musl libc */
-+#define ETH_ALEN	6		/* Octets in one ethernet addr	 */
-+#endif
- 
- #include "nm-dbus-interface.h"
- 
---- shared/systemd/src/basic/socket-util.h	2019-03-16 15:41:33.287235649 +0100
-+++ shared/systemd/src/basic/socket-util.h	2019-03-16 15:42:24.273912106 +0100
-@@ -12,6 +12,11 @@
- #include <sys/socket.h>
- #include <sys/types.h>
- #include <sys/un.h>
-+#if !defined(__GLIBC__)
-+/* SIOCGSTAMPNS from linux/asm-generic.h 
-+ * for src/systemd/src/libsystemd-network/sd-lldp.c */
-+#include <linux/sockios.h>
-+#endif
- 
- #include "macro.h"
- #include "missing_socket.h"
diff --git a/srcpkgs/NetworkManager/patches/musl-process-util.patch b/srcpkgs/NetworkManager/patches/musl-process-util.patch
deleted file mode 100644
index e406de1da850..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-process-util.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- shared/systemd/src/basic/process-util.c
-+++ shared/systemd/src/basic/process-util.c
-@@ -21,6 +21,9 @@
- #include <sys/wait.h>
- #include <syslog.h>
- #include <unistd.h>
-+#ifndef __GLIBC__
-+#include <pthread.h>
-+#endif
- #if 0 /* NM_IGNORED */
- #if HAVE_VALGRIND_VALGRIND_H
- #include <valgrind/valgrind.h>
-@@ -1168,11 +1171,13 @@ void reset_cached_pid(void) {
-         cached_pid = CACHED_PID_UNSET;
- }
- 
-+#ifdef __GLIBC__
- /* We use glibc __register_atfork() + __dso_handle directly here, as they are not included in the glibc
-  * headers. __register_atfork() is mostly equivalent to pthread_atfork(), but doesn't require us to link against
-  * libpthread, as it is part of glibc anyway. */
- extern int __register_atfork(void (*prepare) (void), void (*parent) (void), void (*child) (void), void *dso_handle);
- extern void* __dso_handle _weak_;
-+#endif
- 
- pid_t getpid_cached(void) {
-         static bool installed = false;
-@@ -1201,7 +1206,12 @@ pid_t getpid_cached(void) {
-                          * only half-documented (glibc doesn't document it but LSB does — though only superficially)
-                          * we'll check for errors only in the most generic fashion possible. */
- 
--                        if (__register_atfork(NULL, NULL, reset_cached_pid, __dso_handle) != 0) {
-+                        #ifdef __GLIBC__
-+                            if (__register_atfork(NULL, NULL, reset_cached_pid, __dso_handle) != 0) {
-+                        #else
-+                            if (pthread_atfork(NULL, NULL, reset_cached_pid) != 0) {
-+                        #endif
-+
-                                 /* OOM? Let's try again later */
-                                 cached_pid = CACHED_PID_UNSET;
-                                 return new_pid;
diff --git a/srcpkgs/NetworkManager/patches/musl-use-srand48.patch b/srcpkgs/NetworkManager/patches/musl-use-srand48.patch
deleted file mode 100644
index 43b689f3bad1..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-use-srand48.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- shared/n-dhcp4/src/n-dhcp4-c-probe.c.orig	2020-01-06 15:35:10.128600647 +0100
-+++ shared/n-dhcp4/src/n-dhcp4-c-probe.c	2020-01-06 15:39:41.446240531 +0100
-@@ -362,7 +362,12 @@ static void n_dhcp4_client_probe_config_
-         seed16v[1] = (u64 >> 16) ^ (u64 >>  0);
-         seed16v[2] = (u64 >> 32) ^ (u64 >> 16);
- 
-+#ifdef __GLIBC__
-         r = seed48_r(seed16v, &config->entropy);
-+#else
-+        r = 0;
-+        seed48(seed16v);
-+#endif
-         c_assert(!r);
- }
- 
-@@ -379,7 +384,12 @@ uint32_t n_dhcp4_client_probe_config_get
-         long int result;
-         int r;
- 
-+#ifdef __GLIBC__
-         r = mrand48_r(&config->entropy, &result);
-+#else
-+        r = 0;
-+        result = mrand48();
-+#endif
-         c_assert(!r);
- 
-         return result;
---- shared/n-dhcp4/src/n-dhcp4-private.h.orig	2020-01-06 15:41:31.941501136 +0100
-+++ shared/n-dhcp4/src/n-dhcp4-private.h	2020-01-06 15:41:55.341556325 +0100
-@@ -267,7 +267,9 @@ struct NDhcp4ClientProbeConfig {
-         bool inform_only;
-         bool init_reboot;
-         struct in_addr requested_ip;
-+#ifdef __GLIBC__
-         struct drand48_data entropy;    /* entropy pool */
-+#endif
-         uint64_t ms_start_delay;        /* max ms to wait before starting probe */
-         NDhcp4ClientProbeOption *options[UINT8_MAX + 1];
-         int8_t request_parameters[UINT8_MAX + 1];
diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template
index d439d8b10286..614beaeb2bb6 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -1,9 +1,9 @@
 # Template file for 'NetworkManager'
-# when updating to 1.24 or newer, drop the compat
-# patch in gnome-control-center and rebuild it
+# when updating, drop 'nm122.patch' in gnome-control-center and rebuild it
+# if it builds, revbump it without the patch
 pkgname=NetworkManager
-version=1.22.10
-revision=3
+version=1.30.2
+revision=1
 build_style=meson
 build_helper="gir qemu"
 configure_args="-Dpolkit_agent=true -Dsystemd_journal=false
@@ -11,7 +11,7 @@ configure_args="-Dpolkit_agent=true -Dsystemd_journal=false
  -Dmodify_system=true -Dpolkit_agent=true -Dsystemdsystemunitdir=no
  -Dpppd=/usr/bin/pppd -Dqt=false
  -Dsession_tracking_consolekit=false
- -Dpppd_plugin_dir=/usr/lib/pppd/2.4.9 -Dresolvconf=/usr/bin/resolvconf
+ -Dpppd_plugin_dir=/usr/lib/pppd/2.4.7 -Dresolvconf=/usr/bin/resolvconf
  -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
@@ -35,18 +35,10 @@ 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=2b29ccc1531ba7ebba95a97f40c22b963838e8b6833745efe8e6fb71fd8fca77
-# TODO: Some tests require network namespaces to run.
-make_check=extended
+checksum=0c8e80e77877860e4a4e6ab4a0f7cdc1186e356b65b042a751897188b88944d2
 lib32disabled=yes
 conf_files="/etc/${pkgname}/${pkgname}.conf"
-make_dirs="
- /etc/NetworkManager/system-connections 0755 root root
- /etc/NetworkManager/dispatcher.d/pre-up.d 0750 root root
- /etc/NetworkManager/dispatcher.d/pre-down.d 0750 root root
- /etc/NetworkManager/VPN 0755 root root
- /var/lib/NetworkManager 0755 root root
-"
+make_check=extended
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)

^ permalink raw reply	[flat|nested] 73+ messages in thread

* Re: [PR PATCH] [Updated] NetworkManager: update to 1.30.2
  2021-03-09  3:41 [PR PATCH] NetworkManager: update to 1.31.1 cinerea0
                   ` (12 preceding siblings ...)
  2021-03-19 18:10 ` [PR PATCH] [Updated] NetworkManager: update to 1.30.2 cinerea0
@ 2021-03-19 18:22 ` cinerea0
  2021-03-20  1:03 ` [PR REVIEW] " ericonr
                   ` (57 subsequent siblings)
  71 siblings, 0 replies; 73+ messages in thread
From: cinerea0 @ 2021-03-19 18:22 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1611 bytes --]

There is an updated pull request by cinerea0 against master on the void-packages repository

https://github.com/cinerea0/void-packages nm
https://github.com/void-linux/void-packages/pull/29342

NetworkManager: update to 1.30.2
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->

Closes #27502

A patch file from https://github.com/void-linux/void-packages/pull/29342.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nm-29342.patch --]
[-- Type: text/x-diff, Size: 16497 bytes --]

From 4a663bf26fa34eea89fa1202c001331f67230bab Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Fri, 19 Mar 2021 14:20:07 -0400
Subject: [PATCH] NetworkManager: update to 1.30.2

---
 .../patches/fix-cross-gir.patch               | 67 ++++++-------------
 .../patches/fix-musl-linux-header.diff        | 15 -----
 .../patches/fix-musl-qsort_r.patch            | 16 -----
 .../NetworkManager/patches/musl-basic.patch   | 29 --------
 .../patches/musl-fix-includes.patch           | 54 ---------------
 .../patches/musl-network-support.patch        | 42 ------------
 .../patches/musl-process-util.patch           | 40 -----------
 .../patches/musl-use-srand48.patch            | 40 -----------
 srcpkgs/NetworkManager/template               | 17 ++---
 9 files changed, 27 insertions(+), 293 deletions(-)
 delete mode 100644 srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff
 delete mode 100644 srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-basic.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-fix-includes.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-network-support.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-process-util.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-use-srand48.patch

diff --git a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
index c283d4dc1059..c0b4344b1c15 100644
--- a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
+++ b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
@@ -1,52 +1,29 @@
 Reason: Fix crossbuilding GIR
 Upstream: No, not upstreamable since this is very specific to the Void setup
-diff --git clients/common/meson.build clients/common/meson.build
-index afa257b..50b53e7 100644
---- clients/common/meson.build
-+++ clients/common/meson.build
-@@ -35,7 +35,7 @@ if enable_introspection
-     settings_docs,
-     input: nm_property_docs,
-     output: settings_docs,
--    command: [xsltproc, '--output', '@OUTPUT@', join_paths(meson.current_source_dir(), 'settings-docs.xsl'), '@INPUT@'],
-+    command: [xsltproc, '--output', '@OUTPUT@', join_paths(meson.current_source_dir(), 'settings-docs.xsl'), join_paths(meson.current_source_dir(), '..', '..', '@INPUT@')],
-   )
- 
-   test(
-diff --git libnm/meson.build libnm/meson.build
-index 51ca46d..f14d861 100644
---- libnm/meson.build
-+++ libnm/meson.build
-@@ -236,7 +236,13 @@ if enable_introspection
-     )
-   endif
- 
--  generate_setting_docs = join_paths(meson.current_source_dir(), 'generate-setting-docs.py')
+--- libnm/meson.build.orig	2020-12-28 16:03:30.641850261 +0100
++++ libnm/meson.build	2020-12-28 16:31:54.932136481 +0100
+@@ -276,6 +276,14 @@
+     'GI_TYPELIB_PATH=' + gi_typelib_path,
+     'LD_LIBRARY_PATH=' + ld_library_path,
+   ]
++  
 +  if meson.is_cross_build()
 +    qemu = '/usr/bin/qemu-@XBPS_TARGET_QEMU_MACHINE@-static'
-+    qemu_python3_cmd = qemu + ' -L @XBPS_CROSS_BASE@ @XBPS_CROSS_BASE@/usr/bin/python3'
-+    generate_setting_docs = ['sh', '-c', qemu_python3_cmd, join_paths(meson.current_source_dir(), 'generate-setting-docs.py')]
++    qemu_python3_cmd = qemu + ' -L @XBPS_CROSS_BASE@ @XBPS_CROSS_BASE@/bin/python3'
++    generate_setting_docs = ['sh', '-c', qemu_python3_cmd, join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-gir.py')]
 +  else
-+    generate_setting_docs = [python.path(), join_paths(meson.current_source_dir(), 'generate-setting-docs.py')]
++    generate_setting_docs = [python.path(), join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-gir.py')]
 +  endif
  
-   gi_typelib_path = run_command('printenv', 'GI_TYPELIB_PATH').stdout()
-   if gi_typelib_path != ''
-@@ -261,7 +267,7 @@ if enable_introspection
-     name,
-     input: libnm_gir[0],
-     output: name,
--    command: [generate_setting_docs_env, python.path(), generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--output', '@OUTPUT@'],
-+    command: [generate_setting_docs_env, generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--output', '@OUTPUT@'],
-     depends: libnm_gir,
-   )
- 
-@@ -270,7 +276,7 @@ if enable_introspection
-     name,
-     input: [libnm_gir[0], nm_settings_docs_overrides],
-     output: name,
--    command: [generate_setting_docs_env, python.path(), generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT0@', '--overrides', '@INPUT1@', '--output', '@OUTPUT@'],
-+    command: [generate_setting_docs_env, generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT0@', '--overrides', '@INPUT1@', '--output', '@OUTPUT@'],
-     depends: libnm_gir,
-   )
- endif
+   nm_settings_docs_xml_gir = custom_target(
+     'nm-settings-docs-gir.xml',
+@@ -283,8 +291,7 @@
+     output: 'nm-settings-docs-gir.xml',
+     command: [
+       generate_setting_docs_env,
+-      python.path(),
+-      join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-gir.py'),
++      generate_setting_docs,
+       '--lib-path', meson.current_build_dir(),
+       '--gir', '@INPUT@',
+       '--output', '@OUTPUT@'
diff --git a/srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff b/srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff
deleted file mode 100644
index 511759214a97..000000000000
--- a/srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git src/systemd/src/libsystemd-network/sd-dhcp6-client.c src/systemd/src/libsystemd-network/sd-dhcp6-client.c
-index f67a45bd2..ec11fa605 100644
---- src/systemd/src/libsystemd-network/sd-dhcp6-client.c
-+++ src/systemd/src/libsystemd-network/sd-dhcp6-client.c
-@@ -8,8 +8,10 @@
- #include <errno.h>
- #include <string.h>
- #include <sys/ioctl.h>
-+#ifdef __GLIBC__
- #include <linux/if_arp.h>
- #include <linux/if_infiniband.h>
-+#endif
- 
- #include "sd-dhcp6-client.h"
- 
diff --git a/srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch b/srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch
deleted file mode 100644
index f89eac778502..000000000000
--- a/srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git shared/systemd/src/basic/sort-util.h shared/systemd/src/basic/sort-util.h
-index e029f8646..168735087 100644
---- shared/systemd/src/basic/sort-util.h
-+++ shared/systemd/src/basic/sort-util.h
-@@ -60,7 +60,11 @@ static inline void qsort_r_safe(void *base, size_t nmemb, size_t size, __compar_
-                 return;
- 
-         assert(base);
-+#ifdef __GLIBC__
-         qsort_r(base, nmemb, size, compar, userdata);
-+#else
-+        g_qsort_with_data(base, nmemb, size, compar, userdata);
-+#endif
- }
- 
- #define typesafe_qsort_r(p, n, func, userdata)                          \
diff --git a/srcpkgs/NetworkManager/patches/musl-basic.patch b/srcpkgs/NetworkManager/patches/musl-basic.patch
deleted file mode 100644
index 63ea93ada585..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-basic.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Usual fix for musl libc
---- shared/systemd/src/basic/stdio-util.h.orig
-+++ shared/systemd/src/basic/stdio-util.h
-@@ -19,7 +19,9 @@
-   along with systemd; If not, see <http://www.gnu.org/licenses/>.
- ***/
- 
-+#if defined(__GLIBC__)
- #include <printf.h>
-+#endif
- #include <stdarg.h>
- #include <stdio.h>
- #include <sys/types.h>
- 
---- shared/systemd/src/basic/sort-util.h	2019-06-09 17:02:48.895695896 +0200
-+++ shared/systemd/src/basic/sort-util.h	2019-06-09 17:03:27.564199937 +0200
-@@ -5,6 +5,12 @@
- 
- #include "macro.h"
- 
-+#if !defined(__GLIBC__)
-+typedef int (*__compar_fn_t) (const void*, const void*);
-+typedef __compar_fn_t comparison_fn_t;
-+typedef int (*__compar_d_fn_t) (const void *, const void *, void *);
-+#endif
-+
- void *xbsearch_r(const void *key, const void *base, size_t nmemb, size_t size,
-                  __compar_d_fn_t compar, void *arg);
- 
diff --git a/srcpkgs/NetworkManager/patches/musl-fix-includes.patch b/srcpkgs/NetworkManager/patches/musl-fix-includes.patch
deleted file mode 100644
index 95ffb2d354ea..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-fix-includes.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- src/devices/nm-device.c.orig	2019-12-17 08:59:49.000000000 +0100
-+++ src/devices/nm-device.c	2020-01-06 17:29:08.678242168 +0100
-@@ -17,7 +17,11 @@
- #include <arpa/inet.h>
- #include <fcntl.h>
- #include <linux/if_addr.h>
-+#if defined(__GLIBC__)
- #include <linux/if_arp.h>
-+#else
-+#include <linux/if.h>
-+#endif
- #include <linux/rtnetlink.h>
- #include <linux/pkt_sched.h>
- 
---- src/nm-manager.c.orig	2020-01-06 17:29:08.682242177 +0100
-+++ src/nm-manager.c	2020-01-06 17:30:50.378482034 +0100
-@@ -15,6 +15,7 @@
- #include <sys/stat.h>
- #include <sys/sendfile.h>
- #include <limits.h>
-+#include <asm/types.h>
- 
- #include "nm-glib-aux/nm-c-list.h"
- 
---- src/platform/nm-linux-platform.c.orig	2019-12-17 08:59:49.000000000 +0100
-+++ src/platform/nm-linux-platform.c	2020-01-06 17:29:08.686242186 +0100
-@@ -6,6 +6,7 @@
- #include "nm-default.h"
- 
- #include "nm-linux-platform.h"
-+#include "wpan/nm-wpan-utils.h"
- 
- #include <arpa/inet.h>
- #include <dlfcn.h>
-@@ -14,7 +15,11 @@
- #include <libudev.h>
- #include <linux/fib_rules.h>
- #include <linux/ip.h>
-+#if defined(__GLIBC__)
- #include <linux/if_arp.h>
-+#else
-+#include <linux/if.h>
-+#endif
- #include <linux/if_bridge.h>
- #include <linux/if_link.h>
- #include <linux/if_tun.h>
-@@ -44,7 +49,6 @@
- #include "nm-platform-private.h"
- #include "wifi/nm-wifi-utils.h"
- #include "wifi/nm-wifi-utils-wext.h"
--#include "wpan/nm-wpan-utils.h"
- #include "nm-glib-aux/nm-io-utils.h"
- #include "nm-udev-aux/nm-udev-utils.h"
- 
diff --git a/srcpkgs/NetworkManager/patches/musl-network-support.patch b/srcpkgs/NetworkManager/patches/musl-network-support.patch
deleted file mode 100644
index 0fb63f067b17..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-network-support.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- libnm-core/nm-utils.h.orig
-+++ libnm-core/nm-utils.h
-@@ -30,7 +30,11 @@
- #include <netinet/in.h>
- 
- /* For ETH_ALEN and INFINIBAND_ALEN */
-+#if defined(__GLIBC__)
- #include <linux/if_ether.h>
-+#else
-+#define ETH_ALEN	6		/* Octets in one ethernet addr	 */
-+#endif
- #include <linux/if_infiniband.h>
- 
- #include "nm-core-enum-types.h"
---- src/platform/wifi/nm-wifi-utils.h.orig
-+++ src/platform/wifi/nm-wifi-utils.h
-@@ -22,7 +22,11 @@
- #ifndef __WIFI_UTILS_H__
- #define __WIFI_UTILS_H__
- 
-+#if defined(__GLIBC__)
- #include <net/ethernet.h>
-+#else /* musl libc */
-+#define ETH_ALEN	6		/* Octets in one ethernet addr	 */
-+#endif
- 
- #include "nm-dbus-interface.h"
- 
---- shared/systemd/src/basic/socket-util.h	2019-03-16 15:41:33.287235649 +0100
-+++ shared/systemd/src/basic/socket-util.h	2019-03-16 15:42:24.273912106 +0100
-@@ -12,6 +12,11 @@
- #include <sys/socket.h>
- #include <sys/types.h>
- #include <sys/un.h>
-+#if !defined(__GLIBC__)
-+/* SIOCGSTAMPNS from linux/asm-generic.h 
-+ * for src/systemd/src/libsystemd-network/sd-lldp.c */
-+#include <linux/sockios.h>
-+#endif
- 
- #include "macro.h"
- #include "missing_socket.h"
diff --git a/srcpkgs/NetworkManager/patches/musl-process-util.patch b/srcpkgs/NetworkManager/patches/musl-process-util.patch
deleted file mode 100644
index e406de1da850..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-process-util.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- shared/systemd/src/basic/process-util.c
-+++ shared/systemd/src/basic/process-util.c
-@@ -21,6 +21,9 @@
- #include <sys/wait.h>
- #include <syslog.h>
- #include <unistd.h>
-+#ifndef __GLIBC__
-+#include <pthread.h>
-+#endif
- #if 0 /* NM_IGNORED */
- #if HAVE_VALGRIND_VALGRIND_H
- #include <valgrind/valgrind.h>
-@@ -1168,11 +1171,13 @@ void reset_cached_pid(void) {
-         cached_pid = CACHED_PID_UNSET;
- }
- 
-+#ifdef __GLIBC__
- /* We use glibc __register_atfork() + __dso_handle directly here, as they are not included in the glibc
-  * headers. __register_atfork() is mostly equivalent to pthread_atfork(), but doesn't require us to link against
-  * libpthread, as it is part of glibc anyway. */
- extern int __register_atfork(void (*prepare) (void), void (*parent) (void), void (*child) (void), void *dso_handle);
- extern void* __dso_handle _weak_;
-+#endif
- 
- pid_t getpid_cached(void) {
-         static bool installed = false;
-@@ -1201,7 +1206,12 @@ pid_t getpid_cached(void) {
-                          * only half-documented (glibc doesn't document it but LSB does — though only superficially)
-                          * we'll check for errors only in the most generic fashion possible. */
- 
--                        if (__register_atfork(NULL, NULL, reset_cached_pid, __dso_handle) != 0) {
-+                        #ifdef __GLIBC__
-+                            if (__register_atfork(NULL, NULL, reset_cached_pid, __dso_handle) != 0) {
-+                        #else
-+                            if (pthread_atfork(NULL, NULL, reset_cached_pid) != 0) {
-+                        #endif
-+
-                                 /* OOM? Let's try again later */
-                                 cached_pid = CACHED_PID_UNSET;
-                                 return new_pid;
diff --git a/srcpkgs/NetworkManager/patches/musl-use-srand48.patch b/srcpkgs/NetworkManager/patches/musl-use-srand48.patch
deleted file mode 100644
index 43b689f3bad1..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-use-srand48.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- shared/n-dhcp4/src/n-dhcp4-c-probe.c.orig	2020-01-06 15:35:10.128600647 +0100
-+++ shared/n-dhcp4/src/n-dhcp4-c-probe.c	2020-01-06 15:39:41.446240531 +0100
-@@ -362,7 +362,12 @@ static void n_dhcp4_client_probe_config_
-         seed16v[1] = (u64 >> 16) ^ (u64 >>  0);
-         seed16v[2] = (u64 >> 32) ^ (u64 >> 16);
- 
-+#ifdef __GLIBC__
-         r = seed48_r(seed16v, &config->entropy);
-+#else
-+        r = 0;
-+        seed48(seed16v);
-+#endif
-         c_assert(!r);
- }
- 
-@@ -379,7 +384,12 @@ uint32_t n_dhcp4_client_probe_config_get
-         long int result;
-         int r;
- 
-+#ifdef __GLIBC__
-         r = mrand48_r(&config->entropy, &result);
-+#else
-+        r = 0;
-+        result = mrand48();
-+#endif
-         c_assert(!r);
- 
-         return result;
---- shared/n-dhcp4/src/n-dhcp4-private.h.orig	2020-01-06 15:41:31.941501136 +0100
-+++ shared/n-dhcp4/src/n-dhcp4-private.h	2020-01-06 15:41:55.341556325 +0100
-@@ -267,7 +267,9 @@ struct NDhcp4ClientProbeConfig {
-         bool inform_only;
-         bool init_reboot;
-         struct in_addr requested_ip;
-+#ifdef __GLIBC__
-         struct drand48_data entropy;    /* entropy pool */
-+#endif
-         uint64_t ms_start_delay;        /* max ms to wait before starting probe */
-         NDhcp4ClientProbeOption *options[UINT8_MAX + 1];
-         int8_t request_parameters[UINT8_MAX + 1];
diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template
index d439d8b10286..d2287418e8e6 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -1,9 +1,9 @@
 # Template file for 'NetworkManager'
-# when updating to 1.24 or newer, drop the compat
-# patch in gnome-control-center and rebuild it
+# when updating, drop 'nm122.patch' in gnome-control-center and rebuild it
+# if it builds, revbump it without the patch
 pkgname=NetworkManager
-version=1.22.10
-revision=3
+version=1.30.2
+revision=1
 build_style=meson
 build_helper="gir qemu"
 configure_args="-Dpolkit_agent=true -Dsystemd_journal=false
@@ -35,18 +35,11 @@ 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=2b29ccc1531ba7ebba95a97f40c22b963838e8b6833745efe8e6fb71fd8fca77
+checksum=0c8e80e77877860e4a4e6ab4a0f7cdc1186e356b65b042a751897188b88944d2
 # TODO: Some tests require network namespaces to run.
 make_check=extended
 lib32disabled=yes
 conf_files="/etc/${pkgname}/${pkgname}.conf"
-make_dirs="
- /etc/NetworkManager/system-connections 0755 root root
- /etc/NetworkManager/dispatcher.d/pre-up.d 0750 root root
- /etc/NetworkManager/dispatcher.d/pre-down.d 0750 root root
- /etc/NetworkManager/VPN 0755 root root
- /var/lib/NetworkManager 0755 root root
-"
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)

^ permalink raw reply	[flat|nested] 73+ messages in thread

* Re: [PR REVIEW] NetworkManager: update to 1.30.2
  2021-03-09  3:41 [PR PATCH] NetworkManager: update to 1.31.1 cinerea0
                   ` (13 preceding siblings ...)
  2021-03-19 18:22 ` cinerea0
@ 2021-03-20  1:03 ` ericonr
  2021-03-20  1:05 ` sgn
                   ` (56 subsequent siblings)
  71 siblings, 0 replies; 73+ messages in thread
From: ericonr @ 2021-03-20  1:03 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 164 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/29342#discussion_r598039444

Comment:
Why remove these?

^ permalink raw reply	[flat|nested] 73+ messages in thread

* Re: [PR REVIEW] NetworkManager: update to 1.30.2
  2021-03-09  3:41 [PR PATCH] NetworkManager: update to 1.31.1 cinerea0
                   ` (14 preceding siblings ...)
  2021-03-20  1:03 ` [PR REVIEW] " ericonr
@ 2021-03-20  1:05 ` sgn
  2021-03-20  1:26 ` cinerea0
                   ` (55 subsequent siblings)
  71 siblings, 0 replies; 73+ messages in thread
From: sgn @ 2021-03-20  1:05 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 165 bytes --]

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/29342#discussion_r598039833

Comment:
Do we need to do this?

^ permalink raw reply	[flat|nested] 73+ messages in thread

* Re: [PR REVIEW] NetworkManager: update to 1.30.2
  2021-03-09  3:41 [PR PATCH] NetworkManager: update to 1.31.1 cinerea0
                   ` (15 preceding siblings ...)
  2021-03-20  1:05 ` sgn
@ 2021-03-20  1:26 ` cinerea0
  2021-03-20  1:31 ` sgn
                   ` (54 subsequent siblings)
  71 siblings, 0 replies; 73+ messages in thread
From: cinerea0 @ 2021-03-20  1:26 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 287 bytes --]

New review comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/29342#discussion_r598042512

Comment:
The build output states that those directories get removed during the process of creating the package, so I thought they weren't necessary.

^ permalink raw reply	[flat|nested] 73+ messages in thread

* Re: [PR REVIEW] NetworkManager: update to 1.30.2
  2021-03-09  3:41 [PR PATCH] NetworkManager: update to 1.31.1 cinerea0
                   ` (16 preceding siblings ...)
  2021-03-20  1:26 ` cinerea0
@ 2021-03-20  1:31 ` sgn
  2021-03-20  1:35 ` cinerea0
                   ` (53 subsequent siblings)
  71 siblings, 0 replies; 73+ messages in thread
From: sgn @ 2021-03-20  1:31 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 227 bytes --]

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/29342#discussion_r598043127

Comment:
They're removed because they're empty. We need to create them again at installation.

^ permalink raw reply	[flat|nested] 73+ messages in thread

* Re: [PR REVIEW] NetworkManager: update to 1.30.2
  2021-03-09  3:41 [PR PATCH] NetworkManager: update to 1.31.1 cinerea0
                   ` (17 preceding siblings ...)
  2021-03-20  1:31 ` sgn
@ 2021-03-20  1:35 ` cinerea0
  2021-03-20  1:37 ` cinerea0
                   ` (52 subsequent siblings)
  71 siblings, 0 replies; 73+ messages in thread
From: cinerea0 @ 2021-03-20  1:35 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 362 bytes --]

New review comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/29342#discussion_r598043511

Comment:
I'm not entirely sure, I think that message is @Gottox's doing. Personally I'd be fine with dropping that message because if we still need the patch after 8 minor versions we'll probably need it for a while longer.

^ permalink raw reply	[flat|nested] 73+ messages in thread

* Re: [PR REVIEW] NetworkManager: update to 1.30.2
  2021-03-09  3:41 [PR PATCH] NetworkManager: update to 1.31.1 cinerea0
                   ` (18 preceding siblings ...)
  2021-03-20  1:35 ` cinerea0
@ 2021-03-20  1:37 ` cinerea0
  2021-03-20  2:02 ` sgn
                   ` (51 subsequent siblings)
  71 siblings, 0 replies; 73+ messages in thread
From: cinerea0 @ 2021-03-20  1:37 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 305 bytes --]

New review comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/29342#discussion_r598043795

Comment:
I was under the impression that `make_dirs` only created directories within the package, not at installation time? Or did I confuse that with another option?

^ permalink raw reply	[flat|nested] 73+ messages in thread

* Re: [PR REVIEW] NetworkManager: update to 1.30.2
  2021-03-09  3:41 [PR PATCH] NetworkManager: update to 1.31.1 cinerea0
                   ` (19 preceding siblings ...)
  2021-03-20  1:37 ` cinerea0
@ 2021-03-20  2:02 ` sgn
  2021-03-20  2:26 ` cinerea0
                   ` (50 subsequent siblings)
  71 siblings, 0 replies; 73+ messages in thread
From: sgn @ 2021-03-20  2:02 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 323 bytes --]

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/29342#discussion_r598046537

Comment:
This patch is needed when `-Ddocs=true`, either remove it or enable documentation.
I think it's better to have docs on.
Note that `-Ddocs=true` depends on `-Dintrospection=true`.

^ permalink raw reply	[flat|nested] 73+ messages in thread

* Re: [PR REVIEW] NetworkManager: update to 1.30.2
  2021-03-09  3:41 [PR PATCH] NetworkManager: update to 1.31.1 cinerea0
                   ` (20 preceding siblings ...)
  2021-03-20  2:02 ` sgn
@ 2021-03-20  2:26 ` cinerea0
  2021-03-20  2:42 ` sgn
                   ` (49 subsequent siblings)
  71 siblings, 0 replies; 73+ messages in thread
From: cinerea0 @ 2021-03-20  2:26 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 219 bytes --]

New review comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/29342#discussion_r598048941

Comment:
Just checked the manual, you were right, I'll fix this in my next push.

^ permalink raw reply	[flat|nested] 73+ messages in thread

* Re: NetworkManager: update to 1.30.2
  2021-03-09  3:41 [PR PATCH] NetworkManager: update to 1.31.1 cinerea0
                   ` (21 preceding siblings ...)
  2021-03-20  2:26 ` cinerea0
@ 2021-03-20  2:42 ` sgn
  2021-03-20  5:13 ` [PR REVIEW] " cinerea0
                   ` (48 subsequent siblings)
  71 siblings, 0 replies; 73+ messages in thread
From: sgn @ 2021-03-20  2:42 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 6666 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/29342#issuecomment-803230986

Comment:
```diff
 srcpkgs/NetworkManager/patches/fix-cross-gir.patch | 30 ++++++++++++----------
 srcpkgs/NetworkManager/patches/no-gtk-doc.patch    | 28 ++++++++++++++++++++
 srcpkgs/NetworkManager/template                    | 23 ++++++++---------
 3 files changed, 55 insertions(+), 26 deletions(-)

diff --git a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
index c0b4344b1c..b78edfac24 100644
--- a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
+++ b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
@@ -1,29 +1,31 @@
 Reason: Fix crossbuilding GIR
 Upstream: No, not upstreamable since this is very specific to the Void setup
---- libnm/meson.build.orig	2020-12-28 16:03:30.641850261 +0100
-+++ libnm/meson.build	2020-12-28 16:31:54.932136481 +0100
-@@ -276,6 +276,14 @@
-     'GI_TYPELIB_PATH=' + gi_typelib_path,
+Index: b/libnm/meson.build
+===================================================================
+--- a/libnm/meson.build
++++ b/libnm/meson.build
+@@ -274,13 +274,23 @@ if enable_introspection
      'LD_LIBRARY_PATH=' + ld_library_path,
    ]
-+  
+ 
 +  if meson.is_cross_build()
-+    qemu = '/usr/bin/qemu-@XBPS_TARGET_QEMU_MACHINE@-static'
-+    qemu_python3_cmd = qemu + ' -L @XBPS_CROSS_BASE@ @XBPS_CROSS_BASE@/bin/python3'
-+    generate_setting_docs = ['sh', '-c', qemu_python3_cmd, join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-gir.py')]
++    qemu_python3_cmd = [
++      '/usr/bin/qemu-@XBPS_TARGET_QEMU_MACHINE@-static',
++      '-L', '@XBPS_CROSS_BASE@',
++      '@XBPS_CROSS_BASE@/usr/bin/python3'
++      ]
 +  else
-+    generate_setting_docs = [python.path(), join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-gir.py')]
++    qemu_python3_cmd = python.path()
 +  endif
- 
++
    nm_settings_docs_xml_gir = custom_target(
      'nm-settings-docs-gir.xml',
-@@ -283,8 +291,7 @@
+     input: libnm_gir[0],
      output: 'nm-settings-docs-gir.xml',
      command: [
        generate_setting_docs_env,
 -      python.path(),
--      join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-gir.py'),
-+      generate_setting_docs,
++      qemu_python3_cmd,
+       join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-gir.py'),
        '--lib-path', meson.current_build_dir(),
        '--gir', '@INPUT@',
-       '--output', '@OUTPUT@'
diff --git a/srcpkgs/NetworkManager/patches/no-gtk-doc.patch b/srcpkgs/NetworkManager/patches/no-gtk-doc.patch
new file mode 100644
index 0000000000..2fffc51604
--- /dev/null
+++ b/srcpkgs/NetworkManager/patches/no-gtk-doc.patch
@@ -0,0 +1,28 @@
+Index: b/meson.build
+===================================================================
+--- a/meson.build
++++ b/meson.build
+@@ -943,10 +943,8 @@ if enable_qt
+ endif
+ 
+ if enable_docs
+-  assert(enable_introspection, '-Ddocs=true requires -Dintrospection=true')
+   assert(meson.version().version_compare('>= 0.46.0'), '-Ddocs requires meson >= 0.46')
+   subdir('man')
+-  subdir('docs')
+ endif
+ 
+ configure_file(
+Index: b/clients/common/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,
+ )
+ 
+-if enable_docs
++if enable_docs and enable_introspection
+   settings_docs_source = custom_target(
+     'settings-docs.h',
+     input: nm_settings_docs_xml_gir,
diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template
index d2287418e8..54288f71f9 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -7,28 +7,28 @@ revision=1
 build_style=meson
 build_helper="gir qemu"
 configure_args="-Dpolkit_agent=true -Dsystemd_journal=false
- -Dlibaudit=no -Dovs=false -Dlibnm_glib=true -Dselinux=false
- -Dmodify_system=true -Dpolkit_agent=true -Dsystemdsystemunitdir=no
+ -Dlibaudit=no -Dovs=false -Dselinux=false
+ -Dmodify_system=true -Dsystemdsystemunitdir=no
  -Dpppd=/usr/bin/pppd -Dqt=false
  -Dsession_tracking_consolekit=false
  -Dpppd_plugin_dir=/usr/lib/pppd/2.4.9 -Dresolvconf=/usr/bin/resolvconf
  -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
- -Diwd=true
- -Dudev_dir=/usr/lib/udev -Dintrospection=$(vopt_if gir true false)
- -Dvapi=$(vopt_if vala true false)
+ -Diwd=true -Dudev_dir=/usr/lib/udev -Ddocs=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"
 hostmakedepends="gettext-devel glib-devel libxslt-devel pkg-config
- intltool dbus-glib-devel jansson-devel $(vopt_if vala vala)
- $(vopt_if gir 'python3-gobject')"
+ intltool dbus-glib-devel jansson-devel docbook-xsl
+ $(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
  ModemManager-devel readline-devel libndp-devel newt-devel jansson-devel
  libpsl-devel eudev-libudev-devel mobile-broadband-provider-info
- $(vopt_if gir libgirepository-devel) $(vopt_if elogind elogind-devel)"
+ $(vopt_if gir 'libgirepository-devel python3-gobject')
+ $(vopt_if elogind elogind-devel)"
 depends="dbus iproute2 openresolv wpa_supplicant mobile-broadband-provider-info"
 short_desc="Network Management daemon"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -40,6 +40,7 @@ checksum=0c8e80e77877860e4a4e6ab4a0f7cdc1186e356b65b042a751897188b88944d2
 make_check=extended
 lib32disabled=yes
 conf_files="/etc/${pkgname}/${pkgname}.conf"
+patch_args=-Np1
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)
@@ -50,8 +51,8 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 # Package build options
-build_options="gir vala elogind"
-build_options_default="gir vala elogind"
+build_options="gir elogind"
+build_options_default="gir elogind"
 
 pre_configure() {
 	if [ "$CROSS_BUILD" ]; then
@@ -88,8 +89,6 @@ NetworkManager-devel_package() {
 		vmove "usr/lib/*.so"
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
-		fi
-		if [ "$build_option_vala" ]; then
 			vmove usr/share/vala
 		fi
 	}
```

^ permalink raw reply	[flat|nested] 73+ messages in thread

* Re: [PR REVIEW] NetworkManager: update to 1.30.2
  2021-03-09  3:41 [PR PATCH] NetworkManager: update to 1.31.1 cinerea0
                   ` (22 preceding siblings ...)
  2021-03-20  2:42 ` sgn
@ 2021-03-20  5:13 ` cinerea0
  2021-03-20  5:34 ` sgn
                   ` (47 subsequent siblings)
  71 siblings, 0 replies; 73+ messages in thread
From: cinerea0 @ 2021-03-20  5:13 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 257 bytes --]

New review comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/29342#discussion_r598064799

Comment:
Does `$(vopt_bool gir introspection)` in your patch below function the same as adding `-Dintrospection=true`?

^ permalink raw reply	[flat|nested] 73+ messages in thread

* Re: [PR REVIEW] NetworkManager: update to 1.30.2
  2021-03-09  3:41 [PR PATCH] NetworkManager: update to 1.31.1 cinerea0
                   ` (23 preceding siblings ...)
  2021-03-20  5:13 ` [PR REVIEW] " cinerea0
@ 2021-03-20  5:34 ` sgn
  2021-03-20  6:26 ` Gottox
                   ` (46 subsequent siblings)
  71 siblings, 0 replies; 73+ messages in thread
From: sgn @ 2021-03-20  5:34 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 175 bytes --]

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/29342#discussion_r598066831

Comment:
Yes, when `build_option_gir` on.

^ permalink raw reply	[flat|nested] 73+ messages in thread

* Re: [PR REVIEW] NetworkManager: update to 1.30.2
  2021-03-09  3:41 [PR PATCH] NetworkManager: update to 1.31.1 cinerea0
                   ` (24 preceding siblings ...)
  2021-03-20  5:34 ` sgn
@ 2021-03-20  6:26 ` Gottox
  2021-03-20 16:56 ` [PR PATCH] [Updated] " cinerea0
                   ` (45 subsequent siblings)
  71 siblings, 0 replies; 73+ messages in thread
From: Gottox @ 2021-03-20  6:26 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 181 bytes --]

New review comment by Gottox on void-packages repository

https://github.com/void-linux/void-packages/pull/29342#discussion_r598071279

Comment:
According to `git blame` it's @q66.

^ permalink raw reply	[flat|nested] 73+ messages in thread

* Re: [PR PATCH] [Updated] NetworkManager: update to 1.30.2
  2021-03-09  3:41 [PR PATCH] NetworkManager: update to 1.31.1 cinerea0
                   ` (25 preceding siblings ...)
  2021-03-20  6:26 ` Gottox
@ 2021-03-20 16:56 ` cinerea0
  2021-03-20 17:47 ` cinerea0
                   ` (44 subsequent siblings)
  71 siblings, 0 replies; 73+ messages in thread
From: cinerea0 @ 2021-03-20 16:56 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1611 bytes --]

There is an updated pull request by cinerea0 against master on the void-packages repository

https://github.com/cinerea0/void-packages nm
https://github.com/void-linux/void-packages/pull/29342

NetworkManager: update to 1.30.2
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->

Closes #27502

A patch file from https://github.com/void-linux/void-packages/pull/29342.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nm-29342.patch --]
[-- Type: text/x-diff, Size: 19571 bytes --]

From 025f7f45c5faf31b24aab3f810a1ca44b295bd5b Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Sat, 20 Mar 2021 12:55:34 -0400
Subject: [PATCH] NetworkManager: update to 1.30.2

---
 .../patches/fix-cross-gir.patch               | 69 +++++++------------
 .../patches/fix-musl-linux-header.diff        | 15 ----
 .../patches/fix-musl-qsort_r.patch            | 16 -----
 .../NetworkManager/patches/musl-basic.patch   | 29 --------
 .../patches/musl-fix-includes.patch           | 54 ---------------
 .../patches/musl-network-support.patch        | 42 -----------
 .../patches/musl-process-util.patch           | 40 -----------
 .../patches/musl-use-srand48.patch            | 40 -----------
 .../NetworkManager/patches/no-gtk-doc.patch   | 28 ++++++++
 srcpkgs/NetworkManager/template               | 33 +++++----
 10 files changed, 68 insertions(+), 298 deletions(-)
 delete mode 100644 srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff
 delete mode 100644 srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-basic.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-fix-includes.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-network-support.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-process-util.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-use-srand48.patch
 create mode 100644 srcpkgs/NetworkManager/patches/no-gtk-doc.patch

diff --git a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
index c283d4dc1059..b78edfac2446 100644
--- a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
+++ b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
@@ -1,52 +1,31 @@
 Reason: Fix crossbuilding GIR
 Upstream: No, not upstreamable since this is very specific to the Void setup
-diff --git clients/common/meson.build clients/common/meson.build
-index afa257b..50b53e7 100644
---- clients/common/meson.build
-+++ clients/common/meson.build
-@@ -35,7 +35,7 @@ if enable_introspection
-     settings_docs,
-     input: nm_property_docs,
-     output: settings_docs,
--    command: [xsltproc, '--output', '@OUTPUT@', join_paths(meson.current_source_dir(), 'settings-docs.xsl'), '@INPUT@'],
-+    command: [xsltproc, '--output', '@OUTPUT@', join_paths(meson.current_source_dir(), 'settings-docs.xsl'), join_paths(meson.current_source_dir(), '..', '..', '@INPUT@')],
-   )
+Index: b/libnm/meson.build
+===================================================================
+--- a/libnm/meson.build
++++ b/libnm/meson.build
+@@ -274,13 +274,23 @@ if enable_introspection
+     'LD_LIBRARY_PATH=' + ld_library_path,
+   ]
  
-   test(
-diff --git libnm/meson.build libnm/meson.build
-index 51ca46d..f14d861 100644
---- libnm/meson.build
-+++ libnm/meson.build
-@@ -236,7 +236,13 @@ if enable_introspection
-     )
-   endif
- 
--  generate_setting_docs = join_paths(meson.current_source_dir(), 'generate-setting-docs.py')
 +  if meson.is_cross_build()
-+    qemu = '/usr/bin/qemu-@XBPS_TARGET_QEMU_MACHINE@-static'
-+    qemu_python3_cmd = qemu + ' -L @XBPS_CROSS_BASE@ @XBPS_CROSS_BASE@/usr/bin/python3'
-+    generate_setting_docs = ['sh', '-c', qemu_python3_cmd, join_paths(meson.current_source_dir(), 'generate-setting-docs.py')]
++    qemu_python3_cmd = [
++      '/usr/bin/qemu-@XBPS_TARGET_QEMU_MACHINE@-static',
++      '-L', '@XBPS_CROSS_BASE@',
++      '@XBPS_CROSS_BASE@/usr/bin/python3'
++      ]
 +  else
-+    generate_setting_docs = [python.path(), join_paths(meson.current_source_dir(), 'generate-setting-docs.py')]
++    qemu_python3_cmd = python.path()
 +  endif
- 
-   gi_typelib_path = run_command('printenv', 'GI_TYPELIB_PATH').stdout()
-   if gi_typelib_path != ''
-@@ -261,7 +267,7 @@ if enable_introspection
-     name,
++
+   nm_settings_docs_xml_gir = custom_target(
+     'nm-settings-docs-gir.xml',
      input: libnm_gir[0],
-     output: name,
--    command: [generate_setting_docs_env, python.path(), generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--output', '@OUTPUT@'],
-+    command: [generate_setting_docs_env, generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--output', '@OUTPUT@'],
-     depends: libnm_gir,
-   )
- 
-@@ -270,7 +276,7 @@ if enable_introspection
-     name,
-     input: [libnm_gir[0], nm_settings_docs_overrides],
-     output: name,
--    command: [generate_setting_docs_env, python.path(), generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT0@', '--overrides', '@INPUT1@', '--output', '@OUTPUT@'],
-+    command: [generate_setting_docs_env, generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT0@', '--overrides', '@INPUT1@', '--output', '@OUTPUT@'],
-     depends: libnm_gir,
-   )
- endif
+     output: 'nm-settings-docs-gir.xml',
+     command: [
+       generate_setting_docs_env,
+-      python.path(),
++      qemu_python3_cmd,
+       join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-gir.py'),
+       '--lib-path', meson.current_build_dir(),
+       '--gir', '@INPUT@',
diff --git a/srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff b/srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff
deleted file mode 100644
index 511759214a97..000000000000
--- a/srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git src/systemd/src/libsystemd-network/sd-dhcp6-client.c src/systemd/src/libsystemd-network/sd-dhcp6-client.c
-index f67a45bd2..ec11fa605 100644
---- src/systemd/src/libsystemd-network/sd-dhcp6-client.c
-+++ src/systemd/src/libsystemd-network/sd-dhcp6-client.c
-@@ -8,8 +8,10 @@
- #include <errno.h>
- #include <string.h>
- #include <sys/ioctl.h>
-+#ifdef __GLIBC__
- #include <linux/if_arp.h>
- #include <linux/if_infiniband.h>
-+#endif
- 
- #include "sd-dhcp6-client.h"
- 
diff --git a/srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch b/srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch
deleted file mode 100644
index f89eac778502..000000000000
--- a/srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git shared/systemd/src/basic/sort-util.h shared/systemd/src/basic/sort-util.h
-index e029f8646..168735087 100644
---- shared/systemd/src/basic/sort-util.h
-+++ shared/systemd/src/basic/sort-util.h
-@@ -60,7 +60,11 @@ static inline void qsort_r_safe(void *base, size_t nmemb, size_t size, __compar_
-                 return;
- 
-         assert(base);
-+#ifdef __GLIBC__
-         qsort_r(base, nmemb, size, compar, userdata);
-+#else
-+        g_qsort_with_data(base, nmemb, size, compar, userdata);
-+#endif
- }
- 
- #define typesafe_qsort_r(p, n, func, userdata)                          \
diff --git a/srcpkgs/NetworkManager/patches/musl-basic.patch b/srcpkgs/NetworkManager/patches/musl-basic.patch
deleted file mode 100644
index 63ea93ada585..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-basic.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Usual fix for musl libc
---- shared/systemd/src/basic/stdio-util.h.orig
-+++ shared/systemd/src/basic/stdio-util.h
-@@ -19,7 +19,9 @@
-   along with systemd; If not, see <http://www.gnu.org/licenses/>.
- ***/
- 
-+#if defined(__GLIBC__)
- #include <printf.h>
-+#endif
- #include <stdarg.h>
- #include <stdio.h>
- #include <sys/types.h>
- 
---- shared/systemd/src/basic/sort-util.h	2019-06-09 17:02:48.895695896 +0200
-+++ shared/systemd/src/basic/sort-util.h	2019-06-09 17:03:27.564199937 +0200
-@@ -5,6 +5,12 @@
- 
- #include "macro.h"
- 
-+#if !defined(__GLIBC__)
-+typedef int (*__compar_fn_t) (const void*, const void*);
-+typedef __compar_fn_t comparison_fn_t;
-+typedef int (*__compar_d_fn_t) (const void *, const void *, void *);
-+#endif
-+
- void *xbsearch_r(const void *key, const void *base, size_t nmemb, size_t size,
-                  __compar_d_fn_t compar, void *arg);
- 
diff --git a/srcpkgs/NetworkManager/patches/musl-fix-includes.patch b/srcpkgs/NetworkManager/patches/musl-fix-includes.patch
deleted file mode 100644
index 95ffb2d354ea..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-fix-includes.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- src/devices/nm-device.c.orig	2019-12-17 08:59:49.000000000 +0100
-+++ src/devices/nm-device.c	2020-01-06 17:29:08.678242168 +0100
-@@ -17,7 +17,11 @@
- #include <arpa/inet.h>
- #include <fcntl.h>
- #include <linux/if_addr.h>
-+#if defined(__GLIBC__)
- #include <linux/if_arp.h>
-+#else
-+#include <linux/if.h>
-+#endif
- #include <linux/rtnetlink.h>
- #include <linux/pkt_sched.h>
- 
---- src/nm-manager.c.orig	2020-01-06 17:29:08.682242177 +0100
-+++ src/nm-manager.c	2020-01-06 17:30:50.378482034 +0100
-@@ -15,6 +15,7 @@
- #include <sys/stat.h>
- #include <sys/sendfile.h>
- #include <limits.h>
-+#include <asm/types.h>
- 
- #include "nm-glib-aux/nm-c-list.h"
- 
---- src/platform/nm-linux-platform.c.orig	2019-12-17 08:59:49.000000000 +0100
-+++ src/platform/nm-linux-platform.c	2020-01-06 17:29:08.686242186 +0100
-@@ -6,6 +6,7 @@
- #include "nm-default.h"
- 
- #include "nm-linux-platform.h"
-+#include "wpan/nm-wpan-utils.h"
- 
- #include <arpa/inet.h>
- #include <dlfcn.h>
-@@ -14,7 +15,11 @@
- #include <libudev.h>
- #include <linux/fib_rules.h>
- #include <linux/ip.h>
-+#if defined(__GLIBC__)
- #include <linux/if_arp.h>
-+#else
-+#include <linux/if.h>
-+#endif
- #include <linux/if_bridge.h>
- #include <linux/if_link.h>
- #include <linux/if_tun.h>
-@@ -44,7 +49,6 @@
- #include "nm-platform-private.h"
- #include "wifi/nm-wifi-utils.h"
- #include "wifi/nm-wifi-utils-wext.h"
--#include "wpan/nm-wpan-utils.h"
- #include "nm-glib-aux/nm-io-utils.h"
- #include "nm-udev-aux/nm-udev-utils.h"
- 
diff --git a/srcpkgs/NetworkManager/patches/musl-network-support.patch b/srcpkgs/NetworkManager/patches/musl-network-support.patch
deleted file mode 100644
index 0fb63f067b17..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-network-support.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- libnm-core/nm-utils.h.orig
-+++ libnm-core/nm-utils.h
-@@ -30,7 +30,11 @@
- #include <netinet/in.h>
- 
- /* For ETH_ALEN and INFINIBAND_ALEN */
-+#if defined(__GLIBC__)
- #include <linux/if_ether.h>
-+#else
-+#define ETH_ALEN	6		/* Octets in one ethernet addr	 */
-+#endif
- #include <linux/if_infiniband.h>
- 
- #include "nm-core-enum-types.h"
---- src/platform/wifi/nm-wifi-utils.h.orig
-+++ src/platform/wifi/nm-wifi-utils.h
-@@ -22,7 +22,11 @@
- #ifndef __WIFI_UTILS_H__
- #define __WIFI_UTILS_H__
- 
-+#if defined(__GLIBC__)
- #include <net/ethernet.h>
-+#else /* musl libc */
-+#define ETH_ALEN	6		/* Octets in one ethernet addr	 */
-+#endif
- 
- #include "nm-dbus-interface.h"
- 
---- shared/systemd/src/basic/socket-util.h	2019-03-16 15:41:33.287235649 +0100
-+++ shared/systemd/src/basic/socket-util.h	2019-03-16 15:42:24.273912106 +0100
-@@ -12,6 +12,11 @@
- #include <sys/socket.h>
- #include <sys/types.h>
- #include <sys/un.h>
-+#if !defined(__GLIBC__)
-+/* SIOCGSTAMPNS from linux/asm-generic.h 
-+ * for src/systemd/src/libsystemd-network/sd-lldp.c */
-+#include <linux/sockios.h>
-+#endif
- 
- #include "macro.h"
- #include "missing_socket.h"
diff --git a/srcpkgs/NetworkManager/patches/musl-process-util.patch b/srcpkgs/NetworkManager/patches/musl-process-util.patch
deleted file mode 100644
index e406de1da850..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-process-util.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- shared/systemd/src/basic/process-util.c
-+++ shared/systemd/src/basic/process-util.c
-@@ -21,6 +21,9 @@
- #include <sys/wait.h>
- #include <syslog.h>
- #include <unistd.h>
-+#ifndef __GLIBC__
-+#include <pthread.h>
-+#endif
- #if 0 /* NM_IGNORED */
- #if HAVE_VALGRIND_VALGRIND_H
- #include <valgrind/valgrind.h>
-@@ -1168,11 +1171,13 @@ void reset_cached_pid(void) {
-         cached_pid = CACHED_PID_UNSET;
- }
- 
-+#ifdef __GLIBC__
- /* We use glibc __register_atfork() + __dso_handle directly here, as they are not included in the glibc
-  * headers. __register_atfork() is mostly equivalent to pthread_atfork(), but doesn't require us to link against
-  * libpthread, as it is part of glibc anyway. */
- extern int __register_atfork(void (*prepare) (void), void (*parent) (void), void (*child) (void), void *dso_handle);
- extern void* __dso_handle _weak_;
-+#endif
- 
- pid_t getpid_cached(void) {
-         static bool installed = false;
-@@ -1201,7 +1206,12 @@ pid_t getpid_cached(void) {
-                          * only half-documented (glibc doesn't document it but LSB does — though only superficially)
-                          * we'll check for errors only in the most generic fashion possible. */
- 
--                        if (__register_atfork(NULL, NULL, reset_cached_pid, __dso_handle) != 0) {
-+                        #ifdef __GLIBC__
-+                            if (__register_atfork(NULL, NULL, reset_cached_pid, __dso_handle) != 0) {
-+                        #else
-+                            if (pthread_atfork(NULL, NULL, reset_cached_pid) != 0) {
-+                        #endif
-+
-                                 /* OOM? Let's try again later */
-                                 cached_pid = CACHED_PID_UNSET;
-                                 return new_pid;
diff --git a/srcpkgs/NetworkManager/patches/musl-use-srand48.patch b/srcpkgs/NetworkManager/patches/musl-use-srand48.patch
deleted file mode 100644
index 43b689f3bad1..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-use-srand48.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- shared/n-dhcp4/src/n-dhcp4-c-probe.c.orig	2020-01-06 15:35:10.128600647 +0100
-+++ shared/n-dhcp4/src/n-dhcp4-c-probe.c	2020-01-06 15:39:41.446240531 +0100
-@@ -362,7 +362,12 @@ static void n_dhcp4_client_probe_config_
-         seed16v[1] = (u64 >> 16) ^ (u64 >>  0);
-         seed16v[2] = (u64 >> 32) ^ (u64 >> 16);
- 
-+#ifdef __GLIBC__
-         r = seed48_r(seed16v, &config->entropy);
-+#else
-+        r = 0;
-+        seed48(seed16v);
-+#endif
-         c_assert(!r);
- }
- 
-@@ -379,7 +384,12 @@ uint32_t n_dhcp4_client_probe_config_get
-         long int result;
-         int r;
- 
-+#ifdef __GLIBC__
-         r = mrand48_r(&config->entropy, &result);
-+#else
-+        r = 0;
-+        result = mrand48();
-+#endif
-         c_assert(!r);
- 
-         return result;
---- shared/n-dhcp4/src/n-dhcp4-private.h.orig	2020-01-06 15:41:31.941501136 +0100
-+++ shared/n-dhcp4/src/n-dhcp4-private.h	2020-01-06 15:41:55.341556325 +0100
-@@ -267,7 +267,9 @@ struct NDhcp4ClientProbeConfig {
-         bool inform_only;
-         bool init_reboot;
-         struct in_addr requested_ip;
-+#ifdef __GLIBC__
-         struct drand48_data entropy;    /* entropy pool */
-+#endif
-         uint64_t ms_start_delay;        /* max ms to wait before starting probe */
-         NDhcp4ClientProbeOption *options[UINT8_MAX + 1];
-         int8_t request_parameters[UINT8_MAX + 1];
diff --git a/srcpkgs/NetworkManager/patches/no-gtk-doc.patch b/srcpkgs/NetworkManager/patches/no-gtk-doc.patch
new file mode 100644
index 000000000000..2fffc5160445
--- /dev/null
+++ b/srcpkgs/NetworkManager/patches/no-gtk-doc.patch
@@ -0,0 +1,28 @@
+Index: b/meson.build
+===================================================================
+--- a/meson.build
++++ b/meson.build
+@@ -943,10 +943,8 @@ if enable_qt
+ endif
+ 
+ if enable_docs
+-  assert(enable_introspection, '-Ddocs=true requires -Dintrospection=true')
+   assert(meson.version().version_compare('>= 0.46.0'), '-Ddocs requires meson >= 0.46')
+   subdir('man')
+-  subdir('docs')
+ endif
+ 
+ configure_file(
+Index: b/clients/common/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,
+ )
+ 
+-if enable_docs
++if enable_docs and enable_introspection
+   settings_docs_source = custom_target(
+     'settings-docs.h',
+     input: nm_settings_docs_xml_gir,
diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template
index d439d8b10286..39278f0c59a0 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -1,41 +1,41 @@
 # Template file for 'NetworkManager'
-# when updating to 1.24 or newer, drop the compat
-# patch in gnome-control-center and rebuild it
+# when updating, drop 'nm122.patch' in gnome-control-center and rebuild it
+# if it builds, revbump it without the patch
 pkgname=NetworkManager
-version=1.22.10
-revision=3
+version=1.30.2
+revision=1
 build_style=meson
 build_helper="gir qemu"
 configure_args="-Dpolkit_agent=true -Dsystemd_journal=false
- -Dlibaudit=no -Dovs=false -Dlibnm_glib=true -Dselinux=false
- -Dmodify_system=true -Dpolkit_agent=true -Dsystemdsystemunitdir=no
+ -Dlibaudit=no -Dovs=false -Dselinux=false
+ -Dmodify_system=true -Dsystemdsystemunitdir=no
  -Dpppd=/usr/bin/pppd -Dqt=false
  -Dsession_tracking_consolekit=false
  -Dpppd_plugin_dir=/usr/lib/pppd/2.4.9 -Dresolvconf=/usr/bin/resolvconf
  -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
- -Diwd=true
- -Dudev_dir=/usr/lib/udev -Dintrospection=$(vopt_if gir true false)
- -Dvapi=$(vopt_if vala true false)
+ -Diwd=true -Dudev_dir=/usr/lib/udev -Ddocs=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"
 hostmakedepends="gettext-devel glib-devel libxslt-devel pkg-config
- intltool dbus-glib-devel jansson-devel $(vopt_if vala vala)
- $(vopt_if gir 'python3-gobject')"
+ intltool dbus-glib-devel jansson-devel docbook-xsl
+ $(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
  ModemManager-devel readline-devel libndp-devel newt-devel jansson-devel
  libpsl-devel eudev-libudev-devel mobile-broadband-provider-info
- $(vopt_if gir libgirepository-devel) $(vopt_if elogind elogind-devel)"
+ $(vopt_if gir 'libgirepository-devel python3-gobject')
+ $(vopt_if elogind elogind-devel)"
 depends="dbus iproute2 openresolv wpa_supplicant mobile-broadband-provider-info"
 short_desc="Network Management daemon"
 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=2b29ccc1531ba7ebba95a97f40c22b963838e8b6833745efe8e6fb71fd8fca77
+checksum=0c8e80e77877860e4a4e6ab4a0f7cdc1186e356b65b042a751897188b88944d2
 # TODO: Some tests require network namespaces to run.
 make_check=extended
 lib32disabled=yes
@@ -47,6 +47,7 @@ make_dirs="
  /etc/NetworkManager/VPN 0755 root root
  /var/lib/NetworkManager 0755 root root
 "
+patch_args=-Np1
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)
@@ -57,8 +58,8 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 # Package build options
-build_options="gir vala elogind"
-build_options_default="gir vala elogind"
+build_options="gir elogind"
+build_options_default="gir elogind"
 
 pre_configure() {
 	if [ "$CROSS_BUILD" ]; then
@@ -95,8 +96,6 @@ NetworkManager-devel_package() {
 		vmove "usr/lib/*.so"
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
-		fi
-		if [ "$build_option_vala" ]; then
 			vmove usr/share/vala
 		fi
 	}

^ permalink raw reply	[flat|nested] 73+ messages in thread

* Re: NetworkManager: update to 1.30.2
  2021-03-09  3:41 [PR PATCH] NetworkManager: update to 1.31.1 cinerea0
                   ` (26 preceding siblings ...)
  2021-03-20 16:56 ` [PR PATCH] [Updated] " cinerea0
@ 2021-03-20 17:47 ` cinerea0
  2021-03-21  3:48 ` [PR REVIEW] " q66
                   ` (43 subsequent siblings)
  71 siblings, 0 replies; 73+ messages in thread
From: cinerea0 @ 2021-03-20 17:47 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 293 bytes --]

New comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/29342#issuecomment-803433492

Comment:
Alright, since the changes from @sgn build properly, I think the only thing left to resolve is whether or not the message at the top needs to be there.

^ permalink raw reply	[flat|nested] 73+ messages in thread

* Re: [PR REVIEW] NetworkManager: update to 1.30.2
  2021-03-09  3:41 [PR PATCH] NetworkManager: update to 1.31.1 cinerea0
                   ` (27 preceding siblings ...)
  2021-03-20 17:47 ` cinerea0
@ 2021-03-21  3:48 ` q66
  2021-03-21  4:01 ` cinerea0
                   ` (42 subsequent siblings)
  71 siblings, 0 replies; 73+ messages in thread
From: q66 @ 2021-03-21  3:48 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 350 bytes --]

New review comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/29342#discussion_r598215796

Comment:
?

the comment should be pretty clear, you're updating to networkmanager newer than 1.24, so you will need to remove the comment, remove the patch in gnome-control-center, and rebuild gnome-control-center.

^ permalink raw reply	[flat|nested] 73+ messages in thread

* Re: [PR REVIEW] NetworkManager: update to 1.30.2
  2021-03-09  3:41 [PR PATCH] NetworkManager: update to 1.31.1 cinerea0
                   ` (28 preceding siblings ...)
  2021-03-21  3:48 ` [PR REVIEW] " q66
@ 2021-03-21  4:01 ` cinerea0
  2021-03-21 20:29 ` q66
                   ` (41 subsequent siblings)
  71 siblings, 0 replies; 73+ messages in thread
From: cinerea0 @ 2021-03-21  4:01 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 400 bytes --]

New review comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/29342#discussion_r598216830

Comment:
I attempted to rebuild gnome-control-center without the patch earlier and it failed. According to discussion above the relevant error was:

> /usr/bin/ld: /tmp/test-wifi-panel-text.ojS9Hb.ltrans0.ltrans.o: in function `nm_client_on_permission_change'

^ permalink raw reply	[flat|nested] 73+ messages in thread

* Re: [PR REVIEW] NetworkManager: update to 1.30.2
  2021-03-09  3:41 [PR PATCH] NetworkManager: update to 1.31.1 cinerea0
                   ` (29 preceding siblings ...)
  2021-03-21  4:01 ` cinerea0
@ 2021-03-21 20:29 ` q66
  2021-03-21 23:28 ` [PR PATCH] [Updated] " cinerea0
                   ` (40 subsequent siblings)
  71 siblings, 0 replies; 73+ messages in thread
From: q66 @ 2021-03-21 20:29 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 322 bytes --]

New review comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/29342#discussion_r598333378

Comment:
you must have been doing something wrong, since the patch was added specifically for the reason our networkmanager is way out of date and the function was added as early as 1.24.x

^ permalink raw reply	[flat|nested] 73+ messages in thread

* Re: [PR PATCH] [Updated] NetworkManager: update to 1.30.2
  2021-03-09  3:41 [PR PATCH] NetworkManager: update to 1.31.1 cinerea0
                   ` (30 preceding siblings ...)
  2021-03-21 20:29 ` q66
@ 2021-03-21 23:28 ` cinerea0
  2021-03-21 23:30 ` [PR REVIEW] " cinerea0
                   ` (39 subsequent siblings)
  71 siblings, 0 replies; 73+ messages in thread
From: cinerea0 @ 2021-03-21 23:28 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1611 bytes --]

There is an updated pull request by cinerea0 against master on the void-packages repository

https://github.com/cinerea0/void-packages nm
https://github.com/void-linux/void-packages/pull/29342

NetworkManager: update to 1.30.2
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->

Closes #27502

A patch file from https://github.com/void-linux/void-packages/pull/29342.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nm-29342.patch --]
[-- Type: text/x-diff, Size: 22855 bytes --]

From 025f7f45c5faf31b24aab3f810a1ca44b295bd5b Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Sat, 20 Mar 2021 12:55:34 -0400
Subject: [PATCH 1/2] NetworkManager: update to 1.30.2

---
 .../patches/fix-cross-gir.patch               | 69 +++++++------------
 .../patches/fix-musl-linux-header.diff        | 15 ----
 .../patches/fix-musl-qsort_r.patch            | 16 -----
 .../NetworkManager/patches/musl-basic.patch   | 29 --------
 .../patches/musl-fix-includes.patch           | 54 ---------------
 .../patches/musl-network-support.patch        | 42 -----------
 .../patches/musl-process-util.patch           | 40 -----------
 .../patches/musl-use-srand48.patch            | 40 -----------
 .../NetworkManager/patches/no-gtk-doc.patch   | 28 ++++++++
 srcpkgs/NetworkManager/template               | 33 +++++----
 10 files changed, 68 insertions(+), 298 deletions(-)
 delete mode 100644 srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff
 delete mode 100644 srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-basic.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-fix-includes.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-network-support.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-process-util.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-use-srand48.patch
 create mode 100644 srcpkgs/NetworkManager/patches/no-gtk-doc.patch

diff --git a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
index c283d4dc1059..b78edfac2446 100644
--- a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
+++ b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
@@ -1,52 +1,31 @@
 Reason: Fix crossbuilding GIR
 Upstream: No, not upstreamable since this is very specific to the Void setup
-diff --git clients/common/meson.build clients/common/meson.build
-index afa257b..50b53e7 100644
---- clients/common/meson.build
-+++ clients/common/meson.build
-@@ -35,7 +35,7 @@ if enable_introspection
-     settings_docs,
-     input: nm_property_docs,
-     output: settings_docs,
--    command: [xsltproc, '--output', '@OUTPUT@', join_paths(meson.current_source_dir(), 'settings-docs.xsl'), '@INPUT@'],
-+    command: [xsltproc, '--output', '@OUTPUT@', join_paths(meson.current_source_dir(), 'settings-docs.xsl'), join_paths(meson.current_source_dir(), '..', '..', '@INPUT@')],
-   )
+Index: b/libnm/meson.build
+===================================================================
+--- a/libnm/meson.build
++++ b/libnm/meson.build
+@@ -274,13 +274,23 @@ if enable_introspection
+     'LD_LIBRARY_PATH=' + ld_library_path,
+   ]
  
-   test(
-diff --git libnm/meson.build libnm/meson.build
-index 51ca46d..f14d861 100644
---- libnm/meson.build
-+++ libnm/meson.build
-@@ -236,7 +236,13 @@ if enable_introspection
-     )
-   endif
- 
--  generate_setting_docs = join_paths(meson.current_source_dir(), 'generate-setting-docs.py')
 +  if meson.is_cross_build()
-+    qemu = '/usr/bin/qemu-@XBPS_TARGET_QEMU_MACHINE@-static'
-+    qemu_python3_cmd = qemu + ' -L @XBPS_CROSS_BASE@ @XBPS_CROSS_BASE@/usr/bin/python3'
-+    generate_setting_docs = ['sh', '-c', qemu_python3_cmd, join_paths(meson.current_source_dir(), 'generate-setting-docs.py')]
++    qemu_python3_cmd = [
++      '/usr/bin/qemu-@XBPS_TARGET_QEMU_MACHINE@-static',
++      '-L', '@XBPS_CROSS_BASE@',
++      '@XBPS_CROSS_BASE@/usr/bin/python3'
++      ]
 +  else
-+    generate_setting_docs = [python.path(), join_paths(meson.current_source_dir(), 'generate-setting-docs.py')]
++    qemu_python3_cmd = python.path()
 +  endif
- 
-   gi_typelib_path = run_command('printenv', 'GI_TYPELIB_PATH').stdout()
-   if gi_typelib_path != ''
-@@ -261,7 +267,7 @@ if enable_introspection
-     name,
++
+   nm_settings_docs_xml_gir = custom_target(
+     'nm-settings-docs-gir.xml',
      input: libnm_gir[0],
-     output: name,
--    command: [generate_setting_docs_env, python.path(), generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--output', '@OUTPUT@'],
-+    command: [generate_setting_docs_env, generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--output', '@OUTPUT@'],
-     depends: libnm_gir,
-   )
- 
-@@ -270,7 +276,7 @@ if enable_introspection
-     name,
-     input: [libnm_gir[0], nm_settings_docs_overrides],
-     output: name,
--    command: [generate_setting_docs_env, python.path(), generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT0@', '--overrides', '@INPUT1@', '--output', '@OUTPUT@'],
-+    command: [generate_setting_docs_env, generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT0@', '--overrides', '@INPUT1@', '--output', '@OUTPUT@'],
-     depends: libnm_gir,
-   )
- endif
+     output: 'nm-settings-docs-gir.xml',
+     command: [
+       generate_setting_docs_env,
+-      python.path(),
++      qemu_python3_cmd,
+       join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-gir.py'),
+       '--lib-path', meson.current_build_dir(),
+       '--gir', '@INPUT@',
diff --git a/srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff b/srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff
deleted file mode 100644
index 511759214a97..000000000000
--- a/srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git src/systemd/src/libsystemd-network/sd-dhcp6-client.c src/systemd/src/libsystemd-network/sd-dhcp6-client.c
-index f67a45bd2..ec11fa605 100644
---- src/systemd/src/libsystemd-network/sd-dhcp6-client.c
-+++ src/systemd/src/libsystemd-network/sd-dhcp6-client.c
-@@ -8,8 +8,10 @@
- #include <errno.h>
- #include <string.h>
- #include <sys/ioctl.h>
-+#ifdef __GLIBC__
- #include <linux/if_arp.h>
- #include <linux/if_infiniband.h>
-+#endif
- 
- #include "sd-dhcp6-client.h"
- 
diff --git a/srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch b/srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch
deleted file mode 100644
index f89eac778502..000000000000
--- a/srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git shared/systemd/src/basic/sort-util.h shared/systemd/src/basic/sort-util.h
-index e029f8646..168735087 100644
---- shared/systemd/src/basic/sort-util.h
-+++ shared/systemd/src/basic/sort-util.h
-@@ -60,7 +60,11 @@ static inline void qsort_r_safe(void *base, size_t nmemb, size_t size, __compar_
-                 return;
- 
-         assert(base);
-+#ifdef __GLIBC__
-         qsort_r(base, nmemb, size, compar, userdata);
-+#else
-+        g_qsort_with_data(base, nmemb, size, compar, userdata);
-+#endif
- }
- 
- #define typesafe_qsort_r(p, n, func, userdata)                          \
diff --git a/srcpkgs/NetworkManager/patches/musl-basic.patch b/srcpkgs/NetworkManager/patches/musl-basic.patch
deleted file mode 100644
index 63ea93ada585..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-basic.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Usual fix for musl libc
---- shared/systemd/src/basic/stdio-util.h.orig
-+++ shared/systemd/src/basic/stdio-util.h
-@@ -19,7 +19,9 @@
-   along with systemd; If not, see <http://www.gnu.org/licenses/>.
- ***/
- 
-+#if defined(__GLIBC__)
- #include <printf.h>
-+#endif
- #include <stdarg.h>
- #include <stdio.h>
- #include <sys/types.h>
- 
---- shared/systemd/src/basic/sort-util.h	2019-06-09 17:02:48.895695896 +0200
-+++ shared/systemd/src/basic/sort-util.h	2019-06-09 17:03:27.564199937 +0200
-@@ -5,6 +5,12 @@
- 
- #include "macro.h"
- 
-+#if !defined(__GLIBC__)
-+typedef int (*__compar_fn_t) (const void*, const void*);
-+typedef __compar_fn_t comparison_fn_t;
-+typedef int (*__compar_d_fn_t) (const void *, const void *, void *);
-+#endif
-+
- void *xbsearch_r(const void *key, const void *base, size_t nmemb, size_t size,
-                  __compar_d_fn_t compar, void *arg);
- 
diff --git a/srcpkgs/NetworkManager/patches/musl-fix-includes.patch b/srcpkgs/NetworkManager/patches/musl-fix-includes.patch
deleted file mode 100644
index 95ffb2d354ea..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-fix-includes.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- src/devices/nm-device.c.orig	2019-12-17 08:59:49.000000000 +0100
-+++ src/devices/nm-device.c	2020-01-06 17:29:08.678242168 +0100
-@@ -17,7 +17,11 @@
- #include <arpa/inet.h>
- #include <fcntl.h>
- #include <linux/if_addr.h>
-+#if defined(__GLIBC__)
- #include <linux/if_arp.h>
-+#else
-+#include <linux/if.h>
-+#endif
- #include <linux/rtnetlink.h>
- #include <linux/pkt_sched.h>
- 
---- src/nm-manager.c.orig	2020-01-06 17:29:08.682242177 +0100
-+++ src/nm-manager.c	2020-01-06 17:30:50.378482034 +0100
-@@ -15,6 +15,7 @@
- #include <sys/stat.h>
- #include <sys/sendfile.h>
- #include <limits.h>
-+#include <asm/types.h>
- 
- #include "nm-glib-aux/nm-c-list.h"
- 
---- src/platform/nm-linux-platform.c.orig	2019-12-17 08:59:49.000000000 +0100
-+++ src/platform/nm-linux-platform.c	2020-01-06 17:29:08.686242186 +0100
-@@ -6,6 +6,7 @@
- #include "nm-default.h"
- 
- #include "nm-linux-platform.h"
-+#include "wpan/nm-wpan-utils.h"
- 
- #include <arpa/inet.h>
- #include <dlfcn.h>
-@@ -14,7 +15,11 @@
- #include <libudev.h>
- #include <linux/fib_rules.h>
- #include <linux/ip.h>
-+#if defined(__GLIBC__)
- #include <linux/if_arp.h>
-+#else
-+#include <linux/if.h>
-+#endif
- #include <linux/if_bridge.h>
- #include <linux/if_link.h>
- #include <linux/if_tun.h>
-@@ -44,7 +49,6 @@
- #include "nm-platform-private.h"
- #include "wifi/nm-wifi-utils.h"
- #include "wifi/nm-wifi-utils-wext.h"
--#include "wpan/nm-wpan-utils.h"
- #include "nm-glib-aux/nm-io-utils.h"
- #include "nm-udev-aux/nm-udev-utils.h"
- 
diff --git a/srcpkgs/NetworkManager/patches/musl-network-support.patch b/srcpkgs/NetworkManager/patches/musl-network-support.patch
deleted file mode 100644
index 0fb63f067b17..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-network-support.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- libnm-core/nm-utils.h.orig
-+++ libnm-core/nm-utils.h
-@@ -30,7 +30,11 @@
- #include <netinet/in.h>
- 
- /* For ETH_ALEN and INFINIBAND_ALEN */
-+#if defined(__GLIBC__)
- #include <linux/if_ether.h>
-+#else
-+#define ETH_ALEN	6		/* Octets in one ethernet addr	 */
-+#endif
- #include <linux/if_infiniband.h>
- 
- #include "nm-core-enum-types.h"
---- src/platform/wifi/nm-wifi-utils.h.orig
-+++ src/platform/wifi/nm-wifi-utils.h
-@@ -22,7 +22,11 @@
- #ifndef __WIFI_UTILS_H__
- #define __WIFI_UTILS_H__
- 
-+#if defined(__GLIBC__)
- #include <net/ethernet.h>
-+#else /* musl libc */
-+#define ETH_ALEN	6		/* Octets in one ethernet addr	 */
-+#endif
- 
- #include "nm-dbus-interface.h"
- 
---- shared/systemd/src/basic/socket-util.h	2019-03-16 15:41:33.287235649 +0100
-+++ shared/systemd/src/basic/socket-util.h	2019-03-16 15:42:24.273912106 +0100
-@@ -12,6 +12,11 @@
- #include <sys/socket.h>
- #include <sys/types.h>
- #include <sys/un.h>
-+#if !defined(__GLIBC__)
-+/* SIOCGSTAMPNS from linux/asm-generic.h 
-+ * for src/systemd/src/libsystemd-network/sd-lldp.c */
-+#include <linux/sockios.h>
-+#endif
- 
- #include "macro.h"
- #include "missing_socket.h"
diff --git a/srcpkgs/NetworkManager/patches/musl-process-util.patch b/srcpkgs/NetworkManager/patches/musl-process-util.patch
deleted file mode 100644
index e406de1da850..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-process-util.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- shared/systemd/src/basic/process-util.c
-+++ shared/systemd/src/basic/process-util.c
-@@ -21,6 +21,9 @@
- #include <sys/wait.h>
- #include <syslog.h>
- #include <unistd.h>
-+#ifndef __GLIBC__
-+#include <pthread.h>
-+#endif
- #if 0 /* NM_IGNORED */
- #if HAVE_VALGRIND_VALGRIND_H
- #include <valgrind/valgrind.h>
-@@ -1168,11 +1171,13 @@ void reset_cached_pid(void) {
-         cached_pid = CACHED_PID_UNSET;
- }
- 
-+#ifdef __GLIBC__
- /* We use glibc __register_atfork() + __dso_handle directly here, as they are not included in the glibc
-  * headers. __register_atfork() is mostly equivalent to pthread_atfork(), but doesn't require us to link against
-  * libpthread, as it is part of glibc anyway. */
- extern int __register_atfork(void (*prepare) (void), void (*parent) (void), void (*child) (void), void *dso_handle);
- extern void* __dso_handle _weak_;
-+#endif
- 
- pid_t getpid_cached(void) {
-         static bool installed = false;
-@@ -1201,7 +1206,12 @@ pid_t getpid_cached(void) {
-                          * only half-documented (glibc doesn't document it but LSB does — though only superficially)
-                          * we'll check for errors only in the most generic fashion possible. */
- 
--                        if (__register_atfork(NULL, NULL, reset_cached_pid, __dso_handle) != 0) {
-+                        #ifdef __GLIBC__
-+                            if (__register_atfork(NULL, NULL, reset_cached_pid, __dso_handle) != 0) {
-+                        #else
-+                            if (pthread_atfork(NULL, NULL, reset_cached_pid) != 0) {
-+                        #endif
-+
-                                 /* OOM? Let's try again later */
-                                 cached_pid = CACHED_PID_UNSET;
-                                 return new_pid;
diff --git a/srcpkgs/NetworkManager/patches/musl-use-srand48.patch b/srcpkgs/NetworkManager/patches/musl-use-srand48.patch
deleted file mode 100644
index 43b689f3bad1..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-use-srand48.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- shared/n-dhcp4/src/n-dhcp4-c-probe.c.orig	2020-01-06 15:35:10.128600647 +0100
-+++ shared/n-dhcp4/src/n-dhcp4-c-probe.c	2020-01-06 15:39:41.446240531 +0100
-@@ -362,7 +362,12 @@ static void n_dhcp4_client_probe_config_
-         seed16v[1] = (u64 >> 16) ^ (u64 >>  0);
-         seed16v[2] = (u64 >> 32) ^ (u64 >> 16);
- 
-+#ifdef __GLIBC__
-         r = seed48_r(seed16v, &config->entropy);
-+#else
-+        r = 0;
-+        seed48(seed16v);
-+#endif
-         c_assert(!r);
- }
- 
-@@ -379,7 +384,12 @@ uint32_t n_dhcp4_client_probe_config_get
-         long int result;
-         int r;
- 
-+#ifdef __GLIBC__
-         r = mrand48_r(&config->entropy, &result);
-+#else
-+        r = 0;
-+        result = mrand48();
-+#endif
-         c_assert(!r);
- 
-         return result;
---- shared/n-dhcp4/src/n-dhcp4-private.h.orig	2020-01-06 15:41:31.941501136 +0100
-+++ shared/n-dhcp4/src/n-dhcp4-private.h	2020-01-06 15:41:55.341556325 +0100
-@@ -267,7 +267,9 @@ struct NDhcp4ClientProbeConfig {
-         bool inform_only;
-         bool init_reboot;
-         struct in_addr requested_ip;
-+#ifdef __GLIBC__
-         struct drand48_data entropy;    /* entropy pool */
-+#endif
-         uint64_t ms_start_delay;        /* max ms to wait before starting probe */
-         NDhcp4ClientProbeOption *options[UINT8_MAX + 1];
-         int8_t request_parameters[UINT8_MAX + 1];
diff --git a/srcpkgs/NetworkManager/patches/no-gtk-doc.patch b/srcpkgs/NetworkManager/patches/no-gtk-doc.patch
new file mode 100644
index 000000000000..2fffc5160445
--- /dev/null
+++ b/srcpkgs/NetworkManager/patches/no-gtk-doc.patch
@@ -0,0 +1,28 @@
+Index: b/meson.build
+===================================================================
+--- a/meson.build
++++ b/meson.build
+@@ -943,10 +943,8 @@ if enable_qt
+ endif
+ 
+ if enable_docs
+-  assert(enable_introspection, '-Ddocs=true requires -Dintrospection=true')
+   assert(meson.version().version_compare('>= 0.46.0'), '-Ddocs requires meson >= 0.46')
+   subdir('man')
+-  subdir('docs')
+ endif
+ 
+ configure_file(
+Index: b/clients/common/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,
+ )
+ 
+-if enable_docs
++if enable_docs and enable_introspection
+   settings_docs_source = custom_target(
+     'settings-docs.h',
+     input: nm_settings_docs_xml_gir,
diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template
index d439d8b10286..39278f0c59a0 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -1,41 +1,41 @@
 # Template file for 'NetworkManager'
-# when updating to 1.24 or newer, drop the compat
-# patch in gnome-control-center and rebuild it
+# when updating, drop 'nm122.patch' in gnome-control-center and rebuild it
+# if it builds, revbump it without the patch
 pkgname=NetworkManager
-version=1.22.10
-revision=3
+version=1.30.2
+revision=1
 build_style=meson
 build_helper="gir qemu"
 configure_args="-Dpolkit_agent=true -Dsystemd_journal=false
- -Dlibaudit=no -Dovs=false -Dlibnm_glib=true -Dselinux=false
- -Dmodify_system=true -Dpolkit_agent=true -Dsystemdsystemunitdir=no
+ -Dlibaudit=no -Dovs=false -Dselinux=false
+ -Dmodify_system=true -Dsystemdsystemunitdir=no
  -Dpppd=/usr/bin/pppd -Dqt=false
  -Dsession_tracking_consolekit=false
  -Dpppd_plugin_dir=/usr/lib/pppd/2.4.9 -Dresolvconf=/usr/bin/resolvconf
  -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
- -Diwd=true
- -Dudev_dir=/usr/lib/udev -Dintrospection=$(vopt_if gir true false)
- -Dvapi=$(vopt_if vala true false)
+ -Diwd=true -Dudev_dir=/usr/lib/udev -Ddocs=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"
 hostmakedepends="gettext-devel glib-devel libxslt-devel pkg-config
- intltool dbus-glib-devel jansson-devel $(vopt_if vala vala)
- $(vopt_if gir 'python3-gobject')"
+ intltool dbus-glib-devel jansson-devel docbook-xsl
+ $(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
  ModemManager-devel readline-devel libndp-devel newt-devel jansson-devel
  libpsl-devel eudev-libudev-devel mobile-broadband-provider-info
- $(vopt_if gir libgirepository-devel) $(vopt_if elogind elogind-devel)"
+ $(vopt_if gir 'libgirepository-devel python3-gobject')
+ $(vopt_if elogind elogind-devel)"
 depends="dbus iproute2 openresolv wpa_supplicant mobile-broadband-provider-info"
 short_desc="Network Management daemon"
 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=2b29ccc1531ba7ebba95a97f40c22b963838e8b6833745efe8e6fb71fd8fca77
+checksum=0c8e80e77877860e4a4e6ab4a0f7cdc1186e356b65b042a751897188b88944d2
 # TODO: Some tests require network namespaces to run.
 make_check=extended
 lib32disabled=yes
@@ -47,6 +47,7 @@ make_dirs="
  /etc/NetworkManager/VPN 0755 root root
  /var/lib/NetworkManager 0755 root root
 "
+patch_args=-Np1
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)
@@ -57,8 +58,8 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 # Package build options
-build_options="gir vala elogind"
-build_options_default="gir vala elogind"
+build_options="gir elogind"
+build_options_default="gir elogind"
 
 pre_configure() {
 	if [ "$CROSS_BUILD" ]; then
@@ -95,8 +96,6 @@ NetworkManager-devel_package() {
 		vmove "usr/lib/*.so"
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
-		fi
-		if [ "$build_option_vala" ]; then
 			vmove usr/share/vala
 		fi
 	}

From 1a853af3535e463d7cddb78487af0ecc8790a837 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Sun, 21 Mar 2021 19:27:06 -0400
Subject: [PATCH 2/2] gnome-control-center: update to 3.38.5

---
 .../gnome-control-center/patches/nm122.patch  | 38 -------------------
 srcpkgs/gnome-control-center/template         |  4 +-
 2 files changed, 2 insertions(+), 40 deletions(-)
 delete mode 100644 srcpkgs/gnome-control-center/patches/nm122.patch

diff --git a/srcpkgs/gnome-control-center/patches/nm122.patch b/srcpkgs/gnome-control-center/patches/nm122.patch
deleted file mode 100644
index 833fed3968ea..000000000000
--- a/srcpkgs/gnome-control-center/patches/nm122.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 4159f984bd351caf6f0e1adbd90feeb85ab252f4 Mon Sep 17 00:00:00 2001
-From: Daniel Kolesa <daniel@octaforge.org>
-Date: Wed, 16 Sep 2020 22:02:04 +0200
-Subject: [PATCH] restore compatibility with networkmanager 1.22
-
-drop this patch and rebuild gnome-control-center when updating nm
----
- panels/network/net-device-wifi.c | 7 -------
- 1 file changed, 7 deletions(-)
-
-diff --git panels/network/net-device-wifi.c panels/network/net-device-wifi.c
-index cb86e5b..d63c57c 100644
---- panels/network/net-device-wifi.c
-+++ panels/network/net-device-wifi.c
-@@ -1180,11 +1180,6 @@ nm_client_on_permission_change (NetDeviceWifi *self) {
-         NMClientPermissionResult perm;
-         NMDeviceWifiCapabilities caps;
- 
--        if (nm_client_get_permissions_state (self->client) != NM_TERNARY_TRUE) {
--                /* permissions aren't ready yet */
--                return;
--        }
--
-         /* only enable the button if the user can create a hotspot */
-         perm = nm_client_get_permission_result (self->client, NM_CLIENT_PERMISSION_WIFI_SHARE_OPEN);
-         caps = nm_device_wifi_get_capabilities (NM_DEVICE_WIFI (self->device));
-@@ -1227,8 +1222,6 @@ net_device_wifi_new (CcPanel *panel, NMClient *client, NMDevice *device)
-                                  G_CALLBACK (ap_activated), self, G_CONNECT_SWAPPED);
-         g_signal_connect_object (list, "configure",
-                                  G_CALLBACK (show_details_for_row), self, G_CONNECT_SWAPPED);
--        g_signal_connect_object (client, "notify",
--                                 G_CALLBACK(nm_client_on_permission_change), self, G_CONNECT_SWAPPED);
- 
-         nm_client_on_permission_change(self);
- 
--- 
-2.28.0
-
diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index 7d4a2dc5c47a..001e057fabdc 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-control-center'
 pkgname=gnome-control-center
-version=3.38.4
+version=3.38.5
 revision=1
 build_style=meson
 build_helper="gir"
@@ -24,7 +24,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-control-center"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=49dc6378d4d35c1c6ed59224f5636916c2b6fa49bbfb8b56eb19a84d6e90cd19
+checksum=0ada859620110e829174121c7e1a3f82da80d749d6f61d426a7c8cf4464d72f9
 
 build_options="cheese"
 build_options_default="cheese"

^ permalink raw reply	[flat|nested] 73+ messages in thread

* Re: [PR REVIEW] NetworkManager: update to 1.30.2
  2021-03-09  3:41 [PR PATCH] NetworkManager: update to 1.31.1 cinerea0
                   ` (31 preceding siblings ...)
  2021-03-21 23:28 ` [PR PATCH] [Updated] " cinerea0
@ 2021-03-21 23:30 ` cinerea0
  2021-03-21 23:43 ` cinerea0
                   ` (38 subsequent siblings)
  71 siblings, 0 replies; 73+ messages in thread
From: cinerea0 @ 2021-03-21 23:30 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 275 bytes --]

New review comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/29342#discussion_r598356311

Comment:
Alright, I've pushed a commit with a new version of gnome-control-center to this PR. I'll see if it builds correctly this time.

^ permalink raw reply	[flat|nested] 73+ messages in thread

* Re: NetworkManager: update to 1.30.2
  2021-03-09  3:41 [PR PATCH] NetworkManager: update to 1.31.1 cinerea0
                   ` (32 preceding siblings ...)
  2021-03-21 23:30 ` [PR REVIEW] " cinerea0
@ 2021-03-21 23:43 ` cinerea0
  2021-03-22  0:06 ` [PR REVIEW] " q66
                   ` (37 subsequent siblings)
  71 siblings, 0 replies; 73+ messages in thread
From: cinerea0 @ 2021-03-21 23:43 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 273 bytes --]

New comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/29342#issuecomment-803682122

Comment:
@q66 Building `gnome-control-center` after dropping the patch on my machine succeeds but, as you can see in the checks, fails here.

^ permalink raw reply	[flat|nested] 73+ messages in thread

* Re: [PR REVIEW] NetworkManager: update to 1.30.2
  2021-03-09  3:41 [PR PATCH] NetworkManager: update to 1.31.1 cinerea0
                   ` (33 preceding siblings ...)
  2021-03-21 23:43 ` cinerea0
@ 2021-03-22  0:06 ` q66
  2021-03-22  0:19 ` cinerea0
                   ` (36 subsequent siblings)
  71 siblings, 0 replies; 73+ messages in thread
From: q66 @ 2021-03-22  0:06 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 401 bytes --]

New review comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/29342#discussion_r598361195

Comment:
the reason it's not building on CI is obvious - xbps-src pulling in the old nm when building gnome-control-center, not the new one

you will need to test it locally, and raise the gnome-control-center change as a separate PR after networkmanager is updated

^ permalink raw reply	[flat|nested] 73+ messages in thread

* Re: [PR REVIEW] NetworkManager: update to 1.30.2
  2021-03-09  3:41 [PR PATCH] NetworkManager: update to 1.31.1 cinerea0
                   ` (34 preceding siblings ...)
  2021-03-22  0:06 ` [PR REVIEW] " q66
@ 2021-03-22  0:19 ` cinerea0
  2021-03-22  0:23 ` [PR PATCH] [Updated] " cinerea0
                   ` (35 subsequent siblings)
  71 siblings, 0 replies; 73+ messages in thread
From: cinerea0 @ 2021-03-22  0:19 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 347 bytes --]

New review comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/29342#discussion_r598363185

Comment:
Ah, I was under the impression that the GH checks system "stacked" in such a way that it took into account changes from other commits in the same PR. I'll create a separate PR after this gets merged.

^ permalink raw reply	[flat|nested] 73+ messages in thread

* Re: [PR PATCH] [Updated] NetworkManager: update to 1.30.2
  2021-03-09  3:41 [PR PATCH] NetworkManager: update to 1.31.1 cinerea0
                   ` (35 preceding siblings ...)
  2021-03-22  0:19 ` cinerea0
@ 2021-03-22  0:23 ` cinerea0
  2021-03-22  0:42 ` [PR REVIEW] " ericonr
                   ` (34 subsequent siblings)
  71 siblings, 0 replies; 73+ messages in thread
From: cinerea0 @ 2021-03-22  0:23 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1611 bytes --]

There is an updated pull request by cinerea0 against master on the void-packages repository

https://github.com/cinerea0/void-packages nm
https://github.com/void-linux/void-packages/pull/29342

NetworkManager: update to 1.30.2
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->

Closes #27502

A patch file from https://github.com/void-linux/void-packages/pull/29342.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nm-29342.patch --]
[-- Type: text/x-diff, Size: 19449 bytes --]

From 9e3e5dec4168af0b9ca323f63c297eb7af588b6a Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Sun, 21 Mar 2021 20:22:19 -0400
Subject: [PATCH] NetworkManager: update to 1.30.2

---
 .../patches/fix-cross-gir.patch               | 69 +++++++------------
 .../patches/fix-musl-linux-header.diff        | 15 ----
 .../patches/fix-musl-qsort_r.patch            | 16 -----
 .../NetworkManager/patches/musl-basic.patch   | 29 --------
 .../patches/musl-fix-includes.patch           | 54 ---------------
 .../patches/musl-network-support.patch        | 42 -----------
 .../patches/musl-process-util.patch           | 40 -----------
 .../patches/musl-use-srand48.patch            | 40 -----------
 .../NetworkManager/patches/no-gtk-doc.patch   | 28 ++++++++
 srcpkgs/NetworkManager/template               | 31 ++++-----
 10 files changed, 66 insertions(+), 298 deletions(-)
 delete mode 100644 srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff
 delete mode 100644 srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-basic.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-fix-includes.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-network-support.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-process-util.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-use-srand48.patch
 create mode 100644 srcpkgs/NetworkManager/patches/no-gtk-doc.patch

diff --git a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
index c283d4dc1059..b78edfac2446 100644
--- a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
+++ b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
@@ -1,52 +1,31 @@
 Reason: Fix crossbuilding GIR
 Upstream: No, not upstreamable since this is very specific to the Void setup
-diff --git clients/common/meson.build clients/common/meson.build
-index afa257b..50b53e7 100644
---- clients/common/meson.build
-+++ clients/common/meson.build
-@@ -35,7 +35,7 @@ if enable_introspection
-     settings_docs,
-     input: nm_property_docs,
-     output: settings_docs,
--    command: [xsltproc, '--output', '@OUTPUT@', join_paths(meson.current_source_dir(), 'settings-docs.xsl'), '@INPUT@'],
-+    command: [xsltproc, '--output', '@OUTPUT@', join_paths(meson.current_source_dir(), 'settings-docs.xsl'), join_paths(meson.current_source_dir(), '..', '..', '@INPUT@')],
-   )
+Index: b/libnm/meson.build
+===================================================================
+--- a/libnm/meson.build
++++ b/libnm/meson.build
+@@ -274,13 +274,23 @@ if enable_introspection
+     'LD_LIBRARY_PATH=' + ld_library_path,
+   ]
  
-   test(
-diff --git libnm/meson.build libnm/meson.build
-index 51ca46d..f14d861 100644
---- libnm/meson.build
-+++ libnm/meson.build
-@@ -236,7 +236,13 @@ if enable_introspection
-     )
-   endif
- 
--  generate_setting_docs = join_paths(meson.current_source_dir(), 'generate-setting-docs.py')
 +  if meson.is_cross_build()
-+    qemu = '/usr/bin/qemu-@XBPS_TARGET_QEMU_MACHINE@-static'
-+    qemu_python3_cmd = qemu + ' -L @XBPS_CROSS_BASE@ @XBPS_CROSS_BASE@/usr/bin/python3'
-+    generate_setting_docs = ['sh', '-c', qemu_python3_cmd, join_paths(meson.current_source_dir(), 'generate-setting-docs.py')]
++    qemu_python3_cmd = [
++      '/usr/bin/qemu-@XBPS_TARGET_QEMU_MACHINE@-static',
++      '-L', '@XBPS_CROSS_BASE@',
++      '@XBPS_CROSS_BASE@/usr/bin/python3'
++      ]
 +  else
-+    generate_setting_docs = [python.path(), join_paths(meson.current_source_dir(), 'generate-setting-docs.py')]
++    qemu_python3_cmd = python.path()
 +  endif
- 
-   gi_typelib_path = run_command('printenv', 'GI_TYPELIB_PATH').stdout()
-   if gi_typelib_path != ''
-@@ -261,7 +267,7 @@ if enable_introspection
-     name,
++
+   nm_settings_docs_xml_gir = custom_target(
+     'nm-settings-docs-gir.xml',
      input: libnm_gir[0],
-     output: name,
--    command: [generate_setting_docs_env, python.path(), generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--output', '@OUTPUT@'],
-+    command: [generate_setting_docs_env, generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--output', '@OUTPUT@'],
-     depends: libnm_gir,
-   )
- 
-@@ -270,7 +276,7 @@ if enable_introspection
-     name,
-     input: [libnm_gir[0], nm_settings_docs_overrides],
-     output: name,
--    command: [generate_setting_docs_env, python.path(), generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT0@', '--overrides', '@INPUT1@', '--output', '@OUTPUT@'],
-+    command: [generate_setting_docs_env, generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT0@', '--overrides', '@INPUT1@', '--output', '@OUTPUT@'],
-     depends: libnm_gir,
-   )
- endif
+     output: 'nm-settings-docs-gir.xml',
+     command: [
+       generate_setting_docs_env,
+-      python.path(),
++      qemu_python3_cmd,
+       join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-gir.py'),
+       '--lib-path', meson.current_build_dir(),
+       '--gir', '@INPUT@',
diff --git a/srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff b/srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff
deleted file mode 100644
index 511759214a97..000000000000
--- a/srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git src/systemd/src/libsystemd-network/sd-dhcp6-client.c src/systemd/src/libsystemd-network/sd-dhcp6-client.c
-index f67a45bd2..ec11fa605 100644
---- src/systemd/src/libsystemd-network/sd-dhcp6-client.c
-+++ src/systemd/src/libsystemd-network/sd-dhcp6-client.c
-@@ -8,8 +8,10 @@
- #include <errno.h>
- #include <string.h>
- #include <sys/ioctl.h>
-+#ifdef __GLIBC__
- #include <linux/if_arp.h>
- #include <linux/if_infiniband.h>
-+#endif
- 
- #include "sd-dhcp6-client.h"
- 
diff --git a/srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch b/srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch
deleted file mode 100644
index f89eac778502..000000000000
--- a/srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git shared/systemd/src/basic/sort-util.h shared/systemd/src/basic/sort-util.h
-index e029f8646..168735087 100644
---- shared/systemd/src/basic/sort-util.h
-+++ shared/systemd/src/basic/sort-util.h
-@@ -60,7 +60,11 @@ static inline void qsort_r_safe(void *base, size_t nmemb, size_t size, __compar_
-                 return;
- 
-         assert(base);
-+#ifdef __GLIBC__
-         qsort_r(base, nmemb, size, compar, userdata);
-+#else
-+        g_qsort_with_data(base, nmemb, size, compar, userdata);
-+#endif
- }
- 
- #define typesafe_qsort_r(p, n, func, userdata)                          \
diff --git a/srcpkgs/NetworkManager/patches/musl-basic.patch b/srcpkgs/NetworkManager/patches/musl-basic.patch
deleted file mode 100644
index 63ea93ada585..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-basic.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Usual fix for musl libc
---- shared/systemd/src/basic/stdio-util.h.orig
-+++ shared/systemd/src/basic/stdio-util.h
-@@ -19,7 +19,9 @@
-   along with systemd; If not, see <http://www.gnu.org/licenses/>.
- ***/
- 
-+#if defined(__GLIBC__)
- #include <printf.h>
-+#endif
- #include <stdarg.h>
- #include <stdio.h>
- #include <sys/types.h>
- 
---- shared/systemd/src/basic/sort-util.h	2019-06-09 17:02:48.895695896 +0200
-+++ shared/systemd/src/basic/sort-util.h	2019-06-09 17:03:27.564199937 +0200
-@@ -5,6 +5,12 @@
- 
- #include "macro.h"
- 
-+#if !defined(__GLIBC__)
-+typedef int (*__compar_fn_t) (const void*, const void*);
-+typedef __compar_fn_t comparison_fn_t;
-+typedef int (*__compar_d_fn_t) (const void *, const void *, void *);
-+#endif
-+
- void *xbsearch_r(const void *key, const void *base, size_t nmemb, size_t size,
-                  __compar_d_fn_t compar, void *arg);
- 
diff --git a/srcpkgs/NetworkManager/patches/musl-fix-includes.patch b/srcpkgs/NetworkManager/patches/musl-fix-includes.patch
deleted file mode 100644
index 95ffb2d354ea..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-fix-includes.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- src/devices/nm-device.c.orig	2019-12-17 08:59:49.000000000 +0100
-+++ src/devices/nm-device.c	2020-01-06 17:29:08.678242168 +0100
-@@ -17,7 +17,11 @@
- #include <arpa/inet.h>
- #include <fcntl.h>
- #include <linux/if_addr.h>
-+#if defined(__GLIBC__)
- #include <linux/if_arp.h>
-+#else
-+#include <linux/if.h>
-+#endif
- #include <linux/rtnetlink.h>
- #include <linux/pkt_sched.h>
- 
---- src/nm-manager.c.orig	2020-01-06 17:29:08.682242177 +0100
-+++ src/nm-manager.c	2020-01-06 17:30:50.378482034 +0100
-@@ -15,6 +15,7 @@
- #include <sys/stat.h>
- #include <sys/sendfile.h>
- #include <limits.h>
-+#include <asm/types.h>
- 
- #include "nm-glib-aux/nm-c-list.h"
- 
---- src/platform/nm-linux-platform.c.orig	2019-12-17 08:59:49.000000000 +0100
-+++ src/platform/nm-linux-platform.c	2020-01-06 17:29:08.686242186 +0100
-@@ -6,6 +6,7 @@
- #include "nm-default.h"
- 
- #include "nm-linux-platform.h"
-+#include "wpan/nm-wpan-utils.h"
- 
- #include <arpa/inet.h>
- #include <dlfcn.h>
-@@ -14,7 +15,11 @@
- #include <libudev.h>
- #include <linux/fib_rules.h>
- #include <linux/ip.h>
-+#if defined(__GLIBC__)
- #include <linux/if_arp.h>
-+#else
-+#include <linux/if.h>
-+#endif
- #include <linux/if_bridge.h>
- #include <linux/if_link.h>
- #include <linux/if_tun.h>
-@@ -44,7 +49,6 @@
- #include "nm-platform-private.h"
- #include "wifi/nm-wifi-utils.h"
- #include "wifi/nm-wifi-utils-wext.h"
--#include "wpan/nm-wpan-utils.h"
- #include "nm-glib-aux/nm-io-utils.h"
- #include "nm-udev-aux/nm-udev-utils.h"
- 
diff --git a/srcpkgs/NetworkManager/patches/musl-network-support.patch b/srcpkgs/NetworkManager/patches/musl-network-support.patch
deleted file mode 100644
index 0fb63f067b17..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-network-support.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- libnm-core/nm-utils.h.orig
-+++ libnm-core/nm-utils.h
-@@ -30,7 +30,11 @@
- #include <netinet/in.h>
- 
- /* For ETH_ALEN and INFINIBAND_ALEN */
-+#if defined(__GLIBC__)
- #include <linux/if_ether.h>
-+#else
-+#define ETH_ALEN	6		/* Octets in one ethernet addr	 */
-+#endif
- #include <linux/if_infiniband.h>
- 
- #include "nm-core-enum-types.h"
---- src/platform/wifi/nm-wifi-utils.h.orig
-+++ src/platform/wifi/nm-wifi-utils.h
-@@ -22,7 +22,11 @@
- #ifndef __WIFI_UTILS_H__
- #define __WIFI_UTILS_H__
- 
-+#if defined(__GLIBC__)
- #include <net/ethernet.h>
-+#else /* musl libc */
-+#define ETH_ALEN	6		/* Octets in one ethernet addr	 */
-+#endif
- 
- #include "nm-dbus-interface.h"
- 
---- shared/systemd/src/basic/socket-util.h	2019-03-16 15:41:33.287235649 +0100
-+++ shared/systemd/src/basic/socket-util.h	2019-03-16 15:42:24.273912106 +0100
-@@ -12,6 +12,11 @@
- #include <sys/socket.h>
- #include <sys/types.h>
- #include <sys/un.h>
-+#if !defined(__GLIBC__)
-+/* SIOCGSTAMPNS from linux/asm-generic.h 
-+ * for src/systemd/src/libsystemd-network/sd-lldp.c */
-+#include <linux/sockios.h>
-+#endif
- 
- #include "macro.h"
- #include "missing_socket.h"
diff --git a/srcpkgs/NetworkManager/patches/musl-process-util.patch b/srcpkgs/NetworkManager/patches/musl-process-util.patch
deleted file mode 100644
index e406de1da850..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-process-util.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- shared/systemd/src/basic/process-util.c
-+++ shared/systemd/src/basic/process-util.c
-@@ -21,6 +21,9 @@
- #include <sys/wait.h>
- #include <syslog.h>
- #include <unistd.h>
-+#ifndef __GLIBC__
-+#include <pthread.h>
-+#endif
- #if 0 /* NM_IGNORED */
- #if HAVE_VALGRIND_VALGRIND_H
- #include <valgrind/valgrind.h>
-@@ -1168,11 +1171,13 @@ void reset_cached_pid(void) {
-         cached_pid = CACHED_PID_UNSET;
- }
- 
-+#ifdef __GLIBC__
- /* We use glibc __register_atfork() + __dso_handle directly here, as they are not included in the glibc
-  * headers. __register_atfork() is mostly equivalent to pthread_atfork(), but doesn't require us to link against
-  * libpthread, as it is part of glibc anyway. */
- extern int __register_atfork(void (*prepare) (void), void (*parent) (void), void (*child) (void), void *dso_handle);
- extern void* __dso_handle _weak_;
-+#endif
- 
- pid_t getpid_cached(void) {
-         static bool installed = false;
-@@ -1201,7 +1206,12 @@ pid_t getpid_cached(void) {
-                          * only half-documented (glibc doesn't document it but LSB does — though only superficially)
-                          * we'll check for errors only in the most generic fashion possible. */
- 
--                        if (__register_atfork(NULL, NULL, reset_cached_pid, __dso_handle) != 0) {
-+                        #ifdef __GLIBC__
-+                            if (__register_atfork(NULL, NULL, reset_cached_pid, __dso_handle) != 0) {
-+                        #else
-+                            if (pthread_atfork(NULL, NULL, reset_cached_pid) != 0) {
-+                        #endif
-+
-                                 /* OOM? Let's try again later */
-                                 cached_pid = CACHED_PID_UNSET;
-                                 return new_pid;
diff --git a/srcpkgs/NetworkManager/patches/musl-use-srand48.patch b/srcpkgs/NetworkManager/patches/musl-use-srand48.patch
deleted file mode 100644
index 43b689f3bad1..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-use-srand48.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- shared/n-dhcp4/src/n-dhcp4-c-probe.c.orig	2020-01-06 15:35:10.128600647 +0100
-+++ shared/n-dhcp4/src/n-dhcp4-c-probe.c	2020-01-06 15:39:41.446240531 +0100
-@@ -362,7 +362,12 @@ static void n_dhcp4_client_probe_config_
-         seed16v[1] = (u64 >> 16) ^ (u64 >>  0);
-         seed16v[2] = (u64 >> 32) ^ (u64 >> 16);
- 
-+#ifdef __GLIBC__
-         r = seed48_r(seed16v, &config->entropy);
-+#else
-+        r = 0;
-+        seed48(seed16v);
-+#endif
-         c_assert(!r);
- }
- 
-@@ -379,7 +384,12 @@ uint32_t n_dhcp4_client_probe_config_get
-         long int result;
-         int r;
- 
-+#ifdef __GLIBC__
-         r = mrand48_r(&config->entropy, &result);
-+#else
-+        r = 0;
-+        result = mrand48();
-+#endif
-         c_assert(!r);
- 
-         return result;
---- shared/n-dhcp4/src/n-dhcp4-private.h.orig	2020-01-06 15:41:31.941501136 +0100
-+++ shared/n-dhcp4/src/n-dhcp4-private.h	2020-01-06 15:41:55.341556325 +0100
-@@ -267,7 +267,9 @@ struct NDhcp4ClientProbeConfig {
-         bool inform_only;
-         bool init_reboot;
-         struct in_addr requested_ip;
-+#ifdef __GLIBC__
-         struct drand48_data entropy;    /* entropy pool */
-+#endif
-         uint64_t ms_start_delay;        /* max ms to wait before starting probe */
-         NDhcp4ClientProbeOption *options[UINT8_MAX + 1];
-         int8_t request_parameters[UINT8_MAX + 1];
diff --git a/srcpkgs/NetworkManager/patches/no-gtk-doc.patch b/srcpkgs/NetworkManager/patches/no-gtk-doc.patch
new file mode 100644
index 000000000000..2fffc5160445
--- /dev/null
+++ b/srcpkgs/NetworkManager/patches/no-gtk-doc.patch
@@ -0,0 +1,28 @@
+Index: b/meson.build
+===================================================================
+--- a/meson.build
++++ b/meson.build
+@@ -943,10 +943,8 @@ if enable_qt
+ endif
+ 
+ if enable_docs
+-  assert(enable_introspection, '-Ddocs=true requires -Dintrospection=true')
+   assert(meson.version().version_compare('>= 0.46.0'), '-Ddocs requires meson >= 0.46')
+   subdir('man')
+-  subdir('docs')
+ endif
+ 
+ configure_file(
+Index: b/clients/common/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,
+ )
+ 
+-if enable_docs
++if enable_docs and enable_introspection
+   settings_docs_source = custom_target(
+     'settings-docs.h',
+     input: nm_settings_docs_xml_gir,
diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template
index d439d8b10286..b40abb73c92a 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -1,41 +1,39 @@
 # Template file for 'NetworkManager'
-# when updating to 1.24 or newer, drop the compat
-# patch in gnome-control-center and rebuild it
 pkgname=NetworkManager
-version=1.22.10
-revision=3
+version=1.30.2
+revision=1
 build_style=meson
 build_helper="gir qemu"
 configure_args="-Dpolkit_agent=true -Dsystemd_journal=false
- -Dlibaudit=no -Dovs=false -Dlibnm_glib=true -Dselinux=false
- -Dmodify_system=true -Dpolkit_agent=true -Dsystemdsystemunitdir=no
+ -Dlibaudit=no -Dovs=false -Dselinux=false
+ -Dmodify_system=true -Dsystemdsystemunitdir=no
  -Dpppd=/usr/bin/pppd -Dqt=false
  -Dsession_tracking_consolekit=false
  -Dpppd_plugin_dir=/usr/lib/pppd/2.4.9 -Dresolvconf=/usr/bin/resolvconf
  -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
- -Diwd=true
- -Dudev_dir=/usr/lib/udev -Dintrospection=$(vopt_if gir true false)
- -Dvapi=$(vopt_if vala true false)
+ -Diwd=true -Dudev_dir=/usr/lib/udev -Ddocs=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"
 hostmakedepends="gettext-devel glib-devel libxslt-devel pkg-config
- intltool dbus-glib-devel jansson-devel $(vopt_if vala vala)
- $(vopt_if gir 'python3-gobject')"
+ intltool dbus-glib-devel jansson-devel docbook-xsl
+ $(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
  ModemManager-devel readline-devel libndp-devel newt-devel jansson-devel
  libpsl-devel eudev-libudev-devel mobile-broadband-provider-info
- $(vopt_if gir libgirepository-devel) $(vopt_if elogind elogind-devel)"
+ $(vopt_if gir 'libgirepository-devel python3-gobject')
+ $(vopt_if elogind elogind-devel)"
 depends="dbus iproute2 openresolv wpa_supplicant mobile-broadband-provider-info"
 short_desc="Network Management daemon"
 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=2b29ccc1531ba7ebba95a97f40c22b963838e8b6833745efe8e6fb71fd8fca77
+checksum=0c8e80e77877860e4a4e6ab4a0f7cdc1186e356b65b042a751897188b88944d2
 # TODO: Some tests require network namespaces to run.
 make_check=extended
 lib32disabled=yes
@@ -47,6 +45,7 @@ make_dirs="
  /etc/NetworkManager/VPN 0755 root root
  /var/lib/NetworkManager 0755 root root
 "
+patch_args=-Np1
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)
@@ -57,8 +56,8 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 # Package build options
-build_options="gir vala elogind"
-build_options_default="gir vala elogind"
+build_options="gir elogind"
+build_options_default="gir elogind"
 
 pre_configure() {
 	if [ "$CROSS_BUILD" ]; then
@@ -95,8 +94,6 @@ NetworkManager-devel_package() {
 		vmove "usr/lib/*.so"
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
-		fi
-		if [ "$build_option_vala" ]; then
 			vmove usr/share/vala
 		fi
 	}

^ permalink raw reply	[flat|nested] 73+ messages in thread

* Re: [PR REVIEW] NetworkManager: update to 1.30.2
  2021-03-09  3:41 [PR PATCH] NetworkManager: update to 1.31.1 cinerea0
                   ` (36 preceding siblings ...)
  2021-03-22  0:23 ` [PR PATCH] [Updated] " cinerea0
@ 2021-03-22  0:42 ` ericonr
  2021-03-22  1:33 ` cinerea0
                   ` (33 subsequent siblings)
  71 siblings, 0 replies; 73+ messages in thread
From: ericonr @ 2021-03-22  0:42 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 207 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/29342#discussion_r598366883

Comment:
@cinerea0 it kinda should have, I'm curious why it didn't...

^ permalink raw reply	[flat|nested] 73+ messages in thread

* Re: [PR REVIEW] NetworkManager: update to 1.30.2
  2021-03-09  3:41 [PR PATCH] NetworkManager: update to 1.31.1 cinerea0
                   ` (37 preceding siblings ...)
  2021-03-22  0:42 ` [PR REVIEW] " ericonr
@ 2021-03-22  1:33 ` cinerea0
  2021-03-22  1:48 ` sgn
                   ` (32 subsequent siblings)
  71 siblings, 0 replies; 73+ messages in thread
From: cinerea0 @ 2021-03-22  1:33 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 401 bytes --]

New review comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/29342#discussion_r598376436

Comment:
@ericonr Wait, are you saying that the builds should "stack" in the way I described? Also, now that everything has been mostly resolved, do you think it would be a good idea to merge this and then for me to create a separate PR for gnome-control-center?

^ permalink raw reply	[flat|nested] 73+ messages in thread

* Re: NetworkManager: update to 1.30.2
  2021-03-09  3:41 [PR PATCH] NetworkManager: update to 1.31.1 cinerea0
                   ` (38 preceding siblings ...)
  2021-03-22  1:33 ` cinerea0
@ 2021-03-22  1:48 ` sgn
  2021-03-22  1:56 ` [PR REVIEW] " ericonr
                   ` (31 subsequent siblings)
  71 siblings, 0 replies; 73+ messages in thread
From: sgn @ 2021-03-22  1:48 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 681 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/29342#issuecomment-803709537

Comment:
On 2021-03-21 17:43:03-0700, Érico Nogueira Rolim ***@***.***> wrote:
> @ericonr commented on this pull request.
> 
> 
> 
> > -# when updating to 1.24 or newer, drop the compat
> -# patch in gnome-control-center and rebuild it
> +# when updating, drop 'nm122.patch' in gnome-control-center and rebuild it
> +# if it builds, revbump it without the patch
> 
> @cinerea0 it kinda should have, I'm curious why it didn't...

gnome-control-center doesn't depend directly on NetworkManager,
I think it was, but replaced by libnma-devel for sometime.


^ permalink raw reply	[flat|nested] 73+ messages in thread

* Re: [PR REVIEW] NetworkManager: update to 1.30.2
  2021-03-09  3:41 [PR PATCH] NetworkManager: update to 1.31.1 cinerea0
                   ` (39 preceding siblings ...)
  2021-03-22  1:48 ` sgn
@ 2021-03-22  1:56 ` ericonr
  2021-03-22  2:43 ` [PR PATCH] [Updated] " cinerea0
                   ` (30 subsequent siblings)
  71 siblings, 0 replies; 73+ messages in thread
From: ericonr @ 2021-03-22  1:56 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 530 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/29342#discussion_r598381512

Comment:
> Wait, are you saying that the builds should "stack" in the way I described?

Yes, they should. What's probably happening is what sgn commented below, that because there isn't a direct dependency chain, `gnome-control-center` gets built before `NetworkManager`, so it doesn't pick up the updated package. You can probably revbump `libnma` here to get "gcc" to also build, I think.

^ permalink raw reply	[flat|nested] 73+ messages in thread

* Re: [PR PATCH] [Updated] NetworkManager: update to 1.30.2
  2021-03-09  3:41 [PR PATCH] NetworkManager: update to 1.31.1 cinerea0
                   ` (40 preceding siblings ...)
  2021-03-22  1:56 ` [PR REVIEW] " ericonr
@ 2021-03-22  2:43 ` cinerea0
  2021-03-22  3:38 ` cinerea0
                   ` (29 subsequent siblings)
  71 siblings, 0 replies; 73+ messages in thread
From: cinerea0 @ 2021-03-22  2:43 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1611 bytes --]

There is an updated pull request by cinerea0 against master on the void-packages repository

https://github.com/cinerea0/void-packages nm
https://github.com/void-linux/void-packages/pull/29342

NetworkManager: update to 1.30.2
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->

Closes #27502

A patch file from https://github.com/void-linux/void-packages/pull/29342.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nm-29342.patch --]
[-- Type: text/x-diff, Size: 20117 bytes --]

From 9e3e5dec4168af0b9ca323f63c297eb7af588b6a Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Sun, 21 Mar 2021 20:22:19 -0400
Subject: [PATCH 1/2] NetworkManager: update to 1.30.2

---
 .../patches/fix-cross-gir.patch               | 69 +++++++------------
 .../patches/fix-musl-linux-header.diff        | 15 ----
 .../patches/fix-musl-qsort_r.patch            | 16 -----
 .../NetworkManager/patches/musl-basic.patch   | 29 --------
 .../patches/musl-fix-includes.patch           | 54 ---------------
 .../patches/musl-network-support.patch        | 42 -----------
 .../patches/musl-process-util.patch           | 40 -----------
 .../patches/musl-use-srand48.patch            | 40 -----------
 .../NetworkManager/patches/no-gtk-doc.patch   | 28 ++++++++
 srcpkgs/NetworkManager/template               | 31 ++++-----
 10 files changed, 66 insertions(+), 298 deletions(-)
 delete mode 100644 srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff
 delete mode 100644 srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-basic.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-fix-includes.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-network-support.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-process-util.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-use-srand48.patch
 create mode 100644 srcpkgs/NetworkManager/patches/no-gtk-doc.patch

diff --git a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
index c283d4dc1059..b78edfac2446 100644
--- a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
+++ b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
@@ -1,52 +1,31 @@
 Reason: Fix crossbuilding GIR
 Upstream: No, not upstreamable since this is very specific to the Void setup
-diff --git clients/common/meson.build clients/common/meson.build
-index afa257b..50b53e7 100644
---- clients/common/meson.build
-+++ clients/common/meson.build
-@@ -35,7 +35,7 @@ if enable_introspection
-     settings_docs,
-     input: nm_property_docs,
-     output: settings_docs,
--    command: [xsltproc, '--output', '@OUTPUT@', join_paths(meson.current_source_dir(), 'settings-docs.xsl'), '@INPUT@'],
-+    command: [xsltproc, '--output', '@OUTPUT@', join_paths(meson.current_source_dir(), 'settings-docs.xsl'), join_paths(meson.current_source_dir(), '..', '..', '@INPUT@')],
-   )
+Index: b/libnm/meson.build
+===================================================================
+--- a/libnm/meson.build
++++ b/libnm/meson.build
+@@ -274,13 +274,23 @@ if enable_introspection
+     'LD_LIBRARY_PATH=' + ld_library_path,
+   ]
  
-   test(
-diff --git libnm/meson.build libnm/meson.build
-index 51ca46d..f14d861 100644
---- libnm/meson.build
-+++ libnm/meson.build
-@@ -236,7 +236,13 @@ if enable_introspection
-     )
-   endif
- 
--  generate_setting_docs = join_paths(meson.current_source_dir(), 'generate-setting-docs.py')
 +  if meson.is_cross_build()
-+    qemu = '/usr/bin/qemu-@XBPS_TARGET_QEMU_MACHINE@-static'
-+    qemu_python3_cmd = qemu + ' -L @XBPS_CROSS_BASE@ @XBPS_CROSS_BASE@/usr/bin/python3'
-+    generate_setting_docs = ['sh', '-c', qemu_python3_cmd, join_paths(meson.current_source_dir(), 'generate-setting-docs.py')]
++    qemu_python3_cmd = [
++      '/usr/bin/qemu-@XBPS_TARGET_QEMU_MACHINE@-static',
++      '-L', '@XBPS_CROSS_BASE@',
++      '@XBPS_CROSS_BASE@/usr/bin/python3'
++      ]
 +  else
-+    generate_setting_docs = [python.path(), join_paths(meson.current_source_dir(), 'generate-setting-docs.py')]
++    qemu_python3_cmd = python.path()
 +  endif
- 
-   gi_typelib_path = run_command('printenv', 'GI_TYPELIB_PATH').stdout()
-   if gi_typelib_path != ''
-@@ -261,7 +267,7 @@ if enable_introspection
-     name,
++
+   nm_settings_docs_xml_gir = custom_target(
+     'nm-settings-docs-gir.xml',
      input: libnm_gir[0],
-     output: name,
--    command: [generate_setting_docs_env, python.path(), generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--output', '@OUTPUT@'],
-+    command: [generate_setting_docs_env, generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--output', '@OUTPUT@'],
-     depends: libnm_gir,
-   )
- 
-@@ -270,7 +276,7 @@ if enable_introspection
-     name,
-     input: [libnm_gir[0], nm_settings_docs_overrides],
-     output: name,
--    command: [generate_setting_docs_env, python.path(), generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT0@', '--overrides', '@INPUT1@', '--output', '@OUTPUT@'],
-+    command: [generate_setting_docs_env, generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT0@', '--overrides', '@INPUT1@', '--output', '@OUTPUT@'],
-     depends: libnm_gir,
-   )
- endif
+     output: 'nm-settings-docs-gir.xml',
+     command: [
+       generate_setting_docs_env,
+-      python.path(),
++      qemu_python3_cmd,
+       join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-gir.py'),
+       '--lib-path', meson.current_build_dir(),
+       '--gir', '@INPUT@',
diff --git a/srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff b/srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff
deleted file mode 100644
index 511759214a97..000000000000
--- a/srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git src/systemd/src/libsystemd-network/sd-dhcp6-client.c src/systemd/src/libsystemd-network/sd-dhcp6-client.c
-index f67a45bd2..ec11fa605 100644
---- src/systemd/src/libsystemd-network/sd-dhcp6-client.c
-+++ src/systemd/src/libsystemd-network/sd-dhcp6-client.c
-@@ -8,8 +8,10 @@
- #include <errno.h>
- #include <string.h>
- #include <sys/ioctl.h>
-+#ifdef __GLIBC__
- #include <linux/if_arp.h>
- #include <linux/if_infiniband.h>
-+#endif
- 
- #include "sd-dhcp6-client.h"
- 
diff --git a/srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch b/srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch
deleted file mode 100644
index f89eac778502..000000000000
--- a/srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git shared/systemd/src/basic/sort-util.h shared/systemd/src/basic/sort-util.h
-index e029f8646..168735087 100644
---- shared/systemd/src/basic/sort-util.h
-+++ shared/systemd/src/basic/sort-util.h
-@@ -60,7 +60,11 @@ static inline void qsort_r_safe(void *base, size_t nmemb, size_t size, __compar_
-                 return;
- 
-         assert(base);
-+#ifdef __GLIBC__
-         qsort_r(base, nmemb, size, compar, userdata);
-+#else
-+        g_qsort_with_data(base, nmemb, size, compar, userdata);
-+#endif
- }
- 
- #define typesafe_qsort_r(p, n, func, userdata)                          \
diff --git a/srcpkgs/NetworkManager/patches/musl-basic.patch b/srcpkgs/NetworkManager/patches/musl-basic.patch
deleted file mode 100644
index 63ea93ada585..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-basic.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Usual fix for musl libc
---- shared/systemd/src/basic/stdio-util.h.orig
-+++ shared/systemd/src/basic/stdio-util.h
-@@ -19,7 +19,9 @@
-   along with systemd; If not, see <http://www.gnu.org/licenses/>.
- ***/
- 
-+#if defined(__GLIBC__)
- #include <printf.h>
-+#endif
- #include <stdarg.h>
- #include <stdio.h>
- #include <sys/types.h>
- 
---- shared/systemd/src/basic/sort-util.h	2019-06-09 17:02:48.895695896 +0200
-+++ shared/systemd/src/basic/sort-util.h	2019-06-09 17:03:27.564199937 +0200
-@@ -5,6 +5,12 @@
- 
- #include "macro.h"
- 
-+#if !defined(__GLIBC__)
-+typedef int (*__compar_fn_t) (const void*, const void*);
-+typedef __compar_fn_t comparison_fn_t;
-+typedef int (*__compar_d_fn_t) (const void *, const void *, void *);
-+#endif
-+
- void *xbsearch_r(const void *key, const void *base, size_t nmemb, size_t size,
-                  __compar_d_fn_t compar, void *arg);
- 
diff --git a/srcpkgs/NetworkManager/patches/musl-fix-includes.patch b/srcpkgs/NetworkManager/patches/musl-fix-includes.patch
deleted file mode 100644
index 95ffb2d354ea..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-fix-includes.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- src/devices/nm-device.c.orig	2019-12-17 08:59:49.000000000 +0100
-+++ src/devices/nm-device.c	2020-01-06 17:29:08.678242168 +0100
-@@ -17,7 +17,11 @@
- #include <arpa/inet.h>
- #include <fcntl.h>
- #include <linux/if_addr.h>
-+#if defined(__GLIBC__)
- #include <linux/if_arp.h>
-+#else
-+#include <linux/if.h>
-+#endif
- #include <linux/rtnetlink.h>
- #include <linux/pkt_sched.h>
- 
---- src/nm-manager.c.orig	2020-01-06 17:29:08.682242177 +0100
-+++ src/nm-manager.c	2020-01-06 17:30:50.378482034 +0100
-@@ -15,6 +15,7 @@
- #include <sys/stat.h>
- #include <sys/sendfile.h>
- #include <limits.h>
-+#include <asm/types.h>
- 
- #include "nm-glib-aux/nm-c-list.h"
- 
---- src/platform/nm-linux-platform.c.orig	2019-12-17 08:59:49.000000000 +0100
-+++ src/platform/nm-linux-platform.c	2020-01-06 17:29:08.686242186 +0100
-@@ -6,6 +6,7 @@
- #include "nm-default.h"
- 
- #include "nm-linux-platform.h"
-+#include "wpan/nm-wpan-utils.h"
- 
- #include <arpa/inet.h>
- #include <dlfcn.h>
-@@ -14,7 +15,11 @@
- #include <libudev.h>
- #include <linux/fib_rules.h>
- #include <linux/ip.h>
-+#if defined(__GLIBC__)
- #include <linux/if_arp.h>
-+#else
-+#include <linux/if.h>
-+#endif
- #include <linux/if_bridge.h>
- #include <linux/if_link.h>
- #include <linux/if_tun.h>
-@@ -44,7 +49,6 @@
- #include "nm-platform-private.h"
- #include "wifi/nm-wifi-utils.h"
- #include "wifi/nm-wifi-utils-wext.h"
--#include "wpan/nm-wpan-utils.h"
- #include "nm-glib-aux/nm-io-utils.h"
- #include "nm-udev-aux/nm-udev-utils.h"
- 
diff --git a/srcpkgs/NetworkManager/patches/musl-network-support.patch b/srcpkgs/NetworkManager/patches/musl-network-support.patch
deleted file mode 100644
index 0fb63f067b17..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-network-support.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- libnm-core/nm-utils.h.orig
-+++ libnm-core/nm-utils.h
-@@ -30,7 +30,11 @@
- #include <netinet/in.h>
- 
- /* For ETH_ALEN and INFINIBAND_ALEN */
-+#if defined(__GLIBC__)
- #include <linux/if_ether.h>
-+#else
-+#define ETH_ALEN	6		/* Octets in one ethernet addr	 */
-+#endif
- #include <linux/if_infiniband.h>
- 
- #include "nm-core-enum-types.h"
---- src/platform/wifi/nm-wifi-utils.h.orig
-+++ src/platform/wifi/nm-wifi-utils.h
-@@ -22,7 +22,11 @@
- #ifndef __WIFI_UTILS_H__
- #define __WIFI_UTILS_H__
- 
-+#if defined(__GLIBC__)
- #include <net/ethernet.h>
-+#else /* musl libc */
-+#define ETH_ALEN	6		/* Octets in one ethernet addr	 */
-+#endif
- 
- #include "nm-dbus-interface.h"
- 
---- shared/systemd/src/basic/socket-util.h	2019-03-16 15:41:33.287235649 +0100
-+++ shared/systemd/src/basic/socket-util.h	2019-03-16 15:42:24.273912106 +0100
-@@ -12,6 +12,11 @@
- #include <sys/socket.h>
- #include <sys/types.h>
- #include <sys/un.h>
-+#if !defined(__GLIBC__)
-+/* SIOCGSTAMPNS from linux/asm-generic.h 
-+ * for src/systemd/src/libsystemd-network/sd-lldp.c */
-+#include <linux/sockios.h>
-+#endif
- 
- #include "macro.h"
- #include "missing_socket.h"
diff --git a/srcpkgs/NetworkManager/patches/musl-process-util.patch b/srcpkgs/NetworkManager/patches/musl-process-util.patch
deleted file mode 100644
index e406de1da850..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-process-util.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- shared/systemd/src/basic/process-util.c
-+++ shared/systemd/src/basic/process-util.c
-@@ -21,6 +21,9 @@
- #include <sys/wait.h>
- #include <syslog.h>
- #include <unistd.h>
-+#ifndef __GLIBC__
-+#include <pthread.h>
-+#endif
- #if 0 /* NM_IGNORED */
- #if HAVE_VALGRIND_VALGRIND_H
- #include <valgrind/valgrind.h>
-@@ -1168,11 +1171,13 @@ void reset_cached_pid(void) {
-         cached_pid = CACHED_PID_UNSET;
- }
- 
-+#ifdef __GLIBC__
- /* We use glibc __register_atfork() + __dso_handle directly here, as they are not included in the glibc
-  * headers. __register_atfork() is mostly equivalent to pthread_atfork(), but doesn't require us to link against
-  * libpthread, as it is part of glibc anyway. */
- extern int __register_atfork(void (*prepare) (void), void (*parent) (void), void (*child) (void), void *dso_handle);
- extern void* __dso_handle _weak_;
-+#endif
- 
- pid_t getpid_cached(void) {
-         static bool installed = false;
-@@ -1201,7 +1206,12 @@ pid_t getpid_cached(void) {
-                          * only half-documented (glibc doesn't document it but LSB does — though only superficially)
-                          * we'll check for errors only in the most generic fashion possible. */
- 
--                        if (__register_atfork(NULL, NULL, reset_cached_pid, __dso_handle) != 0) {
-+                        #ifdef __GLIBC__
-+                            if (__register_atfork(NULL, NULL, reset_cached_pid, __dso_handle) != 0) {
-+                        #else
-+                            if (pthread_atfork(NULL, NULL, reset_cached_pid) != 0) {
-+                        #endif
-+
-                                 /* OOM? Let's try again later */
-                                 cached_pid = CACHED_PID_UNSET;
-                                 return new_pid;
diff --git a/srcpkgs/NetworkManager/patches/musl-use-srand48.patch b/srcpkgs/NetworkManager/patches/musl-use-srand48.patch
deleted file mode 100644
index 43b689f3bad1..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-use-srand48.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- shared/n-dhcp4/src/n-dhcp4-c-probe.c.orig	2020-01-06 15:35:10.128600647 +0100
-+++ shared/n-dhcp4/src/n-dhcp4-c-probe.c	2020-01-06 15:39:41.446240531 +0100
-@@ -362,7 +362,12 @@ static void n_dhcp4_client_probe_config_
-         seed16v[1] = (u64 >> 16) ^ (u64 >>  0);
-         seed16v[2] = (u64 >> 32) ^ (u64 >> 16);
- 
-+#ifdef __GLIBC__
-         r = seed48_r(seed16v, &config->entropy);
-+#else
-+        r = 0;
-+        seed48(seed16v);
-+#endif
-         c_assert(!r);
- }
- 
-@@ -379,7 +384,12 @@ uint32_t n_dhcp4_client_probe_config_get
-         long int result;
-         int r;
- 
-+#ifdef __GLIBC__
-         r = mrand48_r(&config->entropy, &result);
-+#else
-+        r = 0;
-+        result = mrand48();
-+#endif
-         c_assert(!r);
- 
-         return result;
---- shared/n-dhcp4/src/n-dhcp4-private.h.orig	2020-01-06 15:41:31.941501136 +0100
-+++ shared/n-dhcp4/src/n-dhcp4-private.h	2020-01-06 15:41:55.341556325 +0100
-@@ -267,7 +267,9 @@ struct NDhcp4ClientProbeConfig {
-         bool inform_only;
-         bool init_reboot;
-         struct in_addr requested_ip;
-+#ifdef __GLIBC__
-         struct drand48_data entropy;    /* entropy pool */
-+#endif
-         uint64_t ms_start_delay;        /* max ms to wait before starting probe */
-         NDhcp4ClientProbeOption *options[UINT8_MAX + 1];
-         int8_t request_parameters[UINT8_MAX + 1];
diff --git a/srcpkgs/NetworkManager/patches/no-gtk-doc.patch b/srcpkgs/NetworkManager/patches/no-gtk-doc.patch
new file mode 100644
index 000000000000..2fffc5160445
--- /dev/null
+++ b/srcpkgs/NetworkManager/patches/no-gtk-doc.patch
@@ -0,0 +1,28 @@
+Index: b/meson.build
+===================================================================
+--- a/meson.build
++++ b/meson.build
+@@ -943,10 +943,8 @@ if enable_qt
+ endif
+ 
+ if enable_docs
+-  assert(enable_introspection, '-Ddocs=true requires -Dintrospection=true')
+   assert(meson.version().version_compare('>= 0.46.0'), '-Ddocs requires meson >= 0.46')
+   subdir('man')
+-  subdir('docs')
+ endif
+ 
+ configure_file(
+Index: b/clients/common/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,
+ )
+ 
+-if enable_docs
++if enable_docs and enable_introspection
+   settings_docs_source = custom_target(
+     'settings-docs.h',
+     input: nm_settings_docs_xml_gir,
diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template
index d439d8b10286..b40abb73c92a 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -1,41 +1,39 @@
 # Template file for 'NetworkManager'
-# when updating to 1.24 or newer, drop the compat
-# patch in gnome-control-center and rebuild it
 pkgname=NetworkManager
-version=1.22.10
-revision=3
+version=1.30.2
+revision=1
 build_style=meson
 build_helper="gir qemu"
 configure_args="-Dpolkit_agent=true -Dsystemd_journal=false
- -Dlibaudit=no -Dovs=false -Dlibnm_glib=true -Dselinux=false
- -Dmodify_system=true -Dpolkit_agent=true -Dsystemdsystemunitdir=no
+ -Dlibaudit=no -Dovs=false -Dselinux=false
+ -Dmodify_system=true -Dsystemdsystemunitdir=no
  -Dpppd=/usr/bin/pppd -Dqt=false
  -Dsession_tracking_consolekit=false
  -Dpppd_plugin_dir=/usr/lib/pppd/2.4.9 -Dresolvconf=/usr/bin/resolvconf
  -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
- -Diwd=true
- -Dudev_dir=/usr/lib/udev -Dintrospection=$(vopt_if gir true false)
- -Dvapi=$(vopt_if vala true false)
+ -Diwd=true -Dudev_dir=/usr/lib/udev -Ddocs=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"
 hostmakedepends="gettext-devel glib-devel libxslt-devel pkg-config
- intltool dbus-glib-devel jansson-devel $(vopt_if vala vala)
- $(vopt_if gir 'python3-gobject')"
+ intltool dbus-glib-devel jansson-devel docbook-xsl
+ $(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
  ModemManager-devel readline-devel libndp-devel newt-devel jansson-devel
  libpsl-devel eudev-libudev-devel mobile-broadband-provider-info
- $(vopt_if gir libgirepository-devel) $(vopt_if elogind elogind-devel)"
+ $(vopt_if gir 'libgirepository-devel python3-gobject')
+ $(vopt_if elogind elogind-devel)"
 depends="dbus iproute2 openresolv wpa_supplicant mobile-broadband-provider-info"
 short_desc="Network Management daemon"
 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=2b29ccc1531ba7ebba95a97f40c22b963838e8b6833745efe8e6fb71fd8fca77
+checksum=0c8e80e77877860e4a4e6ab4a0f7cdc1186e356b65b042a751897188b88944d2
 # TODO: Some tests require network namespaces to run.
 make_check=extended
 lib32disabled=yes
@@ -47,6 +45,7 @@ make_dirs="
  /etc/NetworkManager/VPN 0755 root root
  /var/lib/NetworkManager 0755 root root
 "
+patch_args=-Np1
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)
@@ -57,8 +56,8 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 # Package build options
-build_options="gir vala elogind"
-build_options_default="gir vala elogind"
+build_options="gir elogind"
+build_options_default="gir elogind"
 
 pre_configure() {
 	if [ "$CROSS_BUILD" ]; then
@@ -95,8 +94,6 @@ NetworkManager-devel_package() {
 		vmove "usr/lib/*.so"
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
-		fi
-		if [ "$build_option_vala" ]; then
 			vmove usr/share/vala
 		fi
 	}

From 2b2318d249064dae22f51be38371b48de1a2be25 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Sun, 21 Mar 2021 22:41:49 -0400
Subject: [PATCH 2/2] libnma: revbump for gnome-control-center

---
 srcpkgs/libnma/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libnma/template b/srcpkgs/libnma/template
index 18b016b2b93b..bd4d9fb2ad79 100644
--- a/srcpkgs/libnma/template
+++ b/srcpkgs/libnma/template
@@ -1,7 +1,7 @@
 # Template file for 'libnma'
 pkgname=libnma
 version=1.8.30
-revision=2
+revision=3
 build_style=meson
 build_helper="gir"
 hostmakedepends="gettext glib-devel gtk-doc pkg-config vala"

^ permalink raw reply	[flat|nested] 73+ messages in thread

* Re: [PR PATCH] [Updated] NetworkManager: update to 1.30.2
  2021-03-09  3:41 [PR PATCH] NetworkManager: update to 1.31.1 cinerea0
                   ` (41 preceding siblings ...)
  2021-03-22  2:43 ` [PR PATCH] [Updated] " cinerea0
@ 2021-03-22  3:38 ` cinerea0
  2021-03-22  4:37 ` NetworkManager: update to 1.30.2, gnome-control-center: update to 3.38.5 cinerea0
                   ` (28 subsequent siblings)
  71 siblings, 0 replies; 73+ messages in thread
From: cinerea0 @ 2021-03-22  3:38 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1611 bytes --]

There is an updated pull request by cinerea0 against master on the void-packages repository

https://github.com/cinerea0/void-packages nm
https://github.com/void-linux/void-packages/pull/29342

NetworkManager: update to 1.30.2
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->

Closes #27502

A patch file from https://github.com/void-linux/void-packages/pull/29342.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nm-29342.patch --]
[-- Type: text/x-diff, Size: 23397 bytes --]

From 9e3e5dec4168af0b9ca323f63c297eb7af588b6a Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Sun, 21 Mar 2021 20:22:19 -0400
Subject: [PATCH 1/3] NetworkManager: update to 1.30.2

---
 .../patches/fix-cross-gir.patch               | 69 +++++++------------
 .../patches/fix-musl-linux-header.diff        | 15 ----
 .../patches/fix-musl-qsort_r.patch            | 16 -----
 .../NetworkManager/patches/musl-basic.patch   | 29 --------
 .../patches/musl-fix-includes.patch           | 54 ---------------
 .../patches/musl-network-support.patch        | 42 -----------
 .../patches/musl-process-util.patch           | 40 -----------
 .../patches/musl-use-srand48.patch            | 40 -----------
 .../NetworkManager/patches/no-gtk-doc.patch   | 28 ++++++++
 srcpkgs/NetworkManager/template               | 31 ++++-----
 10 files changed, 66 insertions(+), 298 deletions(-)
 delete mode 100644 srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff
 delete mode 100644 srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-basic.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-fix-includes.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-network-support.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-process-util.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-use-srand48.patch
 create mode 100644 srcpkgs/NetworkManager/patches/no-gtk-doc.patch

diff --git a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
index c283d4dc1059..b78edfac2446 100644
--- a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
+++ b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
@@ -1,52 +1,31 @@
 Reason: Fix crossbuilding GIR
 Upstream: No, not upstreamable since this is very specific to the Void setup
-diff --git clients/common/meson.build clients/common/meson.build
-index afa257b..50b53e7 100644
---- clients/common/meson.build
-+++ clients/common/meson.build
-@@ -35,7 +35,7 @@ if enable_introspection
-     settings_docs,
-     input: nm_property_docs,
-     output: settings_docs,
--    command: [xsltproc, '--output', '@OUTPUT@', join_paths(meson.current_source_dir(), 'settings-docs.xsl'), '@INPUT@'],
-+    command: [xsltproc, '--output', '@OUTPUT@', join_paths(meson.current_source_dir(), 'settings-docs.xsl'), join_paths(meson.current_source_dir(), '..', '..', '@INPUT@')],
-   )
+Index: b/libnm/meson.build
+===================================================================
+--- a/libnm/meson.build
++++ b/libnm/meson.build
+@@ -274,13 +274,23 @@ if enable_introspection
+     'LD_LIBRARY_PATH=' + ld_library_path,
+   ]
  
-   test(
-diff --git libnm/meson.build libnm/meson.build
-index 51ca46d..f14d861 100644
---- libnm/meson.build
-+++ libnm/meson.build
-@@ -236,7 +236,13 @@ if enable_introspection
-     )
-   endif
- 
--  generate_setting_docs = join_paths(meson.current_source_dir(), 'generate-setting-docs.py')
 +  if meson.is_cross_build()
-+    qemu = '/usr/bin/qemu-@XBPS_TARGET_QEMU_MACHINE@-static'
-+    qemu_python3_cmd = qemu + ' -L @XBPS_CROSS_BASE@ @XBPS_CROSS_BASE@/usr/bin/python3'
-+    generate_setting_docs = ['sh', '-c', qemu_python3_cmd, join_paths(meson.current_source_dir(), 'generate-setting-docs.py')]
++    qemu_python3_cmd = [
++      '/usr/bin/qemu-@XBPS_TARGET_QEMU_MACHINE@-static',
++      '-L', '@XBPS_CROSS_BASE@',
++      '@XBPS_CROSS_BASE@/usr/bin/python3'
++      ]
 +  else
-+    generate_setting_docs = [python.path(), join_paths(meson.current_source_dir(), 'generate-setting-docs.py')]
++    qemu_python3_cmd = python.path()
 +  endif
- 
-   gi_typelib_path = run_command('printenv', 'GI_TYPELIB_PATH').stdout()
-   if gi_typelib_path != ''
-@@ -261,7 +267,7 @@ if enable_introspection
-     name,
++
+   nm_settings_docs_xml_gir = custom_target(
+     'nm-settings-docs-gir.xml',
      input: libnm_gir[0],
-     output: name,
--    command: [generate_setting_docs_env, python.path(), generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--output', '@OUTPUT@'],
-+    command: [generate_setting_docs_env, generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--output', '@OUTPUT@'],
-     depends: libnm_gir,
-   )
- 
-@@ -270,7 +276,7 @@ if enable_introspection
-     name,
-     input: [libnm_gir[0], nm_settings_docs_overrides],
-     output: name,
--    command: [generate_setting_docs_env, python.path(), generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT0@', '--overrides', '@INPUT1@', '--output', '@OUTPUT@'],
-+    command: [generate_setting_docs_env, generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT0@', '--overrides', '@INPUT1@', '--output', '@OUTPUT@'],
-     depends: libnm_gir,
-   )
- endif
+     output: 'nm-settings-docs-gir.xml',
+     command: [
+       generate_setting_docs_env,
+-      python.path(),
++      qemu_python3_cmd,
+       join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-gir.py'),
+       '--lib-path', meson.current_build_dir(),
+       '--gir', '@INPUT@',
diff --git a/srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff b/srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff
deleted file mode 100644
index 511759214a97..000000000000
--- a/srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git src/systemd/src/libsystemd-network/sd-dhcp6-client.c src/systemd/src/libsystemd-network/sd-dhcp6-client.c
-index f67a45bd2..ec11fa605 100644
---- src/systemd/src/libsystemd-network/sd-dhcp6-client.c
-+++ src/systemd/src/libsystemd-network/sd-dhcp6-client.c
-@@ -8,8 +8,10 @@
- #include <errno.h>
- #include <string.h>
- #include <sys/ioctl.h>
-+#ifdef __GLIBC__
- #include <linux/if_arp.h>
- #include <linux/if_infiniband.h>
-+#endif
- 
- #include "sd-dhcp6-client.h"
- 
diff --git a/srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch b/srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch
deleted file mode 100644
index f89eac778502..000000000000
--- a/srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git shared/systemd/src/basic/sort-util.h shared/systemd/src/basic/sort-util.h
-index e029f8646..168735087 100644
---- shared/systemd/src/basic/sort-util.h
-+++ shared/systemd/src/basic/sort-util.h
-@@ -60,7 +60,11 @@ static inline void qsort_r_safe(void *base, size_t nmemb, size_t size, __compar_
-                 return;
- 
-         assert(base);
-+#ifdef __GLIBC__
-         qsort_r(base, nmemb, size, compar, userdata);
-+#else
-+        g_qsort_with_data(base, nmemb, size, compar, userdata);
-+#endif
- }
- 
- #define typesafe_qsort_r(p, n, func, userdata)                          \
diff --git a/srcpkgs/NetworkManager/patches/musl-basic.patch b/srcpkgs/NetworkManager/patches/musl-basic.patch
deleted file mode 100644
index 63ea93ada585..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-basic.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Usual fix for musl libc
---- shared/systemd/src/basic/stdio-util.h.orig
-+++ shared/systemd/src/basic/stdio-util.h
-@@ -19,7 +19,9 @@
-   along with systemd; If not, see <http://www.gnu.org/licenses/>.
- ***/
- 
-+#if defined(__GLIBC__)
- #include <printf.h>
-+#endif
- #include <stdarg.h>
- #include <stdio.h>
- #include <sys/types.h>
- 
---- shared/systemd/src/basic/sort-util.h	2019-06-09 17:02:48.895695896 +0200
-+++ shared/systemd/src/basic/sort-util.h	2019-06-09 17:03:27.564199937 +0200
-@@ -5,6 +5,12 @@
- 
- #include "macro.h"
- 
-+#if !defined(__GLIBC__)
-+typedef int (*__compar_fn_t) (const void*, const void*);
-+typedef __compar_fn_t comparison_fn_t;
-+typedef int (*__compar_d_fn_t) (const void *, const void *, void *);
-+#endif
-+
- void *xbsearch_r(const void *key, const void *base, size_t nmemb, size_t size,
-                  __compar_d_fn_t compar, void *arg);
- 
diff --git a/srcpkgs/NetworkManager/patches/musl-fix-includes.patch b/srcpkgs/NetworkManager/patches/musl-fix-includes.patch
deleted file mode 100644
index 95ffb2d354ea..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-fix-includes.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- src/devices/nm-device.c.orig	2019-12-17 08:59:49.000000000 +0100
-+++ src/devices/nm-device.c	2020-01-06 17:29:08.678242168 +0100
-@@ -17,7 +17,11 @@
- #include <arpa/inet.h>
- #include <fcntl.h>
- #include <linux/if_addr.h>
-+#if defined(__GLIBC__)
- #include <linux/if_arp.h>
-+#else
-+#include <linux/if.h>
-+#endif
- #include <linux/rtnetlink.h>
- #include <linux/pkt_sched.h>
- 
---- src/nm-manager.c.orig	2020-01-06 17:29:08.682242177 +0100
-+++ src/nm-manager.c	2020-01-06 17:30:50.378482034 +0100
-@@ -15,6 +15,7 @@
- #include <sys/stat.h>
- #include <sys/sendfile.h>
- #include <limits.h>
-+#include <asm/types.h>
- 
- #include "nm-glib-aux/nm-c-list.h"
- 
---- src/platform/nm-linux-platform.c.orig	2019-12-17 08:59:49.000000000 +0100
-+++ src/platform/nm-linux-platform.c	2020-01-06 17:29:08.686242186 +0100
-@@ -6,6 +6,7 @@
- #include "nm-default.h"
- 
- #include "nm-linux-platform.h"
-+#include "wpan/nm-wpan-utils.h"
- 
- #include <arpa/inet.h>
- #include <dlfcn.h>
-@@ -14,7 +15,11 @@
- #include <libudev.h>
- #include <linux/fib_rules.h>
- #include <linux/ip.h>
-+#if defined(__GLIBC__)
- #include <linux/if_arp.h>
-+#else
-+#include <linux/if.h>
-+#endif
- #include <linux/if_bridge.h>
- #include <linux/if_link.h>
- #include <linux/if_tun.h>
-@@ -44,7 +49,6 @@
- #include "nm-platform-private.h"
- #include "wifi/nm-wifi-utils.h"
- #include "wifi/nm-wifi-utils-wext.h"
--#include "wpan/nm-wpan-utils.h"
- #include "nm-glib-aux/nm-io-utils.h"
- #include "nm-udev-aux/nm-udev-utils.h"
- 
diff --git a/srcpkgs/NetworkManager/patches/musl-network-support.patch b/srcpkgs/NetworkManager/patches/musl-network-support.patch
deleted file mode 100644
index 0fb63f067b17..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-network-support.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- libnm-core/nm-utils.h.orig
-+++ libnm-core/nm-utils.h
-@@ -30,7 +30,11 @@
- #include <netinet/in.h>
- 
- /* For ETH_ALEN and INFINIBAND_ALEN */
-+#if defined(__GLIBC__)
- #include <linux/if_ether.h>
-+#else
-+#define ETH_ALEN	6		/* Octets in one ethernet addr	 */
-+#endif
- #include <linux/if_infiniband.h>
- 
- #include "nm-core-enum-types.h"
---- src/platform/wifi/nm-wifi-utils.h.orig
-+++ src/platform/wifi/nm-wifi-utils.h
-@@ -22,7 +22,11 @@
- #ifndef __WIFI_UTILS_H__
- #define __WIFI_UTILS_H__
- 
-+#if defined(__GLIBC__)
- #include <net/ethernet.h>
-+#else /* musl libc */
-+#define ETH_ALEN	6		/* Octets in one ethernet addr	 */
-+#endif
- 
- #include "nm-dbus-interface.h"
- 
---- shared/systemd/src/basic/socket-util.h	2019-03-16 15:41:33.287235649 +0100
-+++ shared/systemd/src/basic/socket-util.h	2019-03-16 15:42:24.273912106 +0100
-@@ -12,6 +12,11 @@
- #include <sys/socket.h>
- #include <sys/types.h>
- #include <sys/un.h>
-+#if !defined(__GLIBC__)
-+/* SIOCGSTAMPNS from linux/asm-generic.h 
-+ * for src/systemd/src/libsystemd-network/sd-lldp.c */
-+#include <linux/sockios.h>
-+#endif
- 
- #include "macro.h"
- #include "missing_socket.h"
diff --git a/srcpkgs/NetworkManager/patches/musl-process-util.patch b/srcpkgs/NetworkManager/patches/musl-process-util.patch
deleted file mode 100644
index e406de1da850..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-process-util.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- shared/systemd/src/basic/process-util.c
-+++ shared/systemd/src/basic/process-util.c
-@@ -21,6 +21,9 @@
- #include <sys/wait.h>
- #include <syslog.h>
- #include <unistd.h>
-+#ifndef __GLIBC__
-+#include <pthread.h>
-+#endif
- #if 0 /* NM_IGNORED */
- #if HAVE_VALGRIND_VALGRIND_H
- #include <valgrind/valgrind.h>
-@@ -1168,11 +1171,13 @@ void reset_cached_pid(void) {
-         cached_pid = CACHED_PID_UNSET;
- }
- 
-+#ifdef __GLIBC__
- /* We use glibc __register_atfork() + __dso_handle directly here, as they are not included in the glibc
-  * headers. __register_atfork() is mostly equivalent to pthread_atfork(), but doesn't require us to link against
-  * libpthread, as it is part of glibc anyway. */
- extern int __register_atfork(void (*prepare) (void), void (*parent) (void), void (*child) (void), void *dso_handle);
- extern void* __dso_handle _weak_;
-+#endif
- 
- pid_t getpid_cached(void) {
-         static bool installed = false;
-@@ -1201,7 +1206,12 @@ pid_t getpid_cached(void) {
-                          * only half-documented (glibc doesn't document it but LSB does — though only superficially)
-                          * we'll check for errors only in the most generic fashion possible. */
- 
--                        if (__register_atfork(NULL, NULL, reset_cached_pid, __dso_handle) != 0) {
-+                        #ifdef __GLIBC__
-+                            if (__register_atfork(NULL, NULL, reset_cached_pid, __dso_handle) != 0) {
-+                        #else
-+                            if (pthread_atfork(NULL, NULL, reset_cached_pid) != 0) {
-+                        #endif
-+
-                                 /* OOM? Let's try again later */
-                                 cached_pid = CACHED_PID_UNSET;
-                                 return new_pid;
diff --git a/srcpkgs/NetworkManager/patches/musl-use-srand48.patch b/srcpkgs/NetworkManager/patches/musl-use-srand48.patch
deleted file mode 100644
index 43b689f3bad1..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-use-srand48.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- shared/n-dhcp4/src/n-dhcp4-c-probe.c.orig	2020-01-06 15:35:10.128600647 +0100
-+++ shared/n-dhcp4/src/n-dhcp4-c-probe.c	2020-01-06 15:39:41.446240531 +0100
-@@ -362,7 +362,12 @@ static void n_dhcp4_client_probe_config_
-         seed16v[1] = (u64 >> 16) ^ (u64 >>  0);
-         seed16v[2] = (u64 >> 32) ^ (u64 >> 16);
- 
-+#ifdef __GLIBC__
-         r = seed48_r(seed16v, &config->entropy);
-+#else
-+        r = 0;
-+        seed48(seed16v);
-+#endif
-         c_assert(!r);
- }
- 
-@@ -379,7 +384,12 @@ uint32_t n_dhcp4_client_probe_config_get
-         long int result;
-         int r;
- 
-+#ifdef __GLIBC__
-         r = mrand48_r(&config->entropy, &result);
-+#else
-+        r = 0;
-+        result = mrand48();
-+#endif
-         c_assert(!r);
- 
-         return result;
---- shared/n-dhcp4/src/n-dhcp4-private.h.orig	2020-01-06 15:41:31.941501136 +0100
-+++ shared/n-dhcp4/src/n-dhcp4-private.h	2020-01-06 15:41:55.341556325 +0100
-@@ -267,7 +267,9 @@ struct NDhcp4ClientProbeConfig {
-         bool inform_only;
-         bool init_reboot;
-         struct in_addr requested_ip;
-+#ifdef __GLIBC__
-         struct drand48_data entropy;    /* entropy pool */
-+#endif
-         uint64_t ms_start_delay;        /* max ms to wait before starting probe */
-         NDhcp4ClientProbeOption *options[UINT8_MAX + 1];
-         int8_t request_parameters[UINT8_MAX + 1];
diff --git a/srcpkgs/NetworkManager/patches/no-gtk-doc.patch b/srcpkgs/NetworkManager/patches/no-gtk-doc.patch
new file mode 100644
index 000000000000..2fffc5160445
--- /dev/null
+++ b/srcpkgs/NetworkManager/patches/no-gtk-doc.patch
@@ -0,0 +1,28 @@
+Index: b/meson.build
+===================================================================
+--- a/meson.build
++++ b/meson.build
+@@ -943,10 +943,8 @@ if enable_qt
+ endif
+ 
+ if enable_docs
+-  assert(enable_introspection, '-Ddocs=true requires -Dintrospection=true')
+   assert(meson.version().version_compare('>= 0.46.0'), '-Ddocs requires meson >= 0.46')
+   subdir('man')
+-  subdir('docs')
+ endif
+ 
+ configure_file(
+Index: b/clients/common/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,
+ )
+ 
+-if enable_docs
++if enable_docs and enable_introspection
+   settings_docs_source = custom_target(
+     'settings-docs.h',
+     input: nm_settings_docs_xml_gir,
diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template
index d439d8b10286..b40abb73c92a 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -1,41 +1,39 @@
 # Template file for 'NetworkManager'
-# when updating to 1.24 or newer, drop the compat
-# patch in gnome-control-center and rebuild it
 pkgname=NetworkManager
-version=1.22.10
-revision=3
+version=1.30.2
+revision=1
 build_style=meson
 build_helper="gir qemu"
 configure_args="-Dpolkit_agent=true -Dsystemd_journal=false
- -Dlibaudit=no -Dovs=false -Dlibnm_glib=true -Dselinux=false
- -Dmodify_system=true -Dpolkit_agent=true -Dsystemdsystemunitdir=no
+ -Dlibaudit=no -Dovs=false -Dselinux=false
+ -Dmodify_system=true -Dsystemdsystemunitdir=no
  -Dpppd=/usr/bin/pppd -Dqt=false
  -Dsession_tracking_consolekit=false
  -Dpppd_plugin_dir=/usr/lib/pppd/2.4.9 -Dresolvconf=/usr/bin/resolvconf
  -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
- -Diwd=true
- -Dudev_dir=/usr/lib/udev -Dintrospection=$(vopt_if gir true false)
- -Dvapi=$(vopt_if vala true false)
+ -Diwd=true -Dudev_dir=/usr/lib/udev -Ddocs=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"
 hostmakedepends="gettext-devel glib-devel libxslt-devel pkg-config
- intltool dbus-glib-devel jansson-devel $(vopt_if vala vala)
- $(vopt_if gir 'python3-gobject')"
+ intltool dbus-glib-devel jansson-devel docbook-xsl
+ $(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
  ModemManager-devel readline-devel libndp-devel newt-devel jansson-devel
  libpsl-devel eudev-libudev-devel mobile-broadband-provider-info
- $(vopt_if gir libgirepository-devel) $(vopt_if elogind elogind-devel)"
+ $(vopt_if gir 'libgirepository-devel python3-gobject')
+ $(vopt_if elogind elogind-devel)"
 depends="dbus iproute2 openresolv wpa_supplicant mobile-broadband-provider-info"
 short_desc="Network Management daemon"
 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=2b29ccc1531ba7ebba95a97f40c22b963838e8b6833745efe8e6fb71fd8fca77
+checksum=0c8e80e77877860e4a4e6ab4a0f7cdc1186e356b65b042a751897188b88944d2
 # TODO: Some tests require network namespaces to run.
 make_check=extended
 lib32disabled=yes
@@ -47,6 +45,7 @@ make_dirs="
  /etc/NetworkManager/VPN 0755 root root
  /var/lib/NetworkManager 0755 root root
 "
+patch_args=-Np1
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)
@@ -57,8 +56,8 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 # Package build options
-build_options="gir vala elogind"
-build_options_default="gir vala elogind"
+build_options="gir elogind"
+build_options_default="gir elogind"
 
 pre_configure() {
 	if [ "$CROSS_BUILD" ]; then
@@ -95,8 +94,6 @@ NetworkManager-devel_package() {
 		vmove "usr/lib/*.so"
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
-		fi
-		if [ "$build_option_vala" ]; then
 			vmove usr/share/vala
 		fi
 	}

From 2b2318d249064dae22f51be38371b48de1a2be25 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Sun, 21 Mar 2021 22:41:49 -0400
Subject: [PATCH 2/3] libnma: revbump for gnome-control-center

---
 srcpkgs/libnma/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libnma/template b/srcpkgs/libnma/template
index 18b016b2b93b..bd4d9fb2ad79 100644
--- a/srcpkgs/libnma/template
+++ b/srcpkgs/libnma/template
@@ -1,7 +1,7 @@
 # Template file for 'libnma'
 pkgname=libnma
 version=1.8.30
-revision=2
+revision=3
 build_style=meson
 build_helper="gir"
 hostmakedepends="gettext glib-devel gtk-doc pkg-config vala"

From 79b446b6276b2543bdc17f78888999bcf1014fc7 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Sun, 21 Mar 2021 23:37:18 -0400
Subject: [PATCH 3/3] gnome-control-center: update to 3.38.5

---
 .../gnome-control-center/patches/nm122.patch  | 38 -------------------
 srcpkgs/gnome-control-center/template         |  4 +-
 2 files changed, 2 insertions(+), 40 deletions(-)
 delete mode 100644 srcpkgs/gnome-control-center/patches/nm122.patch

diff --git a/srcpkgs/gnome-control-center/patches/nm122.patch b/srcpkgs/gnome-control-center/patches/nm122.patch
deleted file mode 100644
index 833fed3968ea..000000000000
--- a/srcpkgs/gnome-control-center/patches/nm122.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 4159f984bd351caf6f0e1adbd90feeb85ab252f4 Mon Sep 17 00:00:00 2001
-From: Daniel Kolesa <daniel@octaforge.org>
-Date: Wed, 16 Sep 2020 22:02:04 +0200
-Subject: [PATCH] restore compatibility with networkmanager 1.22
-
-drop this patch and rebuild gnome-control-center when updating nm
----
- panels/network/net-device-wifi.c | 7 -------
- 1 file changed, 7 deletions(-)
-
-diff --git panels/network/net-device-wifi.c panels/network/net-device-wifi.c
-index cb86e5b..d63c57c 100644
---- panels/network/net-device-wifi.c
-+++ panels/network/net-device-wifi.c
-@@ -1180,11 +1180,6 @@ nm_client_on_permission_change (NetDeviceWifi *self) {
-         NMClientPermissionResult perm;
-         NMDeviceWifiCapabilities caps;
- 
--        if (nm_client_get_permissions_state (self->client) != NM_TERNARY_TRUE) {
--                /* permissions aren't ready yet */
--                return;
--        }
--
-         /* only enable the button if the user can create a hotspot */
-         perm = nm_client_get_permission_result (self->client, NM_CLIENT_PERMISSION_WIFI_SHARE_OPEN);
-         caps = nm_device_wifi_get_capabilities (NM_DEVICE_WIFI (self->device));
-@@ -1227,8 +1222,6 @@ net_device_wifi_new (CcPanel *panel, NMClient *client, NMDevice *device)
-                                  G_CALLBACK (ap_activated), self, G_CONNECT_SWAPPED);
-         g_signal_connect_object (list, "configure",
-                                  G_CALLBACK (show_details_for_row), self, G_CONNECT_SWAPPED);
--        g_signal_connect_object (client, "notify",
--                                 G_CALLBACK(nm_client_on_permission_change), self, G_CONNECT_SWAPPED);
- 
-         nm_client_on_permission_change(self);
- 
--- 
-2.28.0
-
diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index 7d4a2dc5c47a..001e057fabdc 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-control-center'
 pkgname=gnome-control-center
-version=3.38.4
+version=3.38.5
 revision=1
 build_style=meson
 build_helper="gir"
@@ -24,7 +24,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-control-center"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=49dc6378d4d35c1c6ed59224f5636916c2b6fa49bbfb8b56eb19a84d6e90cd19
+checksum=0ada859620110e829174121c7e1a3f82da80d749d6f61d426a7c8cf4464d72f9
 
 build_options="cheese"
 build_options_default="cheese"

^ permalink raw reply	[flat|nested] 73+ messages in thread

* Re: NetworkManager: update to 1.30.2, gnome-control-center: update to 3.38.5
  2021-03-09  3:41 [PR PATCH] NetworkManager: update to 1.31.1 cinerea0
                   ` (42 preceding siblings ...)
  2021-03-22  3:38 ` cinerea0
@ 2021-03-22  4:37 ` cinerea0
  2021-03-24  0:58 ` [PR REVIEW] " ericonr
                   ` (27 subsequent siblings)
  71 siblings, 0 replies; 73+ messages in thread
From: cinerea0 @ 2021-03-22  4:37 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 260 bytes --]

New comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/29342#issuecomment-803754319

Comment:
@ericonr You were correct that revbumping libnma would allow g-c-c to build correctly, all the checks have passed now.

^ permalink raw reply	[flat|nested] 73+ messages in thread

* Re: [PR REVIEW] NetworkManager: update to 1.30.2, gnome-control-center: update to 3.38.5
  2021-03-09  3:41 [PR PATCH] NetworkManager: update to 1.31.1 cinerea0
                   ` (43 preceding siblings ...)
  2021-03-22  4:37 ` NetworkManager: update to 1.30.2, gnome-control-center: update to 3.38.5 cinerea0
@ 2021-03-24  0:58 ` ericonr
  2021-03-24  0:58 ` ericonr
                   ` (26 subsequent siblings)
  71 siblings, 0 replies; 73+ messages in thread
From: ericonr @ 2021-03-24  0:58 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 301 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/29342#discussion_r600075467

Comment:
I don't get this patch, doesn't it make more sense to make doc generation depend on the gir build option? Or just always build with introspection enabled.

^ permalink raw reply	[flat|nested] 73+ messages in thread

* Re: [PR REVIEW] NetworkManager: update to 1.30.2, gnome-control-center: update to 3.38.5
  2021-03-09  3:41 [PR PATCH] NetworkManager: update to 1.31.1 cinerea0
                   ` (44 preceding siblings ...)
  2021-03-24  0:58 ` [PR REVIEW] " ericonr
@ 2021-03-24  0:58 ` ericonr
  2021-03-24  1:11 ` sgn
                   ` (25 subsequent siblings)
  71 siblings, 0 replies; 73+ messages in thread
From: ericonr @ 2021-03-24  0:58 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 179 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/29342#discussion_r600075137

Comment:
Please try to remove this block.

^ permalink raw reply	[flat|nested] 73+ messages in thread

* Re: [PR REVIEW] NetworkManager: update to 1.30.2, gnome-control-center: update to 3.38.5
  2021-03-09  3:41 [PR PATCH] NetworkManager: update to 1.31.1 cinerea0
                   ` (45 preceding siblings ...)
  2021-03-24  0:58 ` ericonr
@ 2021-03-24  1:11 ` sgn
  2021-03-24  1:48 ` ericonr
                   ` (24 subsequent siblings)
  71 siblings, 0 replies; 73+ messages in thread
From: sgn @ 2021-03-24  1:11 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 356 bytes --]

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/29342#discussion_r600079761

Comment:
`docs` subdir is about building gtk-doc, which is meant for developer and requires `gir`.
Normal users want man instead.
I couldn't build the gtk-doc on my _single_ try, so I disabled it. No code, no problem :-p

^ permalink raw reply	[flat|nested] 73+ messages in thread

* Re: [PR REVIEW] NetworkManager: update to 1.30.2, gnome-control-center: update to 3.38.5
  2021-03-09  3:41 [PR PATCH] NetworkManager: update to 1.31.1 cinerea0
                   ` (46 preceding siblings ...)
  2021-03-24  1:11 ` sgn
@ 2021-03-24  1:48 ` ericonr
  2021-03-24  2:00 ` cinerea0
                   ` (23 subsequent siblings)
  71 siblings, 0 replies; 73+ messages in thread
From: ericonr @ 2021-03-24  1:48 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 297 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/29342#discussion_r600096030

Comment:
Ah, I see! I'd appreciate a comment on top that we want only man, not the full development docs, then.

And maybe make a request to upstream for it?

^ permalink raw reply	[flat|nested] 73+ messages in thread

* Re: [PR REVIEW] NetworkManager: update to 1.30.2, gnome-control-center: update to 3.38.5
  2021-03-09  3:41 [PR PATCH] NetworkManager: update to 1.31.1 cinerea0
                   ` (47 preceding siblings ...)
  2021-03-24  1:48 ` ericonr
@ 2021-03-24  2:00 ` cinerea0
  2021-03-24  2:11 ` cinerea0
                   ` (22 subsequent siblings)
  71 siblings, 0 replies; 73+ messages in thread
From: cinerea0 @ 2021-03-24  2:00 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 299 bytes --]

New review comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/29342#discussion_r600100538

Comment:
Would it be appropriate to change `if enable_docs` to `if enable_docs and enable_introspection` and get rid of the rest of the changes in this section?

^ permalink raw reply	[flat|nested] 73+ messages in thread

* Re: [PR REVIEW] NetworkManager: update to 1.30.2, gnome-control-center: update to 3.38.5
  2021-03-09  3:41 [PR PATCH] NetworkManager: update to 1.31.1 cinerea0
                   ` (48 preceding siblings ...)
  2021-03-24  2:00 ` cinerea0
@ 2021-03-24  2:11 ` cinerea0
  2021-03-24  4:31 ` [PR PATCH] [Updated] " cinerea0
                   ` (21 subsequent siblings)
  71 siblings, 0 replies; 73+ messages in thread
From: cinerea0 @ 2021-03-24  2:11 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 349 bytes --]

New review comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/29342#discussion_r600100538

Comment:
Would it be appropriate to change `if enable_docs` to `if enable_docs and enable_introspection` and get rid of the rest of the changes in this section?

EDIT: Nevermind, didn't see the above comment.

^ permalink raw reply	[flat|nested] 73+ messages in thread

* Re: [PR PATCH] [Updated] NetworkManager: update to 1.30.2, gnome-control-center: update to 3.38.5
  2021-03-09  3:41 [PR PATCH] NetworkManager: update to 1.31.1 cinerea0
                   ` (49 preceding siblings ...)
  2021-03-24  2:11 ` cinerea0
@ 2021-03-24  4:31 ` cinerea0
  2021-03-24  4:36 ` [PR REVIEW] " cinerea0
                   ` (20 subsequent siblings)
  71 siblings, 0 replies; 73+ messages in thread
From: cinerea0 @ 2021-03-24  4:31 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1651 bytes --]

There is an updated pull request by cinerea0 against master on the void-packages repository

https://github.com/cinerea0/void-packages nm
https://github.com/void-linux/void-packages/pull/29342

NetworkManager: update to 1.30.2, gnome-control-center: update to 3.38.5
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->

Closes #27502

A patch file from https://github.com/void-linux/void-packages/pull/29342.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nm-29342.patch --]
[-- Type: text/x-diff, Size: 19365 bytes --]

From 388a1b2ae3270bd171a811ed22b35db6d1ec0dc6 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Wed, 24 Mar 2021 00:30:43 -0400
Subject: [PATCH] NetworkManager: update to 1.30.2

---
 .../patches/fix-cross-gir.patch               | 70 +++++++------------
 .../patches/fix-musl-linux-header.diff        | 15 ----
 .../patches/fix-musl-qsort_r.patch            | 16 -----
 .../NetworkManager/patches/musl-basic.patch   | 29 --------
 .../patches/musl-fix-includes.patch           | 54 --------------
 .../patches/musl-network-support.patch        | 42 -----------
 .../patches/musl-process-util.patch           | 40 -----------
 .../patches/musl-use-srand48.patch            | 40 -----------
 .../NetworkManager/patches/no-gtk-doc.patch   | 28 ++++++++
 srcpkgs/NetworkManager/template               | 30 ++++----
 10 files changed, 65 insertions(+), 299 deletions(-)
 delete mode 100644 srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff
 delete mode 100644 srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-basic.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-fix-includes.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-network-support.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-process-util.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-use-srand48.patch
 create mode 100644 srcpkgs/NetworkManager/patches/no-gtk-doc.patch

diff --git a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
index c283d4dc1059..b499a3ce23c2 100644
--- a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
+++ b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
@@ -1,52 +1,30 @@
 Reason: Fix crossbuilding GIR
 Upstream: No, not upstreamable since this is very specific to the Void setup
-diff --git clients/common/meson.build clients/common/meson.build
-index afa257b..50b53e7 100644
---- clients/common/meson.build
-+++ clients/common/meson.build
-@@ -35,7 +35,7 @@ if enable_introspection
-     settings_docs,
-     input: nm_property_docs,
-     output: settings_docs,
--    command: [xsltproc, '--output', '@OUTPUT@', join_paths(meson.current_source_dir(), 'settings-docs.xsl'), '@INPUT@'],
-+    command: [xsltproc, '--output', '@OUTPUT@', join_paths(meson.current_source_dir(), 'settings-docs.xsl'), join_paths(meson.current_source_dir(), '..', '..', '@INPUT@')],
-   )
- 
-   test(
-diff --git libnm/meson.build libnm/meson.build
-index 51ca46d..f14d861 100644
---- libnm/meson.build
-+++ libnm/meson.build
-@@ -236,7 +236,13 @@ if enable_introspection
-     )
-   endif
- 
--  generate_setting_docs = join_paths(meson.current_source_dir(), 'generate-setting-docs.py')
+--- libnm/meson.build.orig	2021-03-12 10:44:25.000000000 -0500
++++ libnm/meson.build	2021-03-23 23:10:46.315821971 -0400
+@@ -273,6 +273,16 @@
+     'GI_TYPELIB_PATH=' + gi_typelib_path,
+     'LD_LIBRARY_PATH=' + ld_library_path,
+   ]
++  
 +  if meson.is_cross_build()
-+    qemu = '/usr/bin/qemu-@XBPS_TARGET_QEMU_MACHINE@-static'
-+    qemu_python3_cmd = qemu + ' -L @XBPS_CROSS_BASE@ @XBPS_CROSS_BASE@/usr/bin/python3'
-+    generate_setting_docs = ['sh', '-c', qemu_python3_cmd, join_paths(meson.current_source_dir(), 'generate-setting-docs.py')]
++    qemu_python3_cmd = [
++      '/usr/bin/qemu-@XBPS_TARGET_QEMU_MACHINE@-static',
++      '-L', '@XBPS_CROSS_BASE@',
++      '@XBPS_CROSS_BASE@/usr/bin/python3'
++      ]
 +  else
-+    generate_setting_docs = [python.path(), join_paths(meson.current_source_dir(), 'generate-setting-docs.py')]
++    qemu_python3_cmd = python.path()
 +  endif
  
-   gi_typelib_path = run_command('printenv', 'GI_TYPELIB_PATH').stdout()
-   if gi_typelib_path != ''
-@@ -261,7 +267,7 @@ if enable_introspection
-     name,
-     input: libnm_gir[0],
-     output: name,
--    command: [generate_setting_docs_env, python.path(), generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--output', '@OUTPUT@'],
-+    command: [generate_setting_docs_env, generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--output', '@OUTPUT@'],
-     depends: libnm_gir,
-   )
- 
-@@ -270,7 +276,7 @@ if enable_introspection
-     name,
-     input: [libnm_gir[0], nm_settings_docs_overrides],
-     output: name,
--    command: [generate_setting_docs_env, python.path(), generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT0@', '--overrides', '@INPUT1@', '--output', '@OUTPUT@'],
-+    command: [generate_setting_docs_env, generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT0@', '--overrides', '@INPUT1@', '--output', '@OUTPUT@'],
-     depends: libnm_gir,
-   )
- endif
+   nm_settings_docs_xml_gir = custom_target(
+     'nm-settings-docs-gir.xml',
+@@ -280,7 +290,7 @@
+     output: 'nm-settings-docs-gir.xml',
+     command: [
+       generate_setting_docs_env,
+-      python.path(),
++      qemu_python3_cmd,
+       join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-gir.py'),
+       '--lib-path', meson.current_build_dir(),
+       '--gir', '@INPUT@',
diff --git a/srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff b/srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff
deleted file mode 100644
index 511759214a97..000000000000
--- a/srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git src/systemd/src/libsystemd-network/sd-dhcp6-client.c src/systemd/src/libsystemd-network/sd-dhcp6-client.c
-index f67a45bd2..ec11fa605 100644
---- src/systemd/src/libsystemd-network/sd-dhcp6-client.c
-+++ src/systemd/src/libsystemd-network/sd-dhcp6-client.c
-@@ -8,8 +8,10 @@
- #include <errno.h>
- #include <string.h>
- #include <sys/ioctl.h>
-+#ifdef __GLIBC__
- #include <linux/if_arp.h>
- #include <linux/if_infiniband.h>
-+#endif
- 
- #include "sd-dhcp6-client.h"
- 
diff --git a/srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch b/srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch
deleted file mode 100644
index f89eac778502..000000000000
--- a/srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git shared/systemd/src/basic/sort-util.h shared/systemd/src/basic/sort-util.h
-index e029f8646..168735087 100644
---- shared/systemd/src/basic/sort-util.h
-+++ shared/systemd/src/basic/sort-util.h
-@@ -60,7 +60,11 @@ static inline void qsort_r_safe(void *base, size_t nmemb, size_t size, __compar_
-                 return;
- 
-         assert(base);
-+#ifdef __GLIBC__
-         qsort_r(base, nmemb, size, compar, userdata);
-+#else
-+        g_qsort_with_data(base, nmemb, size, compar, userdata);
-+#endif
- }
- 
- #define typesafe_qsort_r(p, n, func, userdata)                          \
diff --git a/srcpkgs/NetworkManager/patches/musl-basic.patch b/srcpkgs/NetworkManager/patches/musl-basic.patch
deleted file mode 100644
index 63ea93ada585..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-basic.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Usual fix for musl libc
---- shared/systemd/src/basic/stdio-util.h.orig
-+++ shared/systemd/src/basic/stdio-util.h
-@@ -19,7 +19,9 @@
-   along with systemd; If not, see <http://www.gnu.org/licenses/>.
- ***/
- 
-+#if defined(__GLIBC__)
- #include <printf.h>
-+#endif
- #include <stdarg.h>
- #include <stdio.h>
- #include <sys/types.h>
- 
---- shared/systemd/src/basic/sort-util.h	2019-06-09 17:02:48.895695896 +0200
-+++ shared/systemd/src/basic/sort-util.h	2019-06-09 17:03:27.564199937 +0200
-@@ -5,6 +5,12 @@
- 
- #include "macro.h"
- 
-+#if !defined(__GLIBC__)
-+typedef int (*__compar_fn_t) (const void*, const void*);
-+typedef __compar_fn_t comparison_fn_t;
-+typedef int (*__compar_d_fn_t) (const void *, const void *, void *);
-+#endif
-+
- void *xbsearch_r(const void *key, const void *base, size_t nmemb, size_t size,
-                  __compar_d_fn_t compar, void *arg);
- 
diff --git a/srcpkgs/NetworkManager/patches/musl-fix-includes.patch b/srcpkgs/NetworkManager/patches/musl-fix-includes.patch
deleted file mode 100644
index 95ffb2d354ea..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-fix-includes.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- src/devices/nm-device.c.orig	2019-12-17 08:59:49.000000000 +0100
-+++ src/devices/nm-device.c	2020-01-06 17:29:08.678242168 +0100
-@@ -17,7 +17,11 @@
- #include <arpa/inet.h>
- #include <fcntl.h>
- #include <linux/if_addr.h>
-+#if defined(__GLIBC__)
- #include <linux/if_arp.h>
-+#else
-+#include <linux/if.h>
-+#endif
- #include <linux/rtnetlink.h>
- #include <linux/pkt_sched.h>
- 
---- src/nm-manager.c.orig	2020-01-06 17:29:08.682242177 +0100
-+++ src/nm-manager.c	2020-01-06 17:30:50.378482034 +0100
-@@ -15,6 +15,7 @@
- #include <sys/stat.h>
- #include <sys/sendfile.h>
- #include <limits.h>
-+#include <asm/types.h>
- 
- #include "nm-glib-aux/nm-c-list.h"
- 
---- src/platform/nm-linux-platform.c.orig	2019-12-17 08:59:49.000000000 +0100
-+++ src/platform/nm-linux-platform.c	2020-01-06 17:29:08.686242186 +0100
-@@ -6,6 +6,7 @@
- #include "nm-default.h"
- 
- #include "nm-linux-platform.h"
-+#include "wpan/nm-wpan-utils.h"
- 
- #include <arpa/inet.h>
- #include <dlfcn.h>
-@@ -14,7 +15,11 @@
- #include <libudev.h>
- #include <linux/fib_rules.h>
- #include <linux/ip.h>
-+#if defined(__GLIBC__)
- #include <linux/if_arp.h>
-+#else
-+#include <linux/if.h>
-+#endif
- #include <linux/if_bridge.h>
- #include <linux/if_link.h>
- #include <linux/if_tun.h>
-@@ -44,7 +49,6 @@
- #include "nm-platform-private.h"
- #include "wifi/nm-wifi-utils.h"
- #include "wifi/nm-wifi-utils-wext.h"
--#include "wpan/nm-wpan-utils.h"
- #include "nm-glib-aux/nm-io-utils.h"
- #include "nm-udev-aux/nm-udev-utils.h"
- 
diff --git a/srcpkgs/NetworkManager/patches/musl-network-support.patch b/srcpkgs/NetworkManager/patches/musl-network-support.patch
deleted file mode 100644
index 0fb63f067b17..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-network-support.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- libnm-core/nm-utils.h.orig
-+++ libnm-core/nm-utils.h
-@@ -30,7 +30,11 @@
- #include <netinet/in.h>
- 
- /* For ETH_ALEN and INFINIBAND_ALEN */
-+#if defined(__GLIBC__)
- #include <linux/if_ether.h>
-+#else
-+#define ETH_ALEN	6		/* Octets in one ethernet addr	 */
-+#endif
- #include <linux/if_infiniband.h>
- 
- #include "nm-core-enum-types.h"
---- src/platform/wifi/nm-wifi-utils.h.orig
-+++ src/platform/wifi/nm-wifi-utils.h
-@@ -22,7 +22,11 @@
- #ifndef __WIFI_UTILS_H__
- #define __WIFI_UTILS_H__
- 
-+#if defined(__GLIBC__)
- #include <net/ethernet.h>
-+#else /* musl libc */
-+#define ETH_ALEN	6		/* Octets in one ethernet addr	 */
-+#endif
- 
- #include "nm-dbus-interface.h"
- 
---- shared/systemd/src/basic/socket-util.h	2019-03-16 15:41:33.287235649 +0100
-+++ shared/systemd/src/basic/socket-util.h	2019-03-16 15:42:24.273912106 +0100
-@@ -12,6 +12,11 @@
- #include <sys/socket.h>
- #include <sys/types.h>
- #include <sys/un.h>
-+#if !defined(__GLIBC__)
-+/* SIOCGSTAMPNS from linux/asm-generic.h 
-+ * for src/systemd/src/libsystemd-network/sd-lldp.c */
-+#include <linux/sockios.h>
-+#endif
- 
- #include "macro.h"
- #include "missing_socket.h"
diff --git a/srcpkgs/NetworkManager/patches/musl-process-util.patch b/srcpkgs/NetworkManager/patches/musl-process-util.patch
deleted file mode 100644
index e406de1da850..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-process-util.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- shared/systemd/src/basic/process-util.c
-+++ shared/systemd/src/basic/process-util.c
-@@ -21,6 +21,9 @@
- #include <sys/wait.h>
- #include <syslog.h>
- #include <unistd.h>
-+#ifndef __GLIBC__
-+#include <pthread.h>
-+#endif
- #if 0 /* NM_IGNORED */
- #if HAVE_VALGRIND_VALGRIND_H
- #include <valgrind/valgrind.h>
-@@ -1168,11 +1171,13 @@ void reset_cached_pid(void) {
-         cached_pid = CACHED_PID_UNSET;
- }
- 
-+#ifdef __GLIBC__
- /* We use glibc __register_atfork() + __dso_handle directly here, as they are not included in the glibc
-  * headers. __register_atfork() is mostly equivalent to pthread_atfork(), but doesn't require us to link against
-  * libpthread, as it is part of glibc anyway. */
- extern int __register_atfork(void (*prepare) (void), void (*parent) (void), void (*child) (void), void *dso_handle);
- extern void* __dso_handle _weak_;
-+#endif
- 
- pid_t getpid_cached(void) {
-         static bool installed = false;
-@@ -1201,7 +1206,12 @@ pid_t getpid_cached(void) {
-                          * only half-documented (glibc doesn't document it but LSB does — though only superficially)
-                          * we'll check for errors only in the most generic fashion possible. */
- 
--                        if (__register_atfork(NULL, NULL, reset_cached_pid, __dso_handle) != 0) {
-+                        #ifdef __GLIBC__
-+                            if (__register_atfork(NULL, NULL, reset_cached_pid, __dso_handle) != 0) {
-+                        #else
-+                            if (pthread_atfork(NULL, NULL, reset_cached_pid) != 0) {
-+                        #endif
-+
-                                 /* OOM? Let's try again later */
-                                 cached_pid = CACHED_PID_UNSET;
-                                 return new_pid;
diff --git a/srcpkgs/NetworkManager/patches/musl-use-srand48.patch b/srcpkgs/NetworkManager/patches/musl-use-srand48.patch
deleted file mode 100644
index 43b689f3bad1..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-use-srand48.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- shared/n-dhcp4/src/n-dhcp4-c-probe.c.orig	2020-01-06 15:35:10.128600647 +0100
-+++ shared/n-dhcp4/src/n-dhcp4-c-probe.c	2020-01-06 15:39:41.446240531 +0100
-@@ -362,7 +362,12 @@ static void n_dhcp4_client_probe_config_
-         seed16v[1] = (u64 >> 16) ^ (u64 >>  0);
-         seed16v[2] = (u64 >> 32) ^ (u64 >> 16);
- 
-+#ifdef __GLIBC__
-         r = seed48_r(seed16v, &config->entropy);
-+#else
-+        r = 0;
-+        seed48(seed16v);
-+#endif
-         c_assert(!r);
- }
- 
-@@ -379,7 +384,12 @@ uint32_t n_dhcp4_client_probe_config_get
-         long int result;
-         int r;
- 
-+#ifdef __GLIBC__
-         r = mrand48_r(&config->entropy, &result);
-+#else
-+        r = 0;
-+        result = mrand48();
-+#endif
-         c_assert(!r);
- 
-         return result;
---- shared/n-dhcp4/src/n-dhcp4-private.h.orig	2020-01-06 15:41:31.941501136 +0100
-+++ shared/n-dhcp4/src/n-dhcp4-private.h	2020-01-06 15:41:55.341556325 +0100
-@@ -267,7 +267,9 @@ struct NDhcp4ClientProbeConfig {
-         bool inform_only;
-         bool init_reboot;
-         struct in_addr requested_ip;
-+#ifdef __GLIBC__
-         struct drand48_data entropy;    /* entropy pool */
-+#endif
-         uint64_t ms_start_delay;        /* max ms to wait before starting probe */
-         NDhcp4ClientProbeOption *options[UINT8_MAX + 1];
-         int8_t request_parameters[UINT8_MAX + 1];
diff --git a/srcpkgs/NetworkManager/patches/no-gtk-doc.patch b/srcpkgs/NetworkManager/patches/no-gtk-doc.patch
new file mode 100644
index 000000000000..c42b10f0accc
--- /dev/null
+++ b/srcpkgs/NetworkManager/patches/no-gtk-doc.patch
@@ -0,0 +1,28 @@
+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
+--- meson.build.orig	2021-03-12 10:53:50.000000000 -0500
++++ meson.build	2021-03-23 23:36:48.747020543 -0400
+@@ -943,10 +943,8 @@
+ endif
+ 
+ if enable_docs
+-  assert(enable_introspection, '-Ddocs=true requires -Dintrospection=true')
+   assert(meson.version().version_compare('>= 0.46.0'), '-Ddocs requires meson >= 0.46')
+   subdir('man')
+-  subdir('docs')
+ endif
+ 
+ configure_file(
+
+
+--- clients/common/meson.build.orig	2021-03-12 10:44:25.000000000 -0500
++++ clients/common/meson.build	2021-03-23 23:45:06.878137038 -0400
+@@ -28,7 +28,7 @@
+   link_with: libnmc_base,
+ )
+ 
+-if enable_docs
++if enable_docs and enable_introspection
+   settings_docs_source = custom_target(
+     'settings-docs.h',
+     input: nm_settings_docs_xml_gir,
diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template
index d439d8b10286..f1c73500dacd 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -1,41 +1,39 @@
 # Template file for 'NetworkManager'
-# when updating to 1.24 or newer, drop the compat
-# patch in gnome-control-center and rebuild it
 pkgname=NetworkManager
-version=1.22.10
-revision=3
+version=1.30.2
+revision=1
 build_style=meson
 build_helper="gir qemu"
 configure_args="-Dpolkit_agent=true -Dsystemd_journal=false
- -Dlibaudit=no -Dovs=false -Dlibnm_glib=true -Dselinux=false
- -Dmodify_system=true -Dpolkit_agent=true -Dsystemdsystemunitdir=no
+ -Dlibaudit=no -Dovs=false -Dselinux=false
+ -Dmodify_system=true -Dsystemdsystemunitdir=no
  -Dpppd=/usr/bin/pppd -Dqt=false
  -Dsession_tracking_consolekit=false
  -Dpppd_plugin_dir=/usr/lib/pppd/2.4.9 -Dresolvconf=/usr/bin/resolvconf
  -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
- -Diwd=true
- -Dudev_dir=/usr/lib/udev -Dintrospection=$(vopt_if gir true false)
- -Dvapi=$(vopt_if vala true false)
+ -Diwd=true -Dudev_dir=/usr/lib/udev -Ddocs=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"
 hostmakedepends="gettext-devel glib-devel libxslt-devel pkg-config
- intltool dbus-glib-devel jansson-devel $(vopt_if vala vala)
- $(vopt_if gir 'python3-gobject')"
+ intltool dbus-glib-devel jansson-devel docbook-xsl
+ $(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
  ModemManager-devel readline-devel libndp-devel newt-devel jansson-devel
  libpsl-devel eudev-libudev-devel mobile-broadband-provider-info
- $(vopt_if gir libgirepository-devel) $(vopt_if elogind elogind-devel)"
+ $(vopt_if gir 'libgirepository-devel python3-gobject')
+ $(vopt_if elogind elogind-devel)"
 depends="dbus iproute2 openresolv wpa_supplicant mobile-broadband-provider-info"
 short_desc="Network Management daemon"
 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=2b29ccc1531ba7ebba95a97f40c22b963838e8b6833745efe8e6fb71fd8fca77
+checksum=0c8e80e77877860e4a4e6ab4a0f7cdc1186e356b65b042a751897188b88944d2
 # TODO: Some tests require network namespaces to run.
 make_check=extended
 lib32disabled=yes
@@ -57,8 +55,8 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 # Package build options
-build_options="gir vala elogind"
-build_options_default="gir vala elogind"
+build_options="gir elogind"
+build_options_default="gir elogind"
 
 pre_configure() {
 	if [ "$CROSS_BUILD" ]; then
@@ -95,8 +93,6 @@ NetworkManager-devel_package() {
 		vmove "usr/lib/*.so"
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
-		fi
-		if [ "$build_option_vala" ]; then
 			vmove usr/share/vala
 		fi
 	}

^ permalink raw reply	[flat|nested] 73+ messages in thread

* Re: [PR REVIEW] NetworkManager: update to 1.30.2, gnome-control-center: update to 3.38.5
  2021-03-09  3:41 [PR PATCH] NetworkManager: update to 1.31.1 cinerea0
                   ` (50 preceding siblings ...)
  2021-03-24  4:31 ` [PR PATCH] [Updated] " cinerea0
@ 2021-03-24  4:36 ` cinerea0
  2021-03-24  5:04 ` cinerea0
                   ` (19 subsequent siblings)
  71 siblings, 0 replies; 73+ messages in thread
From: cinerea0 @ 2021-03-24  4:36 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 239 bytes --]

New review comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/29342#discussion_r600160017

Comment:
I filed an issue: https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/689

^ permalink raw reply	[flat|nested] 73+ messages in thread

* Re: [PR REVIEW] NetworkManager: update to 1.30.2, gnome-control-center: update to 3.38.5
  2021-03-09  3:41 [PR PATCH] NetworkManager: update to 1.31.1 cinerea0
                   ` (51 preceding siblings ...)
  2021-03-24  4:36 ` [PR REVIEW] " cinerea0
@ 2021-03-24  5:04 ` cinerea0
  2021-03-24  5:05 ` [PR PATCH] [Updated] " cinerea0
                   ` (18 subsequent siblings)
  71 siblings, 0 replies; 73+ messages in thread
From: cinerea0 @ 2021-03-24  5:04 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 178 bytes --]

New review comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/29342#discussion_r600175264

Comment:
Fixed in the most recent push.

^ permalink raw reply	[flat|nested] 73+ messages in thread

* Re: [PR PATCH] [Updated] NetworkManager: update to 1.30.2, gnome-control-center: update to 3.38.5
  2021-03-09  3:41 [PR PATCH] NetworkManager: update to 1.31.1 cinerea0
                   ` (52 preceding siblings ...)
  2021-03-24  5:04 ` cinerea0
@ 2021-03-24  5:05 ` cinerea0
  2021-03-24 13:41 ` [PR REVIEW] " ericonr
                   ` (17 subsequent siblings)
  71 siblings, 0 replies; 73+ messages in thread
From: cinerea0 @ 2021-03-24  5:05 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1651 bytes --]

There is an updated pull request by cinerea0 against master on the void-packages repository

https://github.com/cinerea0/void-packages nm
https://github.com/void-linux/void-packages/pull/29342

NetworkManager: update to 1.30.2, gnome-control-center: update to 3.38.5
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->

Closes #27502

A patch file from https://github.com/void-linux/void-packages/pull/29342.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nm-29342.patch --]
[-- Type: text/x-diff, Size: 20033 bytes --]

From 388a1b2ae3270bd171a811ed22b35db6d1ec0dc6 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Wed, 24 Mar 2021 00:30:43 -0400
Subject: [PATCH 1/2] NetworkManager: update to 1.30.2

---
 .../patches/fix-cross-gir.patch               | 70 +++++++------------
 .../patches/fix-musl-linux-header.diff        | 15 ----
 .../patches/fix-musl-qsort_r.patch            | 16 -----
 .../NetworkManager/patches/musl-basic.patch   | 29 --------
 .../patches/musl-fix-includes.patch           | 54 --------------
 .../patches/musl-network-support.patch        | 42 -----------
 .../patches/musl-process-util.patch           | 40 -----------
 .../patches/musl-use-srand48.patch            | 40 -----------
 .../NetworkManager/patches/no-gtk-doc.patch   | 28 ++++++++
 srcpkgs/NetworkManager/template               | 30 ++++----
 10 files changed, 65 insertions(+), 299 deletions(-)
 delete mode 100644 srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff
 delete mode 100644 srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-basic.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-fix-includes.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-network-support.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-process-util.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-use-srand48.patch
 create mode 100644 srcpkgs/NetworkManager/patches/no-gtk-doc.patch

diff --git a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
index c283d4dc1059..b499a3ce23c2 100644
--- a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
+++ b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
@@ -1,52 +1,30 @@
 Reason: Fix crossbuilding GIR
 Upstream: No, not upstreamable since this is very specific to the Void setup
-diff --git clients/common/meson.build clients/common/meson.build
-index afa257b..50b53e7 100644
---- clients/common/meson.build
-+++ clients/common/meson.build
-@@ -35,7 +35,7 @@ if enable_introspection
-     settings_docs,
-     input: nm_property_docs,
-     output: settings_docs,
--    command: [xsltproc, '--output', '@OUTPUT@', join_paths(meson.current_source_dir(), 'settings-docs.xsl'), '@INPUT@'],
-+    command: [xsltproc, '--output', '@OUTPUT@', join_paths(meson.current_source_dir(), 'settings-docs.xsl'), join_paths(meson.current_source_dir(), '..', '..', '@INPUT@')],
-   )
- 
-   test(
-diff --git libnm/meson.build libnm/meson.build
-index 51ca46d..f14d861 100644
---- libnm/meson.build
-+++ libnm/meson.build
-@@ -236,7 +236,13 @@ if enable_introspection
-     )
-   endif
- 
--  generate_setting_docs = join_paths(meson.current_source_dir(), 'generate-setting-docs.py')
+--- libnm/meson.build.orig	2021-03-12 10:44:25.000000000 -0500
++++ libnm/meson.build	2021-03-23 23:10:46.315821971 -0400
+@@ -273,6 +273,16 @@
+     'GI_TYPELIB_PATH=' + gi_typelib_path,
+     'LD_LIBRARY_PATH=' + ld_library_path,
+   ]
++  
 +  if meson.is_cross_build()
-+    qemu = '/usr/bin/qemu-@XBPS_TARGET_QEMU_MACHINE@-static'
-+    qemu_python3_cmd = qemu + ' -L @XBPS_CROSS_BASE@ @XBPS_CROSS_BASE@/usr/bin/python3'
-+    generate_setting_docs = ['sh', '-c', qemu_python3_cmd, join_paths(meson.current_source_dir(), 'generate-setting-docs.py')]
++    qemu_python3_cmd = [
++      '/usr/bin/qemu-@XBPS_TARGET_QEMU_MACHINE@-static',
++      '-L', '@XBPS_CROSS_BASE@',
++      '@XBPS_CROSS_BASE@/usr/bin/python3'
++      ]
 +  else
-+    generate_setting_docs = [python.path(), join_paths(meson.current_source_dir(), 'generate-setting-docs.py')]
++    qemu_python3_cmd = python.path()
 +  endif
  
-   gi_typelib_path = run_command('printenv', 'GI_TYPELIB_PATH').stdout()
-   if gi_typelib_path != ''
-@@ -261,7 +267,7 @@ if enable_introspection
-     name,
-     input: libnm_gir[0],
-     output: name,
--    command: [generate_setting_docs_env, python.path(), generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--output', '@OUTPUT@'],
-+    command: [generate_setting_docs_env, generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--output', '@OUTPUT@'],
-     depends: libnm_gir,
-   )
- 
-@@ -270,7 +276,7 @@ if enable_introspection
-     name,
-     input: [libnm_gir[0], nm_settings_docs_overrides],
-     output: name,
--    command: [generate_setting_docs_env, python.path(), generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT0@', '--overrides', '@INPUT1@', '--output', '@OUTPUT@'],
-+    command: [generate_setting_docs_env, generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT0@', '--overrides', '@INPUT1@', '--output', '@OUTPUT@'],
-     depends: libnm_gir,
-   )
- endif
+   nm_settings_docs_xml_gir = custom_target(
+     'nm-settings-docs-gir.xml',
+@@ -280,7 +290,7 @@
+     output: 'nm-settings-docs-gir.xml',
+     command: [
+       generate_setting_docs_env,
+-      python.path(),
++      qemu_python3_cmd,
+       join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-gir.py'),
+       '--lib-path', meson.current_build_dir(),
+       '--gir', '@INPUT@',
diff --git a/srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff b/srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff
deleted file mode 100644
index 511759214a97..000000000000
--- a/srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git src/systemd/src/libsystemd-network/sd-dhcp6-client.c src/systemd/src/libsystemd-network/sd-dhcp6-client.c
-index f67a45bd2..ec11fa605 100644
---- src/systemd/src/libsystemd-network/sd-dhcp6-client.c
-+++ src/systemd/src/libsystemd-network/sd-dhcp6-client.c
-@@ -8,8 +8,10 @@
- #include <errno.h>
- #include <string.h>
- #include <sys/ioctl.h>
-+#ifdef __GLIBC__
- #include <linux/if_arp.h>
- #include <linux/if_infiniband.h>
-+#endif
- 
- #include "sd-dhcp6-client.h"
- 
diff --git a/srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch b/srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch
deleted file mode 100644
index f89eac778502..000000000000
--- a/srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git shared/systemd/src/basic/sort-util.h shared/systemd/src/basic/sort-util.h
-index e029f8646..168735087 100644
---- shared/systemd/src/basic/sort-util.h
-+++ shared/systemd/src/basic/sort-util.h
-@@ -60,7 +60,11 @@ static inline void qsort_r_safe(void *base, size_t nmemb, size_t size, __compar_
-                 return;
- 
-         assert(base);
-+#ifdef __GLIBC__
-         qsort_r(base, nmemb, size, compar, userdata);
-+#else
-+        g_qsort_with_data(base, nmemb, size, compar, userdata);
-+#endif
- }
- 
- #define typesafe_qsort_r(p, n, func, userdata)                          \
diff --git a/srcpkgs/NetworkManager/patches/musl-basic.patch b/srcpkgs/NetworkManager/patches/musl-basic.patch
deleted file mode 100644
index 63ea93ada585..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-basic.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Usual fix for musl libc
---- shared/systemd/src/basic/stdio-util.h.orig
-+++ shared/systemd/src/basic/stdio-util.h
-@@ -19,7 +19,9 @@
-   along with systemd; If not, see <http://www.gnu.org/licenses/>.
- ***/
- 
-+#if defined(__GLIBC__)
- #include <printf.h>
-+#endif
- #include <stdarg.h>
- #include <stdio.h>
- #include <sys/types.h>
- 
---- shared/systemd/src/basic/sort-util.h	2019-06-09 17:02:48.895695896 +0200
-+++ shared/systemd/src/basic/sort-util.h	2019-06-09 17:03:27.564199937 +0200
-@@ -5,6 +5,12 @@
- 
- #include "macro.h"
- 
-+#if !defined(__GLIBC__)
-+typedef int (*__compar_fn_t) (const void*, const void*);
-+typedef __compar_fn_t comparison_fn_t;
-+typedef int (*__compar_d_fn_t) (const void *, const void *, void *);
-+#endif
-+
- void *xbsearch_r(const void *key, const void *base, size_t nmemb, size_t size,
-                  __compar_d_fn_t compar, void *arg);
- 
diff --git a/srcpkgs/NetworkManager/patches/musl-fix-includes.patch b/srcpkgs/NetworkManager/patches/musl-fix-includes.patch
deleted file mode 100644
index 95ffb2d354ea..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-fix-includes.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- src/devices/nm-device.c.orig	2019-12-17 08:59:49.000000000 +0100
-+++ src/devices/nm-device.c	2020-01-06 17:29:08.678242168 +0100
-@@ -17,7 +17,11 @@
- #include <arpa/inet.h>
- #include <fcntl.h>
- #include <linux/if_addr.h>
-+#if defined(__GLIBC__)
- #include <linux/if_arp.h>
-+#else
-+#include <linux/if.h>
-+#endif
- #include <linux/rtnetlink.h>
- #include <linux/pkt_sched.h>
- 
---- src/nm-manager.c.orig	2020-01-06 17:29:08.682242177 +0100
-+++ src/nm-manager.c	2020-01-06 17:30:50.378482034 +0100
-@@ -15,6 +15,7 @@
- #include <sys/stat.h>
- #include <sys/sendfile.h>
- #include <limits.h>
-+#include <asm/types.h>
- 
- #include "nm-glib-aux/nm-c-list.h"
- 
---- src/platform/nm-linux-platform.c.orig	2019-12-17 08:59:49.000000000 +0100
-+++ src/platform/nm-linux-platform.c	2020-01-06 17:29:08.686242186 +0100
-@@ -6,6 +6,7 @@
- #include "nm-default.h"
- 
- #include "nm-linux-platform.h"
-+#include "wpan/nm-wpan-utils.h"
- 
- #include <arpa/inet.h>
- #include <dlfcn.h>
-@@ -14,7 +15,11 @@
- #include <libudev.h>
- #include <linux/fib_rules.h>
- #include <linux/ip.h>
-+#if defined(__GLIBC__)
- #include <linux/if_arp.h>
-+#else
-+#include <linux/if.h>
-+#endif
- #include <linux/if_bridge.h>
- #include <linux/if_link.h>
- #include <linux/if_tun.h>
-@@ -44,7 +49,6 @@
- #include "nm-platform-private.h"
- #include "wifi/nm-wifi-utils.h"
- #include "wifi/nm-wifi-utils-wext.h"
--#include "wpan/nm-wpan-utils.h"
- #include "nm-glib-aux/nm-io-utils.h"
- #include "nm-udev-aux/nm-udev-utils.h"
- 
diff --git a/srcpkgs/NetworkManager/patches/musl-network-support.patch b/srcpkgs/NetworkManager/patches/musl-network-support.patch
deleted file mode 100644
index 0fb63f067b17..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-network-support.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- libnm-core/nm-utils.h.orig
-+++ libnm-core/nm-utils.h
-@@ -30,7 +30,11 @@
- #include <netinet/in.h>
- 
- /* For ETH_ALEN and INFINIBAND_ALEN */
-+#if defined(__GLIBC__)
- #include <linux/if_ether.h>
-+#else
-+#define ETH_ALEN	6		/* Octets in one ethernet addr	 */
-+#endif
- #include <linux/if_infiniband.h>
- 
- #include "nm-core-enum-types.h"
---- src/platform/wifi/nm-wifi-utils.h.orig
-+++ src/platform/wifi/nm-wifi-utils.h
-@@ -22,7 +22,11 @@
- #ifndef __WIFI_UTILS_H__
- #define __WIFI_UTILS_H__
- 
-+#if defined(__GLIBC__)
- #include <net/ethernet.h>
-+#else /* musl libc */
-+#define ETH_ALEN	6		/* Octets in one ethernet addr	 */
-+#endif
- 
- #include "nm-dbus-interface.h"
- 
---- shared/systemd/src/basic/socket-util.h	2019-03-16 15:41:33.287235649 +0100
-+++ shared/systemd/src/basic/socket-util.h	2019-03-16 15:42:24.273912106 +0100
-@@ -12,6 +12,11 @@
- #include <sys/socket.h>
- #include <sys/types.h>
- #include <sys/un.h>
-+#if !defined(__GLIBC__)
-+/* SIOCGSTAMPNS from linux/asm-generic.h 
-+ * for src/systemd/src/libsystemd-network/sd-lldp.c */
-+#include <linux/sockios.h>
-+#endif
- 
- #include "macro.h"
- #include "missing_socket.h"
diff --git a/srcpkgs/NetworkManager/patches/musl-process-util.patch b/srcpkgs/NetworkManager/patches/musl-process-util.patch
deleted file mode 100644
index e406de1da850..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-process-util.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- shared/systemd/src/basic/process-util.c
-+++ shared/systemd/src/basic/process-util.c
-@@ -21,6 +21,9 @@
- #include <sys/wait.h>
- #include <syslog.h>
- #include <unistd.h>
-+#ifndef __GLIBC__
-+#include <pthread.h>
-+#endif
- #if 0 /* NM_IGNORED */
- #if HAVE_VALGRIND_VALGRIND_H
- #include <valgrind/valgrind.h>
-@@ -1168,11 +1171,13 @@ void reset_cached_pid(void) {
-         cached_pid = CACHED_PID_UNSET;
- }
- 
-+#ifdef __GLIBC__
- /* We use glibc __register_atfork() + __dso_handle directly here, as they are not included in the glibc
-  * headers. __register_atfork() is mostly equivalent to pthread_atfork(), but doesn't require us to link against
-  * libpthread, as it is part of glibc anyway. */
- extern int __register_atfork(void (*prepare) (void), void (*parent) (void), void (*child) (void), void *dso_handle);
- extern void* __dso_handle _weak_;
-+#endif
- 
- pid_t getpid_cached(void) {
-         static bool installed = false;
-@@ -1201,7 +1206,12 @@ pid_t getpid_cached(void) {
-                          * only half-documented (glibc doesn't document it but LSB does — though only superficially)
-                          * we'll check for errors only in the most generic fashion possible. */
- 
--                        if (__register_atfork(NULL, NULL, reset_cached_pid, __dso_handle) != 0) {
-+                        #ifdef __GLIBC__
-+                            if (__register_atfork(NULL, NULL, reset_cached_pid, __dso_handle) != 0) {
-+                        #else
-+                            if (pthread_atfork(NULL, NULL, reset_cached_pid) != 0) {
-+                        #endif
-+
-                                 /* OOM? Let's try again later */
-                                 cached_pid = CACHED_PID_UNSET;
-                                 return new_pid;
diff --git a/srcpkgs/NetworkManager/patches/musl-use-srand48.patch b/srcpkgs/NetworkManager/patches/musl-use-srand48.patch
deleted file mode 100644
index 43b689f3bad1..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-use-srand48.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- shared/n-dhcp4/src/n-dhcp4-c-probe.c.orig	2020-01-06 15:35:10.128600647 +0100
-+++ shared/n-dhcp4/src/n-dhcp4-c-probe.c	2020-01-06 15:39:41.446240531 +0100
-@@ -362,7 +362,12 @@ static void n_dhcp4_client_probe_config_
-         seed16v[1] = (u64 >> 16) ^ (u64 >>  0);
-         seed16v[2] = (u64 >> 32) ^ (u64 >> 16);
- 
-+#ifdef __GLIBC__
-         r = seed48_r(seed16v, &config->entropy);
-+#else
-+        r = 0;
-+        seed48(seed16v);
-+#endif
-         c_assert(!r);
- }
- 
-@@ -379,7 +384,12 @@ uint32_t n_dhcp4_client_probe_config_get
-         long int result;
-         int r;
- 
-+#ifdef __GLIBC__
-         r = mrand48_r(&config->entropy, &result);
-+#else
-+        r = 0;
-+        result = mrand48();
-+#endif
-         c_assert(!r);
- 
-         return result;
---- shared/n-dhcp4/src/n-dhcp4-private.h.orig	2020-01-06 15:41:31.941501136 +0100
-+++ shared/n-dhcp4/src/n-dhcp4-private.h	2020-01-06 15:41:55.341556325 +0100
-@@ -267,7 +267,9 @@ struct NDhcp4ClientProbeConfig {
-         bool inform_only;
-         bool init_reboot;
-         struct in_addr requested_ip;
-+#ifdef __GLIBC__
-         struct drand48_data entropy;    /* entropy pool */
-+#endif
-         uint64_t ms_start_delay;        /* max ms to wait before starting probe */
-         NDhcp4ClientProbeOption *options[UINT8_MAX + 1];
-         int8_t request_parameters[UINT8_MAX + 1];
diff --git a/srcpkgs/NetworkManager/patches/no-gtk-doc.patch b/srcpkgs/NetworkManager/patches/no-gtk-doc.patch
new file mode 100644
index 000000000000..c42b10f0accc
--- /dev/null
+++ b/srcpkgs/NetworkManager/patches/no-gtk-doc.patch
@@ -0,0 +1,28 @@
+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
+--- meson.build.orig	2021-03-12 10:53:50.000000000 -0500
++++ meson.build	2021-03-23 23:36:48.747020543 -0400
+@@ -943,10 +943,8 @@
+ endif
+ 
+ if enable_docs
+-  assert(enable_introspection, '-Ddocs=true requires -Dintrospection=true')
+   assert(meson.version().version_compare('>= 0.46.0'), '-Ddocs requires meson >= 0.46')
+   subdir('man')
+-  subdir('docs')
+ endif
+ 
+ configure_file(
+
+
+--- clients/common/meson.build.orig	2021-03-12 10:44:25.000000000 -0500
++++ clients/common/meson.build	2021-03-23 23:45:06.878137038 -0400
+@@ -28,7 +28,7 @@
+   link_with: libnmc_base,
+ )
+ 
+-if enable_docs
++if enable_docs and enable_introspection
+   settings_docs_source = custom_target(
+     'settings-docs.h',
+     input: nm_settings_docs_xml_gir,
diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template
index d439d8b10286..f1c73500dacd 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -1,41 +1,39 @@
 # Template file for 'NetworkManager'
-# when updating to 1.24 or newer, drop the compat
-# patch in gnome-control-center and rebuild it
 pkgname=NetworkManager
-version=1.22.10
-revision=3
+version=1.30.2
+revision=1
 build_style=meson
 build_helper="gir qemu"
 configure_args="-Dpolkit_agent=true -Dsystemd_journal=false
- -Dlibaudit=no -Dovs=false -Dlibnm_glib=true -Dselinux=false
- -Dmodify_system=true -Dpolkit_agent=true -Dsystemdsystemunitdir=no
+ -Dlibaudit=no -Dovs=false -Dselinux=false
+ -Dmodify_system=true -Dsystemdsystemunitdir=no
  -Dpppd=/usr/bin/pppd -Dqt=false
  -Dsession_tracking_consolekit=false
  -Dpppd_plugin_dir=/usr/lib/pppd/2.4.9 -Dresolvconf=/usr/bin/resolvconf
  -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
- -Diwd=true
- -Dudev_dir=/usr/lib/udev -Dintrospection=$(vopt_if gir true false)
- -Dvapi=$(vopt_if vala true false)
+ -Diwd=true -Dudev_dir=/usr/lib/udev -Ddocs=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"
 hostmakedepends="gettext-devel glib-devel libxslt-devel pkg-config
- intltool dbus-glib-devel jansson-devel $(vopt_if vala vala)
- $(vopt_if gir 'python3-gobject')"
+ intltool dbus-glib-devel jansson-devel docbook-xsl
+ $(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
  ModemManager-devel readline-devel libndp-devel newt-devel jansson-devel
  libpsl-devel eudev-libudev-devel mobile-broadband-provider-info
- $(vopt_if gir libgirepository-devel) $(vopt_if elogind elogind-devel)"
+ $(vopt_if gir 'libgirepository-devel python3-gobject')
+ $(vopt_if elogind elogind-devel)"
 depends="dbus iproute2 openresolv wpa_supplicant mobile-broadband-provider-info"
 short_desc="Network Management daemon"
 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=2b29ccc1531ba7ebba95a97f40c22b963838e8b6833745efe8e6fb71fd8fca77
+checksum=0c8e80e77877860e4a4e6ab4a0f7cdc1186e356b65b042a751897188b88944d2
 # TODO: Some tests require network namespaces to run.
 make_check=extended
 lib32disabled=yes
@@ -57,8 +55,8 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 # Package build options
-build_options="gir vala elogind"
-build_options_default="gir vala elogind"
+build_options="gir elogind"
+build_options_default="gir elogind"
 
 pre_configure() {
 	if [ "$CROSS_BUILD" ]; then
@@ -95,8 +93,6 @@ NetworkManager-devel_package() {
 		vmove "usr/lib/*.so"
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
-		fi
-		if [ "$build_option_vala" ]; then
 			vmove usr/share/vala
 		fi
 	}

From 5ca12deae1b0a2a41dbb8a7735b2a8fc1982d92e Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Wed, 24 Mar 2021 01:04:47 -0400
Subject: [PATCH 2/2] libnma: revbump for gnome-control-center

---
 srcpkgs/libnma/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libnma/template b/srcpkgs/libnma/template
index 18b016b2b93b..bd4d9fb2ad79 100644
--- a/srcpkgs/libnma/template
+++ b/srcpkgs/libnma/template
@@ -1,7 +1,7 @@
 # Template file for 'libnma'
 pkgname=libnma
 version=1.8.30
-revision=2
+revision=3
 build_style=meson
 build_helper="gir"
 hostmakedepends="gettext glib-devel gtk-doc pkg-config vala"

^ permalink raw reply	[flat|nested] 73+ messages in thread

* Re: [PR REVIEW] NetworkManager: update to 1.30.2, gnome-control-center: update to 3.38.5
  2021-03-09  3:41 [PR PATCH] NetworkManager: update to 1.31.1 cinerea0
                   ` (53 preceding siblings ...)
  2021-03-24  5:05 ` [PR PATCH] [Updated] " cinerea0
@ 2021-03-24 13:41 ` ericonr
  2021-03-24 15:02 ` [PR PATCH] [Updated] " cinerea0
                   ` (16 subsequent siblings)
  71 siblings, 0 replies; 73+ messages in thread
From: ericonr @ 2021-03-24 13:41 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 419 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/29342#discussion_r600486546

Comment:
There might have been a misunderstanding? I wasn't talking about `patch_args` (that's fine, and you probably want to leave `-Np1`, which is the direction we want to move in, but rather about the `case XBPS_TARGET_MACHINE` block, which should no longer be necessary, maybe.

^ permalink raw reply	[flat|nested] 73+ messages in thread

* Re: [PR PATCH] [Updated] NetworkManager: update to 1.30.2, gnome-control-center: update to 3.38.5
  2021-03-09  3:41 [PR PATCH] NetworkManager: update to 1.31.1 cinerea0
                   ` (54 preceding siblings ...)
  2021-03-24 13:41 ` [PR REVIEW] " ericonr
@ 2021-03-24 15:02 ` cinerea0
  2021-03-24 15:36 ` cinerea0
                   ` (15 subsequent siblings)
  71 siblings, 0 replies; 73+ messages in thread
From: cinerea0 @ 2021-03-24 15:02 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1651 bytes --]

There is an updated pull request by cinerea0 against master on the void-packages repository

https://github.com/cinerea0/void-packages nm
https://github.com/void-linux/void-packages/pull/29342

NetworkManager: update to 1.30.2, gnome-control-center: update to 3.38.5
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->

Closes #27502

A patch file from https://github.com/void-linux/void-packages/pull/29342.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nm-29342.patch --]
[-- Type: text/x-diff, Size: 23313 bytes --]

From 388a1b2ae3270bd171a811ed22b35db6d1ec0dc6 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Wed, 24 Mar 2021 00:30:43 -0400
Subject: [PATCH 1/3] NetworkManager: update to 1.30.2

---
 .../patches/fix-cross-gir.patch               | 70 +++++++------------
 .../patches/fix-musl-linux-header.diff        | 15 ----
 .../patches/fix-musl-qsort_r.patch            | 16 -----
 .../NetworkManager/patches/musl-basic.patch   | 29 --------
 .../patches/musl-fix-includes.patch           | 54 --------------
 .../patches/musl-network-support.patch        | 42 -----------
 .../patches/musl-process-util.patch           | 40 -----------
 .../patches/musl-use-srand48.patch            | 40 -----------
 .../NetworkManager/patches/no-gtk-doc.patch   | 28 ++++++++
 srcpkgs/NetworkManager/template               | 30 ++++----
 10 files changed, 65 insertions(+), 299 deletions(-)
 delete mode 100644 srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff
 delete mode 100644 srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-basic.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-fix-includes.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-network-support.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-process-util.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-use-srand48.patch
 create mode 100644 srcpkgs/NetworkManager/patches/no-gtk-doc.patch

diff --git a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
index c283d4dc1059..b499a3ce23c2 100644
--- a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
+++ b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
@@ -1,52 +1,30 @@
 Reason: Fix crossbuilding GIR
 Upstream: No, not upstreamable since this is very specific to the Void setup
-diff --git clients/common/meson.build clients/common/meson.build
-index afa257b..50b53e7 100644
---- clients/common/meson.build
-+++ clients/common/meson.build
-@@ -35,7 +35,7 @@ if enable_introspection
-     settings_docs,
-     input: nm_property_docs,
-     output: settings_docs,
--    command: [xsltproc, '--output', '@OUTPUT@', join_paths(meson.current_source_dir(), 'settings-docs.xsl'), '@INPUT@'],
-+    command: [xsltproc, '--output', '@OUTPUT@', join_paths(meson.current_source_dir(), 'settings-docs.xsl'), join_paths(meson.current_source_dir(), '..', '..', '@INPUT@')],
-   )
- 
-   test(
-diff --git libnm/meson.build libnm/meson.build
-index 51ca46d..f14d861 100644
---- libnm/meson.build
-+++ libnm/meson.build
-@@ -236,7 +236,13 @@ if enable_introspection
-     )
-   endif
- 
--  generate_setting_docs = join_paths(meson.current_source_dir(), 'generate-setting-docs.py')
+--- libnm/meson.build.orig	2021-03-12 10:44:25.000000000 -0500
++++ libnm/meson.build	2021-03-23 23:10:46.315821971 -0400
+@@ -273,6 +273,16 @@
+     'GI_TYPELIB_PATH=' + gi_typelib_path,
+     'LD_LIBRARY_PATH=' + ld_library_path,
+   ]
++  
 +  if meson.is_cross_build()
-+    qemu = '/usr/bin/qemu-@XBPS_TARGET_QEMU_MACHINE@-static'
-+    qemu_python3_cmd = qemu + ' -L @XBPS_CROSS_BASE@ @XBPS_CROSS_BASE@/usr/bin/python3'
-+    generate_setting_docs = ['sh', '-c', qemu_python3_cmd, join_paths(meson.current_source_dir(), 'generate-setting-docs.py')]
++    qemu_python3_cmd = [
++      '/usr/bin/qemu-@XBPS_TARGET_QEMU_MACHINE@-static',
++      '-L', '@XBPS_CROSS_BASE@',
++      '@XBPS_CROSS_BASE@/usr/bin/python3'
++      ]
 +  else
-+    generate_setting_docs = [python.path(), join_paths(meson.current_source_dir(), 'generate-setting-docs.py')]
++    qemu_python3_cmd = python.path()
 +  endif
  
-   gi_typelib_path = run_command('printenv', 'GI_TYPELIB_PATH').stdout()
-   if gi_typelib_path != ''
-@@ -261,7 +267,7 @@ if enable_introspection
-     name,
-     input: libnm_gir[0],
-     output: name,
--    command: [generate_setting_docs_env, python.path(), generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--output', '@OUTPUT@'],
-+    command: [generate_setting_docs_env, generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--output', '@OUTPUT@'],
-     depends: libnm_gir,
-   )
- 
-@@ -270,7 +276,7 @@ if enable_introspection
-     name,
-     input: [libnm_gir[0], nm_settings_docs_overrides],
-     output: name,
--    command: [generate_setting_docs_env, python.path(), generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT0@', '--overrides', '@INPUT1@', '--output', '@OUTPUT@'],
-+    command: [generate_setting_docs_env, generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT0@', '--overrides', '@INPUT1@', '--output', '@OUTPUT@'],
-     depends: libnm_gir,
-   )
- endif
+   nm_settings_docs_xml_gir = custom_target(
+     'nm-settings-docs-gir.xml',
+@@ -280,7 +290,7 @@
+     output: 'nm-settings-docs-gir.xml',
+     command: [
+       generate_setting_docs_env,
+-      python.path(),
++      qemu_python3_cmd,
+       join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-gir.py'),
+       '--lib-path', meson.current_build_dir(),
+       '--gir', '@INPUT@',
diff --git a/srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff b/srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff
deleted file mode 100644
index 511759214a97..000000000000
--- a/srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git src/systemd/src/libsystemd-network/sd-dhcp6-client.c src/systemd/src/libsystemd-network/sd-dhcp6-client.c
-index f67a45bd2..ec11fa605 100644
---- src/systemd/src/libsystemd-network/sd-dhcp6-client.c
-+++ src/systemd/src/libsystemd-network/sd-dhcp6-client.c
-@@ -8,8 +8,10 @@
- #include <errno.h>
- #include <string.h>
- #include <sys/ioctl.h>
-+#ifdef __GLIBC__
- #include <linux/if_arp.h>
- #include <linux/if_infiniband.h>
-+#endif
- 
- #include "sd-dhcp6-client.h"
- 
diff --git a/srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch b/srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch
deleted file mode 100644
index f89eac778502..000000000000
--- a/srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git shared/systemd/src/basic/sort-util.h shared/systemd/src/basic/sort-util.h
-index e029f8646..168735087 100644
---- shared/systemd/src/basic/sort-util.h
-+++ shared/systemd/src/basic/sort-util.h
-@@ -60,7 +60,11 @@ static inline void qsort_r_safe(void *base, size_t nmemb, size_t size, __compar_
-                 return;
- 
-         assert(base);
-+#ifdef __GLIBC__
-         qsort_r(base, nmemb, size, compar, userdata);
-+#else
-+        g_qsort_with_data(base, nmemb, size, compar, userdata);
-+#endif
- }
- 
- #define typesafe_qsort_r(p, n, func, userdata)                          \
diff --git a/srcpkgs/NetworkManager/patches/musl-basic.patch b/srcpkgs/NetworkManager/patches/musl-basic.patch
deleted file mode 100644
index 63ea93ada585..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-basic.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Usual fix for musl libc
---- shared/systemd/src/basic/stdio-util.h.orig
-+++ shared/systemd/src/basic/stdio-util.h
-@@ -19,7 +19,9 @@
-   along with systemd; If not, see <http://www.gnu.org/licenses/>.
- ***/
- 
-+#if defined(__GLIBC__)
- #include <printf.h>
-+#endif
- #include <stdarg.h>
- #include <stdio.h>
- #include <sys/types.h>
- 
---- shared/systemd/src/basic/sort-util.h	2019-06-09 17:02:48.895695896 +0200
-+++ shared/systemd/src/basic/sort-util.h	2019-06-09 17:03:27.564199937 +0200
-@@ -5,6 +5,12 @@
- 
- #include "macro.h"
- 
-+#if !defined(__GLIBC__)
-+typedef int (*__compar_fn_t) (const void*, const void*);
-+typedef __compar_fn_t comparison_fn_t;
-+typedef int (*__compar_d_fn_t) (const void *, const void *, void *);
-+#endif
-+
- void *xbsearch_r(const void *key, const void *base, size_t nmemb, size_t size,
-                  __compar_d_fn_t compar, void *arg);
- 
diff --git a/srcpkgs/NetworkManager/patches/musl-fix-includes.patch b/srcpkgs/NetworkManager/patches/musl-fix-includes.patch
deleted file mode 100644
index 95ffb2d354ea..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-fix-includes.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- src/devices/nm-device.c.orig	2019-12-17 08:59:49.000000000 +0100
-+++ src/devices/nm-device.c	2020-01-06 17:29:08.678242168 +0100
-@@ -17,7 +17,11 @@
- #include <arpa/inet.h>
- #include <fcntl.h>
- #include <linux/if_addr.h>
-+#if defined(__GLIBC__)
- #include <linux/if_arp.h>
-+#else
-+#include <linux/if.h>
-+#endif
- #include <linux/rtnetlink.h>
- #include <linux/pkt_sched.h>
- 
---- src/nm-manager.c.orig	2020-01-06 17:29:08.682242177 +0100
-+++ src/nm-manager.c	2020-01-06 17:30:50.378482034 +0100
-@@ -15,6 +15,7 @@
- #include <sys/stat.h>
- #include <sys/sendfile.h>
- #include <limits.h>
-+#include <asm/types.h>
- 
- #include "nm-glib-aux/nm-c-list.h"
- 
---- src/platform/nm-linux-platform.c.orig	2019-12-17 08:59:49.000000000 +0100
-+++ src/platform/nm-linux-platform.c	2020-01-06 17:29:08.686242186 +0100
-@@ -6,6 +6,7 @@
- #include "nm-default.h"
- 
- #include "nm-linux-platform.h"
-+#include "wpan/nm-wpan-utils.h"
- 
- #include <arpa/inet.h>
- #include <dlfcn.h>
-@@ -14,7 +15,11 @@
- #include <libudev.h>
- #include <linux/fib_rules.h>
- #include <linux/ip.h>
-+#if defined(__GLIBC__)
- #include <linux/if_arp.h>
-+#else
-+#include <linux/if.h>
-+#endif
- #include <linux/if_bridge.h>
- #include <linux/if_link.h>
- #include <linux/if_tun.h>
-@@ -44,7 +49,6 @@
- #include "nm-platform-private.h"
- #include "wifi/nm-wifi-utils.h"
- #include "wifi/nm-wifi-utils-wext.h"
--#include "wpan/nm-wpan-utils.h"
- #include "nm-glib-aux/nm-io-utils.h"
- #include "nm-udev-aux/nm-udev-utils.h"
- 
diff --git a/srcpkgs/NetworkManager/patches/musl-network-support.patch b/srcpkgs/NetworkManager/patches/musl-network-support.patch
deleted file mode 100644
index 0fb63f067b17..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-network-support.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- libnm-core/nm-utils.h.orig
-+++ libnm-core/nm-utils.h
-@@ -30,7 +30,11 @@
- #include <netinet/in.h>
- 
- /* For ETH_ALEN and INFINIBAND_ALEN */
-+#if defined(__GLIBC__)
- #include <linux/if_ether.h>
-+#else
-+#define ETH_ALEN	6		/* Octets in one ethernet addr	 */
-+#endif
- #include <linux/if_infiniband.h>
- 
- #include "nm-core-enum-types.h"
---- src/platform/wifi/nm-wifi-utils.h.orig
-+++ src/platform/wifi/nm-wifi-utils.h
-@@ -22,7 +22,11 @@
- #ifndef __WIFI_UTILS_H__
- #define __WIFI_UTILS_H__
- 
-+#if defined(__GLIBC__)
- #include <net/ethernet.h>
-+#else /* musl libc */
-+#define ETH_ALEN	6		/* Octets in one ethernet addr	 */
-+#endif
- 
- #include "nm-dbus-interface.h"
- 
---- shared/systemd/src/basic/socket-util.h	2019-03-16 15:41:33.287235649 +0100
-+++ shared/systemd/src/basic/socket-util.h	2019-03-16 15:42:24.273912106 +0100
-@@ -12,6 +12,11 @@
- #include <sys/socket.h>
- #include <sys/types.h>
- #include <sys/un.h>
-+#if !defined(__GLIBC__)
-+/* SIOCGSTAMPNS from linux/asm-generic.h 
-+ * for src/systemd/src/libsystemd-network/sd-lldp.c */
-+#include <linux/sockios.h>
-+#endif
- 
- #include "macro.h"
- #include "missing_socket.h"
diff --git a/srcpkgs/NetworkManager/patches/musl-process-util.patch b/srcpkgs/NetworkManager/patches/musl-process-util.patch
deleted file mode 100644
index e406de1da850..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-process-util.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- shared/systemd/src/basic/process-util.c
-+++ shared/systemd/src/basic/process-util.c
-@@ -21,6 +21,9 @@
- #include <sys/wait.h>
- #include <syslog.h>
- #include <unistd.h>
-+#ifndef __GLIBC__
-+#include <pthread.h>
-+#endif
- #if 0 /* NM_IGNORED */
- #if HAVE_VALGRIND_VALGRIND_H
- #include <valgrind/valgrind.h>
-@@ -1168,11 +1171,13 @@ void reset_cached_pid(void) {
-         cached_pid = CACHED_PID_UNSET;
- }
- 
-+#ifdef __GLIBC__
- /* We use glibc __register_atfork() + __dso_handle directly here, as they are not included in the glibc
-  * headers. __register_atfork() is mostly equivalent to pthread_atfork(), but doesn't require us to link against
-  * libpthread, as it is part of glibc anyway. */
- extern int __register_atfork(void (*prepare) (void), void (*parent) (void), void (*child) (void), void *dso_handle);
- extern void* __dso_handle _weak_;
-+#endif
- 
- pid_t getpid_cached(void) {
-         static bool installed = false;
-@@ -1201,7 +1206,12 @@ pid_t getpid_cached(void) {
-                          * only half-documented (glibc doesn't document it but LSB does — though only superficially)
-                          * we'll check for errors only in the most generic fashion possible. */
- 
--                        if (__register_atfork(NULL, NULL, reset_cached_pid, __dso_handle) != 0) {
-+                        #ifdef __GLIBC__
-+                            if (__register_atfork(NULL, NULL, reset_cached_pid, __dso_handle) != 0) {
-+                        #else
-+                            if (pthread_atfork(NULL, NULL, reset_cached_pid) != 0) {
-+                        #endif
-+
-                                 /* OOM? Let's try again later */
-                                 cached_pid = CACHED_PID_UNSET;
-                                 return new_pid;
diff --git a/srcpkgs/NetworkManager/patches/musl-use-srand48.patch b/srcpkgs/NetworkManager/patches/musl-use-srand48.patch
deleted file mode 100644
index 43b689f3bad1..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-use-srand48.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- shared/n-dhcp4/src/n-dhcp4-c-probe.c.orig	2020-01-06 15:35:10.128600647 +0100
-+++ shared/n-dhcp4/src/n-dhcp4-c-probe.c	2020-01-06 15:39:41.446240531 +0100
-@@ -362,7 +362,12 @@ static void n_dhcp4_client_probe_config_
-         seed16v[1] = (u64 >> 16) ^ (u64 >>  0);
-         seed16v[2] = (u64 >> 32) ^ (u64 >> 16);
- 
-+#ifdef __GLIBC__
-         r = seed48_r(seed16v, &config->entropy);
-+#else
-+        r = 0;
-+        seed48(seed16v);
-+#endif
-         c_assert(!r);
- }
- 
-@@ -379,7 +384,12 @@ uint32_t n_dhcp4_client_probe_config_get
-         long int result;
-         int r;
- 
-+#ifdef __GLIBC__
-         r = mrand48_r(&config->entropy, &result);
-+#else
-+        r = 0;
-+        result = mrand48();
-+#endif
-         c_assert(!r);
- 
-         return result;
---- shared/n-dhcp4/src/n-dhcp4-private.h.orig	2020-01-06 15:41:31.941501136 +0100
-+++ shared/n-dhcp4/src/n-dhcp4-private.h	2020-01-06 15:41:55.341556325 +0100
-@@ -267,7 +267,9 @@ struct NDhcp4ClientProbeConfig {
-         bool inform_only;
-         bool init_reboot;
-         struct in_addr requested_ip;
-+#ifdef __GLIBC__
-         struct drand48_data entropy;    /* entropy pool */
-+#endif
-         uint64_t ms_start_delay;        /* max ms to wait before starting probe */
-         NDhcp4ClientProbeOption *options[UINT8_MAX + 1];
-         int8_t request_parameters[UINT8_MAX + 1];
diff --git a/srcpkgs/NetworkManager/patches/no-gtk-doc.patch b/srcpkgs/NetworkManager/patches/no-gtk-doc.patch
new file mode 100644
index 000000000000..c42b10f0accc
--- /dev/null
+++ b/srcpkgs/NetworkManager/patches/no-gtk-doc.patch
@@ -0,0 +1,28 @@
+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
+--- meson.build.orig	2021-03-12 10:53:50.000000000 -0500
++++ meson.build	2021-03-23 23:36:48.747020543 -0400
+@@ -943,10 +943,8 @@
+ endif
+ 
+ if enable_docs
+-  assert(enable_introspection, '-Ddocs=true requires -Dintrospection=true')
+   assert(meson.version().version_compare('>= 0.46.0'), '-Ddocs requires meson >= 0.46')
+   subdir('man')
+-  subdir('docs')
+ endif
+ 
+ configure_file(
+
+
+--- clients/common/meson.build.orig	2021-03-12 10:44:25.000000000 -0500
++++ clients/common/meson.build	2021-03-23 23:45:06.878137038 -0400
+@@ -28,7 +28,7 @@
+   link_with: libnmc_base,
+ )
+ 
+-if enable_docs
++if enable_docs and enable_introspection
+   settings_docs_source = custom_target(
+     'settings-docs.h',
+     input: nm_settings_docs_xml_gir,
diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template
index d439d8b10286..f1c73500dacd 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -1,41 +1,39 @@
 # Template file for 'NetworkManager'
-# when updating to 1.24 or newer, drop the compat
-# patch in gnome-control-center and rebuild it
 pkgname=NetworkManager
-version=1.22.10
-revision=3
+version=1.30.2
+revision=1
 build_style=meson
 build_helper="gir qemu"
 configure_args="-Dpolkit_agent=true -Dsystemd_journal=false
- -Dlibaudit=no -Dovs=false -Dlibnm_glib=true -Dselinux=false
- -Dmodify_system=true -Dpolkit_agent=true -Dsystemdsystemunitdir=no
+ -Dlibaudit=no -Dovs=false -Dselinux=false
+ -Dmodify_system=true -Dsystemdsystemunitdir=no
  -Dpppd=/usr/bin/pppd -Dqt=false
  -Dsession_tracking_consolekit=false
  -Dpppd_plugin_dir=/usr/lib/pppd/2.4.9 -Dresolvconf=/usr/bin/resolvconf
  -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
- -Diwd=true
- -Dudev_dir=/usr/lib/udev -Dintrospection=$(vopt_if gir true false)
- -Dvapi=$(vopt_if vala true false)
+ -Diwd=true -Dudev_dir=/usr/lib/udev -Ddocs=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"
 hostmakedepends="gettext-devel glib-devel libxslt-devel pkg-config
- intltool dbus-glib-devel jansson-devel $(vopt_if vala vala)
- $(vopt_if gir 'python3-gobject')"
+ intltool dbus-glib-devel jansson-devel docbook-xsl
+ $(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
  ModemManager-devel readline-devel libndp-devel newt-devel jansson-devel
  libpsl-devel eudev-libudev-devel mobile-broadband-provider-info
- $(vopt_if gir libgirepository-devel) $(vopt_if elogind elogind-devel)"
+ $(vopt_if gir 'libgirepository-devel python3-gobject')
+ $(vopt_if elogind elogind-devel)"
 depends="dbus iproute2 openresolv wpa_supplicant mobile-broadband-provider-info"
 short_desc="Network Management daemon"
 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=2b29ccc1531ba7ebba95a97f40c22b963838e8b6833745efe8e6fb71fd8fca77
+checksum=0c8e80e77877860e4a4e6ab4a0f7cdc1186e356b65b042a751897188b88944d2
 # TODO: Some tests require network namespaces to run.
 make_check=extended
 lib32disabled=yes
@@ -57,8 +55,8 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 # Package build options
-build_options="gir vala elogind"
-build_options_default="gir vala elogind"
+build_options="gir elogind"
+build_options_default="gir elogind"
 
 pre_configure() {
 	if [ "$CROSS_BUILD" ]; then
@@ -95,8 +93,6 @@ NetworkManager-devel_package() {
 		vmove "usr/lib/*.so"
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
-		fi
-		if [ "$build_option_vala" ]; then
 			vmove usr/share/vala
 		fi
 	}

From 5ca12deae1b0a2a41dbb8a7735b2a8fc1982d92e Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Wed, 24 Mar 2021 01:04:47 -0400
Subject: [PATCH 2/3] libnma: revbump for gnome-control-center

---
 srcpkgs/libnma/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libnma/template b/srcpkgs/libnma/template
index 18b016b2b93b..bd4d9fb2ad79 100644
--- a/srcpkgs/libnma/template
+++ b/srcpkgs/libnma/template
@@ -1,7 +1,7 @@
 # Template file for 'libnma'
 pkgname=libnma
 version=1.8.30
-revision=2
+revision=3
 build_style=meson
 build_helper="gir"
 hostmakedepends="gettext glib-devel gtk-doc pkg-config vala"

From fd0f58ff0d65890f30028e5232b1b9001d078ca4 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Wed, 24 Mar 2021 11:01:49 -0400
Subject: [PATCH 3/3] gnome-control-center: update to 3.38.5

---
 .../gnome-control-center/patches/nm122.patch  | 38 -------------------
 srcpkgs/gnome-control-center/template         |  4 +-
 2 files changed, 2 insertions(+), 40 deletions(-)
 delete mode 100644 srcpkgs/gnome-control-center/patches/nm122.patch

diff --git a/srcpkgs/gnome-control-center/patches/nm122.patch b/srcpkgs/gnome-control-center/patches/nm122.patch
deleted file mode 100644
index 833fed3968ea..000000000000
--- a/srcpkgs/gnome-control-center/patches/nm122.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 4159f984bd351caf6f0e1adbd90feeb85ab252f4 Mon Sep 17 00:00:00 2001
-From: Daniel Kolesa <daniel@octaforge.org>
-Date: Wed, 16 Sep 2020 22:02:04 +0200
-Subject: [PATCH] restore compatibility with networkmanager 1.22
-
-drop this patch and rebuild gnome-control-center when updating nm
----
- panels/network/net-device-wifi.c | 7 -------
- 1 file changed, 7 deletions(-)
-
-diff --git panels/network/net-device-wifi.c panels/network/net-device-wifi.c
-index cb86e5b..d63c57c 100644
---- panels/network/net-device-wifi.c
-+++ panels/network/net-device-wifi.c
-@@ -1180,11 +1180,6 @@ nm_client_on_permission_change (NetDeviceWifi *self) {
-         NMClientPermissionResult perm;
-         NMDeviceWifiCapabilities caps;
- 
--        if (nm_client_get_permissions_state (self->client) != NM_TERNARY_TRUE) {
--                /* permissions aren't ready yet */
--                return;
--        }
--
-         /* only enable the button if the user can create a hotspot */
-         perm = nm_client_get_permission_result (self->client, NM_CLIENT_PERMISSION_WIFI_SHARE_OPEN);
-         caps = nm_device_wifi_get_capabilities (NM_DEVICE_WIFI (self->device));
-@@ -1227,8 +1222,6 @@ net_device_wifi_new (CcPanel *panel, NMClient *client, NMDevice *device)
-                                  G_CALLBACK (ap_activated), self, G_CONNECT_SWAPPED);
-         g_signal_connect_object (list, "configure",
-                                  G_CALLBACK (show_details_for_row), self, G_CONNECT_SWAPPED);
--        g_signal_connect_object (client, "notify",
--                                 G_CALLBACK(nm_client_on_permission_change), self, G_CONNECT_SWAPPED);
- 
-         nm_client_on_permission_change(self);
- 
--- 
-2.28.0
-
diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index 7d4a2dc5c47a..001e057fabdc 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-control-center'
 pkgname=gnome-control-center
-version=3.38.4
+version=3.38.5
 revision=1
 build_style=meson
 build_helper="gir"
@@ -24,7 +24,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-control-center"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=49dc6378d4d35c1c6ed59224f5636916c2b6fa49bbfb8b56eb19a84d6e90cd19
+checksum=0ada859620110e829174121c7e1a3f82da80d749d6f61d426a7c8cf4464d72f9
 
 build_options="cheese"
 build_options_default="cheese"

^ permalink raw reply	[flat|nested] 73+ messages in thread

* Re: NetworkManager: update to 1.30.2, gnome-control-center: update to 3.38.5
  2021-03-09  3:41 [PR PATCH] NetworkManager: update to 1.31.1 cinerea0
                   ` (55 preceding siblings ...)
  2021-03-24 15:02 ` [PR PATCH] [Updated] " cinerea0
@ 2021-03-24 15:36 ` cinerea0
  2021-03-24 19:28 ` cinerea0
                   ` (14 subsequent siblings)
  71 siblings, 0 replies; 73+ messages in thread
From: cinerea0 @ 2021-03-24 15:36 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 346 bytes --]

New comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/29342#issuecomment-805928490

Comment:
@sgn I no longer have anything resembling the version of `fix-cross-gir.patch` you diff-ed against to create your patch above, so I can't recreate it. Could you please post your version of that file here?

^ permalink raw reply	[flat|nested] 73+ messages in thread

* Re: NetworkManager: update to 1.30.2, gnome-control-center: update to 3.38.5
  2021-03-09  3:41 [PR PATCH] NetworkManager: update to 1.31.1 cinerea0
                   ` (56 preceding siblings ...)
  2021-03-24 15:36 ` cinerea0
@ 2021-03-24 19:28 ` cinerea0
  2021-03-24 19:59 ` [PR REVIEW] " cinerea0
                   ` (13 subsequent siblings)
  71 siblings, 0 replies; 73+ messages in thread
From: cinerea0 @ 2021-03-24 19:28 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 440 bytes --]

New comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/29342#issuecomment-805928490

Comment:
@sgn I no longer have anything resembling the version of `fix-cross-gir.patch` you diff-ed against to create your patch above, so I can't recreate it. Could you please post your version of that file here?

EDIT: Nevermind, I forgot that GH keeps track of commits that technically no longer exist.

^ permalink raw reply	[flat|nested] 73+ messages in thread

* Re: [PR REVIEW] NetworkManager: update to 1.30.2, gnome-control-center: update to 3.38.5
  2021-03-09  3:41 [PR PATCH] NetworkManager: update to 1.31.1 cinerea0
                   ` (57 preceding siblings ...)
  2021-03-24 19:28 ` cinerea0
@ 2021-03-24 19:59 ` cinerea0
  2021-03-24 20:21 ` ericonr
                   ` (12 subsequent siblings)
  71 siblings, 0 replies; 73+ messages in thread
From: cinerea0 @ 2021-03-24 19:59 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 489 bytes --]

New review comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/29342#discussion_r600833565

Comment:
According to discussion in the link above, it seems like their test process grows exponentially more complex the more options are added, and a hypothetical `-Dman` option might not get tested at all. If we really don't want to ship the developments docs, would it be better to build it and simply remove the directory in a post-install step?

^ permalink raw reply	[flat|nested] 73+ messages in thread

* Re: [PR REVIEW] NetworkManager: update to 1.30.2, gnome-control-center: update to 3.38.5
  2021-03-09  3:41 [PR PATCH] NetworkManager: update to 1.31.1 cinerea0
                   ` (58 preceding siblings ...)
  2021-03-24 19:59 ` [PR REVIEW] " cinerea0
@ 2021-03-24 20:21 ` ericonr
  2021-03-24 20:22 ` ericonr
                   ` (11 subsequent siblings)
  71 siblings, 0 replies; 73+ messages in thread
From: ericonr @ 2021-03-24 20:21 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 227 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/29342#discussion_r600846698

Comment:
I think the issue was that building the docs failed, while the man pages worked.

^ permalink raw reply	[flat|nested] 73+ messages in thread

* Re: [PR REVIEW] NetworkManager: update to 1.30.2, gnome-control-center: update to 3.38.5
  2021-03-09  3:41 [PR PATCH] NetworkManager: update to 1.31.1 cinerea0
                   ` (59 preceding siblings ...)
  2021-03-24 20:21 ` ericonr
@ 2021-03-24 20:22 ` ericonr
  2021-03-24 21:24 ` [PR PATCH] [Updated] " cinerea0
                   ` (10 subsequent siblings)
  71 siblings, 0 replies; 73+ messages in thread
From: ericonr @ 2021-03-24 20:22 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 203 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/29342#discussion_r600846845

Comment:
For the record, this isn't a blocker for merging the PR.

^ permalink raw reply	[flat|nested] 73+ messages in thread

* Re: [PR PATCH] [Updated] NetworkManager: update to 1.30.2, gnome-control-center: update to 3.38.5
  2021-03-09  3:41 [PR PATCH] NetworkManager: update to 1.31.1 cinerea0
                   ` (60 preceding siblings ...)
  2021-03-24 20:22 ` ericonr
@ 2021-03-24 21:24 ` cinerea0
  2021-03-24 23:53 ` cinerea0
                   ` (9 subsequent siblings)
  71 siblings, 0 replies; 73+ messages in thread
From: cinerea0 @ 2021-03-24 21:24 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1651 bytes --]

There is an updated pull request by cinerea0 against master on the void-packages repository

https://github.com/cinerea0/void-packages nm
https://github.com/void-linux/void-packages/pull/29342

NetworkManager: update to 1.30.2, gnome-control-center: update to 3.38.5
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->

Closes #27502

A patch file from https://github.com/void-linux/void-packages/pull/29342.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nm-29342.patch --]
[-- Type: text/x-diff, Size: 18267 bytes --]

From a2cf38b4791e1bdc97c08ca72863935b5802b0a9 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Wed, 24 Mar 2021 17:23:31 -0400
Subject: [PATCH] NetworManager: update to 1.30.2

---
 .../patches/fix-cross-gir.patch               | 69 +++++++------------
 .../patches/fix-musl-linux-header.diff        | 15 ----
 .../patches/fix-musl-qsort_r.patch            | 16 -----
 .../NetworkManager/patches/musl-basic.patch   | 29 --------
 .../patches/musl-fix-includes.patch           | 54 ---------------
 .../patches/musl-network-support.patch        | 42 -----------
 .../patches/musl-process-util.patch           | 40 -----------
 .../patches/musl-use-srand48.patch            | 40 -----------
 srcpkgs/NetworkManager/template               | 39 ++++-------
 9 files changed, 38 insertions(+), 306 deletions(-)
 delete mode 100644 srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff
 delete mode 100644 srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-basic.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-fix-includes.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-network-support.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-process-util.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-use-srand48.patch

diff --git a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
index c283d4dc1059..b78edfac2446 100644
--- a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
+++ b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
@@ -1,52 +1,31 @@
 Reason: Fix crossbuilding GIR
 Upstream: No, not upstreamable since this is very specific to the Void setup
-diff --git clients/common/meson.build clients/common/meson.build
-index afa257b..50b53e7 100644
---- clients/common/meson.build
-+++ clients/common/meson.build
-@@ -35,7 +35,7 @@ if enable_introspection
-     settings_docs,
-     input: nm_property_docs,
-     output: settings_docs,
--    command: [xsltproc, '--output', '@OUTPUT@', join_paths(meson.current_source_dir(), 'settings-docs.xsl'), '@INPUT@'],
-+    command: [xsltproc, '--output', '@OUTPUT@', join_paths(meson.current_source_dir(), 'settings-docs.xsl'), join_paths(meson.current_source_dir(), '..', '..', '@INPUT@')],
-   )
+Index: b/libnm/meson.build
+===================================================================
+--- a/libnm/meson.build
++++ b/libnm/meson.build
+@@ -274,13 +274,23 @@ if enable_introspection
+     'LD_LIBRARY_PATH=' + ld_library_path,
+   ]
  
-   test(
-diff --git libnm/meson.build libnm/meson.build
-index 51ca46d..f14d861 100644
---- libnm/meson.build
-+++ libnm/meson.build
-@@ -236,7 +236,13 @@ if enable_introspection
-     )
-   endif
- 
--  generate_setting_docs = join_paths(meson.current_source_dir(), 'generate-setting-docs.py')
 +  if meson.is_cross_build()
-+    qemu = '/usr/bin/qemu-@XBPS_TARGET_QEMU_MACHINE@-static'
-+    qemu_python3_cmd = qemu + ' -L @XBPS_CROSS_BASE@ @XBPS_CROSS_BASE@/usr/bin/python3'
-+    generate_setting_docs = ['sh', '-c', qemu_python3_cmd, join_paths(meson.current_source_dir(), 'generate-setting-docs.py')]
++    qemu_python3_cmd = [
++      '/usr/bin/qemu-@XBPS_TARGET_QEMU_MACHINE@-static',
++      '-L', '@XBPS_CROSS_BASE@',
++      '@XBPS_CROSS_BASE@/usr/bin/python3'
++      ]
 +  else
-+    generate_setting_docs = [python.path(), join_paths(meson.current_source_dir(), 'generate-setting-docs.py')]
++    qemu_python3_cmd = python.path()
 +  endif
- 
-   gi_typelib_path = run_command('printenv', 'GI_TYPELIB_PATH').stdout()
-   if gi_typelib_path != ''
-@@ -261,7 +267,7 @@ if enable_introspection
-     name,
++
+   nm_settings_docs_xml_gir = custom_target(
+     'nm-settings-docs-gir.xml',
      input: libnm_gir[0],
-     output: name,
--    command: [generate_setting_docs_env, python.path(), generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--output', '@OUTPUT@'],
-+    command: [generate_setting_docs_env, generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--output', '@OUTPUT@'],
-     depends: libnm_gir,
-   )
- 
-@@ -270,7 +276,7 @@ if enable_introspection
-     name,
-     input: [libnm_gir[0], nm_settings_docs_overrides],
-     output: name,
--    command: [generate_setting_docs_env, python.path(), generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT0@', '--overrides', '@INPUT1@', '--output', '@OUTPUT@'],
-+    command: [generate_setting_docs_env, generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT0@', '--overrides', '@INPUT1@', '--output', '@OUTPUT@'],
-     depends: libnm_gir,
-   )
- endif
+     output: 'nm-settings-docs-gir.xml',
+     command: [
+       generate_setting_docs_env,
+-      python.path(),
++      qemu_python3_cmd,
+       join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-gir.py'),
+       '--lib-path', meson.current_build_dir(),
+       '--gir', '@INPUT@',
diff --git a/srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff b/srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff
deleted file mode 100644
index 511759214a97..000000000000
--- a/srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git src/systemd/src/libsystemd-network/sd-dhcp6-client.c src/systemd/src/libsystemd-network/sd-dhcp6-client.c
-index f67a45bd2..ec11fa605 100644
---- src/systemd/src/libsystemd-network/sd-dhcp6-client.c
-+++ src/systemd/src/libsystemd-network/sd-dhcp6-client.c
-@@ -8,8 +8,10 @@
- #include <errno.h>
- #include <string.h>
- #include <sys/ioctl.h>
-+#ifdef __GLIBC__
- #include <linux/if_arp.h>
- #include <linux/if_infiniband.h>
-+#endif
- 
- #include "sd-dhcp6-client.h"
- 
diff --git a/srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch b/srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch
deleted file mode 100644
index f89eac778502..000000000000
--- a/srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git shared/systemd/src/basic/sort-util.h shared/systemd/src/basic/sort-util.h
-index e029f8646..168735087 100644
---- shared/systemd/src/basic/sort-util.h
-+++ shared/systemd/src/basic/sort-util.h
-@@ -60,7 +60,11 @@ static inline void qsort_r_safe(void *base, size_t nmemb, size_t size, __compar_
-                 return;
- 
-         assert(base);
-+#ifdef __GLIBC__
-         qsort_r(base, nmemb, size, compar, userdata);
-+#else
-+        g_qsort_with_data(base, nmemb, size, compar, userdata);
-+#endif
- }
- 
- #define typesafe_qsort_r(p, n, func, userdata)                          \
diff --git a/srcpkgs/NetworkManager/patches/musl-basic.patch b/srcpkgs/NetworkManager/patches/musl-basic.patch
deleted file mode 100644
index 63ea93ada585..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-basic.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Usual fix for musl libc
---- shared/systemd/src/basic/stdio-util.h.orig
-+++ shared/systemd/src/basic/stdio-util.h
-@@ -19,7 +19,9 @@
-   along with systemd; If not, see <http://www.gnu.org/licenses/>.
- ***/
- 
-+#if defined(__GLIBC__)
- #include <printf.h>
-+#endif
- #include <stdarg.h>
- #include <stdio.h>
- #include <sys/types.h>
- 
---- shared/systemd/src/basic/sort-util.h	2019-06-09 17:02:48.895695896 +0200
-+++ shared/systemd/src/basic/sort-util.h	2019-06-09 17:03:27.564199937 +0200
-@@ -5,6 +5,12 @@
- 
- #include "macro.h"
- 
-+#if !defined(__GLIBC__)
-+typedef int (*__compar_fn_t) (const void*, const void*);
-+typedef __compar_fn_t comparison_fn_t;
-+typedef int (*__compar_d_fn_t) (const void *, const void *, void *);
-+#endif
-+
- void *xbsearch_r(const void *key, const void *base, size_t nmemb, size_t size,
-                  __compar_d_fn_t compar, void *arg);
- 
diff --git a/srcpkgs/NetworkManager/patches/musl-fix-includes.patch b/srcpkgs/NetworkManager/patches/musl-fix-includes.patch
deleted file mode 100644
index 95ffb2d354ea..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-fix-includes.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- src/devices/nm-device.c.orig	2019-12-17 08:59:49.000000000 +0100
-+++ src/devices/nm-device.c	2020-01-06 17:29:08.678242168 +0100
-@@ -17,7 +17,11 @@
- #include <arpa/inet.h>
- #include <fcntl.h>
- #include <linux/if_addr.h>
-+#if defined(__GLIBC__)
- #include <linux/if_arp.h>
-+#else
-+#include <linux/if.h>
-+#endif
- #include <linux/rtnetlink.h>
- #include <linux/pkt_sched.h>
- 
---- src/nm-manager.c.orig	2020-01-06 17:29:08.682242177 +0100
-+++ src/nm-manager.c	2020-01-06 17:30:50.378482034 +0100
-@@ -15,6 +15,7 @@
- #include <sys/stat.h>
- #include <sys/sendfile.h>
- #include <limits.h>
-+#include <asm/types.h>
- 
- #include "nm-glib-aux/nm-c-list.h"
- 
---- src/platform/nm-linux-platform.c.orig	2019-12-17 08:59:49.000000000 +0100
-+++ src/platform/nm-linux-platform.c	2020-01-06 17:29:08.686242186 +0100
-@@ -6,6 +6,7 @@
- #include "nm-default.h"
- 
- #include "nm-linux-platform.h"
-+#include "wpan/nm-wpan-utils.h"
- 
- #include <arpa/inet.h>
- #include <dlfcn.h>
-@@ -14,7 +15,11 @@
- #include <libudev.h>
- #include <linux/fib_rules.h>
- #include <linux/ip.h>
-+#if defined(__GLIBC__)
- #include <linux/if_arp.h>
-+#else
-+#include <linux/if.h>
-+#endif
- #include <linux/if_bridge.h>
- #include <linux/if_link.h>
- #include <linux/if_tun.h>
-@@ -44,7 +49,6 @@
- #include "nm-platform-private.h"
- #include "wifi/nm-wifi-utils.h"
- #include "wifi/nm-wifi-utils-wext.h"
--#include "wpan/nm-wpan-utils.h"
- #include "nm-glib-aux/nm-io-utils.h"
- #include "nm-udev-aux/nm-udev-utils.h"
- 
diff --git a/srcpkgs/NetworkManager/patches/musl-network-support.patch b/srcpkgs/NetworkManager/patches/musl-network-support.patch
deleted file mode 100644
index 0fb63f067b17..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-network-support.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- libnm-core/nm-utils.h.orig
-+++ libnm-core/nm-utils.h
-@@ -30,7 +30,11 @@
- #include <netinet/in.h>
- 
- /* For ETH_ALEN and INFINIBAND_ALEN */
-+#if defined(__GLIBC__)
- #include <linux/if_ether.h>
-+#else
-+#define ETH_ALEN	6		/* Octets in one ethernet addr	 */
-+#endif
- #include <linux/if_infiniband.h>
- 
- #include "nm-core-enum-types.h"
---- src/platform/wifi/nm-wifi-utils.h.orig
-+++ src/platform/wifi/nm-wifi-utils.h
-@@ -22,7 +22,11 @@
- #ifndef __WIFI_UTILS_H__
- #define __WIFI_UTILS_H__
- 
-+#if defined(__GLIBC__)
- #include <net/ethernet.h>
-+#else /* musl libc */
-+#define ETH_ALEN	6		/* Octets in one ethernet addr	 */
-+#endif
- 
- #include "nm-dbus-interface.h"
- 
---- shared/systemd/src/basic/socket-util.h	2019-03-16 15:41:33.287235649 +0100
-+++ shared/systemd/src/basic/socket-util.h	2019-03-16 15:42:24.273912106 +0100
-@@ -12,6 +12,11 @@
- #include <sys/socket.h>
- #include <sys/types.h>
- #include <sys/un.h>
-+#if !defined(__GLIBC__)
-+/* SIOCGSTAMPNS from linux/asm-generic.h 
-+ * for src/systemd/src/libsystemd-network/sd-lldp.c */
-+#include <linux/sockios.h>
-+#endif
- 
- #include "macro.h"
- #include "missing_socket.h"
diff --git a/srcpkgs/NetworkManager/patches/musl-process-util.patch b/srcpkgs/NetworkManager/patches/musl-process-util.patch
deleted file mode 100644
index e406de1da850..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-process-util.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- shared/systemd/src/basic/process-util.c
-+++ shared/systemd/src/basic/process-util.c
-@@ -21,6 +21,9 @@
- #include <sys/wait.h>
- #include <syslog.h>
- #include <unistd.h>
-+#ifndef __GLIBC__
-+#include <pthread.h>
-+#endif
- #if 0 /* NM_IGNORED */
- #if HAVE_VALGRIND_VALGRIND_H
- #include <valgrind/valgrind.h>
-@@ -1168,11 +1171,13 @@ void reset_cached_pid(void) {
-         cached_pid = CACHED_PID_UNSET;
- }
- 
-+#ifdef __GLIBC__
- /* We use glibc __register_atfork() + __dso_handle directly here, as they are not included in the glibc
-  * headers. __register_atfork() is mostly equivalent to pthread_atfork(), but doesn't require us to link against
-  * libpthread, as it is part of glibc anyway. */
- extern int __register_atfork(void (*prepare) (void), void (*parent) (void), void (*child) (void), void *dso_handle);
- extern void* __dso_handle _weak_;
-+#endif
- 
- pid_t getpid_cached(void) {
-         static bool installed = false;
-@@ -1201,7 +1206,12 @@ pid_t getpid_cached(void) {
-                          * only half-documented (glibc doesn't document it but LSB does — though only superficially)
-                          * we'll check for errors only in the most generic fashion possible. */
- 
--                        if (__register_atfork(NULL, NULL, reset_cached_pid, __dso_handle) != 0) {
-+                        #ifdef __GLIBC__
-+                            if (__register_atfork(NULL, NULL, reset_cached_pid, __dso_handle) != 0) {
-+                        #else
-+                            if (pthread_atfork(NULL, NULL, reset_cached_pid) != 0) {
-+                        #endif
-+
-                                 /* OOM? Let's try again later */
-                                 cached_pid = CACHED_PID_UNSET;
-                                 return new_pid;
diff --git a/srcpkgs/NetworkManager/patches/musl-use-srand48.patch b/srcpkgs/NetworkManager/patches/musl-use-srand48.patch
deleted file mode 100644
index 43b689f3bad1..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-use-srand48.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- shared/n-dhcp4/src/n-dhcp4-c-probe.c.orig	2020-01-06 15:35:10.128600647 +0100
-+++ shared/n-dhcp4/src/n-dhcp4-c-probe.c	2020-01-06 15:39:41.446240531 +0100
-@@ -362,7 +362,12 @@ static void n_dhcp4_client_probe_config_
-         seed16v[1] = (u64 >> 16) ^ (u64 >>  0);
-         seed16v[2] = (u64 >> 32) ^ (u64 >> 16);
- 
-+#ifdef __GLIBC__
-         r = seed48_r(seed16v, &config->entropy);
-+#else
-+        r = 0;
-+        seed48(seed16v);
-+#endif
-         c_assert(!r);
- }
- 
-@@ -379,7 +384,12 @@ uint32_t n_dhcp4_client_probe_config_get
-         long int result;
-         int r;
- 
-+#ifdef __GLIBC__
-         r = mrand48_r(&config->entropy, &result);
-+#else
-+        r = 0;
-+        result = mrand48();
-+#endif
-         c_assert(!r);
- 
-         return result;
---- shared/n-dhcp4/src/n-dhcp4-private.h.orig	2020-01-06 15:41:31.941501136 +0100
-+++ shared/n-dhcp4/src/n-dhcp4-private.h	2020-01-06 15:41:55.341556325 +0100
-@@ -267,7 +267,9 @@ struct NDhcp4ClientProbeConfig {
-         bool inform_only;
-         bool init_reboot;
-         struct in_addr requested_ip;
-+#ifdef __GLIBC__
-         struct drand48_data entropy;    /* entropy pool */
-+#endif
-         uint64_t ms_start_delay;        /* max ms to wait before starting probe */
-         NDhcp4ClientProbeOption *options[UINT8_MAX + 1];
-         int8_t request_parameters[UINT8_MAX + 1];
diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template
index d439d8b10286..efe5a49ca324 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -1,41 +1,39 @@
 # Template file for 'NetworkManager'
-# when updating to 1.24 or newer, drop the compat
-# patch in gnome-control-center and rebuild it
 pkgname=NetworkManager
-version=1.22.10
-revision=3
+version=1.30.2
+revision=1
 build_style=meson
 build_helper="gir qemu"
 configure_args="-Dpolkit_agent=true -Dsystemd_journal=false
- -Dlibaudit=no -Dovs=false -Dlibnm_glib=true -Dselinux=false
- -Dmodify_system=true -Dpolkit_agent=true -Dsystemdsystemunitdir=no
+ -Dlibaudit=no -Dovs=false -Dselinux=false
+ -Dmodify_system=true -Dsystemdsystemunitdir=no
  -Dpppd=/usr/bin/pppd -Dqt=false
  -Dsession_tracking_consolekit=false
  -Dpppd_plugin_dir=/usr/lib/pppd/2.4.9 -Dresolvconf=/usr/bin/resolvconf
  -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
- -Diwd=true
- -Dudev_dir=/usr/lib/udev -Dintrospection=$(vopt_if gir true false)
- -Dvapi=$(vopt_if vala true false)
+ -Diwd=true -Dudev_dir=/usr/lib/udev -Ddocs=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"
 hostmakedepends="gettext-devel glib-devel libxslt-devel pkg-config
- intltool dbus-glib-devel jansson-devel $(vopt_if vala vala)
- $(vopt_if gir 'python3-gobject')"
+ intltool dbus-glib-devel jansson-devel docbook-xsl
+ $(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
  ModemManager-devel readline-devel libndp-devel newt-devel jansson-devel
  libpsl-devel eudev-libudev-devel mobile-broadband-provider-info
- $(vopt_if gir libgirepository-devel) $(vopt_if elogind elogind-devel)"
+ $(vopt_if gir 'libgirepository-devel python3-gobject')
+ $(vopt_if elogind elogind-devel)"
 depends="dbus iproute2 openresolv wpa_supplicant mobile-broadband-provider-info"
 short_desc="Network Management daemon"
 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=2b29ccc1531ba7ebba95a97f40c22b963838e8b6833745efe8e6fb71fd8fca77
+checksum=0c8e80e77877860e4a4e6ab4a0f7cdc1186e356b65b042a751897188b88944d2
 # TODO: Some tests require network namespaces to run.
 make_check=extended
 lib32disabled=yes
@@ -47,18 +45,11 @@ make_dirs="
  /etc/NetworkManager/VPN 0755 root root
  /var/lib/NetworkManager 0755 root root
 "
-
-case "$XBPS_TARGET_MACHINE" in
-	*-musl)
-			CFLAGS+=" -DRTLD_DEEPBIND=0"
-			# Fail to build on musl
-			configure_args+=" -Dtests=no"
-		;;
-esac
+patch_args=-Np1
 
 # Package build options
-build_options="gir vala elogind"
-build_options_default="gir vala elogind"
+build_options="gir elogind"
+build_options_default="gir elogind"
 
 pre_configure() {
 	if [ "$CROSS_BUILD" ]; then
@@ -95,8 +86,6 @@ NetworkManager-devel_package() {
 		vmove "usr/lib/*.so"
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
-		fi
-		if [ "$build_option_vala" ]; then
 			vmove usr/share/vala
 		fi
 	}

^ permalink raw reply	[flat|nested] 73+ messages in thread

* Re: [PR PATCH] [Updated] NetworkManager: update to 1.30.2, gnome-control-center: update to 3.38.5
  2021-03-09  3:41 [PR PATCH] NetworkManager: update to 1.31.1 cinerea0
                   ` (61 preceding siblings ...)
  2021-03-24 21:24 ` [PR PATCH] [Updated] " cinerea0
@ 2021-03-24 23:53 ` cinerea0
  2021-03-25  0:30 ` cinerea0
                   ` (8 subsequent siblings)
  71 siblings, 0 replies; 73+ messages in thread
From: cinerea0 @ 2021-03-24 23:53 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1651 bytes --]

There is an updated pull request by cinerea0 against master on the void-packages repository

https://github.com/cinerea0/void-packages nm
https://github.com/void-linux/void-packages/pull/29342

NetworkManager: update to 1.30.2, gnome-control-center: update to 3.38.5
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->

Closes #27502

A patch file from https://github.com/void-linux/void-packages/pull/29342.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nm-29342.patch --]
[-- Type: text/x-diff, Size: 18276 bytes --]

From 45582bcafef58fc48f69e3a934f7d9288d596cde Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Wed, 24 Mar 2021 19:40:39 -0400
Subject: [PATCH] NetworkManager: update to 1.30.2

---
 .../patches/fix-cross-gir.patch               | 69 +++++++------------
 .../patches/fix-musl-linux-header.diff        | 15 ----
 .../patches/fix-musl-qsort_r.patch            | 16 -----
 .../NetworkManager/patches/musl-basic.patch   | 29 --------
 .../patches/musl-fix-includes.patch           | 54 ---------------
 .../patches/musl-network-support.patch        | 42 -----------
 .../patches/musl-process-util.patch           | 40 -----------
 .../patches/musl-use-srand48.patch            | 40 -----------
 srcpkgs/NetworkManager/template               | 39 ++++-------
 9 files changed, 38 insertions(+), 306 deletions(-)
 delete mode 100644 srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff
 delete mode 100644 srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-basic.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-fix-includes.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-network-support.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-process-util.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-use-srand48.patch

diff --git a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
index c283d4dc1059..b78edfac2446 100644
--- a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
+++ b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
@@ -1,52 +1,31 @@
 Reason: Fix crossbuilding GIR
 Upstream: No, not upstreamable since this is very specific to the Void setup
-diff --git clients/common/meson.build clients/common/meson.build
-index afa257b..50b53e7 100644
---- clients/common/meson.build
-+++ clients/common/meson.build
-@@ -35,7 +35,7 @@ if enable_introspection
-     settings_docs,
-     input: nm_property_docs,
-     output: settings_docs,
--    command: [xsltproc, '--output', '@OUTPUT@', join_paths(meson.current_source_dir(), 'settings-docs.xsl'), '@INPUT@'],
-+    command: [xsltproc, '--output', '@OUTPUT@', join_paths(meson.current_source_dir(), 'settings-docs.xsl'), join_paths(meson.current_source_dir(), '..', '..', '@INPUT@')],
-   )
+Index: b/libnm/meson.build
+===================================================================
+--- a/libnm/meson.build
++++ b/libnm/meson.build
+@@ -274,13 +274,23 @@ if enable_introspection
+     'LD_LIBRARY_PATH=' + ld_library_path,
+   ]
  
-   test(
-diff --git libnm/meson.build libnm/meson.build
-index 51ca46d..f14d861 100644
---- libnm/meson.build
-+++ libnm/meson.build
-@@ -236,7 +236,13 @@ if enable_introspection
-     )
-   endif
- 
--  generate_setting_docs = join_paths(meson.current_source_dir(), 'generate-setting-docs.py')
 +  if meson.is_cross_build()
-+    qemu = '/usr/bin/qemu-@XBPS_TARGET_QEMU_MACHINE@-static'
-+    qemu_python3_cmd = qemu + ' -L @XBPS_CROSS_BASE@ @XBPS_CROSS_BASE@/usr/bin/python3'
-+    generate_setting_docs = ['sh', '-c', qemu_python3_cmd, join_paths(meson.current_source_dir(), 'generate-setting-docs.py')]
++    qemu_python3_cmd = [
++      '/usr/bin/qemu-@XBPS_TARGET_QEMU_MACHINE@-static',
++      '-L', '@XBPS_CROSS_BASE@',
++      '@XBPS_CROSS_BASE@/usr/bin/python3'
++      ]
 +  else
-+    generate_setting_docs = [python.path(), join_paths(meson.current_source_dir(), 'generate-setting-docs.py')]
++    qemu_python3_cmd = python.path()
 +  endif
- 
-   gi_typelib_path = run_command('printenv', 'GI_TYPELIB_PATH').stdout()
-   if gi_typelib_path != ''
-@@ -261,7 +267,7 @@ if enable_introspection
-     name,
++
+   nm_settings_docs_xml_gir = custom_target(
+     'nm-settings-docs-gir.xml',
      input: libnm_gir[0],
-     output: name,
--    command: [generate_setting_docs_env, python.path(), generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--output', '@OUTPUT@'],
-+    command: [generate_setting_docs_env, generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--output', '@OUTPUT@'],
-     depends: libnm_gir,
-   )
- 
-@@ -270,7 +276,7 @@ if enable_introspection
-     name,
-     input: [libnm_gir[0], nm_settings_docs_overrides],
-     output: name,
--    command: [generate_setting_docs_env, python.path(), generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT0@', '--overrides', '@INPUT1@', '--output', '@OUTPUT@'],
-+    command: [generate_setting_docs_env, generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT0@', '--overrides', '@INPUT1@', '--output', '@OUTPUT@'],
-     depends: libnm_gir,
-   )
- endif
+     output: 'nm-settings-docs-gir.xml',
+     command: [
+       generate_setting_docs_env,
+-      python.path(),
++      qemu_python3_cmd,
+       join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-gir.py'),
+       '--lib-path', meson.current_build_dir(),
+       '--gir', '@INPUT@',
diff --git a/srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff b/srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff
deleted file mode 100644
index 511759214a97..000000000000
--- a/srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git src/systemd/src/libsystemd-network/sd-dhcp6-client.c src/systemd/src/libsystemd-network/sd-dhcp6-client.c
-index f67a45bd2..ec11fa605 100644
---- src/systemd/src/libsystemd-network/sd-dhcp6-client.c
-+++ src/systemd/src/libsystemd-network/sd-dhcp6-client.c
-@@ -8,8 +8,10 @@
- #include <errno.h>
- #include <string.h>
- #include <sys/ioctl.h>
-+#ifdef __GLIBC__
- #include <linux/if_arp.h>
- #include <linux/if_infiniband.h>
-+#endif
- 
- #include "sd-dhcp6-client.h"
- 
diff --git a/srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch b/srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch
deleted file mode 100644
index f89eac778502..000000000000
--- a/srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git shared/systemd/src/basic/sort-util.h shared/systemd/src/basic/sort-util.h
-index e029f8646..168735087 100644
---- shared/systemd/src/basic/sort-util.h
-+++ shared/systemd/src/basic/sort-util.h
-@@ -60,7 +60,11 @@ static inline void qsort_r_safe(void *base, size_t nmemb, size_t size, __compar_
-                 return;
- 
-         assert(base);
-+#ifdef __GLIBC__
-         qsort_r(base, nmemb, size, compar, userdata);
-+#else
-+        g_qsort_with_data(base, nmemb, size, compar, userdata);
-+#endif
- }
- 
- #define typesafe_qsort_r(p, n, func, userdata)                          \
diff --git a/srcpkgs/NetworkManager/patches/musl-basic.patch b/srcpkgs/NetworkManager/patches/musl-basic.patch
deleted file mode 100644
index 63ea93ada585..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-basic.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Usual fix for musl libc
---- shared/systemd/src/basic/stdio-util.h.orig
-+++ shared/systemd/src/basic/stdio-util.h
-@@ -19,7 +19,9 @@
-   along with systemd; If not, see <http://www.gnu.org/licenses/>.
- ***/
- 
-+#if defined(__GLIBC__)
- #include <printf.h>
-+#endif
- #include <stdarg.h>
- #include <stdio.h>
- #include <sys/types.h>
- 
---- shared/systemd/src/basic/sort-util.h	2019-06-09 17:02:48.895695896 +0200
-+++ shared/systemd/src/basic/sort-util.h	2019-06-09 17:03:27.564199937 +0200
-@@ -5,6 +5,12 @@
- 
- #include "macro.h"
- 
-+#if !defined(__GLIBC__)
-+typedef int (*__compar_fn_t) (const void*, const void*);
-+typedef __compar_fn_t comparison_fn_t;
-+typedef int (*__compar_d_fn_t) (const void *, const void *, void *);
-+#endif
-+
- void *xbsearch_r(const void *key, const void *base, size_t nmemb, size_t size,
-                  __compar_d_fn_t compar, void *arg);
- 
diff --git a/srcpkgs/NetworkManager/patches/musl-fix-includes.patch b/srcpkgs/NetworkManager/patches/musl-fix-includes.patch
deleted file mode 100644
index 95ffb2d354ea..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-fix-includes.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- src/devices/nm-device.c.orig	2019-12-17 08:59:49.000000000 +0100
-+++ src/devices/nm-device.c	2020-01-06 17:29:08.678242168 +0100
-@@ -17,7 +17,11 @@
- #include <arpa/inet.h>
- #include <fcntl.h>
- #include <linux/if_addr.h>
-+#if defined(__GLIBC__)
- #include <linux/if_arp.h>
-+#else
-+#include <linux/if.h>
-+#endif
- #include <linux/rtnetlink.h>
- #include <linux/pkt_sched.h>
- 
---- src/nm-manager.c.orig	2020-01-06 17:29:08.682242177 +0100
-+++ src/nm-manager.c	2020-01-06 17:30:50.378482034 +0100
-@@ -15,6 +15,7 @@
- #include <sys/stat.h>
- #include <sys/sendfile.h>
- #include <limits.h>
-+#include <asm/types.h>
- 
- #include "nm-glib-aux/nm-c-list.h"
- 
---- src/platform/nm-linux-platform.c.orig	2019-12-17 08:59:49.000000000 +0100
-+++ src/platform/nm-linux-platform.c	2020-01-06 17:29:08.686242186 +0100
-@@ -6,6 +6,7 @@
- #include "nm-default.h"
- 
- #include "nm-linux-platform.h"
-+#include "wpan/nm-wpan-utils.h"
- 
- #include <arpa/inet.h>
- #include <dlfcn.h>
-@@ -14,7 +15,11 @@
- #include <libudev.h>
- #include <linux/fib_rules.h>
- #include <linux/ip.h>
-+#if defined(__GLIBC__)
- #include <linux/if_arp.h>
-+#else
-+#include <linux/if.h>
-+#endif
- #include <linux/if_bridge.h>
- #include <linux/if_link.h>
- #include <linux/if_tun.h>
-@@ -44,7 +49,6 @@
- #include "nm-platform-private.h"
- #include "wifi/nm-wifi-utils.h"
- #include "wifi/nm-wifi-utils-wext.h"
--#include "wpan/nm-wpan-utils.h"
- #include "nm-glib-aux/nm-io-utils.h"
- #include "nm-udev-aux/nm-udev-utils.h"
- 
diff --git a/srcpkgs/NetworkManager/patches/musl-network-support.patch b/srcpkgs/NetworkManager/patches/musl-network-support.patch
deleted file mode 100644
index 0fb63f067b17..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-network-support.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- libnm-core/nm-utils.h.orig
-+++ libnm-core/nm-utils.h
-@@ -30,7 +30,11 @@
- #include <netinet/in.h>
- 
- /* For ETH_ALEN and INFINIBAND_ALEN */
-+#if defined(__GLIBC__)
- #include <linux/if_ether.h>
-+#else
-+#define ETH_ALEN	6		/* Octets in one ethernet addr	 */
-+#endif
- #include <linux/if_infiniband.h>
- 
- #include "nm-core-enum-types.h"
---- src/platform/wifi/nm-wifi-utils.h.orig
-+++ src/platform/wifi/nm-wifi-utils.h
-@@ -22,7 +22,11 @@
- #ifndef __WIFI_UTILS_H__
- #define __WIFI_UTILS_H__
- 
-+#if defined(__GLIBC__)
- #include <net/ethernet.h>
-+#else /* musl libc */
-+#define ETH_ALEN	6		/* Octets in one ethernet addr	 */
-+#endif
- 
- #include "nm-dbus-interface.h"
- 
---- shared/systemd/src/basic/socket-util.h	2019-03-16 15:41:33.287235649 +0100
-+++ shared/systemd/src/basic/socket-util.h	2019-03-16 15:42:24.273912106 +0100
-@@ -12,6 +12,11 @@
- #include <sys/socket.h>
- #include <sys/types.h>
- #include <sys/un.h>
-+#if !defined(__GLIBC__)
-+/* SIOCGSTAMPNS from linux/asm-generic.h 
-+ * for src/systemd/src/libsystemd-network/sd-lldp.c */
-+#include <linux/sockios.h>
-+#endif
- 
- #include "macro.h"
- #include "missing_socket.h"
diff --git a/srcpkgs/NetworkManager/patches/musl-process-util.patch b/srcpkgs/NetworkManager/patches/musl-process-util.patch
deleted file mode 100644
index e406de1da850..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-process-util.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- shared/systemd/src/basic/process-util.c
-+++ shared/systemd/src/basic/process-util.c
-@@ -21,6 +21,9 @@
- #include <sys/wait.h>
- #include <syslog.h>
- #include <unistd.h>
-+#ifndef __GLIBC__
-+#include <pthread.h>
-+#endif
- #if 0 /* NM_IGNORED */
- #if HAVE_VALGRIND_VALGRIND_H
- #include <valgrind/valgrind.h>
-@@ -1168,11 +1171,13 @@ void reset_cached_pid(void) {
-         cached_pid = CACHED_PID_UNSET;
- }
- 
-+#ifdef __GLIBC__
- /* We use glibc __register_atfork() + __dso_handle directly here, as they are not included in the glibc
-  * headers. __register_atfork() is mostly equivalent to pthread_atfork(), but doesn't require us to link against
-  * libpthread, as it is part of glibc anyway. */
- extern int __register_atfork(void (*prepare) (void), void (*parent) (void), void (*child) (void), void *dso_handle);
- extern void* __dso_handle _weak_;
-+#endif
- 
- pid_t getpid_cached(void) {
-         static bool installed = false;
-@@ -1201,7 +1206,12 @@ pid_t getpid_cached(void) {
-                          * only half-documented (glibc doesn't document it but LSB does — though only superficially)
-                          * we'll check for errors only in the most generic fashion possible. */
- 
--                        if (__register_atfork(NULL, NULL, reset_cached_pid, __dso_handle) != 0) {
-+                        #ifdef __GLIBC__
-+                            if (__register_atfork(NULL, NULL, reset_cached_pid, __dso_handle) != 0) {
-+                        #else
-+                            if (pthread_atfork(NULL, NULL, reset_cached_pid) != 0) {
-+                        #endif
-+
-                                 /* OOM? Let's try again later */
-                                 cached_pid = CACHED_PID_UNSET;
-                                 return new_pid;
diff --git a/srcpkgs/NetworkManager/patches/musl-use-srand48.patch b/srcpkgs/NetworkManager/patches/musl-use-srand48.patch
deleted file mode 100644
index 43b689f3bad1..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-use-srand48.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- shared/n-dhcp4/src/n-dhcp4-c-probe.c.orig	2020-01-06 15:35:10.128600647 +0100
-+++ shared/n-dhcp4/src/n-dhcp4-c-probe.c	2020-01-06 15:39:41.446240531 +0100
-@@ -362,7 +362,12 @@ static void n_dhcp4_client_probe_config_
-         seed16v[1] = (u64 >> 16) ^ (u64 >>  0);
-         seed16v[2] = (u64 >> 32) ^ (u64 >> 16);
- 
-+#ifdef __GLIBC__
-         r = seed48_r(seed16v, &config->entropy);
-+#else
-+        r = 0;
-+        seed48(seed16v);
-+#endif
-         c_assert(!r);
- }
- 
-@@ -379,7 +384,12 @@ uint32_t n_dhcp4_client_probe_config_get
-         long int result;
-         int r;
- 
-+#ifdef __GLIBC__
-         r = mrand48_r(&config->entropy, &result);
-+#else
-+        r = 0;
-+        result = mrand48();
-+#endif
-         c_assert(!r);
- 
-         return result;
---- shared/n-dhcp4/src/n-dhcp4-private.h.orig	2020-01-06 15:41:31.941501136 +0100
-+++ shared/n-dhcp4/src/n-dhcp4-private.h	2020-01-06 15:41:55.341556325 +0100
-@@ -267,7 +267,9 @@ struct NDhcp4ClientProbeConfig {
-         bool inform_only;
-         bool init_reboot;
-         struct in_addr requested_ip;
-+#ifdef __GLIBC__
-         struct drand48_data entropy;    /* entropy pool */
-+#endif
-         uint64_t ms_start_delay;        /* max ms to wait before starting probe */
-         NDhcp4ClientProbeOption *options[UINT8_MAX + 1];
-         int8_t request_parameters[UINT8_MAX + 1];
diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template
index d439d8b10286..0afa1ccae360 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -1,41 +1,39 @@
 # Template file for 'NetworkManager'
-# when updating to 1.24 or newer, drop the compat
-# patch in gnome-control-center and rebuild it
 pkgname=NetworkManager
-version=1.22.10
-revision=3
+version=1.30.2
+revision=1
 build_style=meson
 build_helper="gir qemu"
 configure_args="-Dpolkit_agent=true -Dsystemd_journal=false
- -Dlibaudit=no -Dovs=false -Dlibnm_glib=true -Dselinux=false
- -Dmodify_system=true -Dpolkit_agent=true -Dsystemdsystemunitdir=no
+ -Dlibaudit=no -Dovs=false -Dselinux=false
+ -Dmodify_system=true -Dsystemdsystemunitdir=no
  -Dpppd=/usr/bin/pppd -Dqt=false
  -Dsession_tracking_consolekit=false
  -Dpppd_plugin_dir=/usr/lib/pppd/2.4.9 -Dresolvconf=/usr/bin/resolvconf
  -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
- -Diwd=true
- -Dudev_dir=/usr/lib/udev -Dintrospection=$(vopt_if gir true false)
- -Dvapi=$(vopt_if vala true false)
+ -Diwd=true -Dudev_dir=/usr/lib/udev -Ddocs=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"
 hostmakedepends="gettext-devel glib-devel libxslt-devel pkg-config
- intltool dbus-glib-devel jansson-devel $(vopt_if vala vala)
- $(vopt_if gir 'python3-gobject')"
+ intltool dbus-glib-devel jansson-devel docbook-xsl gtk-doc
+ $(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
  ModemManager-devel readline-devel libndp-devel newt-devel jansson-devel
  libpsl-devel eudev-libudev-devel mobile-broadband-provider-info
- $(vopt_if gir libgirepository-devel) $(vopt_if elogind elogind-devel)"
+ $(vopt_if gir 'libgirepository-devel python3-gobject')
+ $(vopt_if elogind elogind-devel)"
 depends="dbus iproute2 openresolv wpa_supplicant mobile-broadband-provider-info"
 short_desc="Network Management daemon"
 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=2b29ccc1531ba7ebba95a97f40c22b963838e8b6833745efe8e6fb71fd8fca77
+checksum=0c8e80e77877860e4a4e6ab4a0f7cdc1186e356b65b042a751897188b88944d2
 # TODO: Some tests require network namespaces to run.
 make_check=extended
 lib32disabled=yes
@@ -47,18 +45,11 @@ make_dirs="
  /etc/NetworkManager/VPN 0755 root root
  /var/lib/NetworkManager 0755 root root
 "
-
-case "$XBPS_TARGET_MACHINE" in
-	*-musl)
-			CFLAGS+=" -DRTLD_DEEPBIND=0"
-			# Fail to build on musl
-			configure_args+=" -Dtests=no"
-		;;
-esac
+patch_args=-Np1
 
 # Package build options
-build_options="gir vala elogind"
-build_options_default="gir vala elogind"
+build_options="gir elogind"
+build_options_default="gir elogind"
 
 pre_configure() {
 	if [ "$CROSS_BUILD" ]; then
@@ -95,8 +86,6 @@ NetworkManager-devel_package() {
 		vmove "usr/lib/*.so"
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
-		fi
-		if [ "$build_option_vala" ]; then
 			vmove usr/share/vala
 		fi
 	}

^ permalink raw reply	[flat|nested] 73+ messages in thread

* Re: [PR PATCH] [Updated] NetworkManager: update to 1.30.2, gnome-control-center: update to 3.38.5
  2021-03-09  3:41 [PR PATCH] NetworkManager: update to 1.31.1 cinerea0
                   ` (62 preceding siblings ...)
  2021-03-24 23:53 ` cinerea0
@ 2021-03-25  0:30 ` cinerea0
  2021-03-25  1:11 ` [PR REVIEW] " cinerea0
                   ` (7 subsequent siblings)
  71 siblings, 0 replies; 73+ messages in thread
From: cinerea0 @ 2021-03-25  0:30 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1651 bytes --]

There is an updated pull request by cinerea0 against master on the void-packages repository

https://github.com/cinerea0/void-packages nm
https://github.com/void-linux/void-packages/pull/29342

NetworkManager: update to 1.30.2, gnome-control-center: update to 3.38.5
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->

Closes #27502

A patch file from https://github.com/void-linux/void-packages/pull/29342.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nm-29342.patch --]
[-- Type: text/x-diff, Size: 19687 bytes --]

From 5995659acf5898a7c84ec541748546c9125d8951 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Wed, 24 Mar 2021 20:30:11 -0400
Subject: [PATCH] NetworkManager: update to 1.30.2

---
 .../patches/fix-cross-gir.patch               | 69 +++++++------------
 .../patches/fix-musl-linux-header.diff        | 15 ----
 .../patches/fix-musl-qsort_r.patch            | 16 -----
 .../NetworkManager/patches/musl-basic.patch   | 29 --------
 .../patches/musl-fix-includes.patch           | 54 ---------------
 .../patches/musl-network-support.patch        | 42 -----------
 .../patches/musl-process-util.patch           | 40 -----------
 .../patches/musl-use-srand48.patch            | 40 -----------
 .../NetworkManager/patches/no-gtk-doc.patch   | 30 ++++++++
 srcpkgs/NetworkManager/template               | 39 ++++-------
 10 files changed, 68 insertions(+), 306 deletions(-)
 delete mode 100644 srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff
 delete mode 100644 srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-basic.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-fix-includes.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-network-support.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-process-util.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-use-srand48.patch
 create mode 100644 srcpkgs/NetworkManager/patches/no-gtk-doc.patch

diff --git a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
index c283d4dc1059..b78edfac2446 100644
--- a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
+++ b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
@@ -1,52 +1,31 @@
 Reason: Fix crossbuilding GIR
 Upstream: No, not upstreamable since this is very specific to the Void setup
-diff --git clients/common/meson.build clients/common/meson.build
-index afa257b..50b53e7 100644
---- clients/common/meson.build
-+++ clients/common/meson.build
-@@ -35,7 +35,7 @@ if enable_introspection
-     settings_docs,
-     input: nm_property_docs,
-     output: settings_docs,
--    command: [xsltproc, '--output', '@OUTPUT@', join_paths(meson.current_source_dir(), 'settings-docs.xsl'), '@INPUT@'],
-+    command: [xsltproc, '--output', '@OUTPUT@', join_paths(meson.current_source_dir(), 'settings-docs.xsl'), join_paths(meson.current_source_dir(), '..', '..', '@INPUT@')],
-   )
+Index: b/libnm/meson.build
+===================================================================
+--- a/libnm/meson.build
++++ b/libnm/meson.build
+@@ -274,13 +274,23 @@ if enable_introspection
+     'LD_LIBRARY_PATH=' + ld_library_path,
+   ]
  
-   test(
-diff --git libnm/meson.build libnm/meson.build
-index 51ca46d..f14d861 100644
---- libnm/meson.build
-+++ libnm/meson.build
-@@ -236,7 +236,13 @@ if enable_introspection
-     )
-   endif
- 
--  generate_setting_docs = join_paths(meson.current_source_dir(), 'generate-setting-docs.py')
 +  if meson.is_cross_build()
-+    qemu = '/usr/bin/qemu-@XBPS_TARGET_QEMU_MACHINE@-static'
-+    qemu_python3_cmd = qemu + ' -L @XBPS_CROSS_BASE@ @XBPS_CROSS_BASE@/usr/bin/python3'
-+    generate_setting_docs = ['sh', '-c', qemu_python3_cmd, join_paths(meson.current_source_dir(), 'generate-setting-docs.py')]
++    qemu_python3_cmd = [
++      '/usr/bin/qemu-@XBPS_TARGET_QEMU_MACHINE@-static',
++      '-L', '@XBPS_CROSS_BASE@',
++      '@XBPS_CROSS_BASE@/usr/bin/python3'
++      ]
 +  else
-+    generate_setting_docs = [python.path(), join_paths(meson.current_source_dir(), 'generate-setting-docs.py')]
++    qemu_python3_cmd = python.path()
 +  endif
- 
-   gi_typelib_path = run_command('printenv', 'GI_TYPELIB_PATH').stdout()
-   if gi_typelib_path != ''
-@@ -261,7 +267,7 @@ if enable_introspection
-     name,
++
+   nm_settings_docs_xml_gir = custom_target(
+     'nm-settings-docs-gir.xml',
      input: libnm_gir[0],
-     output: name,
--    command: [generate_setting_docs_env, python.path(), generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--output', '@OUTPUT@'],
-+    command: [generate_setting_docs_env, generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--output', '@OUTPUT@'],
-     depends: libnm_gir,
-   )
- 
-@@ -270,7 +276,7 @@ if enable_introspection
-     name,
-     input: [libnm_gir[0], nm_settings_docs_overrides],
-     output: name,
--    command: [generate_setting_docs_env, python.path(), generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT0@', '--overrides', '@INPUT1@', '--output', '@OUTPUT@'],
-+    command: [generate_setting_docs_env, generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT0@', '--overrides', '@INPUT1@', '--output', '@OUTPUT@'],
-     depends: libnm_gir,
-   )
- endif
+     output: 'nm-settings-docs-gir.xml',
+     command: [
+       generate_setting_docs_env,
+-      python.path(),
++      qemu_python3_cmd,
+       join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-gir.py'),
+       '--lib-path', meson.current_build_dir(),
+       '--gir', '@INPUT@',
diff --git a/srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff b/srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff
deleted file mode 100644
index 511759214a97..000000000000
--- a/srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git src/systemd/src/libsystemd-network/sd-dhcp6-client.c src/systemd/src/libsystemd-network/sd-dhcp6-client.c
-index f67a45bd2..ec11fa605 100644
---- src/systemd/src/libsystemd-network/sd-dhcp6-client.c
-+++ src/systemd/src/libsystemd-network/sd-dhcp6-client.c
-@@ -8,8 +8,10 @@
- #include <errno.h>
- #include <string.h>
- #include <sys/ioctl.h>
-+#ifdef __GLIBC__
- #include <linux/if_arp.h>
- #include <linux/if_infiniband.h>
-+#endif
- 
- #include "sd-dhcp6-client.h"
- 
diff --git a/srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch b/srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch
deleted file mode 100644
index f89eac778502..000000000000
--- a/srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git shared/systemd/src/basic/sort-util.h shared/systemd/src/basic/sort-util.h
-index e029f8646..168735087 100644
---- shared/systemd/src/basic/sort-util.h
-+++ shared/systemd/src/basic/sort-util.h
-@@ -60,7 +60,11 @@ static inline void qsort_r_safe(void *base, size_t nmemb, size_t size, __compar_
-                 return;
- 
-         assert(base);
-+#ifdef __GLIBC__
-         qsort_r(base, nmemb, size, compar, userdata);
-+#else
-+        g_qsort_with_data(base, nmemb, size, compar, userdata);
-+#endif
- }
- 
- #define typesafe_qsort_r(p, n, func, userdata)                          \
diff --git a/srcpkgs/NetworkManager/patches/musl-basic.patch b/srcpkgs/NetworkManager/patches/musl-basic.patch
deleted file mode 100644
index 63ea93ada585..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-basic.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Usual fix for musl libc
---- shared/systemd/src/basic/stdio-util.h.orig
-+++ shared/systemd/src/basic/stdio-util.h
-@@ -19,7 +19,9 @@
-   along with systemd; If not, see <http://www.gnu.org/licenses/>.
- ***/
- 
-+#if defined(__GLIBC__)
- #include <printf.h>
-+#endif
- #include <stdarg.h>
- #include <stdio.h>
- #include <sys/types.h>
- 
---- shared/systemd/src/basic/sort-util.h	2019-06-09 17:02:48.895695896 +0200
-+++ shared/systemd/src/basic/sort-util.h	2019-06-09 17:03:27.564199937 +0200
-@@ -5,6 +5,12 @@
- 
- #include "macro.h"
- 
-+#if !defined(__GLIBC__)
-+typedef int (*__compar_fn_t) (const void*, const void*);
-+typedef __compar_fn_t comparison_fn_t;
-+typedef int (*__compar_d_fn_t) (const void *, const void *, void *);
-+#endif
-+
- void *xbsearch_r(const void *key, const void *base, size_t nmemb, size_t size,
-                  __compar_d_fn_t compar, void *arg);
- 
diff --git a/srcpkgs/NetworkManager/patches/musl-fix-includes.patch b/srcpkgs/NetworkManager/patches/musl-fix-includes.patch
deleted file mode 100644
index 95ffb2d354ea..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-fix-includes.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- src/devices/nm-device.c.orig	2019-12-17 08:59:49.000000000 +0100
-+++ src/devices/nm-device.c	2020-01-06 17:29:08.678242168 +0100
-@@ -17,7 +17,11 @@
- #include <arpa/inet.h>
- #include <fcntl.h>
- #include <linux/if_addr.h>
-+#if defined(__GLIBC__)
- #include <linux/if_arp.h>
-+#else
-+#include <linux/if.h>
-+#endif
- #include <linux/rtnetlink.h>
- #include <linux/pkt_sched.h>
- 
---- src/nm-manager.c.orig	2020-01-06 17:29:08.682242177 +0100
-+++ src/nm-manager.c	2020-01-06 17:30:50.378482034 +0100
-@@ -15,6 +15,7 @@
- #include <sys/stat.h>
- #include <sys/sendfile.h>
- #include <limits.h>
-+#include <asm/types.h>
- 
- #include "nm-glib-aux/nm-c-list.h"
- 
---- src/platform/nm-linux-platform.c.orig	2019-12-17 08:59:49.000000000 +0100
-+++ src/platform/nm-linux-platform.c	2020-01-06 17:29:08.686242186 +0100
-@@ -6,6 +6,7 @@
- #include "nm-default.h"
- 
- #include "nm-linux-platform.h"
-+#include "wpan/nm-wpan-utils.h"
- 
- #include <arpa/inet.h>
- #include <dlfcn.h>
-@@ -14,7 +15,11 @@
- #include <libudev.h>
- #include <linux/fib_rules.h>
- #include <linux/ip.h>
-+#if defined(__GLIBC__)
- #include <linux/if_arp.h>
-+#else
-+#include <linux/if.h>
-+#endif
- #include <linux/if_bridge.h>
- #include <linux/if_link.h>
- #include <linux/if_tun.h>
-@@ -44,7 +49,6 @@
- #include "nm-platform-private.h"
- #include "wifi/nm-wifi-utils.h"
- #include "wifi/nm-wifi-utils-wext.h"
--#include "wpan/nm-wpan-utils.h"
- #include "nm-glib-aux/nm-io-utils.h"
- #include "nm-udev-aux/nm-udev-utils.h"
- 
diff --git a/srcpkgs/NetworkManager/patches/musl-network-support.patch b/srcpkgs/NetworkManager/patches/musl-network-support.patch
deleted file mode 100644
index 0fb63f067b17..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-network-support.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- libnm-core/nm-utils.h.orig
-+++ libnm-core/nm-utils.h
-@@ -30,7 +30,11 @@
- #include <netinet/in.h>
- 
- /* For ETH_ALEN and INFINIBAND_ALEN */
-+#if defined(__GLIBC__)
- #include <linux/if_ether.h>
-+#else
-+#define ETH_ALEN	6		/* Octets in one ethernet addr	 */
-+#endif
- #include <linux/if_infiniband.h>
- 
- #include "nm-core-enum-types.h"
---- src/platform/wifi/nm-wifi-utils.h.orig
-+++ src/platform/wifi/nm-wifi-utils.h
-@@ -22,7 +22,11 @@
- #ifndef __WIFI_UTILS_H__
- #define __WIFI_UTILS_H__
- 
-+#if defined(__GLIBC__)
- #include <net/ethernet.h>
-+#else /* musl libc */
-+#define ETH_ALEN	6		/* Octets in one ethernet addr	 */
-+#endif
- 
- #include "nm-dbus-interface.h"
- 
---- shared/systemd/src/basic/socket-util.h	2019-03-16 15:41:33.287235649 +0100
-+++ shared/systemd/src/basic/socket-util.h	2019-03-16 15:42:24.273912106 +0100
-@@ -12,6 +12,11 @@
- #include <sys/socket.h>
- #include <sys/types.h>
- #include <sys/un.h>
-+#if !defined(__GLIBC__)
-+/* SIOCGSTAMPNS from linux/asm-generic.h 
-+ * for src/systemd/src/libsystemd-network/sd-lldp.c */
-+#include <linux/sockios.h>
-+#endif
- 
- #include "macro.h"
- #include "missing_socket.h"
diff --git a/srcpkgs/NetworkManager/patches/musl-process-util.patch b/srcpkgs/NetworkManager/patches/musl-process-util.patch
deleted file mode 100644
index e406de1da850..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-process-util.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- shared/systemd/src/basic/process-util.c
-+++ shared/systemd/src/basic/process-util.c
-@@ -21,6 +21,9 @@
- #include <sys/wait.h>
- #include <syslog.h>
- #include <unistd.h>
-+#ifndef __GLIBC__
-+#include <pthread.h>
-+#endif
- #if 0 /* NM_IGNORED */
- #if HAVE_VALGRIND_VALGRIND_H
- #include <valgrind/valgrind.h>
-@@ -1168,11 +1171,13 @@ void reset_cached_pid(void) {
-         cached_pid = CACHED_PID_UNSET;
- }
- 
-+#ifdef __GLIBC__
- /* We use glibc __register_atfork() + __dso_handle directly here, as they are not included in the glibc
-  * headers. __register_atfork() is mostly equivalent to pthread_atfork(), but doesn't require us to link against
-  * libpthread, as it is part of glibc anyway. */
- extern int __register_atfork(void (*prepare) (void), void (*parent) (void), void (*child) (void), void *dso_handle);
- extern void* __dso_handle _weak_;
-+#endif
- 
- pid_t getpid_cached(void) {
-         static bool installed = false;
-@@ -1201,7 +1206,12 @@ pid_t getpid_cached(void) {
-                          * only half-documented (glibc doesn't document it but LSB does — though only superficially)
-                          * we'll check for errors only in the most generic fashion possible. */
- 
--                        if (__register_atfork(NULL, NULL, reset_cached_pid, __dso_handle) != 0) {
-+                        #ifdef __GLIBC__
-+                            if (__register_atfork(NULL, NULL, reset_cached_pid, __dso_handle) != 0) {
-+                        #else
-+                            if (pthread_atfork(NULL, NULL, reset_cached_pid) != 0) {
-+                        #endif
-+
-                                 /* OOM? Let's try again later */
-                                 cached_pid = CACHED_PID_UNSET;
-                                 return new_pid;
diff --git a/srcpkgs/NetworkManager/patches/musl-use-srand48.patch b/srcpkgs/NetworkManager/patches/musl-use-srand48.patch
deleted file mode 100644
index 43b689f3bad1..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-use-srand48.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- shared/n-dhcp4/src/n-dhcp4-c-probe.c.orig	2020-01-06 15:35:10.128600647 +0100
-+++ shared/n-dhcp4/src/n-dhcp4-c-probe.c	2020-01-06 15:39:41.446240531 +0100
-@@ -362,7 +362,12 @@ static void n_dhcp4_client_probe_config_
-         seed16v[1] = (u64 >> 16) ^ (u64 >>  0);
-         seed16v[2] = (u64 >> 32) ^ (u64 >> 16);
- 
-+#ifdef __GLIBC__
-         r = seed48_r(seed16v, &config->entropy);
-+#else
-+        r = 0;
-+        seed48(seed16v);
-+#endif
-         c_assert(!r);
- }
- 
-@@ -379,7 +384,12 @@ uint32_t n_dhcp4_client_probe_config_get
-         long int result;
-         int r;
- 
-+#ifdef __GLIBC__
-         r = mrand48_r(&config->entropy, &result);
-+#else
-+        r = 0;
-+        result = mrand48();
-+#endif
-         c_assert(!r);
- 
-         return result;
---- shared/n-dhcp4/src/n-dhcp4-private.h.orig	2020-01-06 15:41:31.941501136 +0100
-+++ shared/n-dhcp4/src/n-dhcp4-private.h	2020-01-06 15:41:55.341556325 +0100
-@@ -267,7 +267,9 @@ struct NDhcp4ClientProbeConfig {
-         bool inform_only;
-         bool init_reboot;
-         struct in_addr requested_ip;
-+#ifdef __GLIBC__
-         struct drand48_data entropy;    /* entropy pool */
-+#endif
-         uint64_t ms_start_delay;        /* max ms to wait before starting probe */
-         NDhcp4ClientProbeOption *options[UINT8_MAX + 1];
-         int8_t request_parameters[UINT8_MAX + 1];
diff --git a/srcpkgs/NetworkManager/patches/no-gtk-doc.patch b/srcpkgs/NetworkManager/patches/no-gtk-doc.patch
new file mode 100644
index 000000000000..7492b818868e
--- /dev/null
+++ b/srcpkgs/NetworkManager/patches/no-gtk-doc.patch
@@ -0,0 +1,30 @@
+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
+===================================================================
+--- a/meson.build
++++ b/meson.build
+@@ -943,10 +943,8 @@ if enable_qt
+ endif
+ 
+ if enable_docs
+-  assert(enable_introspection, '-Ddocs=true requires -Dintrospection=true')
+   assert(meson.version().version_compare('>= 0.46.0'), '-Ddocs requires meson >= 0.46')
+   subdir('man')
+-  subdir('docs')
+ endif
+ 
+ configure_file(
+Index: b/clients/common/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,
+ )
+ 
+-if enable_docs
++if enable_docs and enable_introspection
+   settings_docs_source = custom_target(
+     'settings-docs.h',
+     input: nm_settings_docs_xml_gir,
diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template
index d439d8b10286..0afa1ccae360 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -1,41 +1,39 @@
 # Template file for 'NetworkManager'
-# when updating to 1.24 or newer, drop the compat
-# patch in gnome-control-center and rebuild it
 pkgname=NetworkManager
-version=1.22.10
-revision=3
+version=1.30.2
+revision=1
 build_style=meson
 build_helper="gir qemu"
 configure_args="-Dpolkit_agent=true -Dsystemd_journal=false
- -Dlibaudit=no -Dovs=false -Dlibnm_glib=true -Dselinux=false
- -Dmodify_system=true -Dpolkit_agent=true -Dsystemdsystemunitdir=no
+ -Dlibaudit=no -Dovs=false -Dselinux=false
+ -Dmodify_system=true -Dsystemdsystemunitdir=no
  -Dpppd=/usr/bin/pppd -Dqt=false
  -Dsession_tracking_consolekit=false
  -Dpppd_plugin_dir=/usr/lib/pppd/2.4.9 -Dresolvconf=/usr/bin/resolvconf
  -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
- -Diwd=true
- -Dudev_dir=/usr/lib/udev -Dintrospection=$(vopt_if gir true false)
- -Dvapi=$(vopt_if vala true false)
+ -Diwd=true -Dudev_dir=/usr/lib/udev -Ddocs=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"
 hostmakedepends="gettext-devel glib-devel libxslt-devel pkg-config
- intltool dbus-glib-devel jansson-devel $(vopt_if vala vala)
- $(vopt_if gir 'python3-gobject')"
+ intltool dbus-glib-devel jansson-devel docbook-xsl gtk-doc
+ $(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
  ModemManager-devel readline-devel libndp-devel newt-devel jansson-devel
  libpsl-devel eudev-libudev-devel mobile-broadband-provider-info
- $(vopt_if gir libgirepository-devel) $(vopt_if elogind elogind-devel)"
+ $(vopt_if gir 'libgirepository-devel python3-gobject')
+ $(vopt_if elogind elogind-devel)"
 depends="dbus iproute2 openresolv wpa_supplicant mobile-broadband-provider-info"
 short_desc="Network Management daemon"
 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=2b29ccc1531ba7ebba95a97f40c22b963838e8b6833745efe8e6fb71fd8fca77
+checksum=0c8e80e77877860e4a4e6ab4a0f7cdc1186e356b65b042a751897188b88944d2
 # TODO: Some tests require network namespaces to run.
 make_check=extended
 lib32disabled=yes
@@ -47,18 +45,11 @@ make_dirs="
  /etc/NetworkManager/VPN 0755 root root
  /var/lib/NetworkManager 0755 root root
 "
-
-case "$XBPS_TARGET_MACHINE" in
-	*-musl)
-			CFLAGS+=" -DRTLD_DEEPBIND=0"
-			# Fail to build on musl
-			configure_args+=" -Dtests=no"
-		;;
-esac
+patch_args=-Np1
 
 # Package build options
-build_options="gir vala elogind"
-build_options_default="gir vala elogind"
+build_options="gir elogind"
+build_options_default="gir elogind"
 
 pre_configure() {
 	if [ "$CROSS_BUILD" ]; then
@@ -95,8 +86,6 @@ NetworkManager-devel_package() {
 		vmove "usr/lib/*.so"
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
-		fi
-		if [ "$build_option_vala" ]; then
 			vmove usr/share/vala
 		fi
 	}

^ permalink raw reply	[flat|nested] 73+ messages in thread

* Re: [PR REVIEW] NetworkManager: update to 1.30.2, gnome-control-center: update to 3.38.5
  2021-03-09  3:41 [PR PATCH] NetworkManager: update to 1.31.1 cinerea0
                   ` (63 preceding siblings ...)
  2021-03-25  0:30 ` cinerea0
@ 2021-03-25  1:11 ` cinerea0
  2021-03-25  1:12 ` cinerea0
                   ` (6 subsequent siblings)
  71 siblings, 0 replies; 73+ messages in thread
From: cinerea0 @ 2021-03-25  1:11 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 263 bytes --]

New review comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/29342#discussion_r600974615

Comment:
Building fails on ARM architectures without the patch, but builds successfully on all architectures with the patch.

^ permalink raw reply	[flat|nested] 73+ messages in thread

* Re: [PR REVIEW] NetworkManager: update to 1.30.2, gnome-control-center: update to 3.38.5
  2021-03-09  3:41 [PR PATCH] NetworkManager: update to 1.31.1 cinerea0
                   ` (64 preceding siblings ...)
  2021-03-25  1:11 ` [PR REVIEW] " cinerea0
@ 2021-03-25  1:12 ` cinerea0
  2021-03-25  1:19 ` cinerea0
                   ` (5 subsequent siblings)
  71 siblings, 0 replies; 73+ messages in thread
From: cinerea0 @ 2021-03-25  1:12 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 198 bytes --]

New review comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/29342#discussion_r600974738

Comment:
The build succeeds even with that section removed.

^ permalink raw reply	[flat|nested] 73+ messages in thread

* Re: [PR REVIEW] NetworkManager: update to 1.30.2, gnome-control-center: update to 3.38.5
  2021-03-09  3:41 [PR PATCH] NetworkManager: update to 1.31.1 cinerea0
                   ` (65 preceding siblings ...)
  2021-03-25  1:12 ` cinerea0
@ 2021-03-25  1:19 ` cinerea0
  2021-03-25  1:49 ` ericonr
                   ` (4 subsequent siblings)
  71 siblings, 0 replies; 73+ messages in thread
From: cinerea0 @ 2021-03-25  1:19 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 335 bytes --]

New review comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/29342#discussion_r600977262

Comment:
Was that the expected outcome, specifically with ARM archs? I guess that's not what I was expecting. If it was, I'll go ahead and push the other commits and mark this PR ready for review.

^ permalink raw reply	[flat|nested] 73+ messages in thread

* Re: [PR REVIEW] NetworkManager: update to 1.30.2, gnome-control-center: update to 3.38.5
  2021-03-09  3:41 [PR PATCH] NetworkManager: update to 1.31.1 cinerea0
                   ` (66 preceding siblings ...)
  2021-03-25  1:19 ` cinerea0
@ 2021-03-25  1:49 ` ericonr
  2021-03-25  2:20 ` [PR PATCH] [Updated] " cinerea0
                   ` (3 subsequent siblings)
  71 siblings, 0 replies; 73+ messages in thread
From: ericonr @ 2021-03-25  1:49 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 212 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/29342#discussion_r600986405

Comment:
Kinda makes sense, it'd be cross builds that'd be affected by it.

^ permalink raw reply	[flat|nested] 73+ messages in thread

* Re: [PR PATCH] [Updated] NetworkManager: update to 1.30.2, gnome-control-center: update to 3.38.5
  2021-03-09  3:41 [PR PATCH] NetworkManager: update to 1.31.1 cinerea0
                   ` (67 preceding siblings ...)
  2021-03-25  1:49 ` ericonr
@ 2021-03-25  2:20 ` cinerea0
  2021-03-25  3:14 ` cinerea0
                   ` (2 subsequent siblings)
  71 siblings, 0 replies; 73+ messages in thread
From: cinerea0 @ 2021-03-25  2:20 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1651 bytes --]

There is an updated pull request by cinerea0 against master on the void-packages repository

https://github.com/cinerea0/void-packages nm
https://github.com/void-linux/void-packages/pull/29342

NetworkManager: update to 1.30.2, gnome-control-center: update to 3.38.5
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->

Closes #27502

A patch file from https://github.com/void-linux/void-packages/pull/29342.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nm-29342.patch --]
[-- Type: text/x-diff, Size: 20355 bytes --]

From 5995659acf5898a7c84ec541748546c9125d8951 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Wed, 24 Mar 2021 20:30:11 -0400
Subject: [PATCH 1/2] NetworkManager: update to 1.30.2

---
 .../patches/fix-cross-gir.patch               | 69 +++++++------------
 .../patches/fix-musl-linux-header.diff        | 15 ----
 .../patches/fix-musl-qsort_r.patch            | 16 -----
 .../NetworkManager/patches/musl-basic.patch   | 29 --------
 .../patches/musl-fix-includes.patch           | 54 ---------------
 .../patches/musl-network-support.patch        | 42 -----------
 .../patches/musl-process-util.patch           | 40 -----------
 .../patches/musl-use-srand48.patch            | 40 -----------
 .../NetworkManager/patches/no-gtk-doc.patch   | 30 ++++++++
 srcpkgs/NetworkManager/template               | 39 ++++-------
 10 files changed, 68 insertions(+), 306 deletions(-)
 delete mode 100644 srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff
 delete mode 100644 srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-basic.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-fix-includes.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-network-support.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-process-util.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-use-srand48.patch
 create mode 100644 srcpkgs/NetworkManager/patches/no-gtk-doc.patch

diff --git a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
index c283d4dc1059..b78edfac2446 100644
--- a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
+++ b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
@@ -1,52 +1,31 @@
 Reason: Fix crossbuilding GIR
 Upstream: No, not upstreamable since this is very specific to the Void setup
-diff --git clients/common/meson.build clients/common/meson.build
-index afa257b..50b53e7 100644
---- clients/common/meson.build
-+++ clients/common/meson.build
-@@ -35,7 +35,7 @@ if enable_introspection
-     settings_docs,
-     input: nm_property_docs,
-     output: settings_docs,
--    command: [xsltproc, '--output', '@OUTPUT@', join_paths(meson.current_source_dir(), 'settings-docs.xsl'), '@INPUT@'],
-+    command: [xsltproc, '--output', '@OUTPUT@', join_paths(meson.current_source_dir(), 'settings-docs.xsl'), join_paths(meson.current_source_dir(), '..', '..', '@INPUT@')],
-   )
+Index: b/libnm/meson.build
+===================================================================
+--- a/libnm/meson.build
++++ b/libnm/meson.build
+@@ -274,13 +274,23 @@ if enable_introspection
+     'LD_LIBRARY_PATH=' + ld_library_path,
+   ]
  
-   test(
-diff --git libnm/meson.build libnm/meson.build
-index 51ca46d..f14d861 100644
---- libnm/meson.build
-+++ libnm/meson.build
-@@ -236,7 +236,13 @@ if enable_introspection
-     )
-   endif
- 
--  generate_setting_docs = join_paths(meson.current_source_dir(), 'generate-setting-docs.py')
 +  if meson.is_cross_build()
-+    qemu = '/usr/bin/qemu-@XBPS_TARGET_QEMU_MACHINE@-static'
-+    qemu_python3_cmd = qemu + ' -L @XBPS_CROSS_BASE@ @XBPS_CROSS_BASE@/usr/bin/python3'
-+    generate_setting_docs = ['sh', '-c', qemu_python3_cmd, join_paths(meson.current_source_dir(), 'generate-setting-docs.py')]
++    qemu_python3_cmd = [
++      '/usr/bin/qemu-@XBPS_TARGET_QEMU_MACHINE@-static',
++      '-L', '@XBPS_CROSS_BASE@',
++      '@XBPS_CROSS_BASE@/usr/bin/python3'
++      ]
 +  else
-+    generate_setting_docs = [python.path(), join_paths(meson.current_source_dir(), 'generate-setting-docs.py')]
++    qemu_python3_cmd = python.path()
 +  endif
- 
-   gi_typelib_path = run_command('printenv', 'GI_TYPELIB_PATH').stdout()
-   if gi_typelib_path != ''
-@@ -261,7 +267,7 @@ if enable_introspection
-     name,
++
+   nm_settings_docs_xml_gir = custom_target(
+     'nm-settings-docs-gir.xml',
      input: libnm_gir[0],
-     output: name,
--    command: [generate_setting_docs_env, python.path(), generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--output', '@OUTPUT@'],
-+    command: [generate_setting_docs_env, generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--output', '@OUTPUT@'],
-     depends: libnm_gir,
-   )
- 
-@@ -270,7 +276,7 @@ if enable_introspection
-     name,
-     input: [libnm_gir[0], nm_settings_docs_overrides],
-     output: name,
--    command: [generate_setting_docs_env, python.path(), generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT0@', '--overrides', '@INPUT1@', '--output', '@OUTPUT@'],
-+    command: [generate_setting_docs_env, generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT0@', '--overrides', '@INPUT1@', '--output', '@OUTPUT@'],
-     depends: libnm_gir,
-   )
- endif
+     output: 'nm-settings-docs-gir.xml',
+     command: [
+       generate_setting_docs_env,
+-      python.path(),
++      qemu_python3_cmd,
+       join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-gir.py'),
+       '--lib-path', meson.current_build_dir(),
+       '--gir', '@INPUT@',
diff --git a/srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff b/srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff
deleted file mode 100644
index 511759214a97..000000000000
--- a/srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git src/systemd/src/libsystemd-network/sd-dhcp6-client.c src/systemd/src/libsystemd-network/sd-dhcp6-client.c
-index f67a45bd2..ec11fa605 100644
---- src/systemd/src/libsystemd-network/sd-dhcp6-client.c
-+++ src/systemd/src/libsystemd-network/sd-dhcp6-client.c
-@@ -8,8 +8,10 @@
- #include <errno.h>
- #include <string.h>
- #include <sys/ioctl.h>
-+#ifdef __GLIBC__
- #include <linux/if_arp.h>
- #include <linux/if_infiniband.h>
-+#endif
- 
- #include "sd-dhcp6-client.h"
- 
diff --git a/srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch b/srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch
deleted file mode 100644
index f89eac778502..000000000000
--- a/srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git shared/systemd/src/basic/sort-util.h shared/systemd/src/basic/sort-util.h
-index e029f8646..168735087 100644
---- shared/systemd/src/basic/sort-util.h
-+++ shared/systemd/src/basic/sort-util.h
-@@ -60,7 +60,11 @@ static inline void qsort_r_safe(void *base, size_t nmemb, size_t size, __compar_
-                 return;
- 
-         assert(base);
-+#ifdef __GLIBC__
-         qsort_r(base, nmemb, size, compar, userdata);
-+#else
-+        g_qsort_with_data(base, nmemb, size, compar, userdata);
-+#endif
- }
- 
- #define typesafe_qsort_r(p, n, func, userdata)                          \
diff --git a/srcpkgs/NetworkManager/patches/musl-basic.patch b/srcpkgs/NetworkManager/patches/musl-basic.patch
deleted file mode 100644
index 63ea93ada585..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-basic.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Usual fix for musl libc
---- shared/systemd/src/basic/stdio-util.h.orig
-+++ shared/systemd/src/basic/stdio-util.h
-@@ -19,7 +19,9 @@
-   along with systemd; If not, see <http://www.gnu.org/licenses/>.
- ***/
- 
-+#if defined(__GLIBC__)
- #include <printf.h>
-+#endif
- #include <stdarg.h>
- #include <stdio.h>
- #include <sys/types.h>
- 
---- shared/systemd/src/basic/sort-util.h	2019-06-09 17:02:48.895695896 +0200
-+++ shared/systemd/src/basic/sort-util.h	2019-06-09 17:03:27.564199937 +0200
-@@ -5,6 +5,12 @@
- 
- #include "macro.h"
- 
-+#if !defined(__GLIBC__)
-+typedef int (*__compar_fn_t) (const void*, const void*);
-+typedef __compar_fn_t comparison_fn_t;
-+typedef int (*__compar_d_fn_t) (const void *, const void *, void *);
-+#endif
-+
- void *xbsearch_r(const void *key, const void *base, size_t nmemb, size_t size,
-                  __compar_d_fn_t compar, void *arg);
- 
diff --git a/srcpkgs/NetworkManager/patches/musl-fix-includes.patch b/srcpkgs/NetworkManager/patches/musl-fix-includes.patch
deleted file mode 100644
index 95ffb2d354ea..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-fix-includes.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- src/devices/nm-device.c.orig	2019-12-17 08:59:49.000000000 +0100
-+++ src/devices/nm-device.c	2020-01-06 17:29:08.678242168 +0100
-@@ -17,7 +17,11 @@
- #include <arpa/inet.h>
- #include <fcntl.h>
- #include <linux/if_addr.h>
-+#if defined(__GLIBC__)
- #include <linux/if_arp.h>
-+#else
-+#include <linux/if.h>
-+#endif
- #include <linux/rtnetlink.h>
- #include <linux/pkt_sched.h>
- 
---- src/nm-manager.c.orig	2020-01-06 17:29:08.682242177 +0100
-+++ src/nm-manager.c	2020-01-06 17:30:50.378482034 +0100
-@@ -15,6 +15,7 @@
- #include <sys/stat.h>
- #include <sys/sendfile.h>
- #include <limits.h>
-+#include <asm/types.h>
- 
- #include "nm-glib-aux/nm-c-list.h"
- 
---- src/platform/nm-linux-platform.c.orig	2019-12-17 08:59:49.000000000 +0100
-+++ src/platform/nm-linux-platform.c	2020-01-06 17:29:08.686242186 +0100
-@@ -6,6 +6,7 @@
- #include "nm-default.h"
- 
- #include "nm-linux-platform.h"
-+#include "wpan/nm-wpan-utils.h"
- 
- #include <arpa/inet.h>
- #include <dlfcn.h>
-@@ -14,7 +15,11 @@
- #include <libudev.h>
- #include <linux/fib_rules.h>
- #include <linux/ip.h>
-+#if defined(__GLIBC__)
- #include <linux/if_arp.h>
-+#else
-+#include <linux/if.h>
-+#endif
- #include <linux/if_bridge.h>
- #include <linux/if_link.h>
- #include <linux/if_tun.h>
-@@ -44,7 +49,6 @@
- #include "nm-platform-private.h"
- #include "wifi/nm-wifi-utils.h"
- #include "wifi/nm-wifi-utils-wext.h"
--#include "wpan/nm-wpan-utils.h"
- #include "nm-glib-aux/nm-io-utils.h"
- #include "nm-udev-aux/nm-udev-utils.h"
- 
diff --git a/srcpkgs/NetworkManager/patches/musl-network-support.patch b/srcpkgs/NetworkManager/patches/musl-network-support.patch
deleted file mode 100644
index 0fb63f067b17..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-network-support.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- libnm-core/nm-utils.h.orig
-+++ libnm-core/nm-utils.h
-@@ -30,7 +30,11 @@
- #include <netinet/in.h>
- 
- /* For ETH_ALEN and INFINIBAND_ALEN */
-+#if defined(__GLIBC__)
- #include <linux/if_ether.h>
-+#else
-+#define ETH_ALEN	6		/* Octets in one ethernet addr	 */
-+#endif
- #include <linux/if_infiniband.h>
- 
- #include "nm-core-enum-types.h"
---- src/platform/wifi/nm-wifi-utils.h.orig
-+++ src/platform/wifi/nm-wifi-utils.h
-@@ -22,7 +22,11 @@
- #ifndef __WIFI_UTILS_H__
- #define __WIFI_UTILS_H__
- 
-+#if defined(__GLIBC__)
- #include <net/ethernet.h>
-+#else /* musl libc */
-+#define ETH_ALEN	6		/* Octets in one ethernet addr	 */
-+#endif
- 
- #include "nm-dbus-interface.h"
- 
---- shared/systemd/src/basic/socket-util.h	2019-03-16 15:41:33.287235649 +0100
-+++ shared/systemd/src/basic/socket-util.h	2019-03-16 15:42:24.273912106 +0100
-@@ -12,6 +12,11 @@
- #include <sys/socket.h>
- #include <sys/types.h>
- #include <sys/un.h>
-+#if !defined(__GLIBC__)
-+/* SIOCGSTAMPNS from linux/asm-generic.h 
-+ * for src/systemd/src/libsystemd-network/sd-lldp.c */
-+#include <linux/sockios.h>
-+#endif
- 
- #include "macro.h"
- #include "missing_socket.h"
diff --git a/srcpkgs/NetworkManager/patches/musl-process-util.patch b/srcpkgs/NetworkManager/patches/musl-process-util.patch
deleted file mode 100644
index e406de1da850..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-process-util.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- shared/systemd/src/basic/process-util.c
-+++ shared/systemd/src/basic/process-util.c
-@@ -21,6 +21,9 @@
- #include <sys/wait.h>
- #include <syslog.h>
- #include <unistd.h>
-+#ifndef __GLIBC__
-+#include <pthread.h>
-+#endif
- #if 0 /* NM_IGNORED */
- #if HAVE_VALGRIND_VALGRIND_H
- #include <valgrind/valgrind.h>
-@@ -1168,11 +1171,13 @@ void reset_cached_pid(void) {
-         cached_pid = CACHED_PID_UNSET;
- }
- 
-+#ifdef __GLIBC__
- /* We use glibc __register_atfork() + __dso_handle directly here, as they are not included in the glibc
-  * headers. __register_atfork() is mostly equivalent to pthread_atfork(), but doesn't require us to link against
-  * libpthread, as it is part of glibc anyway. */
- extern int __register_atfork(void (*prepare) (void), void (*parent) (void), void (*child) (void), void *dso_handle);
- extern void* __dso_handle _weak_;
-+#endif
- 
- pid_t getpid_cached(void) {
-         static bool installed = false;
-@@ -1201,7 +1206,12 @@ pid_t getpid_cached(void) {
-                          * only half-documented (glibc doesn't document it but LSB does — though only superficially)
-                          * we'll check for errors only in the most generic fashion possible. */
- 
--                        if (__register_atfork(NULL, NULL, reset_cached_pid, __dso_handle) != 0) {
-+                        #ifdef __GLIBC__
-+                            if (__register_atfork(NULL, NULL, reset_cached_pid, __dso_handle) != 0) {
-+                        #else
-+                            if (pthread_atfork(NULL, NULL, reset_cached_pid) != 0) {
-+                        #endif
-+
-                                 /* OOM? Let's try again later */
-                                 cached_pid = CACHED_PID_UNSET;
-                                 return new_pid;
diff --git a/srcpkgs/NetworkManager/patches/musl-use-srand48.patch b/srcpkgs/NetworkManager/patches/musl-use-srand48.patch
deleted file mode 100644
index 43b689f3bad1..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-use-srand48.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- shared/n-dhcp4/src/n-dhcp4-c-probe.c.orig	2020-01-06 15:35:10.128600647 +0100
-+++ shared/n-dhcp4/src/n-dhcp4-c-probe.c	2020-01-06 15:39:41.446240531 +0100
-@@ -362,7 +362,12 @@ static void n_dhcp4_client_probe_config_
-         seed16v[1] = (u64 >> 16) ^ (u64 >>  0);
-         seed16v[2] = (u64 >> 32) ^ (u64 >> 16);
- 
-+#ifdef __GLIBC__
-         r = seed48_r(seed16v, &config->entropy);
-+#else
-+        r = 0;
-+        seed48(seed16v);
-+#endif
-         c_assert(!r);
- }
- 
-@@ -379,7 +384,12 @@ uint32_t n_dhcp4_client_probe_config_get
-         long int result;
-         int r;
- 
-+#ifdef __GLIBC__
-         r = mrand48_r(&config->entropy, &result);
-+#else
-+        r = 0;
-+        result = mrand48();
-+#endif
-         c_assert(!r);
- 
-         return result;
---- shared/n-dhcp4/src/n-dhcp4-private.h.orig	2020-01-06 15:41:31.941501136 +0100
-+++ shared/n-dhcp4/src/n-dhcp4-private.h	2020-01-06 15:41:55.341556325 +0100
-@@ -267,7 +267,9 @@ struct NDhcp4ClientProbeConfig {
-         bool inform_only;
-         bool init_reboot;
-         struct in_addr requested_ip;
-+#ifdef __GLIBC__
-         struct drand48_data entropy;    /* entropy pool */
-+#endif
-         uint64_t ms_start_delay;        /* max ms to wait before starting probe */
-         NDhcp4ClientProbeOption *options[UINT8_MAX + 1];
-         int8_t request_parameters[UINT8_MAX + 1];
diff --git a/srcpkgs/NetworkManager/patches/no-gtk-doc.patch b/srcpkgs/NetworkManager/patches/no-gtk-doc.patch
new file mode 100644
index 000000000000..7492b818868e
--- /dev/null
+++ b/srcpkgs/NetworkManager/patches/no-gtk-doc.patch
@@ -0,0 +1,30 @@
+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
+===================================================================
+--- a/meson.build
++++ b/meson.build
+@@ -943,10 +943,8 @@ if enable_qt
+ endif
+ 
+ if enable_docs
+-  assert(enable_introspection, '-Ddocs=true requires -Dintrospection=true')
+   assert(meson.version().version_compare('>= 0.46.0'), '-Ddocs requires meson >= 0.46')
+   subdir('man')
+-  subdir('docs')
+ endif
+ 
+ configure_file(
+Index: b/clients/common/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,
+ )
+ 
+-if enable_docs
++if enable_docs and enable_introspection
+   settings_docs_source = custom_target(
+     'settings-docs.h',
+     input: nm_settings_docs_xml_gir,
diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template
index d439d8b10286..0afa1ccae360 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -1,41 +1,39 @@
 # Template file for 'NetworkManager'
-# when updating to 1.24 or newer, drop the compat
-# patch in gnome-control-center and rebuild it
 pkgname=NetworkManager
-version=1.22.10
-revision=3
+version=1.30.2
+revision=1
 build_style=meson
 build_helper="gir qemu"
 configure_args="-Dpolkit_agent=true -Dsystemd_journal=false
- -Dlibaudit=no -Dovs=false -Dlibnm_glib=true -Dselinux=false
- -Dmodify_system=true -Dpolkit_agent=true -Dsystemdsystemunitdir=no
+ -Dlibaudit=no -Dovs=false -Dselinux=false
+ -Dmodify_system=true -Dsystemdsystemunitdir=no
  -Dpppd=/usr/bin/pppd -Dqt=false
  -Dsession_tracking_consolekit=false
  -Dpppd_plugin_dir=/usr/lib/pppd/2.4.9 -Dresolvconf=/usr/bin/resolvconf
  -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
- -Diwd=true
- -Dudev_dir=/usr/lib/udev -Dintrospection=$(vopt_if gir true false)
- -Dvapi=$(vopt_if vala true false)
+ -Diwd=true -Dudev_dir=/usr/lib/udev -Ddocs=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"
 hostmakedepends="gettext-devel glib-devel libxslt-devel pkg-config
- intltool dbus-glib-devel jansson-devel $(vopt_if vala vala)
- $(vopt_if gir 'python3-gobject')"
+ intltool dbus-glib-devel jansson-devel docbook-xsl gtk-doc
+ $(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
  ModemManager-devel readline-devel libndp-devel newt-devel jansson-devel
  libpsl-devel eudev-libudev-devel mobile-broadband-provider-info
- $(vopt_if gir libgirepository-devel) $(vopt_if elogind elogind-devel)"
+ $(vopt_if gir 'libgirepository-devel python3-gobject')
+ $(vopt_if elogind elogind-devel)"
 depends="dbus iproute2 openresolv wpa_supplicant mobile-broadband-provider-info"
 short_desc="Network Management daemon"
 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=2b29ccc1531ba7ebba95a97f40c22b963838e8b6833745efe8e6fb71fd8fca77
+checksum=0c8e80e77877860e4a4e6ab4a0f7cdc1186e356b65b042a751897188b88944d2
 # TODO: Some tests require network namespaces to run.
 make_check=extended
 lib32disabled=yes
@@ -47,18 +45,11 @@ make_dirs="
  /etc/NetworkManager/VPN 0755 root root
  /var/lib/NetworkManager 0755 root root
 "
-
-case "$XBPS_TARGET_MACHINE" in
-	*-musl)
-			CFLAGS+=" -DRTLD_DEEPBIND=0"
-			# Fail to build on musl
-			configure_args+=" -Dtests=no"
-		;;
-esac
+patch_args=-Np1
 
 # Package build options
-build_options="gir vala elogind"
-build_options_default="gir vala elogind"
+build_options="gir elogind"
+build_options_default="gir elogind"
 
 pre_configure() {
 	if [ "$CROSS_BUILD" ]; then
@@ -95,8 +86,6 @@ NetworkManager-devel_package() {
 		vmove "usr/lib/*.so"
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
-		fi
-		if [ "$build_option_vala" ]; then
 			vmove usr/share/vala
 		fi
 	}

From e9074b2e888e04c12acac15a393d7b2556c2382f Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Wed, 24 Mar 2021 22:19:43 -0400
Subject: [PATCH 2/2] libnma: revbump for gnome-control-center

---
 srcpkgs/libnma/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libnma/template b/srcpkgs/libnma/template
index 18b016b2b93b..bd4d9fb2ad79 100644
--- a/srcpkgs/libnma/template
+++ b/srcpkgs/libnma/template
@@ -1,7 +1,7 @@
 # Template file for 'libnma'
 pkgname=libnma
 version=1.8.30
-revision=2
+revision=3
 build_style=meson
 build_helper="gir"
 hostmakedepends="gettext glib-devel gtk-doc pkg-config vala"

^ permalink raw reply	[flat|nested] 73+ messages in thread

* Re: [PR PATCH] [Updated] NetworkManager: update to 1.30.2, gnome-control-center: update to 3.38.5
  2021-03-09  3:41 [PR PATCH] NetworkManager: update to 1.31.1 cinerea0
                   ` (68 preceding siblings ...)
  2021-03-25  2:20 ` [PR PATCH] [Updated] " cinerea0
@ 2021-03-25  3:14 ` cinerea0
  2021-03-25 14:30 ` Gottox
  2021-03-25 15:17 ` [PR PATCH] [Merged]: " ericonr
  71 siblings, 0 replies; 73+ messages in thread
From: cinerea0 @ 2021-03-25  3:14 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1651 bytes --]

There is an updated pull request by cinerea0 against master on the void-packages repository

https://github.com/cinerea0/void-packages nm
https://github.com/void-linux/void-packages/pull/29342

NetworkManager: update to 1.30.2, gnome-control-center: update to 3.38.5
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->

Closes #27502

A patch file from https://github.com/void-linux/void-packages/pull/29342.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nm-29342.patch --]
[-- Type: text/x-diff, Size: 23635 bytes --]

From 5995659acf5898a7c84ec541748546c9125d8951 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Wed, 24 Mar 2021 20:30:11 -0400
Subject: [PATCH 1/3] NetworkManager: update to 1.30.2

---
 .../patches/fix-cross-gir.patch               | 69 +++++++------------
 .../patches/fix-musl-linux-header.diff        | 15 ----
 .../patches/fix-musl-qsort_r.patch            | 16 -----
 .../NetworkManager/patches/musl-basic.patch   | 29 --------
 .../patches/musl-fix-includes.patch           | 54 ---------------
 .../patches/musl-network-support.patch        | 42 -----------
 .../patches/musl-process-util.patch           | 40 -----------
 .../patches/musl-use-srand48.patch            | 40 -----------
 .../NetworkManager/patches/no-gtk-doc.patch   | 30 ++++++++
 srcpkgs/NetworkManager/template               | 39 ++++-------
 10 files changed, 68 insertions(+), 306 deletions(-)
 delete mode 100644 srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff
 delete mode 100644 srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-basic.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-fix-includes.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-network-support.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-process-util.patch
 delete mode 100644 srcpkgs/NetworkManager/patches/musl-use-srand48.patch
 create mode 100644 srcpkgs/NetworkManager/patches/no-gtk-doc.patch

diff --git a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
index c283d4dc1059..b78edfac2446 100644
--- a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
+++ b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
@@ -1,52 +1,31 @@
 Reason: Fix crossbuilding GIR
 Upstream: No, not upstreamable since this is very specific to the Void setup
-diff --git clients/common/meson.build clients/common/meson.build
-index afa257b..50b53e7 100644
---- clients/common/meson.build
-+++ clients/common/meson.build
-@@ -35,7 +35,7 @@ if enable_introspection
-     settings_docs,
-     input: nm_property_docs,
-     output: settings_docs,
--    command: [xsltproc, '--output', '@OUTPUT@', join_paths(meson.current_source_dir(), 'settings-docs.xsl'), '@INPUT@'],
-+    command: [xsltproc, '--output', '@OUTPUT@', join_paths(meson.current_source_dir(), 'settings-docs.xsl'), join_paths(meson.current_source_dir(), '..', '..', '@INPUT@')],
-   )
+Index: b/libnm/meson.build
+===================================================================
+--- a/libnm/meson.build
++++ b/libnm/meson.build
+@@ -274,13 +274,23 @@ if enable_introspection
+     'LD_LIBRARY_PATH=' + ld_library_path,
+   ]
  
-   test(
-diff --git libnm/meson.build libnm/meson.build
-index 51ca46d..f14d861 100644
---- libnm/meson.build
-+++ libnm/meson.build
-@@ -236,7 +236,13 @@ if enable_introspection
-     )
-   endif
- 
--  generate_setting_docs = join_paths(meson.current_source_dir(), 'generate-setting-docs.py')
 +  if meson.is_cross_build()
-+    qemu = '/usr/bin/qemu-@XBPS_TARGET_QEMU_MACHINE@-static'
-+    qemu_python3_cmd = qemu + ' -L @XBPS_CROSS_BASE@ @XBPS_CROSS_BASE@/usr/bin/python3'
-+    generate_setting_docs = ['sh', '-c', qemu_python3_cmd, join_paths(meson.current_source_dir(), 'generate-setting-docs.py')]
++    qemu_python3_cmd = [
++      '/usr/bin/qemu-@XBPS_TARGET_QEMU_MACHINE@-static',
++      '-L', '@XBPS_CROSS_BASE@',
++      '@XBPS_CROSS_BASE@/usr/bin/python3'
++      ]
 +  else
-+    generate_setting_docs = [python.path(), join_paths(meson.current_source_dir(), 'generate-setting-docs.py')]
++    qemu_python3_cmd = python.path()
 +  endif
- 
-   gi_typelib_path = run_command('printenv', 'GI_TYPELIB_PATH').stdout()
-   if gi_typelib_path != ''
-@@ -261,7 +267,7 @@ if enable_introspection
-     name,
++
+   nm_settings_docs_xml_gir = custom_target(
+     'nm-settings-docs-gir.xml',
      input: libnm_gir[0],
-     output: name,
--    command: [generate_setting_docs_env, python.path(), generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--output', '@OUTPUT@'],
-+    command: [generate_setting_docs_env, generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--output', '@OUTPUT@'],
-     depends: libnm_gir,
-   )
- 
-@@ -270,7 +276,7 @@ if enable_introspection
-     name,
-     input: [libnm_gir[0], nm_settings_docs_overrides],
-     output: name,
--    command: [generate_setting_docs_env, python.path(), generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT0@', '--overrides', '@INPUT1@', '--output', '@OUTPUT@'],
-+    command: [generate_setting_docs_env, generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT0@', '--overrides', '@INPUT1@', '--output', '@OUTPUT@'],
-     depends: libnm_gir,
-   )
- endif
+     output: 'nm-settings-docs-gir.xml',
+     command: [
+       generate_setting_docs_env,
+-      python.path(),
++      qemu_python3_cmd,
+       join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-gir.py'),
+       '--lib-path', meson.current_build_dir(),
+       '--gir', '@INPUT@',
diff --git a/srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff b/srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff
deleted file mode 100644
index 511759214a97..000000000000
--- a/srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git src/systemd/src/libsystemd-network/sd-dhcp6-client.c src/systemd/src/libsystemd-network/sd-dhcp6-client.c
-index f67a45bd2..ec11fa605 100644
---- src/systemd/src/libsystemd-network/sd-dhcp6-client.c
-+++ src/systemd/src/libsystemd-network/sd-dhcp6-client.c
-@@ -8,8 +8,10 @@
- #include <errno.h>
- #include <string.h>
- #include <sys/ioctl.h>
-+#ifdef __GLIBC__
- #include <linux/if_arp.h>
- #include <linux/if_infiniband.h>
-+#endif
- 
- #include "sd-dhcp6-client.h"
- 
diff --git a/srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch b/srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch
deleted file mode 100644
index f89eac778502..000000000000
--- a/srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git shared/systemd/src/basic/sort-util.h shared/systemd/src/basic/sort-util.h
-index e029f8646..168735087 100644
---- shared/systemd/src/basic/sort-util.h
-+++ shared/systemd/src/basic/sort-util.h
-@@ -60,7 +60,11 @@ static inline void qsort_r_safe(void *base, size_t nmemb, size_t size, __compar_
-                 return;
- 
-         assert(base);
-+#ifdef __GLIBC__
-         qsort_r(base, nmemb, size, compar, userdata);
-+#else
-+        g_qsort_with_data(base, nmemb, size, compar, userdata);
-+#endif
- }
- 
- #define typesafe_qsort_r(p, n, func, userdata)                          \
diff --git a/srcpkgs/NetworkManager/patches/musl-basic.patch b/srcpkgs/NetworkManager/patches/musl-basic.patch
deleted file mode 100644
index 63ea93ada585..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-basic.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Usual fix for musl libc
---- shared/systemd/src/basic/stdio-util.h.orig
-+++ shared/systemd/src/basic/stdio-util.h
-@@ -19,7 +19,9 @@
-   along with systemd; If not, see <http://www.gnu.org/licenses/>.
- ***/
- 
-+#if defined(__GLIBC__)
- #include <printf.h>
-+#endif
- #include <stdarg.h>
- #include <stdio.h>
- #include <sys/types.h>
- 
---- shared/systemd/src/basic/sort-util.h	2019-06-09 17:02:48.895695896 +0200
-+++ shared/systemd/src/basic/sort-util.h	2019-06-09 17:03:27.564199937 +0200
-@@ -5,6 +5,12 @@
- 
- #include "macro.h"
- 
-+#if !defined(__GLIBC__)
-+typedef int (*__compar_fn_t) (const void*, const void*);
-+typedef __compar_fn_t comparison_fn_t;
-+typedef int (*__compar_d_fn_t) (const void *, const void *, void *);
-+#endif
-+
- void *xbsearch_r(const void *key, const void *base, size_t nmemb, size_t size,
-                  __compar_d_fn_t compar, void *arg);
- 
diff --git a/srcpkgs/NetworkManager/patches/musl-fix-includes.patch b/srcpkgs/NetworkManager/patches/musl-fix-includes.patch
deleted file mode 100644
index 95ffb2d354ea..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-fix-includes.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- src/devices/nm-device.c.orig	2019-12-17 08:59:49.000000000 +0100
-+++ src/devices/nm-device.c	2020-01-06 17:29:08.678242168 +0100
-@@ -17,7 +17,11 @@
- #include <arpa/inet.h>
- #include <fcntl.h>
- #include <linux/if_addr.h>
-+#if defined(__GLIBC__)
- #include <linux/if_arp.h>
-+#else
-+#include <linux/if.h>
-+#endif
- #include <linux/rtnetlink.h>
- #include <linux/pkt_sched.h>
- 
---- src/nm-manager.c.orig	2020-01-06 17:29:08.682242177 +0100
-+++ src/nm-manager.c	2020-01-06 17:30:50.378482034 +0100
-@@ -15,6 +15,7 @@
- #include <sys/stat.h>
- #include <sys/sendfile.h>
- #include <limits.h>
-+#include <asm/types.h>
- 
- #include "nm-glib-aux/nm-c-list.h"
- 
---- src/platform/nm-linux-platform.c.orig	2019-12-17 08:59:49.000000000 +0100
-+++ src/platform/nm-linux-platform.c	2020-01-06 17:29:08.686242186 +0100
-@@ -6,6 +6,7 @@
- #include "nm-default.h"
- 
- #include "nm-linux-platform.h"
-+#include "wpan/nm-wpan-utils.h"
- 
- #include <arpa/inet.h>
- #include <dlfcn.h>
-@@ -14,7 +15,11 @@
- #include <libudev.h>
- #include <linux/fib_rules.h>
- #include <linux/ip.h>
-+#if defined(__GLIBC__)
- #include <linux/if_arp.h>
-+#else
-+#include <linux/if.h>
-+#endif
- #include <linux/if_bridge.h>
- #include <linux/if_link.h>
- #include <linux/if_tun.h>
-@@ -44,7 +49,6 @@
- #include "nm-platform-private.h"
- #include "wifi/nm-wifi-utils.h"
- #include "wifi/nm-wifi-utils-wext.h"
--#include "wpan/nm-wpan-utils.h"
- #include "nm-glib-aux/nm-io-utils.h"
- #include "nm-udev-aux/nm-udev-utils.h"
- 
diff --git a/srcpkgs/NetworkManager/patches/musl-network-support.patch b/srcpkgs/NetworkManager/patches/musl-network-support.patch
deleted file mode 100644
index 0fb63f067b17..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-network-support.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- libnm-core/nm-utils.h.orig
-+++ libnm-core/nm-utils.h
-@@ -30,7 +30,11 @@
- #include <netinet/in.h>
- 
- /* For ETH_ALEN and INFINIBAND_ALEN */
-+#if defined(__GLIBC__)
- #include <linux/if_ether.h>
-+#else
-+#define ETH_ALEN	6		/* Octets in one ethernet addr	 */
-+#endif
- #include <linux/if_infiniband.h>
- 
- #include "nm-core-enum-types.h"
---- src/platform/wifi/nm-wifi-utils.h.orig
-+++ src/platform/wifi/nm-wifi-utils.h
-@@ -22,7 +22,11 @@
- #ifndef __WIFI_UTILS_H__
- #define __WIFI_UTILS_H__
- 
-+#if defined(__GLIBC__)
- #include <net/ethernet.h>
-+#else /* musl libc */
-+#define ETH_ALEN	6		/* Octets in one ethernet addr	 */
-+#endif
- 
- #include "nm-dbus-interface.h"
- 
---- shared/systemd/src/basic/socket-util.h	2019-03-16 15:41:33.287235649 +0100
-+++ shared/systemd/src/basic/socket-util.h	2019-03-16 15:42:24.273912106 +0100
-@@ -12,6 +12,11 @@
- #include <sys/socket.h>
- #include <sys/types.h>
- #include <sys/un.h>
-+#if !defined(__GLIBC__)
-+/* SIOCGSTAMPNS from linux/asm-generic.h 
-+ * for src/systemd/src/libsystemd-network/sd-lldp.c */
-+#include <linux/sockios.h>
-+#endif
- 
- #include "macro.h"
- #include "missing_socket.h"
diff --git a/srcpkgs/NetworkManager/patches/musl-process-util.patch b/srcpkgs/NetworkManager/patches/musl-process-util.patch
deleted file mode 100644
index e406de1da850..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-process-util.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- shared/systemd/src/basic/process-util.c
-+++ shared/systemd/src/basic/process-util.c
-@@ -21,6 +21,9 @@
- #include <sys/wait.h>
- #include <syslog.h>
- #include <unistd.h>
-+#ifndef __GLIBC__
-+#include <pthread.h>
-+#endif
- #if 0 /* NM_IGNORED */
- #if HAVE_VALGRIND_VALGRIND_H
- #include <valgrind/valgrind.h>
-@@ -1168,11 +1171,13 @@ void reset_cached_pid(void) {
-         cached_pid = CACHED_PID_UNSET;
- }
- 
-+#ifdef __GLIBC__
- /* We use glibc __register_atfork() + __dso_handle directly here, as they are not included in the glibc
-  * headers. __register_atfork() is mostly equivalent to pthread_atfork(), but doesn't require us to link against
-  * libpthread, as it is part of glibc anyway. */
- extern int __register_atfork(void (*prepare) (void), void (*parent) (void), void (*child) (void), void *dso_handle);
- extern void* __dso_handle _weak_;
-+#endif
- 
- pid_t getpid_cached(void) {
-         static bool installed = false;
-@@ -1201,7 +1206,12 @@ pid_t getpid_cached(void) {
-                          * only half-documented (glibc doesn't document it but LSB does — though only superficially)
-                          * we'll check for errors only in the most generic fashion possible. */
- 
--                        if (__register_atfork(NULL, NULL, reset_cached_pid, __dso_handle) != 0) {
-+                        #ifdef __GLIBC__
-+                            if (__register_atfork(NULL, NULL, reset_cached_pid, __dso_handle) != 0) {
-+                        #else
-+                            if (pthread_atfork(NULL, NULL, reset_cached_pid) != 0) {
-+                        #endif
-+
-                                 /* OOM? Let's try again later */
-                                 cached_pid = CACHED_PID_UNSET;
-                                 return new_pid;
diff --git a/srcpkgs/NetworkManager/patches/musl-use-srand48.patch b/srcpkgs/NetworkManager/patches/musl-use-srand48.patch
deleted file mode 100644
index 43b689f3bad1..000000000000
--- a/srcpkgs/NetworkManager/patches/musl-use-srand48.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- shared/n-dhcp4/src/n-dhcp4-c-probe.c.orig	2020-01-06 15:35:10.128600647 +0100
-+++ shared/n-dhcp4/src/n-dhcp4-c-probe.c	2020-01-06 15:39:41.446240531 +0100
-@@ -362,7 +362,12 @@ static void n_dhcp4_client_probe_config_
-         seed16v[1] = (u64 >> 16) ^ (u64 >>  0);
-         seed16v[2] = (u64 >> 32) ^ (u64 >> 16);
- 
-+#ifdef __GLIBC__
-         r = seed48_r(seed16v, &config->entropy);
-+#else
-+        r = 0;
-+        seed48(seed16v);
-+#endif
-         c_assert(!r);
- }
- 
-@@ -379,7 +384,12 @@ uint32_t n_dhcp4_client_probe_config_get
-         long int result;
-         int r;
- 
-+#ifdef __GLIBC__
-         r = mrand48_r(&config->entropy, &result);
-+#else
-+        r = 0;
-+        result = mrand48();
-+#endif
-         c_assert(!r);
- 
-         return result;
---- shared/n-dhcp4/src/n-dhcp4-private.h.orig	2020-01-06 15:41:31.941501136 +0100
-+++ shared/n-dhcp4/src/n-dhcp4-private.h	2020-01-06 15:41:55.341556325 +0100
-@@ -267,7 +267,9 @@ struct NDhcp4ClientProbeConfig {
-         bool inform_only;
-         bool init_reboot;
-         struct in_addr requested_ip;
-+#ifdef __GLIBC__
-         struct drand48_data entropy;    /* entropy pool */
-+#endif
-         uint64_t ms_start_delay;        /* max ms to wait before starting probe */
-         NDhcp4ClientProbeOption *options[UINT8_MAX + 1];
-         int8_t request_parameters[UINT8_MAX + 1];
diff --git a/srcpkgs/NetworkManager/patches/no-gtk-doc.patch b/srcpkgs/NetworkManager/patches/no-gtk-doc.patch
new file mode 100644
index 000000000000..7492b818868e
--- /dev/null
+++ b/srcpkgs/NetworkManager/patches/no-gtk-doc.patch
@@ -0,0 +1,30 @@
+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
+===================================================================
+--- a/meson.build
++++ b/meson.build
+@@ -943,10 +943,8 @@ if enable_qt
+ endif
+ 
+ if enable_docs
+-  assert(enable_introspection, '-Ddocs=true requires -Dintrospection=true')
+   assert(meson.version().version_compare('>= 0.46.0'), '-Ddocs requires meson >= 0.46')
+   subdir('man')
+-  subdir('docs')
+ endif
+ 
+ configure_file(
+Index: b/clients/common/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,
+ )
+ 
+-if enable_docs
++if enable_docs and enable_introspection
+   settings_docs_source = custom_target(
+     'settings-docs.h',
+     input: nm_settings_docs_xml_gir,
diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template
index d439d8b10286..0afa1ccae360 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -1,41 +1,39 @@
 # Template file for 'NetworkManager'
-# when updating to 1.24 or newer, drop the compat
-# patch in gnome-control-center and rebuild it
 pkgname=NetworkManager
-version=1.22.10
-revision=3
+version=1.30.2
+revision=1
 build_style=meson
 build_helper="gir qemu"
 configure_args="-Dpolkit_agent=true -Dsystemd_journal=false
- -Dlibaudit=no -Dovs=false -Dlibnm_glib=true -Dselinux=false
- -Dmodify_system=true -Dpolkit_agent=true -Dsystemdsystemunitdir=no
+ -Dlibaudit=no -Dovs=false -Dselinux=false
+ -Dmodify_system=true -Dsystemdsystemunitdir=no
  -Dpppd=/usr/bin/pppd -Dqt=false
  -Dsession_tracking_consolekit=false
  -Dpppd_plugin_dir=/usr/lib/pppd/2.4.9 -Dresolvconf=/usr/bin/resolvconf
  -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
- -Diwd=true
- -Dudev_dir=/usr/lib/udev -Dintrospection=$(vopt_if gir true false)
- -Dvapi=$(vopt_if vala true false)
+ -Diwd=true -Dudev_dir=/usr/lib/udev -Ddocs=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"
 hostmakedepends="gettext-devel glib-devel libxslt-devel pkg-config
- intltool dbus-glib-devel jansson-devel $(vopt_if vala vala)
- $(vopt_if gir 'python3-gobject')"
+ intltool dbus-glib-devel jansson-devel docbook-xsl gtk-doc
+ $(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
  ModemManager-devel readline-devel libndp-devel newt-devel jansson-devel
  libpsl-devel eudev-libudev-devel mobile-broadband-provider-info
- $(vopt_if gir libgirepository-devel) $(vopt_if elogind elogind-devel)"
+ $(vopt_if gir 'libgirepository-devel python3-gobject')
+ $(vopt_if elogind elogind-devel)"
 depends="dbus iproute2 openresolv wpa_supplicant mobile-broadband-provider-info"
 short_desc="Network Management daemon"
 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=2b29ccc1531ba7ebba95a97f40c22b963838e8b6833745efe8e6fb71fd8fca77
+checksum=0c8e80e77877860e4a4e6ab4a0f7cdc1186e356b65b042a751897188b88944d2
 # TODO: Some tests require network namespaces to run.
 make_check=extended
 lib32disabled=yes
@@ -47,18 +45,11 @@ make_dirs="
  /etc/NetworkManager/VPN 0755 root root
  /var/lib/NetworkManager 0755 root root
 "
-
-case "$XBPS_TARGET_MACHINE" in
-	*-musl)
-			CFLAGS+=" -DRTLD_DEEPBIND=0"
-			# Fail to build on musl
-			configure_args+=" -Dtests=no"
-		;;
-esac
+patch_args=-Np1
 
 # Package build options
-build_options="gir vala elogind"
-build_options_default="gir vala elogind"
+build_options="gir elogind"
+build_options_default="gir elogind"
 
 pre_configure() {
 	if [ "$CROSS_BUILD" ]; then
@@ -95,8 +86,6 @@ NetworkManager-devel_package() {
 		vmove "usr/lib/*.so"
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
-		fi
-		if [ "$build_option_vala" ]; then
 			vmove usr/share/vala
 		fi
 	}

From e9074b2e888e04c12acac15a393d7b2556c2382f Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Wed, 24 Mar 2021 22:19:43 -0400
Subject: [PATCH 2/3] libnma: revbump for gnome-control-center

---
 srcpkgs/libnma/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libnma/template b/srcpkgs/libnma/template
index 18b016b2b93b..bd4d9fb2ad79 100644
--- a/srcpkgs/libnma/template
+++ b/srcpkgs/libnma/template
@@ -1,7 +1,7 @@
 # Template file for 'libnma'
 pkgname=libnma
 version=1.8.30
-revision=2
+revision=3
 build_style=meson
 build_helper="gir"
 hostmakedepends="gettext glib-devel gtk-doc pkg-config vala"

From 8b805aa857f20b1c70d8d682ef97f465ee049bdd Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Wed, 24 Mar 2021 23:14:25 -0400
Subject: [PATCH 3/3] gnome-control-center: update to 3.38.5

---
 .../gnome-control-center/patches/nm122.patch  | 38 -------------------
 srcpkgs/gnome-control-center/template         |  4 +-
 2 files changed, 2 insertions(+), 40 deletions(-)
 delete mode 100644 srcpkgs/gnome-control-center/patches/nm122.patch

diff --git a/srcpkgs/gnome-control-center/patches/nm122.patch b/srcpkgs/gnome-control-center/patches/nm122.patch
deleted file mode 100644
index 833fed3968ea..000000000000
--- a/srcpkgs/gnome-control-center/patches/nm122.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 4159f984bd351caf6f0e1adbd90feeb85ab252f4 Mon Sep 17 00:00:00 2001
-From: Daniel Kolesa <daniel@octaforge.org>
-Date: Wed, 16 Sep 2020 22:02:04 +0200
-Subject: [PATCH] restore compatibility with networkmanager 1.22
-
-drop this patch and rebuild gnome-control-center when updating nm
----
- panels/network/net-device-wifi.c | 7 -------
- 1 file changed, 7 deletions(-)
-
-diff --git panels/network/net-device-wifi.c panels/network/net-device-wifi.c
-index cb86e5b..d63c57c 100644
---- panels/network/net-device-wifi.c
-+++ panels/network/net-device-wifi.c
-@@ -1180,11 +1180,6 @@ nm_client_on_permission_change (NetDeviceWifi *self) {
-         NMClientPermissionResult perm;
-         NMDeviceWifiCapabilities caps;
- 
--        if (nm_client_get_permissions_state (self->client) != NM_TERNARY_TRUE) {
--                /* permissions aren't ready yet */
--                return;
--        }
--
-         /* only enable the button if the user can create a hotspot */
-         perm = nm_client_get_permission_result (self->client, NM_CLIENT_PERMISSION_WIFI_SHARE_OPEN);
-         caps = nm_device_wifi_get_capabilities (NM_DEVICE_WIFI (self->device));
-@@ -1227,8 +1222,6 @@ net_device_wifi_new (CcPanel *panel, NMClient *client, NMDevice *device)
-                                  G_CALLBACK (ap_activated), self, G_CONNECT_SWAPPED);
-         g_signal_connect_object (list, "configure",
-                                  G_CALLBACK (show_details_for_row), self, G_CONNECT_SWAPPED);
--        g_signal_connect_object (client, "notify",
--                                 G_CALLBACK(nm_client_on_permission_change), self, G_CONNECT_SWAPPED);
- 
-         nm_client_on_permission_change(self);
- 
--- 
-2.28.0
-
diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index 7d4a2dc5c47a..001e057fabdc 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-control-center'
 pkgname=gnome-control-center
-version=3.38.4
+version=3.38.5
 revision=1
 build_style=meson
 build_helper="gir"
@@ -24,7 +24,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-control-center"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=49dc6378d4d35c1c6ed59224f5636916c2b6fa49bbfb8b56eb19a84d6e90cd19
+checksum=0ada859620110e829174121c7e1a3f82da80d749d6f61d426a7c8cf4464d72f9
 
 build_options="cheese"
 build_options_default="cheese"

^ permalink raw reply	[flat|nested] 73+ messages in thread

* Re: NetworkManager: update to 1.30.2, gnome-control-center: update to 3.38.5
  2021-03-09  3:41 [PR PATCH] NetworkManager: update to 1.31.1 cinerea0
                   ` (69 preceding siblings ...)
  2021-03-25  3:14 ` cinerea0
@ 2021-03-25 14:30 ` Gottox
  2021-03-25 15:17 ` [PR PATCH] [Merged]: " ericonr
  71 siblings, 0 replies; 73+ messages in thread
From: Gottox @ 2021-03-25 14:30 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 144 bytes --]

New comment by Gottox on void-packages repository

https://github.com/void-linux/void-packages/pull/29342#issuecomment-806855158

Comment:
lgtm

^ permalink raw reply	[flat|nested] 73+ messages in thread

* Re: [PR PATCH] [Merged]: NetworkManager: update to 1.30.2, gnome-control-center: update to 3.38.5
  2021-03-09  3:41 [PR PATCH] NetworkManager: update to 1.31.1 cinerea0
                   ` (70 preceding siblings ...)
  2021-03-25 14:30 ` Gottox
@ 2021-03-25 15:17 ` ericonr
  71 siblings, 0 replies; 73+ messages in thread
From: ericonr @ 2021-03-25 15:17 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1498 bytes --]

There's a merged pull request on the void-packages repository

NetworkManager: update to 1.30.2, gnome-control-center: update to 3.38.5
https://github.com/void-linux/void-packages/pull/29342

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->

Closes #27502

^ permalink raw reply	[flat|nested] 73+ messages in thread

end of thread, other threads:[~2021-03-25 15:17 UTC | newest]

Thread overview: 73+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-09  3:41 [PR PATCH] NetworkManager: update to 1.31.1 cinerea0
2021-03-09  3:50 ` cinerea0
2021-03-09  4:37 ` [PR PATCH] [Updated] " cinerea0
2021-03-09  5:07 ` NetworkManager: update to 1.31.1, gnome-control-center: drop NM compat patch cinerea0
2021-03-09  9:04 ` FollieHiyuki
2021-03-15 16:28 ` NetworkManager: update to 1.31.1 cinerea0
2021-03-15 16:55 ` [PR REVIEW] " ericonr
2021-03-15 16:55 ` ericonr
2021-03-15 17:04 ` ericonr
2021-03-16  2:56 ` [PR PATCH] [Updated] " cinerea0
2021-03-16  3:23 ` [PR REVIEW] " cinerea0
2021-03-16  3:33 ` cinerea0
2021-03-16  3:40 ` cinerea0
2021-03-19 18:10 ` [PR PATCH] [Updated] NetworkManager: update to 1.30.2 cinerea0
2021-03-19 18:22 ` cinerea0
2021-03-20  1:03 ` [PR REVIEW] " ericonr
2021-03-20  1:05 ` sgn
2021-03-20  1:26 ` cinerea0
2021-03-20  1:31 ` sgn
2021-03-20  1:35 ` cinerea0
2021-03-20  1:37 ` cinerea0
2021-03-20  2:02 ` sgn
2021-03-20  2:26 ` cinerea0
2021-03-20  2:42 ` sgn
2021-03-20  5:13 ` [PR REVIEW] " cinerea0
2021-03-20  5:34 ` sgn
2021-03-20  6:26 ` Gottox
2021-03-20 16:56 ` [PR PATCH] [Updated] " cinerea0
2021-03-20 17:47 ` cinerea0
2021-03-21  3:48 ` [PR REVIEW] " q66
2021-03-21  4:01 ` cinerea0
2021-03-21 20:29 ` q66
2021-03-21 23:28 ` [PR PATCH] [Updated] " cinerea0
2021-03-21 23:30 ` [PR REVIEW] " cinerea0
2021-03-21 23:43 ` cinerea0
2021-03-22  0:06 ` [PR REVIEW] " q66
2021-03-22  0:19 ` cinerea0
2021-03-22  0:23 ` [PR PATCH] [Updated] " cinerea0
2021-03-22  0:42 ` [PR REVIEW] " ericonr
2021-03-22  1:33 ` cinerea0
2021-03-22  1:48 ` sgn
2021-03-22  1:56 ` [PR REVIEW] " ericonr
2021-03-22  2:43 ` [PR PATCH] [Updated] " cinerea0
2021-03-22  3:38 ` cinerea0
2021-03-22  4:37 ` NetworkManager: update to 1.30.2, gnome-control-center: update to 3.38.5 cinerea0
2021-03-24  0:58 ` [PR REVIEW] " ericonr
2021-03-24  0:58 ` ericonr
2021-03-24  1:11 ` sgn
2021-03-24  1:48 ` ericonr
2021-03-24  2:00 ` cinerea0
2021-03-24  2:11 ` cinerea0
2021-03-24  4:31 ` [PR PATCH] [Updated] " cinerea0
2021-03-24  4:36 ` [PR REVIEW] " cinerea0
2021-03-24  5:04 ` cinerea0
2021-03-24  5:05 ` [PR PATCH] [Updated] " cinerea0
2021-03-24 13:41 ` [PR REVIEW] " ericonr
2021-03-24 15:02 ` [PR PATCH] [Updated] " cinerea0
2021-03-24 15:36 ` cinerea0
2021-03-24 19:28 ` cinerea0
2021-03-24 19:59 ` [PR REVIEW] " cinerea0
2021-03-24 20:21 ` ericonr
2021-03-24 20:22 ` ericonr
2021-03-24 21:24 ` [PR PATCH] [Updated] " cinerea0
2021-03-24 23:53 ` cinerea0
2021-03-25  0:30 ` cinerea0
2021-03-25  1:11 ` [PR REVIEW] " cinerea0
2021-03-25  1:12 ` cinerea0
2021-03-25  1:19 ` cinerea0
2021-03-25  1:49 ` ericonr
2021-03-25  2:20 ` [PR PATCH] [Updated] " cinerea0
2021-03-25  3:14 ` cinerea0
2021-03-25 14:30 ` Gottox
2021-03-25 15:17 ` [PR PATCH] [Merged]: " ericonr

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).