diff options
| author |   Eric Hameleers <alien@slackware.com> | 2015-10-21 18:54:54 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2015-10-21 18:54:54 +0000 |
| commit | 2a740fc9cd8020b85fd2f9d655c4c2a4818bf479 (patch) | |
| tree | 951e9ea750027238a3e4e170b255ba240ae60d52 /p7zip | |
| parent | ad4327eb2abb22ed610b4552f58877517ec4eedb (diff) | |
| download | asb-2a740fc9cd8020b85fd2f9d655c4c2a4818bf479.tar.gz asb-2a740fc9cd8020b85fd2f9d655c4c2a4818bf479.tar.xz | |
p7zip: updated to 15.09
Diffstat (limited to 'p7zip')
| -rwxr-xr-x | p7zip/build/p7zip.SlackBuild | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/p7zip/build/p7zip.SlackBuild b/p7zip/build/p7zip.SlackBuild index 77038c14..017ed9dd 100755 --- a/p7zip/build/p7zip.SlackBuild +++ b/p7zip/build/p7zip.SlackBuild @@ -45,6 +45,8 @@ # * Update. # 9.38.1-1: 20/jul/2015 by Eric Hameleers <alien@slackware.com> # * Update. +# 15.09-1: 21/oct/2015 by Eric Hameleers <alien@slackware.com> +# * Update. # # Run 'sh p7zip.SlackBuild' to build a Slackware package. # The package (.tgz) plus descriptive .txt file are created in /tmp . @@ -55,7 +57,7 @@ # Set initial variables: PRGNAM=p7zip -VERSION=${VERSION:-9.38.1} +VERSION=${VERSION:-15.09} BUILD=${BUILD:-1} TAG=${TAG:-alien} @@ -161,8 +163,8 @@ cd ${PRGNAM}_${VERSION} # Patches borrowed from Gentoo: touch $OUTPUT/patch-${PRGNAM}.log -cat $SRCDIR/patches/p7zip_CVE-2015-1038.patch | patch -p1 --verbose \ - 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log +#cat $SRCDIR/patches/p7zip_CVE-2015-1038.patch | patch -p1 --verbose \ +# 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log cat $SRCDIR/patches/p7zip_osversion.patch | patch -p1 --verbose \ 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log @@ -176,14 +178,15 @@ mv contrib/gzip-like_CLI_wrapper_for_7z/README README.p7zip_wrapper cp -f makefile.linux_${ARCHSUFFIX} makefile.machine sed -i -e "s#/lib/#/lib${LIBDIRSUFFIX}/#g" $(grep -rl /lib/ .) sed -i -e 's/chmod 555/chmod 755/' -e 's/chmod 444/chmod 644/' install.sh +sed -i -e "s#7zFM_do_not_use#7zFM#g" $(grep -rl 7zFM_do_not_use .) # First, build the commandline tools: if [ "$GUI" = "YES" ]; then - TARGETS=all4 + TARGETS=all6 make depend \ 2>&1 | tee $OUTPUT/makedepend-${PRGNAM}.log else - TARGETS=all3 + TARGETS=all4 fi make $TARGETS \ @@ -214,7 +217,8 @@ if [ "$GUI" = "YES" ]; then cp -a GUI/p7zipForFilemanager $PKG/usr/bin/p7zipForFilemanager cp -a GUI/Lang $PKG/usr/lib${LIBDIRSUFFIX}/p7zip/ cp -a GUI/help $PKG/usr/lib${LIBDIRSUFFIX}/p7zip/ - cp -a bin/Client7z $PKG/usr/lib${LIBDIRSUFFIX}/p7zip/ + #cp -a bin/Client7z $PKG/usr/lib${LIBDIRSUFFIX}/p7zip/ + cp -a bin/LzmaCon $PKG/usr/lib${LIBDIRSUFFIX}/p7zip/ cp -a bin/7zFM $PKG/usr/lib${LIBDIRSUFFIX}/p7zip/ cp -a bin/7zG $PKG/usr/lib${LIBDIRSUFFIX}/p7zip/ @@ -222,6 +226,7 @@ if [ "$GUI" = "YES" ]; then # We have to create wrapper shell scripts: sed -e "s#/usr/lib${LIBDIRSUFFIX}/p7zip/7z#/usr/lib${LIBDIRSUFFIX}/p7zip/7zG#" $PKG/usr/bin/7z > $PKG/usr/bin/7zG sed -e "s#/usr/lib${LIBDIRSUFFIX}/p7zip/7z#/usr/lib${LIBDIRSUFFIX}/p7zip/Client7z#" $PKG/usr/bin/7z > $PKG/usr/bin/Client7z + sed -e "s#/usr/lib${LIBDIRSUFFIX}/p7zip/7z#/usr/lib${LIBDIRSUFFIX}/p7zip/LzmaCon#" $PKG/usr/bin/7z > $PKG/usr/bin/LzmaCon # We need to treat this with care so that the menu entry works but # the dolphin "open with..." menu too: cat <<EOT > $PKG/usr/bin/7zFM @@ -229,7 +234,7 @@ if [ "$GUI" = "YES" ]; then [ -z "\$1" ] && ARGS=\$HOME || ARGS="\$@" "/usr/lib${LIBDIRSUFFIX}/p7zip/7zFM" "\$ARGS" EOT - chmod 755 $PKG/usr/bin/{7zFM,7zG,Client7z} + chmod 755 $PKG/usr/bin/{7zFM,7zG,Client7z,LzmaCon} # Add a menu entry for the file manager: mkdir -p $PKG/usr/share/applications |