diff --git a/srcpkgs/NetworkManager/patches/musl.patch b/srcpkgs/NetworkManager/patches/musl.patch deleted file mode 100644 index 71fb91936e6..00000000000 --- a/srcpkgs/NetworkManager/patches/musl.patch +++ /dev/null @@ -1,56 +0,0 @@ -For musl libc instead of including or -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 - --/* For ETH_ALEN and INFINIBAND_ALEN */ -+#if defined(__GLIBC__) -+/* For ETH_ALEN */ - #include -+#else -+#define ETH_ALEN 6 /* Octets in one ethernet addr */ -+#endif -+ -+/* For INFINIBAND_ALEN */ - #include - - #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 -+#else -+#define ETH_ALEN 6 /* Octets in one ethernet addr */ -+#endif - #include - - #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 -+#else -+#define ETH_ALEN 6 /* Octets in one ethernet addr */ -+#endif - - #include - #include "nm-types.h" - - G_BEGIN_DECLS - - diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template index a29d27717e4..4dede159574 100644 --- a/srcpkgs/NetworkManager/template +++ b/srcpkgs/NetworkManager/template @@ -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 " 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