diff options
| author |   B. Watson <yalhcru@gmail.com> | 2022-02-17 15:17:58 -0500 |
|---|---|---|
| committer |   Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2022-02-19 12:09:26 +0700 |
| commit | 6da1a00e59f87938637f4dcb29f1731cdd1692d8 (patch) | |
| tree | 94b43ededf19015128b5d4200edf2377c74f0af1 | |
| parent | 93d8774ce1870da35d187c0380425e5963a766fa (diff) | |
| download | slackbuilds-6da1a00e59f87938637f4dcb29f1731cdd1692d8.tar.gz slackbuilds-6da1a00e59f87938637f4dcb29f1731cdd1692d8.tar.xz | |
office/mytetra: Fix 15.0 build.
Signed-off-by: B. Watson <yalhcru@gmail.com>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
| -rw-r--r-- | office/mytetra/mytetra.SlackBuild | 19 | ||||
| -rw-r--r-- | office/mytetra/mytetra.info | 4 |
2 files changed, 12 insertions, 11 deletions
diff --git a/office/mytetra/mytetra.SlackBuild b/office/mytetra/mytetra.SlackBuild index f0eb3d0fef..c1bcd24f34 100644 --- a/office/mytetra/mytetra.SlackBuild +++ b/office/mytetra/mytetra.SlackBuild @@ -4,6 +4,10 @@ # Written by Andrey Maraev <andrew.maraev60@yandex.ru> +# 20220217 bkw: Modified by SlackBuilds.org: fix build on 15.0. There +# are newer releases of this, which might not require qt4, but for now +# it's enough to get it building and ship it. + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=mytetra @@ -14,15 +18,12 @@ PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -32,8 +33,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" @@ -58,9 +59,9 @@ cd $PRGNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ # Correct target path in file mytetra.pro sed "s,/usr/local/bin,/usr/bin,g" -i mytetra.pro @@ -68,7 +69,7 @@ sed "s,/usr/local/bin,/usr/bin,g" -i mytetra.pro # Patch fix gcc 4.7 patch -p0 -i $CWD/mytetra-gcc4.7.patch -qmake \ +qmake-qt4 \ QMAKE_CFLAGS="$SLKCFLAGS" \ QMAKE_CXXFLAGS="$SLKCFLAGS" diff --git a/office/mytetra/mytetra.info b/office/mytetra/mytetra.info index 34dfdfee3e..30a6acf85d 100644 --- a/office/mytetra/mytetra.info +++ b/office/mytetra/mytetra.info @@ -1,10 +1,10 @@ PRGNAM="mytetra" VERSION="1.30.1" HOMEPAGE="https://webhamster.ru/site/page/index/articles/projectcode/138" -DOWNLOAD="https://webhamster.ru/db/data/articles/105/mytetra_1_30_1_src.zip" +DOWNLOAD="https://slackware.uk/~urchlay/src/mytetra_1_30_1_src.zip" MD5SUM="3af1f0feacec645540c0857d57669fa1" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="qt4" MAINTAINER="Andrey Maraev" EMAIL="andrew.maraev60@yandex.ru" |