* [PR PATCH] NetworkManager: update to 1.26.2.
@ 2020-12-28 15:53 codingHahn
2020-12-29 3:04 ` [PR PATCH] [Updated] " codingHahn
` (16 more replies)
0 siblings, 17 replies; 18+ messages in thread
From: codingHahn @ 2020-12-28 15:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 368 bytes --]
There is a new pull request by codingHahn against master on the void-packages repository
https://github.com/codingHahn/void-packages-1 network-manager-1.26.2
https://github.com/void-linux/void-packages/pull/27502
NetworkManager: update to 1.26.2.
Builds for me. Tests follow
A patch file from https://github.com/void-linux/void-packages/pull/27502.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-network-manager-1.26.2-27502.patch --]
[-- Type: text/x-diff, Size: 5296 bytes --]
From 90391341bdf7c6839ff2ba6e2179f1c88522e6e3 Mon Sep 17 00:00:00 2001
From: Nick Hahn <nick.hahn@posteo.de>
Date: Mon, 28 Dec 2020 15:56:57 +0100
Subject: [PATCH] NetworkManager: update to 1.26.2.
---
.../patches/fix-cross-gir.patch | 57 +++++++------------
srcpkgs/NetworkManager/template | 5 +-
2 files changed, 24 insertions(+), 38 deletions(-)
diff --git a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
index 2d0db910adb..69687da097f 100644
--- a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
+++ b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
@@ -1,8 +1,5 @@
Reason: Fix crossbuilding GIR
Upstream: No, not upstreamable since this is very specific to the Void setup
-diff --git clients/common/meson.build clients/common/meson.build
-index afa257b..50b53e7 100644
---- clients/common/meson.build
+++ clients/common/meson.build
@@ -35,7 +35,7 @@ if enable_introspection
settings_docs,
@@ -11,42 +8,32 @@ index afa257b..50b53e7 100644
- command: [xsltproc, '--output', '@OUTPUT@', join_paths(meson.current_source_dir(), 'settings-docs.xsl'), '@INPUT@'],
+ command: [xsltproc, '--output', '@OUTPUT@', join_paths(meson.current_source_dir(), 'settings-docs.xsl'), join_paths(meson.current_source_dir(), '..', '..', '@INPUT@')],
)
-
+
test(
-diff --git libnm/meson.build libnm/meson.build
-index 51ca46d..f14d861 100644
---- libnm/meson.build
-+++ libnm/meson.build
-@@ -236,7 +236,13 @@ if enable_introspection
- )
- endif
-
-- generate_setting_docs = join_paths(meson.current_source_dir(), 'generate-setting-docs.py')
+--- libnm/meson.build.orig 2020-12-28 16:03:30.641850261 +0100
++++ libnm/meson.build 2020-12-28 16:31:54.932136481 +0100
+@@ -276,6 +276,14 @@
+ 'GI_TYPELIB_PATH=' + gi_typelib_path,
+ 'LD_LIBRARY_PATH=' + ld_library_path,
+ ]
++
+ if meson.is_cross_build()
+ qemu = '/usr/bin/qemu-@XBPS_TARGET_QEMU_MACHINE@-static'
+ qemu_python3_cmd = qemu + ' -L @XBPS_CROSS_BASE@ @XBPS_CROSS_BASE@/bin/python3'
-+ generate_setting_docs = ['sh', '-c', qemu_python3_cmd, join_paths(meson.current_source_dir(), 'generate-setting-docs.py')]
++ generate_setting_docs = ['sh', '-c', qemu_python3_cmd, join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-gir.py')]
+ else
-+ generate_setting_docs = [python.path(), join_paths(meson.current_source_dir(), 'generate-setting-docs.py')]
++ generate_setting_docs = [python.path(), join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-gir.py')]
+ endif
- gi_typelib_path = run_command('printenv', 'GI_TYPELIB_PATH').stdout()
- if gi_typelib_path != ''
-@@ -261,7 +267,7 @@ if enable_introspection
- name,
- input: libnm_gir[0],
- output: name,
-- command: [generate_setting_docs_env, python.path(), generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--output', '@OUTPUT@'],
-+ command: [generate_setting_docs_env, generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--output', '@OUTPUT@'],
- depends: libnm_gir,
- )
-
-@@ -270,7 +276,7 @@ if enable_introspection
- name,
- input: [libnm_gir[0], nm_settings_docs_overrides],
- output: name,
-- command: [generate_setting_docs_env, python.path(), generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT0@', '--overrides', '@INPUT1@', '--output', '@OUTPUT@'],
-+ command: [generate_setting_docs_env, generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT0@', '--overrides', '@INPUT1@', '--output', '@OUTPUT@'],
- depends: libnm_gir,
- )
- endif
+ nm_settings_docs_xml_gir = custom_target(
+ 'nm-settings-docs-gir.xml',
+@@ -283,8 +291,7 @@
+ output: 'nm-settings-docs-gir.xml',
+ command: [
+ generate_setting_docs_env,
+- python.path(),
+- join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-gir.py'),
++ generate_setting_docs,
+ '--lib-path', meson.current_build_dir(),
+ '--gir', '@INPUT@',
+ '--output', '@OUTPUT@'
diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template
index e482bba98de..cc24b4e1f64 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -2,7 +2,7 @@
# when updating to 1.24 or newer, drop the compat
# patch in gnome-control-center and rebuild it
pkgname=NetworkManager
-version=1.22.10
+version=1.26.2
revision=2
build_style=meson
build_helper="gir qemu"
@@ -35,7 +35,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/NetworkManager"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2b29ccc1531ba7ebba95a97f40c22b963838e8b6833745efe8e6fb71fd8fca77
+checksum=2a8368ed1e4485e2ba7ca83b4b2bb07cacc33562951eb77de10d2b6411dce7e6
lib32disabled=yes
conf_files="/etc/${pkgname}/${pkgname}.conf"
make_dirs="
@@ -57,7 +57,6 @@ esac
# Package build options
build_options="gir vala elogind"
build_options_default="gir vala elogind"
-
pre_configure() {
if [ "$CROSS_BUILD" ]; then
# Replace the values from our patch into the system itself
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PR PATCH] [Updated] NetworkManager: update to 1.26.2.
2020-12-28 15:53 [PR PATCH] NetworkManager: update to 1.26.2 codingHahn
@ 2020-12-29 3:04 ` codingHahn
2020-12-29 7:32 ` [PR REVIEW] NetworkManager: update to 1.26.6 fosslinux
` (15 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: codingHahn @ 2020-12-29 3:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 467 bytes --]
There is an updated pull request by codingHahn against master on the void-packages repository
https://github.com/codingHahn/void-packages-1 network-manager-1.26.2
https://github.com/void-linux/void-packages/pull/27502
NetworkManager: update to 1.26.2.
Builds for me.
Tests:
- [ ] x86
- [x] x86_64
- [ ] arm
- [ ] anything musl
Do we need to revbump some packages?
A patch file from https://github.com/void-linux/void-packages/pull/27502.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-network-manager-1.26.2-27502.patch --]
[-- Type: text/x-diff, Size: 5296 bytes --]
From 87340024f71f2dcf9fb5ae0b18ebf6c4b112824e Mon Sep 17 00:00:00 2001
From: Nick Hahn <nick.hahn@posteo.de>
Date: Mon, 28 Dec 2020 15:56:57 +0100
Subject: [PATCH] NetworkManager: update to 1.26.6.
---
.../patches/fix-cross-gir.patch | 57 +++++++------------
srcpkgs/NetworkManager/template | 5 +-
2 files changed, 24 insertions(+), 38 deletions(-)
diff --git a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
index 2d0db910adb..69687da097f 100644
--- a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
+++ b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
@@ -1,8 +1,5 @@
Reason: Fix crossbuilding GIR
Upstream: No, not upstreamable since this is very specific to the Void setup
-diff --git clients/common/meson.build clients/common/meson.build
-index afa257b..50b53e7 100644
---- clients/common/meson.build
+++ clients/common/meson.build
@@ -35,7 +35,7 @@ if enable_introspection
settings_docs,
@@ -11,42 +8,32 @@ index afa257b..50b53e7 100644
- command: [xsltproc, '--output', '@OUTPUT@', join_paths(meson.current_source_dir(), 'settings-docs.xsl'), '@INPUT@'],
+ command: [xsltproc, '--output', '@OUTPUT@', join_paths(meson.current_source_dir(), 'settings-docs.xsl'), join_paths(meson.current_source_dir(), '..', '..', '@INPUT@')],
)
-
+
test(
-diff --git libnm/meson.build libnm/meson.build
-index 51ca46d..f14d861 100644
---- libnm/meson.build
-+++ libnm/meson.build
-@@ -236,7 +236,13 @@ if enable_introspection
- )
- endif
-
-- generate_setting_docs = join_paths(meson.current_source_dir(), 'generate-setting-docs.py')
+--- libnm/meson.build.orig 2020-12-28 16:03:30.641850261 +0100
++++ libnm/meson.build 2020-12-28 16:31:54.932136481 +0100
+@@ -276,6 +276,14 @@
+ 'GI_TYPELIB_PATH=' + gi_typelib_path,
+ 'LD_LIBRARY_PATH=' + ld_library_path,
+ ]
++
+ if meson.is_cross_build()
+ qemu = '/usr/bin/qemu-@XBPS_TARGET_QEMU_MACHINE@-static'
+ qemu_python3_cmd = qemu + ' -L @XBPS_CROSS_BASE@ @XBPS_CROSS_BASE@/bin/python3'
-+ generate_setting_docs = ['sh', '-c', qemu_python3_cmd, join_paths(meson.current_source_dir(), 'generate-setting-docs.py')]
++ generate_setting_docs = ['sh', '-c', qemu_python3_cmd, join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-gir.py')]
+ else
-+ generate_setting_docs = [python.path(), join_paths(meson.current_source_dir(), 'generate-setting-docs.py')]
++ generate_setting_docs = [python.path(), join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-gir.py')]
+ endif
- gi_typelib_path = run_command('printenv', 'GI_TYPELIB_PATH').stdout()
- if gi_typelib_path != ''
-@@ -261,7 +267,7 @@ if enable_introspection
- name,
- input: libnm_gir[0],
- output: name,
-- command: [generate_setting_docs_env, python.path(), generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--output', '@OUTPUT@'],
-+ command: [generate_setting_docs_env, generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--output', '@OUTPUT@'],
- depends: libnm_gir,
- )
-
-@@ -270,7 +276,7 @@ if enable_introspection
- name,
- input: [libnm_gir[0], nm_settings_docs_overrides],
- output: name,
-- command: [generate_setting_docs_env, python.path(), generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT0@', '--overrides', '@INPUT1@', '--output', '@OUTPUT@'],
-+ command: [generate_setting_docs_env, generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT0@', '--overrides', '@INPUT1@', '--output', '@OUTPUT@'],
- depends: libnm_gir,
- )
- endif
+ nm_settings_docs_xml_gir = custom_target(
+ 'nm-settings-docs-gir.xml',
+@@ -283,8 +291,7 @@
+ output: 'nm-settings-docs-gir.xml',
+ command: [
+ generate_setting_docs_env,
+- python.path(),
+- join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-gir.py'),
++ generate_setting_docs,
+ '--lib-path', meson.current_build_dir(),
+ '--gir', '@INPUT@',
+ '--output', '@OUTPUT@'
diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template
index e482bba98de..f6512a58bad 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -2,7 +2,7 @@
# when updating to 1.24 or newer, drop the compat
# patch in gnome-control-center and rebuild it
pkgname=NetworkManager
-version=1.22.10
+version=1.26.6
revision=2
build_style=meson
build_helper="gir qemu"
@@ -35,7 +35,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/NetworkManager"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2b29ccc1531ba7ebba95a97f40c22b963838e8b6833745efe8e6fb71fd8fca77
+checksum=1637d28d8ee74f3d4b7473febc2806ca66a21069680b6645bb11a192653e9603
lib32disabled=yes
conf_files="/etc/${pkgname}/${pkgname}.conf"
make_dirs="
@@ -57,7 +57,6 @@ esac
# Package build options
build_options="gir vala elogind"
build_options_default="gir vala elogind"
-
pre_configure() {
if [ "$CROSS_BUILD" ]; then
# Replace the values from our patch into the system itself
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PR REVIEW] NetworkManager: update to 1.26.6.
2020-12-28 15:53 [PR PATCH] NetworkManager: update to 1.26.2 codingHahn
2020-12-29 3:04 ` [PR PATCH] [Updated] " codingHahn
@ 2020-12-29 7:32 ` fosslinux
2021-01-21 17:36 ` ericonr
` (14 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: fosslinux @ 2020-12-29 7:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 161 bytes --]
New review comment by fosslinux on void-packages repository
https://github.com/void-linux/void-packages/pull/27502#discussion_r549599671
Comment:
act on this?
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: NetworkManager: update to 1.26.6.
2020-12-28 15:53 [PR PATCH] NetworkManager: update to 1.26.2 codingHahn
2020-12-29 3:04 ` [PR PATCH] [Updated] " codingHahn
2020-12-29 7:32 ` [PR REVIEW] NetworkManager: update to 1.26.6 fosslinux
@ 2021-01-21 17:36 ` ericonr
2021-01-25 15:46 ` codingHahn
` (13 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: ericonr @ 2021-01-21 17:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 158 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/27502#issuecomment-764816950
Comment:
@codingHahn ping?
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: NetworkManager: update to 1.26.6.
2020-12-28 15:53 [PR PATCH] NetworkManager: update to 1.26.2 codingHahn
` (2 preceding siblings ...)
2021-01-21 17:36 ` ericonr
@ 2021-01-25 15:46 ` codingHahn
2021-01-26 15:01 ` pullmoll
` (12 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: codingHahn @ 2021-01-25 15:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 273 bytes --]
New comment by codingHahn on void-packages repository
https://github.com/void-linux/void-packages/pull/27502#issuecomment-766908495
Comment:
Sorry for the delay. x86 glibc fails during the tests. Any ideas?
Musl probably fails because of some patch. I will take a look.
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: NetworkManager: update to 1.26.6.
2020-12-28 15:53 [PR PATCH] NetworkManager: update to 1.26.2 codingHahn
` (3 preceding siblings ...)
2021-01-25 15:46 ` codingHahn
@ 2021-01-26 15:01 ` pullmoll
2021-01-26 15:03 ` ericonr
` (11 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: pullmoll @ 2021-01-26 15:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 245 bytes --]
New comment by pullmoll on void-packages repository
https://github.com/void-linux/void-packages/pull/27502#issuecomment-767601707
Comment:
The current NetworkManager 1.22.10 no longer (cross) builds.
There is version 1.28.0 it seems, though.
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: NetworkManager: update to 1.26.6.
2020-12-28 15:53 [PR PATCH] NetworkManager: update to 1.26.2 codingHahn
` (4 preceding siblings ...)
2021-01-26 15:01 ` pullmoll
@ 2021-01-26 15:03 ` ericonr
2021-01-26 15:04 ` ericonr
` (10 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: ericonr @ 2021-01-26 15:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 198 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/27502#issuecomment-767603628
Comment:
Put tests behind `if [ "$XBPS_CHECK_PKGS" = full ]; then`
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: NetworkManager: update to 1.26.6.
2020-12-28 15:53 [PR PATCH] NetworkManager: update to 1.26.2 codingHahn
` (5 preceding siblings ...)
2021-01-26 15:03 ` ericonr
@ 2021-01-26 15:04 ` ericonr
2021-01-27 13:09 ` codingHahn
` (9 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: ericonr @ 2021-01-26 15:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 288 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/27502#issuecomment-767603628
Comment:
Put tests behind `if [ "$XBPS_CHECK_PKGS" = full ]; then`
Since they use network namespaces and others, they aren't going to work in CI cleanly.
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: NetworkManager: update to 1.26.6.
2020-12-28 15:53 [PR PATCH] NetworkManager: update to 1.26.2 codingHahn
` (6 preceding siblings ...)
2021-01-26 15:04 ` ericonr
@ 2021-01-27 13:09 ` codingHahn
2021-01-28 3:51 ` ericonr
` (8 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: codingHahn @ 2021-01-27 13:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 294 bytes --]
New comment by codingHahn on void-packages repository
https://github.com/void-linux/void-packages/pull/27502#issuecomment-768274599
Comment:
> The current NetworkManager 1.22.10 no longer (cross) builds.
> There is version 1.28.0 it seems, though.
Should we update to 1.28 straight away?
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: NetworkManager: update to 1.26.6.
2020-12-28 15:53 [PR PATCH] NetworkManager: update to 1.26.2 codingHahn
` (7 preceding siblings ...)
2021-01-27 13:09 ` codingHahn
@ 2021-01-28 3:51 ` ericonr
2021-01-30 11:07 ` [PR PATCH] [Updated] " codingHahn
` (7 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: ericonr @ 2021-01-28 3:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 204 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/27502#issuecomment-768780987
Comment:
> Should we update to 1.28 straight away?
Probably best, yes
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PR PATCH] [Updated] NetworkManager: update to 1.26.6.
2020-12-28 15:53 [PR PATCH] NetworkManager: update to 1.26.2 codingHahn
` (8 preceding siblings ...)
2021-01-28 3:51 ` ericonr
@ 2021-01-30 11:07 ` codingHahn
2021-01-30 11:10 ` codingHahn
` (6 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: codingHahn @ 2021-01-30 11:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 484 bytes --]
There is an updated pull request by codingHahn against master on the void-packages repository
https://github.com/codingHahn/void-packages-1 network-manager-1.26.2
https://github.com/void-linux/void-packages/pull/27502
NetworkManager: update to 1.26.6.
Builds for me.
Tests:
- [ ] x86
- [x] x86_64
- [ ] arm
- [ ] anything musl
Do we need to revbump some packages?
Closes #25891
A patch file from https://github.com/void-linux/void-packages/pull/27502.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-network-manager-1.26.2-27502.patch --]
[-- Type: text/x-diff, Size: 7643 bytes --]
From 53e374bef3f044a3f6a8797472626a4d319d334c Mon Sep 17 00:00:00 2001
From: Nick Hahn <nick.hahn@posteo.de>
Date: Mon, 28 Dec 2020 15:56:57 +0100
Subject: [PATCH] NetworkManager: update to 1.28.0.
---
.../patches/fix-cross-gir.patch | 59 ++++++++-----------
.../patches/musl-use-srand48.patch | 40 -------------
srcpkgs/NetworkManager/template | 15 ++++-
3 files changed, 35 insertions(+), 79 deletions(-)
delete mode 100644 srcpkgs/NetworkManager/patches/musl-use-srand48.patch
diff --git a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
index c283d4dc105..69687da097f 100644
--- a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
+++ b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
@@ -1,8 +1,5 @@
Reason: Fix crossbuilding GIR
Upstream: No, not upstreamable since this is very specific to the Void setup
-diff --git clients/common/meson.build clients/common/meson.build
-index afa257b..50b53e7 100644
---- clients/common/meson.build
+++ clients/common/meson.build
@@ -35,7 +35,7 @@ if enable_introspection
settings_docs,
@@ -11,42 +8,32 @@ index afa257b..50b53e7 100644
- command: [xsltproc, '--output', '@OUTPUT@', join_paths(meson.current_source_dir(), 'settings-docs.xsl'), '@INPUT@'],
+ command: [xsltproc, '--output', '@OUTPUT@', join_paths(meson.current_source_dir(), 'settings-docs.xsl'), join_paths(meson.current_source_dir(), '..', '..', '@INPUT@')],
)
-
+
test(
-diff --git libnm/meson.build libnm/meson.build
-index 51ca46d..f14d861 100644
---- libnm/meson.build
-+++ libnm/meson.build
-@@ -236,7 +236,13 @@ if enable_introspection
- )
- endif
-
-- generate_setting_docs = join_paths(meson.current_source_dir(), 'generate-setting-docs.py')
+--- libnm/meson.build.orig 2020-12-28 16:03:30.641850261 +0100
++++ libnm/meson.build 2020-12-28 16:31:54.932136481 +0100
+@@ -276,6 +276,14 @@
+ 'GI_TYPELIB_PATH=' + gi_typelib_path,
+ 'LD_LIBRARY_PATH=' + ld_library_path,
+ ]
++
+ if meson.is_cross_build()
+ qemu = '/usr/bin/qemu-@XBPS_TARGET_QEMU_MACHINE@-static'
-+ qemu_python3_cmd = qemu + ' -L @XBPS_CROSS_BASE@ @XBPS_CROSS_BASE@/usr/bin/python3'
-+ generate_setting_docs = ['sh', '-c', qemu_python3_cmd, join_paths(meson.current_source_dir(), 'generate-setting-docs.py')]
++ qemu_python3_cmd = qemu + ' -L @XBPS_CROSS_BASE@ @XBPS_CROSS_BASE@/bin/python3'
++ generate_setting_docs = ['sh', '-c', qemu_python3_cmd, join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-gir.py')]
+ else
-+ generate_setting_docs = [python.path(), join_paths(meson.current_source_dir(), 'generate-setting-docs.py')]
++ generate_setting_docs = [python.path(), join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-gir.py')]
+ endif
- gi_typelib_path = run_command('printenv', 'GI_TYPELIB_PATH').stdout()
- if gi_typelib_path != ''
-@@ -261,7 +267,7 @@ if enable_introspection
- name,
- input: libnm_gir[0],
- output: name,
-- command: [generate_setting_docs_env, python.path(), generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--output', '@OUTPUT@'],
-+ command: [generate_setting_docs_env, generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--output', '@OUTPUT@'],
- depends: libnm_gir,
- )
-
-@@ -270,7 +276,7 @@ if enable_introspection
- name,
- input: [libnm_gir[0], nm_settings_docs_overrides],
- output: name,
-- command: [generate_setting_docs_env, python.path(), generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT0@', '--overrides', '@INPUT1@', '--output', '@OUTPUT@'],
-+ command: [generate_setting_docs_env, generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT0@', '--overrides', '@INPUT1@', '--output', '@OUTPUT@'],
- depends: libnm_gir,
- )
- endif
+ nm_settings_docs_xml_gir = custom_target(
+ 'nm-settings-docs-gir.xml',
+@@ -283,8 +291,7 @@
+ output: 'nm-settings-docs-gir.xml',
+ command: [
+ generate_setting_docs_env,
+- python.path(),
+- join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-gir.py'),
++ generate_setting_docs,
+ '--lib-path', meson.current_build_dir(),
+ '--gir', '@INPUT@',
+ '--output', '@OUTPUT@'
diff --git a/srcpkgs/NetworkManager/patches/musl-use-srand48.patch b/srcpkgs/NetworkManager/patches/musl-use-srand48.patch
deleted file mode 100644
index 43b689f3bad..00000000000
--- a/srcpkgs/NetworkManager/patches/musl-use-srand48.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- shared/n-dhcp4/src/n-dhcp4-c-probe.c.orig 2020-01-06 15:35:10.128600647 +0100
-+++ shared/n-dhcp4/src/n-dhcp4-c-probe.c 2020-01-06 15:39:41.446240531 +0100
-@@ -362,7 +362,12 @@ static void n_dhcp4_client_probe_config_
- seed16v[1] = (u64 >> 16) ^ (u64 >> 0);
- seed16v[2] = (u64 >> 32) ^ (u64 >> 16);
-
-+#ifdef __GLIBC__
- r = seed48_r(seed16v, &config->entropy);
-+#else
-+ r = 0;
-+ seed48(seed16v);
-+#endif
- c_assert(!r);
- }
-
-@@ -379,7 +384,12 @@ uint32_t n_dhcp4_client_probe_config_get
- long int result;
- int r;
-
-+#ifdef __GLIBC__
- r = mrand48_r(&config->entropy, &result);
-+#else
-+ r = 0;
-+ result = mrand48();
-+#endif
- c_assert(!r);
-
- return result;
---- shared/n-dhcp4/src/n-dhcp4-private.h.orig 2020-01-06 15:41:31.941501136 +0100
-+++ shared/n-dhcp4/src/n-dhcp4-private.h 2020-01-06 15:41:55.341556325 +0100
-@@ -267,7 +267,9 @@ struct NDhcp4ClientProbeConfig {
- bool inform_only;
- bool init_reboot;
- struct in_addr requested_ip;
-+#ifdef __GLIBC__
- struct drand48_data entropy; /* entropy pool */
-+#endif
- uint64_t ms_start_delay; /* max ms to wait before starting probe */
- NDhcp4ClientProbeOption *options[UINT8_MAX + 1];
- int8_t request_parameters[UINT8_MAX + 1];
diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template
index e482bba98de..2cce753b64c 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -2,7 +2,7 @@
# when updating to 1.24 or newer, drop the compat
# patch in gnome-control-center and rebuild it
pkgname=NetworkManager
-version=1.22.10
+version=1.28.0
revision=2
build_style=meson
build_helper="gir qemu"
@@ -35,7 +35,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/NetworkManager"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2b29ccc1531ba7ebba95a97f40c22b963838e8b6833745efe8e6fb71fd8fca77
+checksum=3e170e9045e20598d2630e40c5789b2e2c46b942bfe5cb220f36202299253062
lib32disabled=yes
conf_files="/etc/${pkgname}/${pkgname}.conf"
make_dirs="
@@ -57,7 +57,6 @@ esac
# Package build options
build_options="gir vala elogind"
build_options_default="gir vala elogind"
-
pre_configure() {
if [ "$CROSS_BUILD" ]; then
# Replace the values from our patch into the system itself
@@ -68,6 +67,16 @@ pre_configure() {
fi
}
+do_check() {
+ if [ "$XBPS_CHECK_PKGS" = full ]; then
+ : ${make_cmd:=ninja}
+ : ${make_check_target:=test}
+ : ${meson_builddir:=build}
+
+ ${make_cmd} -C ${meson_builddir} ${makejobs} ${make_check_args} ${make_check_target}
+ fi
+}
+
post_install() {
vinstall ${FILESDIR}/${pkgname}.conf 644 etc/${pkgname}
vinstall ${FILESDIR}/50-org.freedesktop.NetworkManager.rules 644 \
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: NetworkManager: update to 1.26.6.
2020-12-28 15:53 [PR PATCH] NetworkManager: update to 1.26.2 codingHahn
` (9 preceding siblings ...)
2021-01-30 11:07 ` [PR PATCH] [Updated] " codingHahn
@ 2021-01-30 11:10 ` codingHahn
2021-02-05 10:58 ` NetworkManager: update to 1.28.0 codingHahn
` (5 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: codingHahn @ 2021-01-30 11:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 411 bytes --]
New comment by codingHahn on void-packages repository
https://github.com/void-linux/void-packages/pull/27502#issuecomment-770195688
Comment:
Updated to 1.28.0, dropped musl patch that did not apply cleanly (I did not find the patched sections in the files anymore). The check should now be behind `if [ "$XBPS_CHECK_PKGS" = full ]; then` . I hope I did that correctly. If you have a cleaner way, let me know.
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: NetworkManager: update to 1.28.0.
2020-12-28 15:53 [PR PATCH] NetworkManager: update to 1.26.2 codingHahn
` (10 preceding siblings ...)
2021-01-30 11:10 ` codingHahn
@ 2021-02-05 10:58 ` codingHahn
2021-02-05 13:28 ` ericonr
` (4 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: codingHahn @ 2021-02-05 10:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 3425 bytes --]
New comment by codingHahn on void-packages repository
https://github.com/void-linux/void-packages/pull/27502#issuecomment-773960617
Comment:
It seems that all -musl packages fail with this error:
```
[463/709] Compiling C object src/libNetworkManagerBase.a.p/NetworkManagerUtils.c.o
FAILED: src/libNetworkManagerBase.a.p/NetworkManagerUtils.c.o
arm-linux-musleabihf-gcc -Isrc/libNetworkManagerBase.a.p -Isrc -I../src -Ilibnm-core -I../libnm-core -I. -I.. -Ishared -I../shared -I../shared/systemd/sd-adapt-shared -I../shared/systemd/src/basic -I../shared/systemd/src/shared -I/usr/arm-linux-musleabihf/usr/include/gio-unix-2.0 -I/usr/arm-linux-musleabihf/usr/include/libmount -I/usr/arm-linux-musleabihf/usr/include/blkid -I/usr/arm-linux-musleabihf/usr/include/glib-2.0 -I/usr/arm-linux-musleabihf/usr/lib/glib-2.0/include -I/usr/arm-linux-musleabihf/usr/include/elogind -I/usr/arm-linux-musleabihf/usr/include -flto -fdiagnostics-color=always -DNDEBUG -pipe -D_FILE_OFFSET_BITS=64 -std=gnu11 -fdata-sections -ffunction-sections -flto-partition=none -Wall -Wextra -Wdeclaration-after-statement -Wfloat-equal -Wformat-nonliteral -Wformat-security -Wimplicit-function-declaration -Winit-self -Wlogical-op -Wmissing-declarations -Wmissing-include-dirs -Wmissing-prototypes -Wpointer-arith -Wshadow -Wshift-negative-value -Wstrict-prototypes -Wundef -Wvla -Wno-duplicate-decl-specifier -Wno-format-truncation -Wno-format-y2k -Wno-missing-field-initializers -Wno-pragmas -Wno-sign-compare -Wno-unknown-pragmas -Wno-unused-parameter -Wpointer-arith -Wshadow -Wstrict-prototypes -Wundef -fno-strict-aliasing -Wimplicit-fallthrough -fstack-clash-protection -D_FORTIFY_SOURCE=2 -O2 -march=armv6 -mfpu=vfp -mfloat-abi=hard -DRTLD_DEEPBIND=0 -fPIC -pthread -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_40 -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_40 -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON -MD -MQ src/libNetworkManagerBase.a.p/NetworkManagerUtils.c.o -MF src/libNetworkManagerBase.a.p/NetworkManagerUtils.c.o.d -o src/libNetworkManagerBase.a.p/NetworkManagerUtils.c.o -c ../src/NetworkManagerUtils.c
In file included from ../src/NetworkManagerUtils.c:12:
../src/NetworkManagerUtils.c: In function 'nm_utils_tfilters_from_tc_setting':
../src/NetworkManagerUtils.c:1222:51: error: 'ETH_P_ALL' undeclared (first use in this function)
1222 | tfilter->info = TC_H_MAKE(0, htons(ETH_P_ALL));
| ^~~~~~~~~
../src/NetworkManagerUtils.c:1222:51: note: each undeclared identifier is reported only once for each function it appears in
```
After a quick search it seems that this constant is either from the linux kernel or glibc.
And all non-musl ones fail here:
```
[456/841] Generating nm-settings-docs-gir.xml with a custom command
FAILED: libnm/nm-settings-docs-gir.xml
env GI_TYPELIB_PATH=/builddir/NetworkManager-1.28.0/build/libnm LD_LIBRARY_PATH=/builddir/NetworkManager-1.28.0/build/libnm sh -c '/usr/bin/qemu-aarch64-static -L /usr/aarch64-linux-gnu /usr/aarch64-linux-gnu/bin/python3' /builddir/NetworkManager-1.28.0/tools/generate-docs-nm-settings-docs-gir.py --lib-path /builddir/NetworkManager-1.28.0/build/libnm --gir libnm/NM-1.0.gir --output libnm/nm-settings-docs-gir.xml
```
I'll have to look at the patch again that was supposed to fix that (fix-cross-gir.patch)
I will fix the lint error this weekend.
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: NetworkManager: update to 1.28.0.
2020-12-28 15:53 [PR PATCH] NetworkManager: update to 1.26.2 codingHahn
` (11 preceding siblings ...)
2021-02-05 10:58 ` NetworkManager: update to 1.28.0 codingHahn
@ 2021-02-05 13:28 ` ericonr
2021-02-05 13:28 ` [PR REVIEW] " ericonr
` (3 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: ericonr @ 2021-02-05 13:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 222 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/27502#issuecomment-774032791
Comment:
We should definitely have that definition, will have to check why it isn't found.
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PR REVIEW] NetworkManager: update to 1.28.0.
2020-12-28 15:53 [PR PATCH] NetworkManager: update to 1.26.2 codingHahn
` (12 preceding siblings ...)
2021-02-05 13:28 ` ericonr
@ 2021-02-05 13:28 ` ericonr
2021-02-09 9:54 ` codingHahn
` (2 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: ericonr @ 2021-02-05 13:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 194 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/27502#discussion_r570966540
Comment:
```suggestion
ninja -C build test
```
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PR REVIEW] NetworkManager: update to 1.28.0.
2020-12-28 15:53 [PR PATCH] NetworkManager: update to 1.26.2 codingHahn
` (13 preceding siblings ...)
2021-02-05 13:28 ` [PR REVIEW] " ericonr
@ 2021-02-09 9:54 ` codingHahn
2021-03-21 20:39 ` codingHahn
2021-03-21 20:39 ` [PR PATCH] [Closed]: " codingHahn
16 siblings, 0 replies; 18+ messages in thread
From: codingHahn @ 2021-02-09 9:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 224 bytes --]
New review comment by codingHahn on void-packages repository
https://github.com/void-linux/void-packages/pull/27502#discussion_r572742109
Comment:
Yeah, seems better. I just copied it from the buildstyle. Will change that
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: NetworkManager: update to 1.28.0.
2020-12-28 15:53 [PR PATCH] NetworkManager: update to 1.26.2 codingHahn
` (14 preceding siblings ...)
2021-02-09 9:54 ` codingHahn
@ 2021-03-21 20:39 ` codingHahn
2021-03-21 20:39 ` [PR PATCH] [Closed]: " codingHahn
16 siblings, 0 replies; 18+ messages in thread
From: codingHahn @ 2021-03-21 20:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 165 bytes --]
New comment by codingHahn on void-packages repository
https://github.com/void-linux/void-packages/pull/27502#issuecomment-803656307
Comment:
Superseded by #29342
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PR PATCH] [Closed]: NetworkManager: update to 1.28.0.
2020-12-28 15:53 [PR PATCH] NetworkManager: update to 1.26.2 codingHahn
` (15 preceding siblings ...)
2021-03-21 20:39 ` codingHahn
@ 2021-03-21 20:39 ` codingHahn
16 siblings, 0 replies; 18+ messages in thread
From: codingHahn @ 2021-03-21 20:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 305 bytes --]
There's a closed pull request on the void-packages repository
NetworkManager: update to 1.28.0.
https://github.com/void-linux/void-packages/pull/27502
Description:
Builds for me.
Tests:
- [ ] x86
- [x] x86_64
- [ ] arm
- [ ] anything musl
Do we need to revbump some packages?
Closes #25891
^ permalink raw reply [flat|nested] 18+ messages in thread
end of thread, other threads:[~2021-03-21 20:39 UTC | newest]
Thread overview: 18+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-28 15:53 [PR PATCH] NetworkManager: update to 1.26.2 codingHahn
2020-12-29 3:04 ` [PR PATCH] [Updated] " codingHahn
2020-12-29 7:32 ` [PR REVIEW] NetworkManager: update to 1.26.6 fosslinux
2021-01-21 17:36 ` ericonr
2021-01-25 15:46 ` codingHahn
2021-01-26 15:01 ` pullmoll
2021-01-26 15:03 ` ericonr
2021-01-26 15:04 ` ericonr
2021-01-27 13:09 ` codingHahn
2021-01-28 3:51 ` ericonr
2021-01-30 11:07 ` [PR PATCH] [Updated] " codingHahn
2021-01-30 11:10 ` codingHahn
2021-02-05 10:58 ` NetworkManager: update to 1.28.0 codingHahn
2021-02-05 13:28 ` ericonr
2021-02-05 13:28 ` [PR REVIEW] " ericonr
2021-02-09 9:54 ` codingHahn
2021-03-21 20:39 ` codingHahn
2021-03-21 20:39 ` [PR PATCH] [Closed]: " codingHahn
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).