network/mosaic-ck: Updated for version 2.7ck13.

Signed-off-by: B. Watson <yalhcru@gmail.com>

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

3 files changed, 25 insertions, 20 deletions

diff --git a/network/mosaic-ck/README b/network/mosaic-ck/README
index 4db1b18e3d..c46a7a52ea 100644
--- a/network/mosaic-ck/README
+++ b/network/mosaic-ck/README
@@ -1,8 +1,8 @@
 mosaic-ck (Cameron Kaiser's fork of NCSA Mosaic)
 
 Mosaic is widely considered the grandfather of the modern web
-browser. Developed at NCSA, it was the first Web browser to win widespread
-use and acceptance. The last release of Mosaic was in 1997.
+browser. Developed at NCSA, it was the first Web browser to win
+widespread use and acceptance. The last release of Mosaic was in 1997.
 
 mosaic-ck is a fork of Mosaic, with several features that allow it
 to work as a basic, no-frills browser on the modern WWW. Think of it
diff --git a/network/mosaic-ck/mosaic-ck.SlackBuild b/network/mosaic-ck/mosaic-ck.SlackBuild
index 39b1b37683..fc63621b3d 100644
--- a/network/mosaic-ck/mosaic-ck.SlackBuild
+++ b/network/mosaic-ck/mosaic-ck.SlackBuild
@@ -6,6 +6,10 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20211207 bkw: update for 2.7ck13, which contains build fixes
+# for recent glibc (e.g. the one in Slackware -current). Also
+# add new-style icons.
+
 # 20161028 bkw: Re-add to SBo, with fix for Slack 14.2's libpng-1.6.
 # If you're wondering why I stick with 2.7ck9 when 2.7ck11 has been
 # out for a while, it's because none of the changes in ck10 or ck11
@@ -19,8 +23,8 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=mosaic-ck
-VERSION=${VERSION:-2.7ck9}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-2.7ck13}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -32,9 +36,6 @@ if [ -z "$ARCH" ]; then
   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
@@ -69,11 +70,8 @@ rm -rf $PRGNAM
 tar xvf $CWD/$TARBALL
 cd $PRGNAM
 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 \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 # I don't know who thought it was a good idea to link with /usr/lib/libjpeg.a
 # and /usr/lib/libpng.a instead of just saying -ljpeg -lpng.
@@ -107,11 +105,18 @@ install -m0644 app-defaults.color $PKG/etc/X11/app-defaults/Mosaic
 mkdir -p $PKG/usr/share/applications
 cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
 
-# Original mosaic uses an icon that looks like icon.1.xpm. We'll pick one
-# of the other animation frames for mosaic-ck, to avoid confusion with
-# the original.
+# Original mosaic uses an icon that looks like icon.1.xpm. Go ahead
+# and use it, since there's no chance of conflicting with the original
+# mosaic on modern systems.
+for px in 16 32 48 64; do
+  size=${px}x${px}
+  dir=$PKG/usr/share/icons/hicolor/$size/apps
+  mkdir -p $dir
+  convert -resize $size src/pixmaps/icon.1.xpm $dir/$PRGNAM.png
+done
+
 mkdir -p $PKG/usr/share/pixmaps
-convert src/pixmaps/icon.10.xpm png:- > $PKG/usr/share/pixmaps/$PRGNAM.png
+ln -s ../icons/hicolor/48x48/apps/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
 
 # man page written for this build. kind of amazed that the source doesn't
 # come with a man page.
diff --git a/network/mosaic-ck/mosaic-ck.info b/network/mosaic-ck/mosaic-ck.info
index 8289604f2b..fc539c4b2e 100644
--- a/network/mosaic-ck/mosaic-ck.info
+++ b/network/mosaic-ck/mosaic-ck.info
@@ -1,8 +1,8 @@
 PRGNAM="mosaic-ck"
-VERSION="2.7ck9"
-HOMEPAGE="http://www.floodgap.com/retrotech/machten/mosaic/"
-DOWNLOAD="https://slackware.uk/~urchlay/src/mosaic27ck9.tar.gz"
-MD5SUM="a412ea475bb5059182ee9642c95368cc"
+VERSION="2.7ck13"
+HOMEPAGE="https://www.floodgap.com/retrotech/machten/mosaic/"
+DOWNLOAD="https://slackware.uk/~urchlay/src/mosaic27ck13.tar.gz"
+MD5SUM="7c4c807af8313104bc0fc19ee76325dd"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""