* [PR PATCH] NetworkManager: update to 1.40.0
@ 2022-08-31 15:32 cinerea0
2022-08-31 17:42 ` [PR PATCH] [Updated] " cinerea0
` (18 more replies)
0 siblings, 19 replies; 20+ messages in thread
From: cinerea0 @ 2022-08-31 15:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1241 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/39003
NetworkManager: update to 1.40.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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/39003.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nm-39003.patch --]
[-- Type: text/x-diff, Size: 4384 bytes --]
From 0c9bb2d215f6c75a68b91f6af70a17e89827ce03 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Wed, 31 Aug 2022 11:31:09 -0400
Subject: [PATCH] NetworkManager: update to 1.40.0
---
.../NetworkManager/patches/fix-cross-gir.patch | 12 ++++++------
srcpkgs/NetworkManager/patches/no-gtk-doc.patch | 16 ++++++++--------
srcpkgs/NetworkManager/template | 4 ++--
3 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
index d3fa6ffe5d9c..6e6220da4ff4 100644
--- a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
+++ b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
@@ -1,10 +1,10 @@
-Reason: Fix crossbuilding GIR
-Upstream: No, not upstreamable since this is very specific to the Void setup
-Index: b/src/libnm-client-impl/meson.build
-===================================================================
+# Reason: Fix crossbuilding GIR
+# Upstream: No, not upstreamable since this is very specific to the Void setup
+diff --git a/src/libnm-client-impl/meson.build b/src/libnm-client-impl/meson.build
+index 46464a6328..27a42f51e6 100644
--- a/src/libnm-client-impl/meson.build
+++ b/src/libnm-client-impl/meson.build
-@@ -210,6 +210,16 @@ if enable_introspection
+@@ -219,6 +219,16 @@ if enable_introspection
ld_library_path = ':' + ld_library_path
endif
ld_library_path = meson.current_build_dir() + ld_library_path
@@ -21,7 +21,7 @@ Index: b/src/libnm-client-impl/meson.build
nm_settings_docs_xml_gir = custom_target(
'nm-settings-docs-gir.xml',
-@@ -219,7 +229,7 @@ if enable_introspection
+@@ -228,7 +238,7 @@ if enable_introspection
'env',
'GI_TYPELIB_PATH=' + gi_typelib_path,
'LD_LIBRARY_PATH=' + ld_library_path,
diff --git a/srcpkgs/NetworkManager/patches/no-gtk-doc.patch b/srcpkgs/NetworkManager/patches/no-gtk-doc.patch
index 87e75aa35106..2cd7cf42b71c 100644
--- a/srcpkgs/NetworkManager/patches/no-gtk-doc.patch
+++ b/srcpkgs/NetworkManager/patches/no-gtk-doc.patch
@@ -1,10 +1,10 @@
-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
-===================================================================
+# Reason: We only want to build man pages, not development docs
+# Upstream: Patch was rejected - https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/689
+diff --git a/meson.build b/meson.build
+index 996617f4ca..fb4a914470 100644
--- a/meson.build
+++ b/meson.build
-@@ -943,10 +943,8 @@ if enable_qt
+@@ -952,10 +952,8 @@ if enable_qt
endif
if enable_docs
@@ -15,8 +15,8 @@ Index: b/meson.build
endif
configure_file(
-Index: b/src/libnmc-setting/meson.build
-===================================================================
+diff --git a/src/libnmc-setting/meson.build b/src/libnmc-setting/meson.build
+index 49314cad2e..376ec4e740 100644
--- a/src/libnmc-setting/meson.build
+++ b/src/libnmc-setting/meson.build
@@ -1,6 +1,6 @@
@@ -24,6 +24,6 @@ Index: b/src/libnmc-setting/meson.build
-if enable_docs
+if enable_docs and enable_introspection
+ assert(enable_introspection, '-Ddocs=true requires -Dintrospection=true')
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 191bbfa1f172..93fe84edc139 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -1,6 +1,6 @@
# Template file for 'NetworkManager'
pkgname=NetworkManager
-version=1.38.4
+version=1.40.0
revision=1
build_style=meson
build_helper="gir qemu"
@@ -35,7 +35,7 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/NetworkManager"
changelog="https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/raw/nm-1-38/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=841f64d41776aadd92b151f47e50f62be8a0611a9056fe6bf81881024e6a96c5
+checksum=aee7e057bc2cca5dab84e41f15f1da8b795eb290747b04cbeee822bad9e9fc03
# TODO: Some tests require network namespaces to run.
make_check=extended
lib32disabled=yes
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] NetworkManager: update to 1.40.0
2022-08-31 15:32 [PR PATCH] NetworkManager: update to 1.40.0 cinerea0
@ 2022-08-31 17:42 ` cinerea0
2022-08-31 17:53 ` cinerea0
` (17 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: cinerea0 @ 2022-08-31 17:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1246 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/39003
NetworkManager: update to 1.40.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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/39003.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nm-39003.patch --]
[-- Type: text/x-diff, Size: 5000 bytes --]
From b495bdc440ca2243d57f2cd88c74a8e052bf21a0 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Wed, 31 Aug 2022 13:42:18 -0400
Subject: [PATCH] NetworkManager: update to 1.40.0
---
.../NetworkManager/patches/fix-cross-gir.patch | 12 ++++++------
srcpkgs/NetworkManager/patches/no-gtk-doc.patch | 16 ++++++++--------
srcpkgs/NetworkManager/template | 8 ++++----
3 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
index d3fa6ffe5d9c..6e6220da4ff4 100644
--- a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
+++ b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
@@ -1,10 +1,10 @@
-Reason: Fix crossbuilding GIR
-Upstream: No, not upstreamable since this is very specific to the Void setup
-Index: b/src/libnm-client-impl/meson.build
-===================================================================
+# Reason: Fix crossbuilding GIR
+# Upstream: No, not upstreamable since this is very specific to the Void setup
+diff --git a/src/libnm-client-impl/meson.build b/src/libnm-client-impl/meson.build
+index 46464a6328..27a42f51e6 100644
--- a/src/libnm-client-impl/meson.build
+++ b/src/libnm-client-impl/meson.build
-@@ -210,6 +210,16 @@ if enable_introspection
+@@ -219,6 +219,16 @@ if enable_introspection
ld_library_path = ':' + ld_library_path
endif
ld_library_path = meson.current_build_dir() + ld_library_path
@@ -21,7 +21,7 @@ Index: b/src/libnm-client-impl/meson.build
nm_settings_docs_xml_gir = custom_target(
'nm-settings-docs-gir.xml',
-@@ -219,7 +229,7 @@ if enable_introspection
+@@ -228,7 +238,7 @@ if enable_introspection
'env',
'GI_TYPELIB_PATH=' + gi_typelib_path,
'LD_LIBRARY_PATH=' + ld_library_path,
diff --git a/srcpkgs/NetworkManager/patches/no-gtk-doc.patch b/srcpkgs/NetworkManager/patches/no-gtk-doc.patch
index 87e75aa35106..2cd7cf42b71c 100644
--- a/srcpkgs/NetworkManager/patches/no-gtk-doc.patch
+++ b/srcpkgs/NetworkManager/patches/no-gtk-doc.patch
@@ -1,10 +1,10 @@
-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
-===================================================================
+# Reason: We only want to build man pages, not development docs
+# Upstream: Patch was rejected - https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/689
+diff --git a/meson.build b/meson.build
+index 996617f4ca..fb4a914470 100644
--- a/meson.build
+++ b/meson.build
-@@ -943,10 +943,8 @@ if enable_qt
+@@ -952,10 +952,8 @@ if enable_qt
endif
if enable_docs
@@ -15,8 +15,8 @@ Index: b/meson.build
endif
configure_file(
-Index: b/src/libnmc-setting/meson.build
-===================================================================
+diff --git a/src/libnmc-setting/meson.build b/src/libnmc-setting/meson.build
+index 49314cad2e..376ec4e740 100644
--- a/src/libnmc-setting/meson.build
+++ b/src/libnmc-setting/meson.build
@@ -1,6 +1,6 @@
@@ -24,6 +24,6 @@ Index: b/src/libnmc-setting/meson.build
-if enable_docs
+if enable_docs and enable_introspection
+ assert(enable_introspection, '-Ddocs=true requires -Dintrospection=true')
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 191bbfa1f172..a40edbc4e78d 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -1,6 +1,6 @@
# Template file for 'NetworkManager'
pkgname=NetworkManager
-version=1.38.4
+version=1.40.0
revision=1
build_style=meson
build_helper="gir qemu"
@@ -18,8 +18,8 @@ configure_args="-Dsystemd_journal=false
-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 docbook-xsl gtk-doc
+hostmakedepends="AppStream gettext-devel glib-devel libxslt-devel
+ pkgconfig 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
@@ -35,7 +35,7 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/NetworkManager"
changelog="https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/raw/nm-1-38/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=841f64d41776aadd92b151f47e50f62be8a0611a9056fe6bf81881024e6a96c5
+checksum=aee7e057bc2cca5dab84e41f15f1da8b795eb290747b04cbeee822bad9e9fc03
# TODO: Some tests require network namespaces to run.
make_check=extended
lib32disabled=yes
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] NetworkManager: update to 1.40.0
2022-08-31 15:32 [PR PATCH] NetworkManager: update to 1.40.0 cinerea0
2022-08-31 17:42 ` [PR PATCH] [Updated] " cinerea0
@ 2022-08-31 17:53 ` cinerea0
2022-08-31 18:17 ` [PR PATCH] [Closed]: " cinerea0
` (16 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: cinerea0 @ 2022-08-31 17:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1246 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/39003
NetworkManager: update to 1.40.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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/39003.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nm-39003.patch --]
[-- Type: text/x-diff, Size: 5001 bytes --]
From da1e4e685e275ae36c677e2cd3d80d5acca918d8 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Wed, 31 Aug 2022 13:53:29 -0400
Subject: [PATCH] NetworkManager: update to 1.40.0
---
.../NetworkManager/patches/fix-cross-gir.patch | 12 ++++++------
srcpkgs/NetworkManager/patches/no-gtk-doc.patch | 16 ++++++++--------
srcpkgs/NetworkManager/template | 8 ++++----
3 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
index d3fa6ffe5d9c..6e6220da4ff4 100644
--- a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
+++ b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
@@ -1,10 +1,10 @@
-Reason: Fix crossbuilding GIR
-Upstream: No, not upstreamable since this is very specific to the Void setup
-Index: b/src/libnm-client-impl/meson.build
-===================================================================
+# Reason: Fix crossbuilding GIR
+# Upstream: No, not upstreamable since this is very specific to the Void setup
+diff --git a/src/libnm-client-impl/meson.build b/src/libnm-client-impl/meson.build
+index 46464a6328..27a42f51e6 100644
--- a/src/libnm-client-impl/meson.build
+++ b/src/libnm-client-impl/meson.build
-@@ -210,6 +210,16 @@ if enable_introspection
+@@ -219,6 +219,16 @@ if enable_introspection
ld_library_path = ':' + ld_library_path
endif
ld_library_path = meson.current_build_dir() + ld_library_path
@@ -21,7 +21,7 @@ Index: b/src/libnm-client-impl/meson.build
nm_settings_docs_xml_gir = custom_target(
'nm-settings-docs-gir.xml',
-@@ -219,7 +229,7 @@ if enable_introspection
+@@ -228,7 +238,7 @@ if enable_introspection
'env',
'GI_TYPELIB_PATH=' + gi_typelib_path,
'LD_LIBRARY_PATH=' + ld_library_path,
diff --git a/srcpkgs/NetworkManager/patches/no-gtk-doc.patch b/srcpkgs/NetworkManager/patches/no-gtk-doc.patch
index 87e75aa35106..2cd7cf42b71c 100644
--- a/srcpkgs/NetworkManager/patches/no-gtk-doc.patch
+++ b/srcpkgs/NetworkManager/patches/no-gtk-doc.patch
@@ -1,10 +1,10 @@
-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
-===================================================================
+# Reason: We only want to build man pages, not development docs
+# Upstream: Patch was rejected - https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/689
+diff --git a/meson.build b/meson.build
+index 996617f4ca..fb4a914470 100644
--- a/meson.build
+++ b/meson.build
-@@ -943,10 +943,8 @@ if enable_qt
+@@ -952,10 +952,8 @@ if enable_qt
endif
if enable_docs
@@ -15,8 +15,8 @@ Index: b/meson.build
endif
configure_file(
-Index: b/src/libnmc-setting/meson.build
-===================================================================
+diff --git a/src/libnmc-setting/meson.build b/src/libnmc-setting/meson.build
+index 49314cad2e..376ec4e740 100644
--- a/src/libnmc-setting/meson.build
+++ b/src/libnmc-setting/meson.build
@@ -1,6 +1,6 @@
@@ -24,6 +24,6 @@ Index: b/src/libnmc-setting/meson.build
-if enable_docs
+if enable_docs and enable_introspection
+ assert(enable_introspection, '-Ddocs=true requires -Dintrospection=true')
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 191bbfa1f172..c65f452323bf 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -1,6 +1,6 @@
# Template file for 'NetworkManager'
pkgname=NetworkManager
-version=1.38.4
+version=1.40.0
revision=1
build_style=meson
build_helper="gir qemu"
@@ -18,8 +18,8 @@ configure_args="-Dsystemd_journal=false
-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 docbook-xsl gtk-doc
+hostmakedepends="AppStream gettext-devel glib-devel libxslt-devel
+ pkg-config 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
@@ -35,7 +35,7 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/NetworkManager"
changelog="https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/raw/nm-1-38/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=841f64d41776aadd92b151f47e50f62be8a0611a9056fe6bf81881024e6a96c5
+checksum=aee7e057bc2cca5dab84e41f15f1da8b795eb290747b04cbeee822bad9e9fc03
# TODO: Some tests require network namespaces to run.
make_check=extended
lib32disabled=yes
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Closed]: NetworkManager: update to 1.40.0
2022-08-31 15:32 [PR PATCH] NetworkManager: update to 1.40.0 cinerea0
2022-08-31 17:42 ` [PR PATCH] [Updated] " cinerea0
2022-08-31 17:53 ` cinerea0
@ 2022-08-31 18:17 ` cinerea0
2022-08-31 18:17 ` [PR PATCH] [Updated] " cinerea0
` (15 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: cinerea0 @ 2022-08-31 18:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1093 bytes --]
There's a closed pull request on the void-packages repository
NetworkManager: update to 1.40.0
https://github.com/void-linux/void-packages/pull/39003
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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] 20+ messages in thread
* Re: [PR PATCH] [Updated] NetworkManager: update to 1.40.0
2022-08-31 15:32 [PR PATCH] NetworkManager: update to 1.40.0 cinerea0
` (2 preceding siblings ...)
2022-08-31 18:17 ` [PR PATCH] [Closed]: " cinerea0
@ 2022-08-31 18:17 ` cinerea0
2022-08-31 18:19 ` cinerea0
` (14 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: cinerea0 @ 2022-08-31 18:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1246 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/39003
NetworkManager: update to 1.40.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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/39003.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nm-39003.patch --]
[-- Type: text/x-diff, Size: 0 bytes --]
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] NetworkManager: update to 1.40.0
2022-08-31 15:32 [PR PATCH] NetworkManager: update to 1.40.0 cinerea0
` (3 preceding siblings ...)
2022-08-31 18:17 ` [PR PATCH] [Updated] " cinerea0
@ 2022-08-31 18:19 ` cinerea0
2022-08-31 18:44 ` cinerea0
` (13 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: cinerea0 @ 2022-08-31 18:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1246 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/39003
NetworkManager: update to 1.40.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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/39003.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nm-39003.patch --]
[-- Type: text/x-diff, Size: 5006 bytes --]
From 7528a90a2909432fc3fbf1ab3a363d3c8b3411ab Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Wed, 31 Aug 2022 14:19:00 -0400
Subject: [PATCH] NetworkManager: update to 1.40.0
---
.../NetworkManager/patches/fix-cross-gir.patch | 12 ++++++------
srcpkgs/NetworkManager/patches/no-gtk-doc.patch | 16 ++++++++--------
srcpkgs/NetworkManager/template | 8 ++++----
3 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
index d3fa6ffe5d9c..6e6220da4ff4 100644
--- a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
+++ b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
@@ -1,10 +1,10 @@
-Reason: Fix crossbuilding GIR
-Upstream: No, not upstreamable since this is very specific to the Void setup
-Index: b/src/libnm-client-impl/meson.build
-===================================================================
+# Reason: Fix crossbuilding GIR
+# Upstream: No, not upstreamable since this is very specific to the Void setup
+diff --git a/src/libnm-client-impl/meson.build b/src/libnm-client-impl/meson.build
+index 46464a6328..27a42f51e6 100644
--- a/src/libnm-client-impl/meson.build
+++ b/src/libnm-client-impl/meson.build
-@@ -210,6 +210,16 @@ if enable_introspection
+@@ -219,6 +219,16 @@ if enable_introspection
ld_library_path = ':' + ld_library_path
endif
ld_library_path = meson.current_build_dir() + ld_library_path
@@ -21,7 +21,7 @@ Index: b/src/libnm-client-impl/meson.build
nm_settings_docs_xml_gir = custom_target(
'nm-settings-docs-gir.xml',
-@@ -219,7 +229,7 @@ if enable_introspection
+@@ -228,7 +238,7 @@ if enable_introspection
'env',
'GI_TYPELIB_PATH=' + gi_typelib_path,
'LD_LIBRARY_PATH=' + ld_library_path,
diff --git a/srcpkgs/NetworkManager/patches/no-gtk-doc.patch b/srcpkgs/NetworkManager/patches/no-gtk-doc.patch
index 87e75aa35106..2cd7cf42b71c 100644
--- a/srcpkgs/NetworkManager/patches/no-gtk-doc.patch
+++ b/srcpkgs/NetworkManager/patches/no-gtk-doc.patch
@@ -1,10 +1,10 @@
-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
-===================================================================
+# Reason: We only want to build man pages, not development docs
+# Upstream: Patch was rejected - https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/689
+diff --git a/meson.build b/meson.build
+index 996617f4ca..fb4a914470 100644
--- a/meson.build
+++ b/meson.build
-@@ -943,10 +943,8 @@ if enable_qt
+@@ -952,10 +952,8 @@ if enable_qt
endif
if enable_docs
@@ -15,8 +15,8 @@ Index: b/meson.build
endif
configure_file(
-Index: b/src/libnmc-setting/meson.build
-===================================================================
+diff --git a/src/libnmc-setting/meson.build b/src/libnmc-setting/meson.build
+index 49314cad2e..376ec4e740 100644
--- a/src/libnmc-setting/meson.build
+++ b/src/libnmc-setting/meson.build
@@ -1,6 +1,6 @@
@@ -24,6 +24,6 @@ Index: b/src/libnmc-setting/meson.build
-if enable_docs
+if enable_docs and enable_introspection
+ assert(enable_introspection, '-Ddocs=true requires -Dintrospection=true')
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 191bbfa1f172..29d86fa30f97 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -1,6 +1,6 @@
# Template file for 'NetworkManager'
pkgname=NetworkManager
-version=1.38.4
+version=1.40.0
revision=1
build_style=meson
build_helper="gir qemu"
@@ -18,8 +18,8 @@ configure_args="-Dsystemd_journal=false
-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 docbook-xsl gtk-doc
+hostmakedepends="appstream-glib gettext-devel glib-devel libxslt-devel
+ pkg-config 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
@@ -35,7 +35,7 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/NetworkManager"
changelog="https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/raw/nm-1-38/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=841f64d41776aadd92b151f47e50f62be8a0611a9056fe6bf81881024e6a96c5
+checksum=aee7e057bc2cca5dab84e41f15f1da8b795eb290747b04cbeee822bad9e9fc03
# TODO: Some tests require network namespaces to run.
make_check=extended
lib32disabled=yes
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] NetworkManager: update to 1.40.0
2022-08-31 15:32 [PR PATCH] NetworkManager: update to 1.40.0 cinerea0
` (4 preceding siblings ...)
2022-08-31 18:19 ` cinerea0
@ 2022-08-31 18:44 ` cinerea0
2022-08-31 19:19 ` cinerea0
` (12 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: cinerea0 @ 2022-08-31 18:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1246 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/39003
NetworkManager: update to 1.40.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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/39003.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nm-39003.patch --]
[-- Type: text/x-diff, Size: 5360 bytes --]
From c8aacf8422603bbdeb7ec92408f3d655f11da751 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Wed, 31 Aug 2022 14:43:59 -0400
Subject: [PATCH] NetworkManager: update to 1.40.0
---
.../NetworkManager/patches/fix-cross-gir.patch | 12 ++++++------
srcpkgs/NetworkManager/patches/no-gtk-doc.patch | 16 ++++++++--------
srcpkgs/NetworkManager/template | 9 +++++----
3 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
index d3fa6ffe5d9c..6e6220da4ff4 100644
--- a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
+++ b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
@@ -1,10 +1,10 @@
-Reason: Fix crossbuilding GIR
-Upstream: No, not upstreamable since this is very specific to the Void setup
-Index: b/src/libnm-client-impl/meson.build
-===================================================================
+# Reason: Fix crossbuilding GIR
+# Upstream: No, not upstreamable since this is very specific to the Void setup
+diff --git a/src/libnm-client-impl/meson.build b/src/libnm-client-impl/meson.build
+index 46464a6328..27a42f51e6 100644
--- a/src/libnm-client-impl/meson.build
+++ b/src/libnm-client-impl/meson.build
-@@ -210,6 +210,16 @@ if enable_introspection
+@@ -219,6 +219,16 @@ if enable_introspection
ld_library_path = ':' + ld_library_path
endif
ld_library_path = meson.current_build_dir() + ld_library_path
@@ -21,7 +21,7 @@ Index: b/src/libnm-client-impl/meson.build
nm_settings_docs_xml_gir = custom_target(
'nm-settings-docs-gir.xml',
-@@ -219,7 +229,7 @@ if enable_introspection
+@@ -228,7 +238,7 @@ if enable_introspection
'env',
'GI_TYPELIB_PATH=' + gi_typelib_path,
'LD_LIBRARY_PATH=' + ld_library_path,
diff --git a/srcpkgs/NetworkManager/patches/no-gtk-doc.patch b/srcpkgs/NetworkManager/patches/no-gtk-doc.patch
index 87e75aa35106..2cd7cf42b71c 100644
--- a/srcpkgs/NetworkManager/patches/no-gtk-doc.patch
+++ b/srcpkgs/NetworkManager/patches/no-gtk-doc.patch
@@ -1,10 +1,10 @@
-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
-===================================================================
+# Reason: We only want to build man pages, not development docs
+# Upstream: Patch was rejected - https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/689
+diff --git a/meson.build b/meson.build
+index 996617f4ca..fb4a914470 100644
--- a/meson.build
+++ b/meson.build
-@@ -943,10 +943,8 @@ if enable_qt
+@@ -952,10 +952,8 @@ if enable_qt
endif
if enable_docs
@@ -15,8 +15,8 @@ Index: b/meson.build
endif
configure_file(
-Index: b/src/libnmc-setting/meson.build
-===================================================================
+diff --git a/src/libnmc-setting/meson.build b/src/libnmc-setting/meson.build
+index 49314cad2e..376ec4e740 100644
--- a/src/libnmc-setting/meson.build
+++ b/src/libnmc-setting/meson.build
@@ -1,6 +1,6 @@
@@ -24,6 +24,6 @@ Index: b/src/libnmc-setting/meson.build
-if enable_docs
+if enable_docs and enable_introspection
+ assert(enable_introspection, '-Ddocs=true requires -Dintrospection=true')
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 191bbfa1f172..f43d7c9fe65d 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -1,6 +1,6 @@
# Template file for 'NetworkManager'
pkgname=NetworkManager
-version=1.38.4
+version=1.40.0
revision=1
build_style=meson
build_helper="gir qemu"
@@ -18,13 +18,14 @@ configure_args="-Dsystemd_journal=false
-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 docbook-xsl gtk-doc
+hostmakedepends="appstream-glib gettext-devel glib-devel libxslt-devel
+ pkg-config 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
ModemManager-devel readline-devel libndp-devel newt-devel jansson-devel
libpsl-devel eudev-libudev-devel mobile-broadband-provider-info gnutls-devel
+ appstream-glib-devel
$(vopt_if gir 'libgirepository-devel python3-gobject')
$(vopt_if elogind elogind-devel)"
depends="dbus iproute2 openresolv wpa_supplicant mobile-broadband-provider-info"
@@ -35,7 +36,7 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/NetworkManager"
changelog="https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/raw/nm-1-38/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=841f64d41776aadd92b151f47e50f62be8a0611a9056fe6bf81881024e6a96c5
+checksum=aee7e057bc2cca5dab84e41f15f1da8b795eb290747b04cbeee822bad9e9fc03
# TODO: Some tests require network namespaces to run.
make_check=extended
lib32disabled=yes
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] NetworkManager: update to 1.40.0
2022-08-31 15:32 [PR PATCH] NetworkManager: update to 1.40.0 cinerea0
` (5 preceding siblings ...)
2022-08-31 18:44 ` cinerea0
@ 2022-08-31 19:19 ` cinerea0
2022-08-31 19:55 ` cinerea0
` (11 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: cinerea0 @ 2022-08-31 19:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1246 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/39003
NetworkManager: update to 1.40.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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/39003.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nm-39003.patch --]
[-- Type: text/x-diff, Size: 4904 bytes --]
From 9a80beab78732bbf0fc4a36b44fc1ed6e9743d50 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Wed, 31 Aug 2022 15:18:42 -0400
Subject: [PATCH] NetworkManager: update to 1.40.0
---
.../NetworkManager/patches/fix-cross-gir.patch | 12 ++++++------
srcpkgs/NetworkManager/patches/no-gtk-doc.patch | 16 ++++++++--------
srcpkgs/NetworkManager/template | 5 +++--
3 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
index d3fa6ffe5d9c..6e6220da4ff4 100644
--- a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
+++ b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
@@ -1,10 +1,10 @@
-Reason: Fix crossbuilding GIR
-Upstream: No, not upstreamable since this is very specific to the Void setup
-Index: b/src/libnm-client-impl/meson.build
-===================================================================
+# Reason: Fix crossbuilding GIR
+# Upstream: No, not upstreamable since this is very specific to the Void setup
+diff --git a/src/libnm-client-impl/meson.build b/src/libnm-client-impl/meson.build
+index 46464a6328..27a42f51e6 100644
--- a/src/libnm-client-impl/meson.build
+++ b/src/libnm-client-impl/meson.build
-@@ -210,6 +210,16 @@ if enable_introspection
+@@ -219,6 +219,16 @@ if enable_introspection
ld_library_path = ':' + ld_library_path
endif
ld_library_path = meson.current_build_dir() + ld_library_path
@@ -21,7 +21,7 @@ Index: b/src/libnm-client-impl/meson.build
nm_settings_docs_xml_gir = custom_target(
'nm-settings-docs-gir.xml',
-@@ -219,7 +229,7 @@ if enable_introspection
+@@ -228,7 +238,7 @@ if enable_introspection
'env',
'GI_TYPELIB_PATH=' + gi_typelib_path,
'LD_LIBRARY_PATH=' + ld_library_path,
diff --git a/srcpkgs/NetworkManager/patches/no-gtk-doc.patch b/srcpkgs/NetworkManager/patches/no-gtk-doc.patch
index 87e75aa35106..2cd7cf42b71c 100644
--- a/srcpkgs/NetworkManager/patches/no-gtk-doc.patch
+++ b/srcpkgs/NetworkManager/patches/no-gtk-doc.patch
@@ -1,10 +1,10 @@
-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
-===================================================================
+# Reason: We only want to build man pages, not development docs
+# Upstream: Patch was rejected - https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/689
+diff --git a/meson.build b/meson.build
+index 996617f4ca..fb4a914470 100644
--- a/meson.build
+++ b/meson.build
-@@ -943,10 +943,8 @@ if enable_qt
+@@ -952,10 +952,8 @@ if enable_qt
endif
if enable_docs
@@ -15,8 +15,8 @@ Index: b/meson.build
endif
configure_file(
-Index: b/src/libnmc-setting/meson.build
-===================================================================
+diff --git a/src/libnmc-setting/meson.build b/src/libnmc-setting/meson.build
+index 49314cad2e..376ec4e740 100644
--- a/src/libnmc-setting/meson.build
+++ b/src/libnmc-setting/meson.build
@@ -1,6 +1,6 @@
@@ -24,6 +24,6 @@ Index: b/src/libnmc-setting/meson.build
-if enable_docs
+if enable_docs and enable_introspection
+ assert(enable_introspection, '-Ddocs=true requires -Dintrospection=true')
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 191bbfa1f172..265012f8bcae 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -1,6 +1,6 @@
# Template file for 'NetworkManager'
pkgname=NetworkManager
-version=1.38.4
+version=1.40.0
revision=1
build_style=meson
build_helper="gir qemu"
@@ -25,6 +25,7 @@ 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 gnutls-devel
+ appstream-glib appstream-glib-devel
$(vopt_if gir 'libgirepository-devel python3-gobject')
$(vopt_if elogind elogind-devel)"
depends="dbus iproute2 openresolv wpa_supplicant mobile-broadband-provider-info"
@@ -35,7 +36,7 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/NetworkManager"
changelog="https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/raw/nm-1-38/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=841f64d41776aadd92b151f47e50f62be8a0611a9056fe6bf81881024e6a96c5
+checksum=aee7e057bc2cca5dab84e41f15f1da8b795eb290747b04cbeee822bad9e9fc03
# TODO: Some tests require network namespaces to run.
make_check=extended
lib32disabled=yes
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: NetworkManager: update to 1.40.0
2022-08-31 15:32 [PR PATCH] NetworkManager: update to 1.40.0 cinerea0
` (6 preceding siblings ...)
2022-08-31 19:19 ` cinerea0
@ 2022-08-31 19:55 ` cinerea0
2022-08-31 19:55 ` [PR REVIEW] " paper42
` (10 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: cinerea0 @ 2022-08-31 19:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 453 bytes --]
New comment by cinerea0 on void-packages repository
https://github.com/void-linux/void-packages/pull/39003#issuecomment-1233359292
Comment:
The errors appear to be most commonly caused by appstream not being present. The following configurations have resulted in failure:
* `AppStream` in hostmakedepends
* `appstream-glib` in hostmakedepends and `appstream-glib-devel` in makedepends
* `appstream-glib` and `appstream-glib-devel` in makedepends
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR REVIEW] NetworkManager: update to 1.40.0
2022-08-31 15:32 [PR PATCH] NetworkManager: update to 1.40.0 cinerea0
` (7 preceding siblings ...)
2022-08-31 19:55 ` cinerea0
@ 2022-08-31 19:55 ` paper42
2022-08-31 19:56 ` paper42
` (9 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: paper42 @ 2022-08-31 19:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 174 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/39003#discussion_r959971013
Comment:
what's the reason for this?
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: NetworkManager: update to 1.40.0
2022-08-31 15:32 [PR PATCH] NetworkManager: update to 1.40.0 cinerea0
` (8 preceding siblings ...)
2022-08-31 19:55 ` [PR REVIEW] " paper42
@ 2022-08-31 19:56 ` paper42
2022-08-31 19:58 ` [PR PATCH] [Updated] " cinerea0
` (8 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: paper42 @ 2022-08-31 19:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 593 bytes --]
New comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/39003#issuecomment-1233360414
Comment:
> The errors appear to be most commonly caused by appstream not being present. The following configurations have resulted in failure:
>
> * `AppStream` in hostmakedepends
>
> * `appstream-glib` in hostmakedepends and `appstream-glib-devel` in makedepends
>
> * `appstream-glib` and `appstream-glib-devel` in makedepends
the error message is about a polkit policy file, not an appstream file, add polkit-devel to hostmakedepends
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] NetworkManager: update to 1.40.0
2022-08-31 15:32 [PR PATCH] NetworkManager: update to 1.40.0 cinerea0
` (9 preceding siblings ...)
2022-08-31 19:56 ` paper42
@ 2022-08-31 19:58 ` cinerea0
2022-08-31 20:01 ` cinerea0
` (7 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: cinerea0 @ 2022-08-31 19:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1246 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/39003
NetworkManager: update to 1.40.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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/39003.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nm-39003.patch --]
[-- Type: text/x-diff, Size: 1677 bytes --]
From 65317e982aed324bcf8ba95eeb617d43a8a17726 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Wed, 31 Aug 2022 15:58:37 -0400
Subject: [PATCH] NetworkManager: update to 1.40.0
---
srcpkgs/NetworkManager/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template
index 191bbfa1f172..9b28975283f9 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -1,6 +1,6 @@
# Template file for 'NetworkManager'
pkgname=NetworkManager
-version=1.38.4
+version=1.40.0
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 docbook-xsl gtk-doc
+ intltool dbus-glib-devel docbook-xsl gtk-doc polkit-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
@@ -35,7 +35,7 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/NetworkManager"
changelog="https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/raw/nm-1-38/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=841f64d41776aadd92b151f47e50f62be8a0611a9056fe6bf81881024e6a96c5
+checksum=aee7e057bc2cca5dab84e41f15f1da8b795eb290747b04cbeee822bad9e9fc03
# TODO: Some tests require network namespaces to run.
make_check=extended
lib32disabled=yes
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] NetworkManager: update to 1.40.0
2022-08-31 15:32 [PR PATCH] NetworkManager: update to 1.40.0 cinerea0
` (10 preceding siblings ...)
2022-08-31 19:58 ` [PR PATCH] [Updated] " cinerea0
@ 2022-08-31 20:01 ` cinerea0
2022-08-31 20:03 ` [PR REVIEW] " cinerea0
` (6 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: cinerea0 @ 2022-08-31 20:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1246 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/39003
NetworkManager: update to 1.40.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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/39003.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nm-39003.patch --]
[-- Type: text/x-diff, Size: 4883 bytes --]
From 33a729f95d6779a7b0a795f5b24571a36b46b5fb Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Wed, 31 Aug 2022 16:01:05 -0400
Subject: [PATCH] NetworkManager: update to 1.40.0
---
.../NetworkManager/patches/fix-cross-gir.patch | 12 ++++++------
srcpkgs/NetworkManager/patches/no-gtk-doc.patch | 16 ++++++++--------
srcpkgs/NetworkManager/template | 6 +++---
3 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
index d3fa6ffe5d9c..6e6220da4ff4 100644
--- a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
+++ b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
@@ -1,10 +1,10 @@
-Reason: Fix crossbuilding GIR
-Upstream: No, not upstreamable since this is very specific to the Void setup
-Index: b/src/libnm-client-impl/meson.build
-===================================================================
+# Reason: Fix crossbuilding GIR
+# Upstream: No, not upstreamable since this is very specific to the Void setup
+diff --git a/src/libnm-client-impl/meson.build b/src/libnm-client-impl/meson.build
+index 46464a6328..27a42f51e6 100644
--- a/src/libnm-client-impl/meson.build
+++ b/src/libnm-client-impl/meson.build
-@@ -210,6 +210,16 @@ if enable_introspection
+@@ -219,6 +219,16 @@ if enable_introspection
ld_library_path = ':' + ld_library_path
endif
ld_library_path = meson.current_build_dir() + ld_library_path
@@ -21,7 +21,7 @@ Index: b/src/libnm-client-impl/meson.build
nm_settings_docs_xml_gir = custom_target(
'nm-settings-docs-gir.xml',
-@@ -219,7 +229,7 @@ if enable_introspection
+@@ -228,7 +238,7 @@ if enable_introspection
'env',
'GI_TYPELIB_PATH=' + gi_typelib_path,
'LD_LIBRARY_PATH=' + ld_library_path,
diff --git a/srcpkgs/NetworkManager/patches/no-gtk-doc.patch b/srcpkgs/NetworkManager/patches/no-gtk-doc.patch
index 87e75aa35106..2cd7cf42b71c 100644
--- a/srcpkgs/NetworkManager/patches/no-gtk-doc.patch
+++ b/srcpkgs/NetworkManager/patches/no-gtk-doc.patch
@@ -1,10 +1,10 @@
-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
-===================================================================
+# Reason: We only want to build man pages, not development docs
+# Upstream: Patch was rejected - https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/689
+diff --git a/meson.build b/meson.build
+index 996617f4ca..fb4a914470 100644
--- a/meson.build
+++ b/meson.build
-@@ -943,10 +943,8 @@ if enable_qt
+@@ -952,10 +952,8 @@ if enable_qt
endif
if enable_docs
@@ -15,8 +15,8 @@ Index: b/meson.build
endif
configure_file(
-Index: b/src/libnmc-setting/meson.build
-===================================================================
+diff --git a/src/libnmc-setting/meson.build b/src/libnmc-setting/meson.build
+index 49314cad2e..376ec4e740 100644
--- a/src/libnmc-setting/meson.build
+++ b/src/libnmc-setting/meson.build
@@ -1,6 +1,6 @@
@@ -24,6 +24,6 @@ Index: b/src/libnmc-setting/meson.build
-if enable_docs
+if enable_docs and enable_introspection
+ assert(enable_introspection, '-Ddocs=true requires -Dintrospection=true')
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 191bbfa1f172..9b28975283f9 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -1,6 +1,6 @@
# Template file for 'NetworkManager'
pkgname=NetworkManager
-version=1.38.4
+version=1.40.0
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 docbook-xsl gtk-doc
+ intltool dbus-glib-devel docbook-xsl gtk-doc polkit-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
@@ -35,7 +35,7 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/NetworkManager"
changelog="https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/raw/nm-1-38/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=841f64d41776aadd92b151f47e50f62be8a0611a9056fe6bf81881024e6a96c5
+checksum=aee7e057bc2cca5dab84e41f15f1da8b795eb290747b04cbeee822bad9e9fc03
# TODO: Some tests require network namespaces to run.
make_check=extended
lib32disabled=yes
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR REVIEW] NetworkManager: update to 1.40.0
2022-08-31 15:32 [PR PATCH] NetworkManager: update to 1.40.0 cinerea0
` (11 preceding siblings ...)
2022-08-31 20:01 ` cinerea0
@ 2022-08-31 20:03 ` cinerea0
2022-08-31 20:28 ` paper42
` (5 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: cinerea0 @ 2022-08-31 20:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 414 bytes --]
New review comment by cinerea0 on void-packages repository
https://github.com/void-linux/void-packages/pull/39003#discussion_r959979026
Comment:
The patch no longer applied due to the meson.build file changing slightly, so I decided to recreate it. That said, the docs option now requires the introspection option, so I'm wondering if there may be a way to use `vopt` to drop the need for this patch altogether.
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR REVIEW] NetworkManager: update to 1.40.0
2022-08-31 15:32 [PR PATCH] NetworkManager: update to 1.40.0 cinerea0
` (12 preceding siblings ...)
2022-08-31 20:03 ` [PR REVIEW] " cinerea0
@ 2022-08-31 20:28 ` paper42
2022-08-31 20:29 ` paper42
` (4 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: paper42 @ 2022-08-31 20:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 201 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/39003#discussion_r959997575
Comment:
this patch applies fine, the other one needed a rebase
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR REVIEW] NetworkManager: update to 1.40.0
2022-08-31 15:32 [PR PATCH] NetworkManager: update to 1.40.0 cinerea0
` (13 preceding siblings ...)
2022-08-31 20:28 ` paper42
@ 2022-08-31 20:29 ` paper42
2022-09-01 14:06 ` [PR PATCH] [Updated] " cinerea0
` (3 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: paper42 @ 2022-08-31 20:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 258 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/39003#discussion_r959998533
Comment:
```suggestion
changelog="https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/raw/nm-1-40/NEWS"
```
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] NetworkManager: update to 1.40.0
2022-08-31 15:32 [PR PATCH] NetworkManager: update to 1.40.0 cinerea0
` (14 preceding siblings ...)
2022-08-31 20:29 ` paper42
@ 2022-09-01 14:06 ` cinerea0
2022-09-01 14:46 ` cinerea0
` (2 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: cinerea0 @ 2022-09-01 14:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1246 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/39003
NetworkManager: update to 1.40.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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/39003.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nm-39003.patch --]
[-- Type: text/x-diff, Size: 3605 bytes --]
From 2c6492fc3920f8f5c6d267f46e77dad19c1868e2 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 1 Sep 2022 10:06:28 -0400
Subject: [PATCH] NetworkManager: update to 1.40.0
---
srcpkgs/NetworkManager/patches/no-gtk-doc.patch | 16 ++++++++--------
srcpkgs/NetworkManager/template | 8 ++++----
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/NetworkManager/patches/no-gtk-doc.patch b/srcpkgs/NetworkManager/patches/no-gtk-doc.patch
index 87e75aa35106..2cd7cf42b71c 100644
--- a/srcpkgs/NetworkManager/patches/no-gtk-doc.patch
+++ b/srcpkgs/NetworkManager/patches/no-gtk-doc.patch
@@ -1,10 +1,10 @@
-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
-===================================================================
+# Reason: We only want to build man pages, not development docs
+# Upstream: Patch was rejected - https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/689
+diff --git a/meson.build b/meson.build
+index 996617f4ca..fb4a914470 100644
--- a/meson.build
+++ b/meson.build
-@@ -943,10 +943,8 @@ if enable_qt
+@@ -952,10 +952,8 @@ if enable_qt
endif
if enable_docs
@@ -15,8 +15,8 @@ Index: b/meson.build
endif
configure_file(
-Index: b/src/libnmc-setting/meson.build
-===================================================================
+diff --git a/src/libnmc-setting/meson.build b/src/libnmc-setting/meson.build
+index 49314cad2e..376ec4e740 100644
--- a/src/libnmc-setting/meson.build
+++ b/src/libnmc-setting/meson.build
@@ -1,6 +1,6 @@
@@ -24,6 +24,6 @@ Index: b/src/libnmc-setting/meson.build
-if enable_docs
+if enable_docs and enable_introspection
+ assert(enable_introspection, '-Ddocs=true requires -Dintrospection=true')
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 191bbfa1f172..a090d498db0c 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -1,6 +1,6 @@
# Template file for 'NetworkManager'
pkgname=NetworkManager
-version=1.38.4
+version=1.40.0
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 docbook-xsl gtk-doc
+ dbus-glib-devel docbook-xsl gtk-doc polkit-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,9 +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-38/NEWS"
+changelog="https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/raw/nm-1-40/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=841f64d41776aadd92b151f47e50f62be8a0611a9056fe6bf81881024e6a96c5
+checksum=aee7e057bc2cca5dab84e41f15f1da8b795eb290747b04cbeee822bad9e9fc03
# TODO: Some tests require network namespaces to run.
make_check=extended
lib32disabled=yes
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] NetworkManager: update to 1.40.0
2022-08-31 15:32 [PR PATCH] NetworkManager: update to 1.40.0 cinerea0
` (15 preceding siblings ...)
2022-09-01 14:06 ` [PR PATCH] [Updated] " cinerea0
@ 2022-09-01 14:46 ` cinerea0
2022-09-01 15:11 ` cinerea0
2022-09-01 17:47 ` [PR PATCH] [Merged]: " paper42
18 siblings, 0 replies; 20+ messages in thread
From: cinerea0 @ 2022-09-01 14:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1246 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/39003
NetworkManager: update to 1.40.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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/39003.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nm-39003.patch --]
[-- Type: text/x-diff, Size: 3610 bytes --]
From cc302a079678b4a353bcd5452c51621383d73eb8 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 1 Sep 2022 10:45:46 -0400
Subject: [PATCH] NetworkManager: update to 1.40.0
---
srcpkgs/NetworkManager/patches/no-gtk-doc.patch | 16 ++++++++--------
srcpkgs/NetworkManager/template | 8 ++++----
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/NetworkManager/patches/no-gtk-doc.patch b/srcpkgs/NetworkManager/patches/no-gtk-doc.patch
index 87e75aa35106..2cd7cf42b71c 100644
--- a/srcpkgs/NetworkManager/patches/no-gtk-doc.patch
+++ b/srcpkgs/NetworkManager/patches/no-gtk-doc.patch
@@ -1,10 +1,10 @@
-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
-===================================================================
+# Reason: We only want to build man pages, not development docs
+# Upstream: Patch was rejected - https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/689
+diff --git a/meson.build b/meson.build
+index 996617f4ca..fb4a914470 100644
--- a/meson.build
+++ b/meson.build
-@@ -943,10 +943,8 @@ if enable_qt
+@@ -952,10 +952,8 @@ if enable_qt
endif
if enable_docs
@@ -15,8 +15,8 @@ Index: b/meson.build
endif
configure_file(
-Index: b/src/libnmc-setting/meson.build
-===================================================================
+diff --git a/src/libnmc-setting/meson.build b/src/libnmc-setting/meson.build
+index 49314cad2e..376ec4e740 100644
--- a/src/libnmc-setting/meson.build
+++ b/src/libnmc-setting/meson.build
@@ -1,6 +1,6 @@
@@ -24,6 +24,6 @@ Index: b/src/libnmc-setting/meson.build
-if enable_docs
+if enable_docs and enable_introspection
+ assert(enable_introspection, '-Ddocs=true requires -Dintrospection=true')
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 191bbfa1f172..8bff706bc42d 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -1,6 +1,6 @@
# Template file for 'NetworkManager'
pkgname=NetworkManager
-version=1.38.4
+version=1.40.0
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 docbook-xsl gtk-doc
+ dbus-glib-devel docbook-xsl gtk-doc polkit-devel perl
$(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,9 +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-38/NEWS"
+changelog="https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/raw/nm-1-40/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=841f64d41776aadd92b151f47e50f62be8a0611a9056fe6bf81881024e6a96c5
+checksum=aee7e057bc2cca5dab84e41f15f1da8b795eb290747b04cbeee822bad9e9fc03
# TODO: Some tests require network namespaces to run.
make_check=extended
lib32disabled=yes
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: NetworkManager: update to 1.40.0
2022-08-31 15:32 [PR PATCH] NetworkManager: update to 1.40.0 cinerea0
` (16 preceding siblings ...)
2022-09-01 14:46 ` cinerea0
@ 2022-09-01 15:11 ` cinerea0
2022-09-01 17:47 ` [PR PATCH] [Merged]: " paper42
18 siblings, 0 replies; 20+ messages in thread
From: cinerea0 @ 2022-09-01 15:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 231 bytes --]
New comment by cinerea0 on void-packages repository
https://github.com/void-linux/void-packages/pull/39003#issuecomment-1234418196
Comment:
That was an embarrassing amount of fumbling on my part, but it should be good to go now.
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Merged]: NetworkManager: update to 1.40.0
2022-08-31 15:32 [PR PATCH] NetworkManager: update to 1.40.0 cinerea0
` (17 preceding siblings ...)
2022-09-01 15:11 ` cinerea0
@ 2022-09-01 17:47 ` paper42
18 siblings, 0 replies; 20+ messages in thread
From: paper42 @ 2022-09-01 17:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1093 bytes --]
There's a merged pull request on the void-packages repository
NetworkManager: update to 1.40.0
https://github.com/void-linux/void-packages/pull/39003
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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] 20+ messages in thread
end of thread, other threads:[~2022-09-01 17:47 UTC | newest]
Thread overview: 20+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-31 15:32 [PR PATCH] NetworkManager: update to 1.40.0 cinerea0
2022-08-31 17:42 ` [PR PATCH] [Updated] " cinerea0
2022-08-31 17:53 ` cinerea0
2022-08-31 18:17 ` [PR PATCH] [Closed]: " cinerea0
2022-08-31 18:17 ` [PR PATCH] [Updated] " cinerea0
2022-08-31 18:19 ` cinerea0
2022-08-31 18:44 ` cinerea0
2022-08-31 19:19 ` cinerea0
2022-08-31 19:55 ` cinerea0
2022-08-31 19:55 ` [PR REVIEW] " paper42
2022-08-31 19:56 ` paper42
2022-08-31 19:58 ` [PR PATCH] [Updated] " cinerea0
2022-08-31 20:01 ` cinerea0
2022-08-31 20:03 ` [PR REVIEW] " cinerea0
2022-08-31 20:28 ` paper42
2022-08-31 20:29 ` paper42
2022-09-01 14:06 ` [PR PATCH] [Updated] " cinerea0
2022-09-01 14:46 ` cinerea0
2022-09-01 15:11 ` cinerea0
2022-09-01 17:47 ` [PR PATCH] [Merged]: " paper42
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).