Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion srcpkgs/NetworkManager/files/NetworkManager/run
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
exec 2>&1
sv check dbus >/dev/null || exit 1
exec NetworkManager -n > /dev/null 2>&1
exec NetworkManager -n >/dev/null 2>&1
8 changes: 4 additions & 4 deletions srcpkgs/NetworkManager/patches/fix-cross-gir.patch
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Index: b/src/libnm-client-impl/meson.build
===================================================================
--- a/src/libnm-client-impl/meson.build
+++ b/src/libnm-client-impl/meson.build
@@ -177,6 +177,16 @@ if enable_introspection
@@ -179,6 +179,16 @@ if enable_introspection
endif
ld_library_path = meson.current_build_dir() + ld_library_path

Expand All @@ -21,7 +21,7 @@ Index: b/src/libnm-client-impl/meson.build
gen_infos_cmd = files(source_root / 'tools' / 'generate-docs-nm-property-infos.py')
gen_gir_cmd = files(source_root / 'tools' / 'generate-docs-nm-settings-docs-gir.py')

@@ -190,7 +200,7 @@ if enable_introspection
@@ -192,7 +202,7 @@ if enable_introspection
input: [gen_infos_cmd, libnm_gir[0]] + libnm_core_settings_sources,
output: 'nm-property-infos-' + name + '.xml',
command: [
Expand All @@ -30,12 +30,12 @@ Index: b/src/libnm-client-impl/meson.build
gen_infos_cmd,
name,
'@OUTPUT@',
@@ -206,7 +216,7 @@ if enable_introspection
@@ -208,7 +218,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],
'--output', '@OUTPUT@',
28 changes: 0 additions & 28 deletions srcpkgs/NetworkManager/patches/no-gtk-doc.patch

This file was deleted.

17 changes: 9 additions & 8 deletions srcpkgs/NetworkManager/template
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Template file for 'NetworkManager'
pkgname=NetworkManager
version=1.50.0
version=1.56.0
revision=1
build_style=meson
build_helper="gir qemu"
Expand All @@ -13,16 +13,16 @@ configure_args="-Dsystemd_journal=false
-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 -Dnft=/usr/bin/nft
-Diwd=true -Dudev_dir=/usr/lib/udev -Ddocs=true
-Diwd=true -Dudev_dir=/usr/lib/udev -Ddocs=false -Dman=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"
-Dconfig_dhcp_default=internal -Dtests=no"
hostmakedepends="gettext-devel glib-devel libxslt-devel pkg-config
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 libcurl-devel
libnl3-devel polkit-devel ppp-devel libcurl-devel libnvme-devel
ModemManager-devel readline-devel libndp-devel newt-devel jansson-devel
libpsl-devel eudev-libudev-devel mobile-broadband-provider-info gnutls-devel
$(vopt_if gir 'libgirepository-devel python3-gobject')
Expand All @@ -32,10 +32,10 @@ checkdepends="python3-dbus"
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-50/NEWS"
distfiles="${GNOME_SITE}/NetworkManager/${version%.*}/NetworkManager-${version}.tar.xz"
checksum=fc03e7388a656cebc454c5d89481626122b1975d7c26babc64dc7e488faa66e3
homepage="https://networkmanager.dev"
changelog="https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/raw/nm-1-56/NEWS"
distfiles="https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/releases/${version}/downloads/NetworkManager-${version}.tar.xz"
checksum=59a32d385cc1e7ae26e43798c6f12d07ff6198abd041ec0620b3a08cfc021ccc
# TODO: Some tests require network namespaces to run.
make_check=extended
lib32disabled=yes
Expand Down Expand Up @@ -90,6 +90,7 @@ libnm_package() {
fi
}
}

NetworkManager-devel_package() {
depends="dbus-glib-devel libnm-${version}_${revision}"
short_desc+=" - development files"
Expand Down