7 files changed, 55 insertions, 45 deletions
diff --git a/desktop/xpenguins-xtrathemes/M.U.L.E..about b/desktop/xpenguins-xtrathemes/M.U.L.E..about
new file mode 100644
index 0000000000..6d012cec9f
--- /dev/null
+++ b/desktop/xpenguins-xtrathemes/M.U.L.E..about
@@ -0,0 +1,6 @@
+artist Unknown
+maintainer Unknown
+license Unknown
+comment No information available
+icon M.U.L.E..png
+date Unknown
diff --git a/desktop/xpenguins-xtrathemes/M.U.L.E..png b/desktop/xpenguins-xtrathemes/M.U.L.E..png
new file mode 100644
index 0000000000..9044c3012b
--- /dev/null
+++ b/desktop/xpenguins-xtrathemes/M.U.L.E..png
diff --git a/desktop/xpenguins-xtrathemes/README b/desktop/xpenguins-xtrathemes/README
index a4a5ded6dc..c94e585ef6 100644
--- a/desktop/xpenguins-xtrathemes/README
+++ b/desktop/xpenguins-xtrathemes/README
@@ -1,3 +1,6 @@
-XPenguins Themes 1.0
-   
-Addon for XPenguins
+xpenguins-xtrathemes (extra themes for xpenguins)
+
+The graphics in these themes come from various classic video
+games and animated TV shows. Included themes: Lemmings, M.U.L.E.,
+Megaman, Sonic_the_Hedgehog, The_Simpsons, Turkeys, Walking_Man,
+Winnie_the_Pooh, Worms, XSheep.
diff --git a/desktop/xpenguins-xtrathemes/XSheep.about b/desktop/xpenguins-xtrathemes/XSheep.about
new file mode 100644
index 0000000000..0c7cc4d61b
--- /dev/null
+++ b/desktop/xpenguins-xtrathemes/XSheep.about
@@ -0,0 +1,6 @@
+artist Unknown
+maintainer Unknown
+license Unknown
+comment No information available
+icon XSheep.png
+date Unknown
diff --git a/desktop/xpenguins-xtrathemes/XSheep.png b/desktop/xpenguins-xtrathemes/XSheep.png
new file mode 100644
index 0000000000..c96712b4f6
--- /dev/null
+++ b/desktop/xpenguins-xtrathemes/XSheep.png
diff --git a/desktop/xpenguins-xtrathemes/slack-desc b/desktop/xpenguins-xtrathemes/slack-desc
index 590ac467a4..60b712fd14 100644
--- a/desktop/xpenguins-xtrathemes/slack-desc
+++ b/desktop/xpenguins-xtrathemes/slack-desc
@@ -6,12 +6,12 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
                     |-----handy-ruler------------------------------------------------------|
-xpenguins-xtrathemes: xpenguins-xtrathemes (Addon for xpenguins)
+xpenguins-xtrathemes: xpenguins-xtrathemes (extra themes for xpenguins)
 xpenguins-xtrathemes:
-xpenguins-xtrathemes: Addon for xpenguins. xpenguins needed in order for them
-xpenguins-xtrathemes: to work.
-xpenguins-xtrathemes:
-xpenguins-xtrathemes: Look for xpenguins in slackbuilds.org
+xpenguins-xtrathemes: The graphics in these themes come from various classic video
+xpenguins-xtrathemes: games and animated TV shows. Included themes: Lemmings, M.U.L.E.,
+xpenguins-xtrathemes: Megaman, Sonic_the_Hedgehog, The_Simpsons, Turkeys, Walking_Man,
+xpenguins-xtrathemes: Winnie_the_Pooh, Worms, XSheep.
 xpenguins-xtrathemes:
 xpenguins-xtrathemes:
 xpenguins-xtrathemes:
diff --git a/desktop/xpenguins-xtrathemes/xpenguins-xtrathemes.SlackBuild b/desktop/xpenguins-xtrathemes/xpenguins-xtrathemes.SlackBuild
index 65215da6ca..f1bf240bdd 100644
--- a/desktop/xpenguins-xtrathemes/xpenguins-xtrathemes.SlackBuild
+++ b/desktop/xpenguins-xtrathemes/xpenguins-xtrathemes.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Slackware build script for <xpenguins_xtrathemes>
+# Slackware build script for xpenguins-xtrathemes
 
 # Copyright <2018> <Michael Heras> <USA>
 # All rights reserved.
@@ -22,19 +22,22 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# |-----------------------------------------------------------------| #
+# Modified by SlackBuilds.org:
+# 20220207 bkw: BUILD=2
+# - force ARCH=noarch.
+# - add missing 'about' files (xpenguins segfaults without them).
+# - add a couple of missing icons, resize a couple that were too big.
+# - vastly simplify the script.
 
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=xpenguins-xtrathemes
 VERSION=${VERSION:-1.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
+ARCH=noarch
 
-# 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
@@ -44,46 +47,38 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
+mkdir -p $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-#untars to just themes
-cd themes
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 chown -R root:root .
 
-mkdir -p $PKG/usr/share/xpenguins/themes/Lemmings
-mkdir -p $PKG/usr/share/xpenguins/themes/M.U.L.E.
-mkdir -p $PKG/usr/share/xpenguins/themes/Megaman
-mkdir -p $PKG/usr/share/xpenguins/themes/Sonic_the_Hedgehog
-mkdir -p $PKG/usr/share/xpenguins/themes/The_Simpsons
-mkdir -p $PKG/usr/share/xpenguins/themes/Turkeys
-mkdir -p $PKG/usr/share/xpenguins/themes/Walking_Man
-mkdir -p $PKG/usr/share/xpenguins/themes/Winnie_the_Pooh
-mkdir -p $PKG/usr/share/xpenguins/themes/Worms
-mkdir -p $PKG/usr/share/xpenguins/themes/XSheep
-
-cp -r Lemmings/* $PKG/usr/share/xpenguins/themes/Lemmings
-cp -r M.U.L.E./* $PKG/usr/share/xpenguins/themes/M.U.L.E.
-cp -r Megaman/* $PKG/usr/share/xpenguins/themes/Megaman
-cp -r Sonic_the_Hedgehog/* $PKG/usr/share/xpenguins/themes/Sonic_the_Hedgehog
-cp -r The_Simpsons/* $PKG/usr/share/xpenguins/themes/The_Simpsons
-cp -r Turkeys/* $PKG/usr/share/xpenguins/themes/Turkeys
-cp -r Walking_Man/* $PKG/usr/share/xpenguins/themes/Walking_Man
-cp -r Winnie_the_Pooh/* $PKG/usr/share/xpenguins/themes/Winnie_the_Pooh
-cp -r Worms/* $PKG/usr/share/xpenguins/themes/Worms
-cp -r XSheep/* $PKG/usr/share/xpenguins/themes/XSheep
+# 20220207 bkw: someone left a backup file in the tarball:
+rm -f themes/*/*~
+
+# 20220207 bkw: these icons are just too big, they break the xpenguins UI.
+for i in themes/Winnie_the_Pooh/pooh_sitter.png themes/Walking_Man/walkingman.png; do
+  convert -resize 32x32 $i 1.png
+  mv 1.png $i
+done
+
+SHAREDIR=$PKG/usr/share/xpenguins/
+mkdir -p $SHAREDIR
+cp -r themes $SHAREDIR
+
+# 20220207 bkw: xpenguins will segfault if a theme has no about file.
+# Went ahead and made icons, too.
+for i in XSheep M.U.L.E.; do
+  install -oroot -groot -m0644 $CWD/$i.about $SHAREDIR/themes/$i/about
+  install -oroot -groot -m0644 $CWD/$i.png $SHAREDIR/themes/$i/$i.png
+done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild