p7zip: fix build against gcc 10, remove hardcoded -pipe, release bump

p7zip/.signature

@@ -1,8 +1,9 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF37IM0ATuRuLIEcxyM86x5S1dKTW0T/IR07nlrE+T9VMB6m2pCG0kIwTO+4b0RWl0Ztpx9PV8Yt97xrbmjx6YQgI=
-SHA256 (Pkgfile) = 1e5619ad27fdb542b9ef28032d9df1a7218a60061c6196db0ea0d476832ba7a0
+RWSagIOpLGJF3/8PrkfBzhlyS6BMTlwRvWDdOWqheGnW5vGAk4ol+5qtB88bhjxHeHZKX/tQE43QJzaUq2LG0xUg6k2mLP0CSAY=
+SHA256 (Pkgfile) = 39b8e4161d9b5da5e64568c9749e5b40eae83bd6a436b0394542bfd2ba027b05
 SHA256 (.footprint) = 262106f802932fda3d849240c2989aa139523c2da42d343535491abcc22b26e5
 SHA256 (p7zip_16.02_src_all.tar.bz2) = 5eb20ac0e2944f6cb9c2d51dd6c4518941c185347d4089ea89087ffdd6e2341f
 SHA256 (CVE-2016-9296.patch) = f9bcbf21d4aa8938861a6cba992df13dec19538286e9ed747ccec6d9a4e8f983
 SHA256 (CVE-2017-17969.patch) = 0027f47eb8633244ac0177c1bb4ed50afa64ab757b34379a4b64ac923b9385b0
 SHA256 (CVE-2018-5996.patch) = 9c92b9060fb0ecc3e754e6440d7773d04bc324d0f998ebcebc263264e5a520df
+SHA256 (CPP_Windows_ErrorMsg.patch) = 672584c08006b794a5cc0e8e01e6d67714eacec5f591efb02358ec99afbdcc16

p7zip/CPP_Windows_ErrorMsg.patch

@@ -0,0 +1,33 @@
+This fixes the build with Clang 6.0:
+
+ ../../../../CPP/Windows/ErrorMsg.cpp:24:10: error: case value evaluates to -2147024809, which cannot be narrowed to type 'DWORD' (aka  'unsigned int') [-Wc++11-narrowing]
+     case E_INVALIDARG          : txt = "E_INVALIDARG"; break ;
+          ^
+ ../../../../CPP/Common/MyWindows.h:89:22: note: expanded from macro 'E_INVALIDARG'
+ #define E_INVALIDARG ((HRESULT)0x80070057L)
+                      ^
+
+The HRESULT cast in the macro causes the value to be read as signed int.
+--- CPP/Windows/ErrorMsg.cpp.orig	2015-01-18 18:20:28 UTC
++++ CPP/Windows/ErrorMsg.cpp
+@@ -15,13 +15,13 @@ UString MyFormatMessage(DWORD errorCode)
+ 
+   switch(errorCode) {
+     case ERROR_NO_MORE_FILES   : txt = "No more files"; break ;
+-    case E_NOTIMPL             : txt = "E_NOTIMPL"; break ;
+-    case E_NOINTERFACE         : txt = "E_NOINTERFACE"; break ;
+-    case E_ABORT               : txt = "E_ABORT"; break ;
+-    case E_FAIL                : txt = "E_FAIL"; break ;
+-    case STG_E_INVALIDFUNCTION : txt = "STG_E_INVALIDFUNCTION"; break ;
+-    case E_OUTOFMEMORY         : txt = "E_OUTOFMEMORY"; break ;
+-    case E_INVALIDARG          : txt = "E_INVALIDARG"; break ;
++    case (DWORD)(E_NOTIMPL)             : txt = "E_NOTIMPL"; break ;
++    case (DWORD)(E_NOINTERFACE)         : txt = "E_NOINTERFACE"; break ;
++    case (DWORD)(E_ABORT)               : txt = "E_ABORT"; break ;
++    case (DWORD)(E_FAIL)                : txt = "E_FAIL"; break ;
++    case (DWORD)(STG_E_INVALIDFUNCTION) : txt = "STG_E_INVALIDFUNCTION"; break ;
++    case (DWORD)(E_OUTOFMEMORY)         : txt = "E_OUTOFMEMORY"; break ;
++    case (DWORD)(E_INVALIDARG)          : txt = "E_INVALIDARG"; break ;
+     case ERROR_DIRECTORY          : txt = "Error Directory"; break ;
+     default:
+       txt = strerror(errorCode);

p7zip/Pkgfile

@@ -5,11 +5,12 @@
 
 name=p7zip
 version=16.02
-release=2
+release=3
 source=(https://downloads.sourceforge.net/project/$name/$name/$version/${name}_${version}_src_all.tar.bz2
 	CVE-2016-9296.patch
 	CVE-2017-17969.patch
-	CVE-2018-5996.patch)
+	CVE-2018-5996.patch
+	CPP_Windows_ErrorMsg.patch)
 
 build() {
 	cd ${name}_$version
@@ -23,6 +24,10 @@ build() {
 	# https://nvd.nist.gov/vuln/detail/CVE-2018-5996
 	patch -p1 -i $SRC/CVE-2018-5996.patch
 
+	# fix build against gcc 10
+	patch -p0 -i $SRC/CPP_Windows_ErrorMsg.patch
+
+	sed -i 's/ -pipe / /g' makefile.*
 	cp makefile.linux_amd64_asm makefile.machine
 
 	make all3 OPTFLAGS="$CFLAGS"