wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-06-05 06:33:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

NetworkManager: update to 1.18.1.

Browse source
This commit is contained in:
Helmut Pozimski 2019-06-09 16:53:15 +02:00
parent 4d589b5da2
commit 98355bdb58
3 changed files with 20 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
srcpkgs/NetworkManager/patches/musl-basic.patch
View file

@ -11,11 +11,12 @@ Usual fix for musl libc
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h> #include <stdio.h>
#include <sys/types.h> #include <sys/types.h>
--- shared/systemd/src/basic/util.h.orig
+++ shared/systemd/src/basic/util.h --- shared/systemd/src/basic/sort-util.h 2019-06-09 17:02:48.895695896 +0200
@@ -46,6 +46,12 @@ +++ shared/systemd/src/basic/sort-util.h 2019-06-09 17:03:27.564199937 +0200
#include "missing.h" @@ -5,6 +5,12 @@
#include "time-util.h"
#include "macro.h"
+#if !defined(__GLIBC__) +#if !defined(__GLIBC__)
+typedef int (*__compar_fn_t) (const void*, const void*); +typedef int (*__compar_fn_t) (const void*, const void*);
@ -23,6 +24,6 @@ Usual fix for musl libc
+typedef int (*__compar_d_fn_t) (const void *, const void *, void *); +typedef int (*__compar_d_fn_t) (const void *, const void *, void *);
+#endif +#endif
+ +
size_t page_size(void) _pure_; void *xbsearch_r(const void *key, const void *base, size_t nmemb, size_t size,
#define PAGE_ALIGN(l) ALIGN_TO((l), page_size()) __compar_d_fn_t compar, void *arg);

18
srcpkgs/NetworkManager/patches/musl-fix-includes.patch
View file

@ -22,8 +22,8 @@
#include "nm-utils/nm-c-list.h" #include "nm-utils/nm-c-list.h"
--- src/platform/nm-linux-platform.c --- src/platform/nm-linux-platform.c 2019-04-19 11:31:51.000000000 +0200
+++ src/platform/nm-linux-platform.c +++ src/platform/nm-linux-platform.c 2019-06-09 16:45:15.082158443 +0200
@@ -20,6 +20,7 @@ @@ -20,6 +20,7 @@
#include "nm-default.h" #include "nm-default.h"
@ -32,23 +32,23 @@
#include <arpa/inet.h> #include <arpa/inet.h>
#include <dlfcn.h> #include <dlfcn.h>
@@ -27,7 +28,11 @@ @@ -28,7 +29,11 @@
#include <fcntl.h>
#include <libudev.h> #include <libudev.h>
#include <linux/fib_rules.h>
#include <linux/ip.h> #include <linux/ip.h>
+#if defined(__GLIBC__) +#if defined(__GLIBC__)
#include <linux/if_arp.h> #include <linux/if_arp.h>
+#else +#else
+#include <linux/if.h> +#include <linux/if.h>
+#endif +#endif
#include <linux/if_bridge.h>
#include <linux/if_link.h> #include <linux/if_link.h>
#include <linux/if_tun.h> #include <linux/if_tun.h>
#include <linux/if_tunnel.h> @@ -57,7 +62,6 @@
@@ -53,7 +58,6 @@
#include "nm-platform-private.h" #include "nm-platform-private.h"
#include "wifi/nm-wifi-utils.h" #include "wifi/nm-wifi-utils.h"
#include "wifi/nm-wifi-utils-wext.h" #include "wifi/nm-wifi-utils-wext.h"
-#include "wpan/nm-wpan-utils.h" -#include "wpan/nm-wpan-utils.h"
#include "nm-utils/unaligned.h" #include "nm-glib-aux/nm-io-utils.h"
#include "nm-utils/nm-io-utils.h" #include "nm-udev-aux/nm-udev-utils.h"
#include "nm-utils/nm-udev-utils.h"

6
srcpkgs/NetworkManager/template
View file

@ -1,7 +1,7 @@
# Template file for 'NetworkManager' # Template file for 'NetworkManager'
pkgname=NetworkManager pkgname=NetworkManager
version=1.16.0 version=1.18.1
revision=2 revision=1
build_style=meson build_style=meson
build_helper="gir" build_helper="gir"
configure_args="-Dpolkit_agent=true -Dsystemd_journal=false configure_args="-Dpolkit_agent=true -Dsystemd_journal=false
@ -28,7 +28,7 @@ maintainer="Rasmus Thomsen <oss@cogitri.dev>"
license="GPL-2.0-or-later" license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/NetworkManager" homepage="https://wiki.gnome.org/Projects/NetworkManager"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
checksum=8e962833b6ca03edda1bc57ed6614a7b8c2339531b44acef098d05f2324c5d2c checksum=0d477d4dd08ebe7fe089e0a1141b61a09c38c98498cf3a112cba2be97d166f1f
lib32disabled=yes lib32disabled=yes
conf_files="/etc/${pkgname}/${pkgname}.conf" conf_files="/etc/${pkgname}/${pkgname}.conf"
make_dirs=" make_dirs="