Re: [PR PATCH] [Updated] NetworkManager: update to 1.26.2.

[codingHahn <codingHahn@users.noreply.github.com>]

[-- 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