From 438cba2ab760bab1385d33a2229dae639d99bbda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Wed, 9 May 2018 17:08:39 +0200 Subject: [PATCH] NetworkManager: fix build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes: #14260 Signed-off-by: Jürgen Buchmüller --- srcpkgs/NetworkManager/template | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template index 6078060c8e7..184b3e05a20 100644 --- a/srcpkgs/NetworkManager/template +++ b/srcpkgs/NetworkManager/template @@ -22,15 +22,19 @@ configure_args="--without-dhcpcd --with-dhclient=/usr/bin/dhclient short_desc="Network Management daemon" maintainer="Juan RP " homepage="https://wiki.gnome.org/Projects/NetworkManager" -license="GPL-2" +license="GPL-2.0-or-later" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" checksum=6af0b1e856a3725f88791f55c4fbb04105dc0b20dbf182aaec8aad16481fac76 # gtk-doc generation is disabled but gtkdocisze is required by autogen.sh -hostmakedepends=" - automake libtool pkg-config intltool gnutls-devel glib-devel dbus-glib-devel - gettext-devel gtk-doc dbus iproute2 dhclient wpa_supplicant bluez iptables - $(vopt_if gir gobject-introspection) $(vopt_if gir python-gobject)" +hostmakedepends="automake bluez dbus-glib-devel dhclient gettext-devel + glib-devel gnutls-devel gtk-doc intltool iproute2 iptables libtool + libxslt-devel pkg-config $(vopt_if gir 'gobject-introspection') + $(vopt_if gir 'python-gobject') wpa_supplicant" +makedepends="ModemManager-devel dbus-glib-devel gnutls-devel iptables-devel + jansson-devel libcurl-devel libgudev-devel libndp-devel newt-devel polkit-devel + ppp-devel $(vopt_if elogind 'elogind-devel') + $(vopt_if gir 'libgirepository-devel')" # Install host dependency to read the soname. Should be the same on # host and target. hostmakedepends+=" jansson-devel" @@ -38,9 +42,9 @@ makedepends="libuuid-devel gnutls-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 $(vopt_if gir libgirepository-devel) $(vopt_if elogind elogind-devel)" +depends="dbus dhclient iproute2 openresolv wpa_supplicant" lib32disabled=yes -depends="dbus iproute2 dhclient wpa_supplicant openresolv" conf_files="/etc/${pkgname}/${pkgname}.conf" make_dirs=" /etc/NetworkManager/system-connections 0750 root root @@ -66,6 +70,9 @@ pre_configure() { # Full switch to /run to not depend on /var/run being a symlink. sed -e 's,^nmrundir=.*$,nmrundir=\"/run/\$PACKAGE\",' -i configure + # Fsckd-up check for gi ? + sed -e 's,! "$PYTHON" -c ,"$PYTHON" -c,' -i configure + sed -e "s/HAVE_LIBSYSTEMD/0/" -i src/devices/wwan/nm-modem-manager.c }