diff options
| author | B. Watson <yalhcru@gmail.com> | 2017-03-24 18:20:08 -0400 |
|---|---|---|
| committer | David Spencer <idlemoor@slackbuilds.org> | 2017-03-26 02:15:17 +0100 |
| commit | d1bb093e6549a1cd9b14c8ee870fb94ee0336a60 (patch) | |
| tree | 612c3299a9691e6d595d7a5ae6bd9f4196f09f1a | |
| parent | 0208372e56d8eceac8d42b7ffd193c748a867280 (diff) | |
| download | slackbuilds-d1bb093e6549a1cd9b14c8ee870fb94ee0336a60.tar.gz | |
libraries/qt3: New maintainer, i486=>i586, minor fix.
Signed-off-by: B. Watson <yalhcru@gmail.com>
Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
| -rw-r--r-- | libraries/qt3/qt3.SlackBuild | 30 | ||||
| -rw-r--r-- | libraries/qt3/qt3.info | 4 |
2 files changed, 25 insertions, 9 deletions
diff --git a/libraries/qt3/qt3.SlackBuild b/libraries/qt3/qt3.SlackBuild index aaf39bff36..f78956b910 100644 --- a/libraries/qt3/qt3.SlackBuild +++ b/libraries/qt3/qt3.SlackBuild @@ -1,6 +1,9 @@ #!/bin/sh -# Ryan P.C. McQuen | Everett, WA | ryanpcmcquen@member.fsf.org +# Formerly maintained by: +# Ryan P.C. McQuen | Everett, WA | <email removed> + +# Now maintained by B. Watson <yalhcru@gmail.com> # Copyright 2006, 2007, 2008 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. @@ -31,6 +34,19 @@ # - included patch for new libpng (based on work by Stuart Winter) # Revision date 2012/08/09 +# 20170324 bkw: +# - take over maintenance. +# - i486=>i586. +# - use + rather than ; with find/chmod, speeds things up slightly. +# - minor fix: stripping -jN from MAKEFLAGS failed, if N>9 (or if +# less than 9, with leading zero(es): -j05 for example). + +# TODO: fix these: +#sbrun: WARNING: files altered outside the sandbox: +#u /root/.qt/.qt_plugins_3.3rc.lock +#t /root/.qt/qt_plugins_3.3rc.tmp +#u /root/.qt/qt_plugins_3.3rc + PRGNAM=qt3 VERSION=${VERSION:-3.3.8b} BUILD=${BUILD:-5} @@ -40,7 +56,7 @@ SRCNAM=qt-x11-free if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -51,8 +67,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" @@ -97,9 +113,9 @@ patch -p1 < $CWD/qt3_gcc47.patch 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 {} \+ # And here's what we are currently using. The "yes" agrees to the GPL, so don't run this script if you # don't agree. :-) @@ -138,7 +154,7 @@ QTDIR=$PKG/opt/kde3/lib${LIBDIRSUFFIX}/$PRGNAM-$VERSION export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$QTDIR/lib:$TMP/$SRCNAM-$VERSION/lib # Strip jobs number from the MAKEFLAGS (needed) -MAKEFLAGS=$(echo "$MAKEFLAGS" | sed "s/-j[0-999]//g") +MAKEFLAGS=$(echo "$MAKEFLAGS" | sed "s/-j[0-9]*//g") # We're using '-i' to work around a bug where the build tries to strip html files. # Build the important stuff: make -i -j1 diff --git a/libraries/qt3/qt3.info b/libraries/qt3/qt3.info index 0dabcb8a7a..6dcf13ff7b 100644 --- a/libraries/qt3/qt3.info +++ b/libraries/qt3/qt3.info @@ -6,5 +6,5 @@ MD5SUM="9f05b4125cfe477cc52c9742c3c09009" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Ryan P.C. McQuen" -EMAIL="ryanpcmcquen@member.fsf.org" +MAINTAINER="B. Watson" +EMAIL="yalhcru@gmail.com" |