NetworkManager: update to 1.4.4.

This commit is contained in:
Enno Boland 2016-09-22 14:38:37 +02:00
parent 3f1663b52f
commit d0a25cc735
2 changed files with 3 additions and 59 deletions

View File

@ -1,56 +0,0 @@
For musl libc instead of including <linux/if_ether.h> or <net/ethernet.h>
just define the required constant ETH_ALEN locally.
--- libnm-core/nm-utils.h 2016-04-01 23:27:51.000000000 +0200
+++ libnm-core/nm-utils.h 2016-11-01 02:37:51.933498880 +0100
@@ -29,8 +29,14 @@
#include <netinet/in.h>
-/* For ETH_ALEN and INFINIBAND_ALEN */
+#if defined(__GLIBC__)
+/* For ETH_ALEN */
#include <linux/if_ether.h>
+#else
+#define ETH_ALEN 6 /* Octets in one ethernet addr */
+#endif
+
+/* For INFINIBAND_ALEN */
#include <linux/if_infiniband.h>
#include "nm-core-enum-types.h"
--- src/platform/wifi/wifi-utils.h
+++ src/platform/wifi/wifi-utils.h.new
@@ -22,10 +22,14 @@
#ifndef __WIFI_UTILS_H__
#define __WIFI_UTILS_H__
+#if defined(__GLIBC__)
#include <net/ethernet.h>
+#else
+#define ETH_ALEN 6 /* Octets in one ethernet addr */
+#endif
#include <glib.h>
#include "nm-dbus-interface.h"
typedef struct WifiData WifiData;
--- src/settings/nm-settings-connection.h
+++ src/settings/nm-settings-connection.h.new
@@ -22,10 +22,14 @@
#ifndef __NETWORKMANAGER_SETTINGS_CONNECTION_H__
#define __NETWORKMANAGER_SETTINGS_CONNECTION_H__
+#if defined(__GLIBC__)
#include <net/ethernet.h>
+#else
+#define ETH_ALEN 6 /* Octets in one ethernet addr */
+#endif
#include <nm-connection.h>
#include "nm-types.h"
G_BEGIN_DECLS

View File

@ -1,7 +1,7 @@
# Template file for 'NetworkManager'
pkgname=NetworkManager
version=1.0.12
revision=8
version=1.4.4
revision=1
build_style=gnu-configure
configure_args="--without-dhcpcd --with-dhclient=/usr/bin/dhclient
--with-system-ca-path=/etc/ssl/certs --enable-more-warnings=no
@ -21,7 +21,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
homepage="https://wiki.gnome.org/Projects/NetworkManager"
license="GPL-2"
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
checksum=3a470f8c60109b1acb5784ddc2423501706b5fe34c793a6faee87e591eb04a9e
checksum=829378f318cc008d138a23ca6a9191928ce75344e7e47a2f2c35f4ac82133309
hostmakedepends="
automake libtool pkg-config intltool gnutls-devel glib-devel dbus-glib-devel