New comment by sgn on void-packages repository https://github.com/void-linux/void-packages/pull/29342#issuecomment-803230986 Comment: ```diff srcpkgs/NetworkManager/patches/fix-cross-gir.patch | 30 ++++++++++++---------- srcpkgs/NetworkManager/patches/no-gtk-doc.patch | 28 ++++++++++++++++++++ srcpkgs/NetworkManager/template | 23 ++++++++--------- 3 files changed, 55 insertions(+), 26 deletions(-) diff --git a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch index c0b4344b1c..b78edfac24 100644 --- a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch +++ b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch @@ -1,29 +1,31 @@ Reason: Fix crossbuilding GIR Upstream: No, not upstreamable since this is very specific to the Void setup ---- 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, +Index: b/libnm/meson.build +=================================================================== +--- a/libnm/meson.build ++++ b/libnm/meson.build +@@ -274,13 +274,23 @@ if enable_introspection '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.source_root(), 'tools', 'generate-docs-nm-settings-docs-gir.py')] ++ qemu_python3_cmd = [ ++ '/usr/bin/qemu-@XBPS_TARGET_QEMU_MACHINE@-static', ++ '-L', '@XBPS_CROSS_BASE@', ++ '@XBPS_CROSS_BASE@/usr/bin/python3' ++ ] + else -+ generate_setting_docs = [python.path(), join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-gir.py')] ++ qemu_python3_cmd = python.path() + endif - ++ nm_settings_docs_xml_gir = custom_target( 'nm-settings-docs-gir.xml', -@@ -283,8 +291,7 @@ + input: libnm_gir[0], 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, ++ qemu_python3_cmd, + join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-gir.py'), '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', - '--output', '@OUTPUT@' diff --git a/srcpkgs/NetworkManager/patches/no-gtk-doc.patch b/srcpkgs/NetworkManager/patches/no-gtk-doc.patch new file mode 100644 index 0000000000..2fffc51604 --- /dev/null +++ b/srcpkgs/NetworkManager/patches/no-gtk-doc.patch @@ -0,0 +1,28 @@ +Index: b/meson.build +=================================================================== +--- a/meson.build ++++ b/meson.build +@@ -943,10 +943,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') + subdir('man') +- subdir('docs') + endif + + configure_file( +Index: b/clients/common/meson.build +=================================================================== +--- a/clients/common/meson.build ++++ b/clients/common/meson.build +@@ -28,7 +28,7 @@ libnmc_base_dep = declare_dependency( + link_with: libnmc_base, + ) + +-if enable_docs ++if enable_docs and enable_introspection + settings_docs_source = custom_target( + 'settings-docs.h', + input: nm_settings_docs_xml_gir, diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template index d2287418e8..54288f71f9 100644 --- a/srcpkgs/NetworkManager/template +++ b/srcpkgs/NetworkManager/template @@ -7,28 +7,28 @@ revision=1 build_style=meson build_helper="gir qemu" configure_args="-Dpolkit_agent=true -Dsystemd_journal=false - -Dlibaudit=no -Dovs=false -Dlibnm_glib=true -Dselinux=false - -Dmodify_system=true -Dpolkit_agent=true -Dsystemdsystemunitdir=no + -Dlibaudit=no -Dovs=false -Dselinux=false + -Dmodify_system=true -Dsystemdsystemunitdir=no -Dpppd=/usr/bin/pppd -Dqt=false -Dsession_tracking_consolekit=false -Dpppd_plugin_dir=/usr/lib/pppd/2.4.9 -Dresolvconf=/usr/bin/resolvconf -Ddhclient=/usr/bin/dhclient -Dkernel_firmware_dir=/usr/lib/firmware -Ddnsmasq=/usr/bin/dnsmasq -Ddbus_conf_dir=/etc/dbus-1/system.d -Ddhcpcd=/usr/bin/dhcpcd -Diptables=/usr/bin/iptables - -Diwd=true - -Dudev_dir=/usr/lib/udev -Dintrospection=$(vopt_if gir true false) - -Dvapi=$(vopt_if vala true false) + -Diwd=true -Dudev_dir=/usr/lib/udev -Ddocs=true + $(vopt_bool gir introspection) $(vopt_bool gir vapi) -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 jansson-devel $(vopt_if vala vala) - $(vopt_if gir 'python3-gobject')" + intltool dbus-glib-devel jansson-devel docbook-xsl + $(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 - $(vopt_if gir libgirepository-devel) $(vopt_if elogind elogind-devel)" + $(vopt_if gir 'libgirepository-devel python3-gobject') + $(vopt_if elogind elogind-devel)" depends="dbus iproute2 openresolv wpa_supplicant mobile-broadband-provider-info" short_desc="Network Management daemon" maintainer="Enno Boland " @@ -40,6 +40,7 @@ checksum=0c8e80e77877860e4a4e6ab4a0f7cdc1186e356b65b042a751897188b88944d2 make_check=extended lib32disabled=yes conf_files="/etc/${pkgname}/${pkgname}.conf" +patch_args=-Np1 case "$XBPS_TARGET_MACHINE" in *-musl) @@ -50,8 +51,8 @@ case "$XBPS_TARGET_MACHINE" in esac # Package build options -build_options="gir vala elogind" -build_options_default="gir vala elogind" +build_options="gir elogind" +build_options_default="gir elogind" pre_configure() { if [ "$CROSS_BUILD" ]; then @@ -88,8 +89,6 @@ NetworkManager-devel_package() { vmove "usr/lib/*.so" if [ "$build_option_gir" ]; then vmove usr/share/gir-1.0 - fi - if [ "$build_option_vala" ]; then vmove usr/share/vala fi } ```