From 0aa7ef355ca60e4b2d78b2372450cc3b89d0d064 Mon Sep 17 00:00:00 2001 From: cinerea0 Date: Tue, 27 Feb 2024 21:57:58 -0500 Subject: [PATCH] NetworkManager: update to 1.46.0 --- .../patches/fix-cross-gir.patch | 37 ++++++++++++------- .../NetworkManager/patches/no-gtk-doc.patch | 18 ++++----- srcpkgs/NetworkManager/template | 12 +++--- 3 files changed, 38 insertions(+), 29 deletions(-) diff --git a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch index d3fa6ffe5d9c64..ebf6a3a567ca3f 100644 --- a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch +++ b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch @@ -4,11 +4,10 @@ Index: b/src/libnm-client-impl/meson.build =================================================================== --- a/src/libnm-client-impl/meson.build +++ b/src/libnm-client-impl/meson.build -@@ -210,6 +210,16 @@ if enable_introspection - ld_library_path = ':' + ld_library_path +@@ -178,6 +178,16 @@ if enable_introspection endif ld_library_path = meson.current_build_dir() + ld_library_path -+ + + if meson.is_cross_build() + qemu_python3_cmd = [ + '/usr/bin/qemu-@XBPS_TARGET_QEMU_MACHINE@-static', @@ -18,15 +17,25 @@ Index: b/src/libnm-client-impl/meson.build + else + qemu_python3_cmd = python.path() + endif ++ + gen_infos_cmd = join_paths(meson.source_root(), 'tools', 'generate-docs-nm-property-infos.py') + gen_gir_cmd = join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-gir.py') - nm_settings_docs_xml_gir = custom_target( - 'nm-settings-docs-gir.xml', -@@ -219,7 +229,7 @@ if enable_introspection - 'env', - 'GI_TYPELIB_PATH=' + gi_typelib_path, - 'LD_LIBRARY_PATH=' + ld_library_path, -- python.path(), -+ qemu_python3_cmd, - join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-gir.py'), - '--lib-path', meson.current_build_dir(), - '--gir', '@INPUT@', +@@ -191,7 +201,7 @@ if enable_introspection + input: [gen_infos_cmd, libnm_gir[0]] + libnm_core_settings_sources, + output: 'nm-property-infos-' + name + '.xml', + command: [ +- python.path(), ++ qemu_python3_cmd, + gen_infos_cmd, + name, + '@OUTPUT@', +@@ -207,7 +217,7 @@ if enable_introspection + 'env', + 'GI_TYPELIB_PATH=' + gi_typelib_path, + 'LD_LIBRARY_PATH=' + ld_library_path, +- python.path(), ++ qemu_python3_cmd, + gen_gir_cmd, + '--lib-path', meson.current_build_dir(), + '--gir', libnm_gir[0], diff --git a/srcpkgs/NetworkManager/patches/no-gtk-doc.patch b/srcpkgs/NetworkManager/patches/no-gtk-doc.patch index 2cd7cf42b71c38..e8e3c930f16d1d 100644 --- a/srcpkgs/NetworkManager/patches/no-gtk-doc.patch +++ b/srcpkgs/NetworkManager/patches/no-gtk-doc.patch @@ -1,22 +1,22 @@ # 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 +index 1cc11d0dfdc..b25b9d93554 100644 --- a/meson.build +++ b/meson.build -@@ -952,10 +952,8 @@ if enable_qt +@@ -977,10 +977,8 @@ if enable_qt endif if enable_docs - assert(enable_introspection, '-Ddocs=true requires -Dintrospection=true') - assert(meson.version().version_compare('>= 0.46.0'), '-Ddocs requires meson >= 0.46') + assert(meson.version().version_compare('>= 0.49.0'), '-Ddocs requires meson >= 0.49') subdir('man') - subdir('docs') - endif - - configure_file( + meson.add_dist_script( + 'tools/meson-dist-data.sh', + '--build-root', build_root diff --git a/src/libnmc-setting/meson.build b/src/libnmc-setting/meson.build -index 49314cad2e..376ec4e740 100644 +index 7fb460dc331..fadc90f01f8 100644 --- a/src/libnmc-setting/meson.build +++ b/src/libnmc-setting/meson.build @@ -1,6 +1,6 @@ @@ -25,5 +25,5 @@ index 49314cad2e..376ec4e740 100644 -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', + + merge_cmd = join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-merge.py') diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template index e3d769e5040ec9..70dd9c5b7115bd 100644 --- a/srcpkgs/NetworkManager/template +++ b/srcpkgs/NetworkManager/template @@ -1,6 +1,6 @@ # Template file for 'NetworkManager' pkgname=NetworkManager -version=1.44.2 +version=1.46.0 revision=1 build_style=meson build_helper="gir qemu" @@ -33,13 +33,13 @@ short_desc="Network Management daemon" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/NetworkManager" -changelog="https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/raw/nm-1-44/NEWS" +changelog="https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/raw/nm-1-46/NEWS" distfiles="${GNOME_SITE}/NetworkManager/${version%.*}/NetworkManager-${version}.tar.xz" -checksum=4b58bf3ac57e2cefb5652efd0945eb0b4bc36a63d92a61ab471d8bb2c9a420e1 +checksum=722649e25362693b334371473802a729b0ec9ee283375096905f868808e74068 # TODO: Some tests require network namespaces to run. make_check=extended lib32disabled=yes -conf_files="/etc/${pkgname}/${pkgname}.conf" +conf_files="/etc/NetworkManager/NetworkManager.conf" make_dirs=" /etc/NetworkManager/system-connections 0755 root root /etc/NetworkManager/dispatcher.d/pre-up.d 0750 root root @@ -75,10 +75,10 @@ post_check() { } post_install() { - vinstall ${FILESDIR}/${pkgname}.conf 644 etc/${pkgname} + vinstall ${FILESDIR}/NetworkManager.conf 644 etc/NetworkManager vinstall ${FILESDIR}/50-org.freedesktop.NetworkManager.rules 644 \ /usr/share/polkit-1/rules.d - vsv ${pkgname} + vsv NetworkManager } libnm_package() {