From: cinerea0 <cinerea0@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] NetworkManager: update to 1.30.2, gnome-control-center: update to 3.38.5
Date: Wed, 24 Mar 2021 16:02:18 +0100 [thread overview]
Message-ID: <20210324150218.mBDKY9qRyQ6iMoaSi5R3oMLsC5vqHUQy1-MTryBIyo0@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29342@inbox.vuxu.org>
[-- 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 +++++++------------
| 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"
next prev parent reply other threads:[~2021-03-24 15:02 UTC|newest]
Thread overview: 73+ messages / expand[flat|nested] mbox.gz Atom feed top
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 ` cinerea0 [this message]
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210324150218.mBDKY9qRyQ6iMoaSi5R3oMLsC5vqHUQy1-MTryBIyo0@z \
--to=cinerea0@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).