* Re: [PR PATCH] [Updated] NetworkManager: update to 1.36.2.
2022-03-12 17:40 [PR PATCH] NetworkManager: update to 1.36.2 paper42
@ 2022-03-15 18:35 ` paper42
2022-03-15 19:06 ` paper42
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: paper42 @ 2022-03-15 18:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1226 bytes --]
There is an updated pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages nm1.36
https://github.com/void-linux/void-packages/pull/36112
NetworkManager: update to 1.36.2.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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/36112.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nm1.36-36112.patch --]
[-- Type: text/x-diff, Size: 2016 bytes --]
From 9c5406aaf0366246557fec4362e01bc5fbfeb61a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 12 Mar 2022 18:05:48 +0100
Subject: [PATCH] NetworkManager: update to 1.36.2.
jansson-devel in hostmakedepends is necessary to work around a bug where
meson.build tries to figure out the jansson soname, but searches only on
the host.
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/955
---
srcpkgs/NetworkManager/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template
index 5483f5c8b35b..0cc2a2529108 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -1,6 +1,6 @@
# Template file for 'NetworkManager'
pkgname=NetworkManager
-version=1.34.0
+version=1.36.2
revision=1
build_style=meson
build_helper="gir qemu"
@@ -19,7 +19,7 @@ configure_args="-Dsystemd_journal=false
-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 docbook-xsl gtk-doc
+ intltool dbus-glib-devel docbook-xsl gtk-doc jansson-devel
$(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
@@ -33,8 +33,9 @@ short_desc="Network Management daemon"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/NetworkManager"
+changelog="https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/raw/nm-1-36/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=819795d0899076204f5672421a58f1b1d9e393536ee87bb844b911e6243bf0bd
+checksum=ab855cbe3b41832e9a3b003810e7c7313dfe19e630d29806d14d87fdd1470cab
# TODO: Some tests require network namespaces to run.
make_check=extended
lib32disabled=yes
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Updated] NetworkManager: update to 1.36.2.
2022-03-12 17:40 [PR PATCH] NetworkManager: update to 1.36.2 paper42
2022-03-15 18:35 ` [PR PATCH] [Updated] " paper42
@ 2022-03-15 19:06 ` paper42
2022-03-15 21:26 ` paper42
2022-03-16 9:13 ` [PR PATCH] [Merged]: " paper42
3 siblings, 0 replies; 5+ messages in thread
From: paper42 @ 2022-03-15 19:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1226 bytes --]
There is an updated pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages nm1.36
https://github.com/void-linux/void-packages/pull/36112
NetworkManager: update to 1.36.2.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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/36112.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nm1.36-36112.patch --]
[-- Type: text/x-diff, Size: 2168 bytes --]
From b45b4b0a359e6aff9ad42440ef6ec04f2ff067be Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 12 Mar 2022 18:05:48 +0100
Subject: [PATCH] NetworkManager: update to 1.36.2.
---
srcpkgs/NetworkManager/template | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template
index 5483f5c8b35b..b5d52f27830a 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -1,6 +1,6 @@
# Template file for 'NetworkManager'
pkgname=NetworkManager
-version=1.34.0
+version=1.36.2
revision=1
build_style=meson
build_helper="gir qemu"
@@ -19,7 +19,7 @@ configure_args="-Dsystemd_journal=false
-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 docbook-xsl gtk-doc
+ intltool dbus-glib-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
@@ -33,8 +33,9 @@ short_desc="Network Management daemon"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/NetworkManager"
+changelog="https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/raw/nm-1-36/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=819795d0899076204f5672421a58f1b1d9e393536ee87bb844b911e6243bf0bd
+checksum=ab855cbe3b41832e9a3b003810e7c7313dfe19e630d29806d14d87fdd1470cab
# TODO: Some tests require network namespaces to run.
make_check=extended
lib32disabled=yes
@@ -58,6 +59,9 @@ post_patch() {
-e "s|@XBPS_CROSS_BASE@|${XBPS_CROSS_BASE}|g" \
-e "s|@XBPS_TARGET_QEMU_MACHINE@|${XBPS_TARGET_QEMU_MACHINE}|" \
src/libnm-client-impl/meson.build
+ # https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/955
+ vsed -i "s#jansson_dep.get_pkgconfig_variable('libdir')#'${XBPS_CROSS_BASE}/usr/lib'#" \
+ -e meson.build
fi
}
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Updated] NetworkManager: update to 1.36.2.
2022-03-12 17:40 [PR PATCH] NetworkManager: update to 1.36.2 paper42
2022-03-15 18:35 ` [PR PATCH] [Updated] " paper42
2022-03-15 19:06 ` paper42
@ 2022-03-15 21:26 ` paper42
2022-03-16 9:13 ` [PR PATCH] [Merged]: " paper42
3 siblings, 0 replies; 5+ messages in thread
From: paper42 @ 2022-03-15 21:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1226 bytes --]
There is an updated pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages nm1.36
https://github.com/void-linux/void-packages/pull/36112
NetworkManager: update to 1.36.2.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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/36112.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nm1.36-36112.patch --]
[-- Type: text/x-diff, Size: 2168 bytes --]
From 52a65c9127da1e6853b111a522b3c8033f40398d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 12 Mar 2022 18:05:48 +0100
Subject: [PATCH] NetworkManager: update to 1.36.2.
---
srcpkgs/NetworkManager/template | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template
index 5483f5c8b35b..5502f41159d3 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -1,6 +1,6 @@
# Template file for 'NetworkManager'
pkgname=NetworkManager
-version=1.34.0
+version=1.36.2
revision=1
build_style=meson
build_helper="gir qemu"
@@ -19,7 +19,7 @@ configure_args="-Dsystemd_journal=false
-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 docbook-xsl gtk-doc
+ intltool dbus-glib-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
@@ -33,8 +33,9 @@ short_desc="Network Management daemon"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/NetworkManager"
+changelog="https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/raw/nm-1-36/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=819795d0899076204f5672421a58f1b1d9e393536ee87bb844b911e6243bf0bd
+checksum=ab855cbe3b41832e9a3b003810e7c7313dfe19e630d29806d14d87fdd1470cab
# TODO: Some tests require network namespaces to run.
make_check=extended
lib32disabled=yes
@@ -58,6 +59,9 @@ post_patch() {
-e "s|@XBPS_CROSS_BASE@|${XBPS_CROSS_BASE}|g" \
-e "s|@XBPS_TARGET_QEMU_MACHINE@|${XBPS_TARGET_QEMU_MACHINE}|" \
src/libnm-client-impl/meson.build
+ # https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/955
+ vsed -e "s#jansson_dep.get_pkgconfig_variable('libdir')#'${XBPS_CROSS_BASE}/usr/lib'#" \
+ -i meson.build
fi
}
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Merged]: NetworkManager: update to 1.36.2.
2022-03-12 17:40 [PR PATCH] NetworkManager: update to 1.36.2 paper42
` (2 preceding siblings ...)
2022-03-15 21:26 ` paper42
@ 2022-03-16 9:13 ` paper42
3 siblings, 0 replies; 5+ messages in thread
From: paper42 @ 2022-03-16 9:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1071 bytes --]
There's a merged pull request on the void-packages repository
NetworkManager: update to 1.36.2.
https://github.com/void-linux/void-packages/pull/36112
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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
-->
^ permalink raw reply [flat|nested] 5+ messages in thread