diff options
| -rw-r--r-- | academic/convertall/convertall.SlackBuild | 18 | ||||
| -rw-r--r-- | academic/convertall/convertall.info | 10 | ||||
| -rw-r--r-- | academic/convertall/doinst.sh | 2 | ||||
| -rw-r--r-- | academic/convertall/slack-desc | 12 |
4 files changed, 22 insertions, 20 deletions
diff --git a/academic/convertall/convertall.SlackBuild b/academic/convertall/convertall.SlackBuild index 796ea42d07..fdb395cf6c 100644 --- a/academic/convertall/convertall.SlackBuild +++ b/academic/convertall/convertall.SlackBuild @@ -2,10 +2,12 @@ # # Slackware build script for convertall # -# Copyright 2012 John Berger <irgunii ampersand gmail . com>, TN, USA +# Copyright 2012-2021 John Berger <irgunii ampersand gmail . com>, TN, USA # I couldn't have made this script work without the help of -# Willy Sudiarto Raharjo <willysr@slackware-id.org>, so -# all thanks go to him. +# Willy Sudiarto Raharjo <willysr@slackware-id.org>, so big thanks to him. +# Also a big thank you to Kevin McCormick for helping with a python 3 +# problem I'd missed. +# # # All rights reserved. # @@ -28,13 +30,13 @@ PRGNAM=convertall SRCNAM=ConvertAll -VERSION=${VERSION:-0.5.2} +VERSION=${VERSION:-0.8.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -45,8 +47,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -77,7 +79,7 @@ find -L . \ # Change installation directory to /usr and use LIBDIRSUFFIX sed -i -e "s/usr\/local/usr/" -e "s/'lib'/'lib$LIBDIRSUFFIX'/" install.py -python install.py -b $PKG +python3 install.py -b $PKG 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/academic/convertall/convertall.info b/academic/convertall/convertall.info index 38fc747b7f..181b2b33f8 100644 --- a/academic/convertall/convertall.info +++ b/academic/convertall/convertall.info @@ -1,10 +1,10 @@ PRGNAM="convertall" -VERSION="0.5.2" -HOMEPAGE="http://www.convertall.bellz.org/index.html" -DOWNLOAD="http://downloads.sourceforge.net/convertall/convertall-0.5.2.tar.gz" -MD5SUM="9378cb3ab40cf944570d53bcc5718ee8" +VERSION="0.8.0" +HOMEPAGE="https://www.convertall.bellz.org/index.html" +DOWNLOAD="https://github.com/doug-101/ConvertAll/releases/download/v0.8.0/convertall-0.8.0.tar.gz" +MD5SUM="6e2513d056bc10e2f037591bc08a8e21" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="python3 qt5 python3-PyQt5" MAINTAINER="John Berger" EMAIL="irgunii ampersand gmail . com" diff --git a/academic/convertall/doinst.sh b/academic/convertall/doinst.sh index 4f83cde390..7443749d1c 100644 --- a/academic/convertall/doinst.sh +++ b/academic/convertall/doinst.sh @@ -9,6 +9,6 @@ fi if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then if [ -x /usr/bin/gtk-update-icon-cache ]; then - /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 + /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1 fi fi diff --git a/academic/convertall/slack-desc b/academic/convertall/slack-desc index 7f4ae4d1c2..59999208c7 100644 --- a/academic/convertall/slack-desc +++ b/academic/convertall/slack-desc @@ -1,9 +1,9 @@ # HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| convertall: convertall (unit conversion) @@ -14,6 +14,6 @@ convertall: decade, that's fine. Or from meter-pounds. Or from cubic convertall: nautical miles. The units don't have to make sense to convertall: anyone but you. convertall: -convertall: Project website: http://www.convertall.bellz.org +convertall: Project website: https://www.convertall.bellz.org convertall: convertall: |