multimedia/winff: Fix ARCH, README grammar.

Signed-off-by: B. Watson <urchlay@slackware.uk>

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

2 files changed, 28 insertions, 28 deletions

diff --git a/multimedia/winff/README b/multimedia/winff/README
index 10961045aa4b6..7a65a950cbf0e 100644
--- a/multimedia/winff/README
+++ b/multimedia/winff/README
@@ -9,26 +9,26 @@ NOTE:
 If you have a previous ~/.winff directory you might want to
 remove it or your presets might not be updated.
 
-WinFF is no longer maintained by the original author.It is currently
-maintained by Debian maintainer Paul Gevers  and the website winff.org
-has been hijacked see the following post for details.
+WinFF is no longer maintained by the original author. It is currently
+maintained by Debian maintainer Paul Gevers and the website winff.org
+has been hijacked. See the following post for details:
 https://github.com/WinFF/winff/issues/250
 
-I've patched link for the FFmpeg Windows build website in the about
-section to point it to correct website as mentioned in the FFmpeg
-Website. see the following link for details.
+I've patched the link for the FFmpeg Windows build website in the
+about section to point it to correct website as mentioned on the
+FFmpeg website. See the following link for details:
 https://ffmpeg.org/download.html#build-windows
 
-The Launchpad link no longer works and i've patched it to
-point to the winff debian maintainer's [Paul Gevers] page.
-I've made sure other websites link to https version.
+The Launchpad link no longer works and I've patched it to point to
+the WinFF Debian maintainer's [Paul Gevers] page. I've made sure other
+websites link to the https version.
 
-There was also an issue with opening the documetation in slackware,
-The paths to the documetation is hardcoded in the source file.
-I've patched it to look in the /usr/doc/$PRGNAM-$VERSION folder
+There was also an issue with opening the documentation in Slackware.
+The path to the documetation is hardcoded in the source file.
+I've patched it to look in the /usr/doc/$PRGNAM-$VERSION directory.
 
 I've patched winff to use xdg-open to use the user's default
-pdf viewer.
+PDF viewer.
 
-This build now uses qt5 hence libqtpas is now a dependency.
-Install libqtpas before installing lazarus.
+This build now uses qt5, hence libqtpas is now a dependency. Install
+libqtpas before installing lazarus.
diff --git a/multimedia/winff/winff.SlackBuild b/multimedia/winff/winff.SlackBuild
index f97fc8396bd11..9de9cf69bac7a 100644
--- a/multimedia/winff/winff.SlackBuild
+++ b/multimedia/winff/winff.SlackBuild
@@ -23,6 +23,11 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20230527 bkw: modified by SlackBuilds.org:
+# - fix ARCH, use separate CPU variable for the compiler.
+# - grammar cleanups for README.
+# - stop creating /root/.lazarus/compilertest.pas outside of $TMP.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=winff
@@ -40,10 +45,6 @@ case "$( uname -m )" in
 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
@@ -54,10 +55,10 @@ PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 case "$ARCH" in
-  i?86)   ARCH="i386"
+  i?86)   CPU="i386"
           LIBDIRSUFFIX=""
           ;;
-  x86_64) ARCH="x86_64"
+  x86_64) CPU="x86_64"
           LIBDIRSUFFIX="64"
           ;;
   *)      printf "$ARCH is not supported...\n"
@@ -78,9 +79,9 @@ cd $PRGNAM-$LONGNAM
 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 \
+  -o -perm 511 \) -exec chmod 755 {} + -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} +
 
 echo "Patching Winff, See README and changelog for Details"
 
@@ -112,12 +113,11 @@ cd ../..
 
 echo "Building WinFF with QT5 Widget insted of GTK"
 
-lazbuild --lazarusdir=/usr/share/lazarus --widgetset=qt5 --cpu=$ARCH -B $TMP/$PRGNAM-$LONGNAM/$PRGNAM/winff.lpr
-
-install -m 0755 -D $TMP/$PRGNAM-$LONGNAM/$PRGNAM/$PRGNAM $PKG/usr/bin/$PRGNAM
+HOME=$(pwd) lazbuild --lazarusdir=/usr/share/lazarus \
+                     --widgetset=qt5 --cpu=$CPU \
+                     -B $TMP/$PRGNAM-$LONGNAM/$PRGNAM/winff.lpr
 
-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
+install -s -m 0755 -D $TMP/$PRGNAM-$LONGNAM/$PRGNAM/$PRGNAM $PKG/usr/bin/$PRGNAM
 
 mkdir -pv $PKG/usr/share/winff
 cp -a $TMP/$PRGNAM-$LONGNAM/$PRGNAM/languages  $PKG/usr/share/winff/