From 90e32b456fb98e43c367c81ed4a8516b9c93e71c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Thu, 9 Feb 2017 21:14:11 +0100
Subject: [PATCH] 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.
---
 common/shlibs                                 |  1 +
 .../lxpanel/patches/10-devproc-lxpanel.patch  | 26 +++++--------------
 srcpkgs/lxpanel/template                      |  3 +--
 3 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index f853c9b6f40..56ce9d1f34c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2772,3 +2772,4 @@ libCGAL.so.12 cgal-4.9_1
 libCGAL_Core.so.12 cgal-4.9_1
 libCGAL_ImageIO.so.12 cgal-4.9_1
 libqscintilla2-qt5.so.12 qscintilla-qt5-2.9.4_1
+liblxpanel.so.0 lxpanel-0.9.3_1
diff --git a/srcpkgs/lxpanel/patches/10-devproc-lxpanel.patch b/srcpkgs/lxpanel/patches/10-devproc-lxpanel.patch
index 8b1169b8862..c319f26181b 100644
--- a/srcpkgs/lxpanel/patches/10-devproc-lxpanel.patch
+++ b/srcpkgs/lxpanel/patches/10-devproc-lxpanel.patch
@@ -1,25 +1,11 @@
---- a/plugins/netstat/devproc.c
-+++ b/plugins/netstat/devproc.c
-@@ -26,18 +26,19 @@
- #include <sys/socket.h>
+--- plugins/netstat/devproc.c	2015-07-14 11:07:22.000000000 +0200
++++ plugins/netstat/devproc.c	2017-02-09 21:01:08.348058591 +0100
+@@ -27,6 +27,8 @@
  #include <sys/ioctl.h>
-+#include <netinet/if_ether.h>
  #include <netinet/in.h>
++#include <linux/if_ether.h>
++#define _NETINET_IF_ETHER_H
  #include <net/if.h>
  #include <net/if_arp.h>
  #include <arpa/inet.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,
+ #include <linux/sockios.h>
diff --git a/srcpkgs/lxpanel/template b/srcpkgs/lxpanel/template
index 14cef01c4eb..0896973f85b 100644
--- a/srcpkgs/lxpanel/template
+++ b/srcpkgs/lxpanel/template
@@ -1,7 +1,7 @@
 # Template file for 'lxpanel'
 pkgname=lxpanel
 version=0.9.3
-revision=1
+revision=2
 lib32disabled=yes
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
@@ -15,7 +15,6 @@ license="GPL-2"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
 checksum=342cfa205f255acf69c76ba0ca6c77c890f3955a879b755931c80ffae4d98fb1
-patch_args="-p1"
 
 case "$XBPS_TARGET_MACHINE" in
 	aarch64-musl) CFLAGS="-D_LINUX_IF_ETHER_H";;