system/p7zip: Updated for version 17.04

Signed-off-by: Heinz Wiesinger <pprkut@slackbuilds.org>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

4 files changed, 20 insertions, 75 deletions

diff --git a/system/p7zip/README b/system/p7zip/README
index 9c897a2d16fd..faacf40f040d 100644
--- a/system/p7zip/README
+++ b/system/p7zip/README
@@ -1,5 +1,2 @@
 7-Zip is a well-known file compression utility for windows.
 p7zip is a ported version for linux with nearly the same capabilities.
-
-If you want to build the new GUI, you have to pass GUI=yes to the script:
-this requires an optional dependency, wxPython.
diff --git a/system/p7zip/gcc10.patch b/system/p7zip/gcc10.patch
deleted file mode 100644
index d9571cc23075..000000000000
--- a/system/p7zip/gcc10.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://sourceforge.net/p/p7zip/bugs/226/
-
---- a/CPP/Windows/ErrorMsg.cpp  2020-05-28 00:35:02.729896917 +0200
-+++ b/CPP/Windows/ErrorMsg.cpp  2020-05-28 00:40:01.676442629 +0200
-@@ -13,7 +13,7 @@
-   const char * txt = 0;
-   AString msg;
-
--  switch(errorCode) {
-+  switch(HRESULT(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 ;
-@@ -43,7 +43,7 @@
-   const char * txt = 0;
-   AString msg;
-
--  switch(messageID) {
-+  switch(HRESULT(messageID)) {
-     case ERROR_NO_MORE_FILES   : txt = "No more files"; break ;
-     case E_NOTIMPL             : txt = "E_NOTIMPL"; break ;
-     case E_NOINTERFACE         : txt = "E_NOINTERFACE"; break ;
diff --git a/system/p7zip/p7zip.SlackBuild b/system/p7zip/p7zip.SlackBuild
index be524a75a7c8..cc474caca92b 100644
--- a/system/p7zip/p7zip.SlackBuild
+++ b/system/p7zip/p7zip.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for p7zip
 
-# Copyright 2007-2016 Heinz Wiesinger, Amsterdam, Netherlands
+# Copyright 2007-2021 Heinz Wiesinger, Amsterdam, Netherlands
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -11,22 +11,22 @@
 # 1. Redistributions of this script must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 #
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=p7zip
-VERSION=${VERSION:-16.02}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-17.04}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -72,9 +72,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf ${PRGNAM}_${VERSION}
-tar xvf $CWD/${PRGNAM}_${VERSION}_src_all.tar.bz2
-cd ${PRGNAM}_${VERSION}
+rm -rf ${PRGNAM}-${VERSION}
+tar xvf $CWD/${PRGNAM}-${VERSION}.tar.gz
+cd ${PRGNAM}-${VERSION}
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -82,8 +82,6 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-patch -p1 < $CWD/gcc10.patch
-
 make all3 \
   OPTFLAGS="$SLKCFLAGS -std=gnu++14" \
   DEST_HOME=/usr \
@@ -91,16 +89,6 @@ make all3 \
   DEST_SHARE=/usr/lib$LIBDIRSUFFIX/p7zip \
   DEST_DIR=$PKG
 
-if ! [ "$GUI" = "no" ]; then
-    sed -i "s|/usr/lib/|/usr/lib$LIBDIRSUFFIX/|g" CPP/7zip/UI/GUI/makefile.depend
-    make 7zG \
-    OPTFLAGS="$SLKCFLAGS -std=gnu++14" \
-    DEST_HOME=/usr \
-    DEST_SHARE_DOC=/usr/doc/$PRGNAM-$VERSION \
-    DEST_SHARE=/usr/lib$LIBDIRSUFFIX/p7zip \
-    DEST_DIR=$PKG
-fi
-
 make install \
   OPTFLAGS="$SLKCFLAGS" \
   DEST_HOME=/usr \
@@ -117,24 +105,6 @@ mkdir -p $PKG/usr/share/mc/extfs/
 install -m 755 contrib/VirtualFileSystemForMidnightCommander/u7z \
   $PKG/usr/share/mc/extfs/
 
-if ! [ "$GUI" = "no" ]; then
-  # Unfortunately we have to install 7zG by hand
-  install -m 555 $PKG/usr/bin/7z $PKG/usr/bin/7zG
-  sed -i "s|/usr/lib$LIBDIRSUFFIX/p7zip/7z|/usr/lib$LIBDIRSUFFIX/p7zip/7zG|" $PKG/usr/bin/7zG
-
-  install -m 555 bin/7zG $PKG/usr/lib$LIBDIRSUFFIX/p7zip/7zG
-  cp -r GUI/Lang $PKG/usr/lib$LIBDIRSUFFIX/p7zip/Lang
-  find $PKG/usr/lib$LIBDIRSUFFIX/p7zip/Lang -type d -exec chmod 555 {} \;
-  find $PKG/usr/lib$LIBDIRSUFFIX/p7zip/Lang -type f -exec chmod 444 {} \;
-
-  install -m 555 GUI/p7zipForFilemanager  $PKG/usr/bin/p7zipForFilemanager
-
-  install -m 444 -D GUI/p7zip_16_ok.png $PKG/usr/share/icons/hicolor/16x16/apps/p7zip.png
-
-  mkdir -p $PKG/usr/share/kde4/services/ServiceMenus
-  cp GUI/kde4/*.desktop $PKG/usr/share/kde4/services/ServiceMenus/
-fi
-
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
diff --git a/system/p7zip/p7zip.info b/system/p7zip/p7zip.info
index ea621fb121e4..feaa6f1d4445 100644
--- a/system/p7zip/p7zip.info
+++ b/system/p7zip/p7zip.info
@@ -1,8 +1,8 @@
 PRGNAM="p7zip"
-VERSION="16.02"
-HOMEPAGE="http://p7zip.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/p7zip/p7zip_16.02_src_all.tar.bz2"
-MD5SUM="a0128d661cfe7cc8c121e73519c54fbf"
+VERSION="17.04"
+HOMEPAGE="https://github.com/jinfeihan57/p7zip"
+DOWNLOAD="https://github.com/jinfeihan57/p7zip/archive/v17.04/p7zip-17.04.tar.gz"
+MD5SUM="00acfd6be87848231722d2d53f89e4a5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""