From: cinerea0 <cinerea0@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] NetworkManager: update to 1.32.2
Date: Sat, 03 Jul 2021 03:33:51 +0200 [thread overview]
Message-ID: <20210703013351.gRo0XE7U_fIgWnYjCq3_8suGMjV_47OvVTAoWHm4ClU@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-31752@inbox.vuxu.org>
[-- 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/31752
NetworkManager: update to 1.32.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
-->
A patch file from https://github.com/void-linux/void-packages/pull/31752.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nm-31752.patch --]
[-- Type: text/x-diff, Size: 4859 bytes --]
From ff0797e1924e40890c20f3f92f4afc5ffd8e7c09 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Fri, 2 Jul 2021 21:07:32 -0400
Subject: [PATCH] NetworkManager: update to 1.32.2
---
.../patches/fix-cross-gir.patch | 23 ++++++++++---------
.../NetworkManager/patches/no-gtk-doc.patch | 17 +++++++-------
srcpkgs/NetworkManager/template | 8 +++----
3 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
index b78edfac2446..f1eca73f1f7f 100644
--- a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
+++ b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
@@ -2,12 +2,13 @@ Reason: Fix crossbuilding GIR
Upstream: No, not upstreamable since this is very specific to the Void setup
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,
- ]
-
+--- a/src/libnm-client-impl/meson.build
++++ b/src/libnm-client-impl/meson.build
+@@ -210,6 +210,16 @@ if enable_introspection
+ ld_library_path = ':' + ld_library_path
+ endif
+ ld_library_path = meson.current_build_dir() + ld_library_path
++
+ if meson.is_cross_build()
+ qemu_python3_cmd = [
+ '/usr/bin/qemu-@XBPS_TARGET_QEMU_MACHINE@-static',
@@ -17,13 +18,13 @@ Index: b/libnm/meson.build
+ else
+ qemu_python3_cmd = python.path()
+ endif
-+
+
nm_settings_docs_xml_gir = custom_target(
'nm-settings-docs-gir.xml',
- input: libnm_gir[0],
- output: 'nm-settings-docs-gir.xml',
- command: [
- generate_setting_docs_env,
+@@ -219,7 +229,7 @@ if enable_introspection
+ 'env',
+ 'GI_TYPELIB_PATH=' + gi_typelib_path,
+ 'LD_LIBRARY_PATH=' + ld_library_path,
- python.path(),
+ qemu_python3_cmd,
join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-gir.py'),
diff --git a/srcpkgs/NetworkManager/patches/no-gtk-doc.patch b/srcpkgs/NetworkManager/patches/no-gtk-doc.patch
index 7492b818868e..87e75aa35106 100644
--- a/srcpkgs/NetworkManager/patches/no-gtk-doc.patch
+++ b/srcpkgs/NetworkManager/patches/no-gtk-doc.patch
@@ -15,16 +15,15 @@ Index: b/meson.build
endif
configure_file(
-Index: b/clients/common/meson.build
+Index: b/src/libnmc-setting/meson.build
===================================================================
---- a/clients/common/meson.build
-+++ b/clients/common/meson.build
-@@ -28,7 +28,7 @@ libnmc_base_dep = declare_dependency(
- link_with: libnmc_base,
- )
+--- a/src/libnmc-setting/meson.build
++++ b/src/libnmc-setting/meson.build
+@@ -1,6 +1,6 @@
+ # SPDX-License-Identifier: LGPL-2.1-or-later
-if enable_docs
+if enable_docs and enable_introspection
- settings_docs_source = custom_target(
- 'settings-docs.h',
- input: nm_settings_docs_xml_gir,
+ settings_docs_input_xml = custom_target(
+ 'settings-docs-input.xml',
+ input: [nm_settings_docs_xml_gir, nm_property_infos_xml['nmcli']],
diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template
index 7af0685be910..6213a548d8a6 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -1,6 +1,6 @@
# Template file for 'NetworkManager'
pkgname=NetworkManager
-version=1.30.4
+version=1.32.2
revision=1
build_style=meson
build_helper="gir qemu"
@@ -24,7 +24,7 @@ hostmakedepends="gettext-devel glib-devel libxslt-devel pkg-config
makedepends="libuuid-devel nss-devel dbus-glib-devel libgudev-devel
libnl3-devel polkit-devel ppp-devel iptables-devel libcurl-devel
ModemManager-devel readline-devel libndp-devel newt-devel jansson-devel
- libpsl-devel eudev-libudev-devel mobile-broadband-provider-info
+ libpsl-devel eudev-libudev-devel mobile-broadband-provider-info gnutls-devel
$(vopt_if gir 'libgirepository-devel python3-gobject')
$(vopt_if elogind elogind-devel)"
depends="dbus iproute2 openresolv wpa_supplicant mobile-broadband-provider-info"
@@ -34,7 +34,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/NetworkManager"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6050b724212ea3ce7386113359bea9afa1f679a54f60d999a5999892e672c190
+checksum=701d511067f757d0f92f412c98cdb49a74a6ba69448aabb1beadacbc171e3873
# TODO: Some tests require network namespaces to run.
make_check=extended
lib32disabled=yes
@@ -66,7 +66,7 @@ pre_configure() {
vsed -i \
-e "s|@XBPS_CROSS_BASE@|${XBPS_CROSS_BASE}|g" \
-e "s|@XBPS_TARGET_QEMU_MACHINE@|${XBPS_TARGET_QEMU_MACHINE}|" \
- libnm/meson.build
+ src/libnm-client-impl/meson.build
fi
}
next prev parent reply other threads:[~2021-07-03 1:33 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-02 18:40 [PR PATCH] " cinerea0
2021-07-02 23:01 ` [PR PATCH] [Updated] " cinerea0
2021-07-03 1:07 ` cinerea0
2021-07-03 1:33 ` cinerea0 [this message]
2021-07-03 2:02 ` [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=20210703013351.gRo0XE7U_fIgWnYjCq3_8suGMjV_47OvVTAoWHm4ClU@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).