app-arch/p7zip: fix compilation on OSX El Capitan also, bug #577344

Package-Manager: portage-2.2.28-prefix

diff --git a/app-arch/p7zip/files/p7zip-15.14-darwin.patch b/app-arch/p7zip/files/p7zip-15.14-darwin.patch
index 2db6de96d3e09927706bfbe3d1a39c6fd0fb7206..412b838cedd723030d00c39490a686fef2140fe3 100644 (file)
--- a/app-arch/p7zip/files/p7zip-15.14-darwin.patch
+++ b/app-arch/p7zip/files/p7zip-15.14-darwin.patch
@@ -1,4 +1,5 @@
 Darwin has wchar_h and wctypes_h.
+El Capitan needs <sys/types.h> for ino_t.
 
 --- CPP/myWindows/config.h
 +++ CPP/myWindows/config.h
@@ -11,3 +12,14 @@ Darwin has wchar_h and wctypes_h.
  
      /* <wchar.h> */
      /* ENV_HAVE_WCHAR__H and not ENV_HAVE_WCHAR_H to avoid warning with wxWidgets */
+--- CPP/myWindows/StdAfx.h
++++ CPP/myWindows/StdAfx.h
+@@ -32,7 +32,7 @@
+ #include <errno.h>
+ #include <math.h>
+ 
+-#ifdef __NETWARE__
++#if defined(__NETWARE__) || defined(__MACH__)
+ #include <sys/types.h>
+ #endif
+