lxpanel: fix musl
With new kernel libc headers lxpanel needs a fix for musl libc to not include netinet/if_ether.h but only linux/if_ether.h. Also liblxpanel.so.0 was missing in common/shlibs.
This commit is contained in:
parent
1f6bb398e8
commit
90e32b456f
3 changed files with 8 additions and 22 deletions
|
@ -2772,3 +2772,4 @@ libCGAL.so.12 cgal-4.9_1
|
||||||
libCGAL_Core.so.12 cgal-4.9_1
|
libCGAL_Core.so.12 cgal-4.9_1
|
||||||
libCGAL_ImageIO.so.12 cgal-4.9_1
|
libCGAL_ImageIO.so.12 cgal-4.9_1
|
||||||
libqscintilla2-qt5.so.12 qscintilla-qt5-2.9.4_1
|
libqscintilla2-qt5.so.12 qscintilla-qt5-2.9.4_1
|
||||||
|
liblxpanel.so.0 lxpanel-0.9.3_1
|
||||||
|
|
|
@ -1,25 +1,11 @@
|
||||||
--- a/plugins/netstat/devproc.c
|
--- plugins/netstat/devproc.c 2015-07-14 11:07:22.000000000 +0200
|
||||||
+++ b/plugins/netstat/devproc.c
|
+++ plugins/netstat/devproc.c 2017-02-09 21:01:08.348058591 +0100
|
||||||
@@ -26,18 +26,19 @@
|
@@ -27,6 +27,8 @@
|
||||||
#include <sys/socket.h>
|
|
||||||
#include <sys/ioctl.h>
|
#include <sys/ioctl.h>
|
||||||
+#include <netinet/if_ether.h>
|
|
||||||
#include <netinet/in.h>
|
#include <netinet/in.h>
|
||||||
|
+#include <linux/if_ether.h>
|
||||||
|
+#define _NETINET_IF_ETHER_H
|
||||||
#include <net/if.h>
|
#include <net/if.h>
|
||||||
#include <net/if_arp.h>
|
#include <net/if_arp.h>
|
||||||
#include <arpa/inet.h>
|
#include <arpa/inet.h>
|
||||||
-#include <linux/sockios.h>
|
#include <linux/sockios.h>
|
||||||
-#include <linux/types.h>
|
|
||||||
-#include <linux/ethtool.h>
|
|
||||||
#include <iwlib.h>
|
|
||||||
#include "nsconfig.h"
|
|
||||||
#include "netstat.h"
|
|
||||||
#include "statusicon.h"
|
|
||||||
#include "devproc.h"
|
|
||||||
#include "dbg.h"
|
|
||||||
+#include <linux/sockios.h>
|
|
||||||
+#include <linux/types.h>
|
|
||||||
+#include <linux/ethtool.h>
|
|
||||||
|
|
||||||
/* network device list */
|
|
||||||
static void netproc_netdevlist_add(NETDEVLIST_PTR *netdev_list,
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'lxpanel'
|
# Template file for 'lxpanel'
|
||||||
pkgname=lxpanel
|
pkgname=lxpanel
|
||||||
version=0.9.3
|
version=0.9.3
|
||||||
revision=1
|
revision=2
|
||||||
lib32disabled=yes
|
lib32disabled=yes
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
hostmakedepends="pkg-config intltool"
|
hostmakedepends="pkg-config intltool"
|
||||||
|
@ -15,7 +15,6 @@ license="GPL-2"
|
||||||
maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
||||||
distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
|
distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
|
||||||
checksum=342cfa205f255acf69c76ba0ca6c77c890f3955a879b755931c80ffae4d98fb1
|
checksum=342cfa205f255acf69c76ba0ca6c77c890f3955a879b755931c80ffae4d98fb1
|
||||||
patch_args="-p1"
|
|
||||||
|
|
||||||
case "$XBPS_TARGET_MACHINE" in
|
case "$XBPS_TARGET_MACHINE" in
|
||||||
aarch64-musl) CFLAGS="-D_LINUX_IF_ETHER_H";;
|
aarch64-musl) CFLAGS="-D_LINUX_IF_ETHER_H";;
|
||||||
|
|
Loading…
Reference in a new issue