games/golly: New-style icons.

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

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

6 files changed, 11 insertions, 12 deletions

diff --git a/games/golly/golly.SlackBuild b/games/golly/golly.SlackBuild
index ed03a34006..724467d8b6 100644
--- a/games/golly/golly.SlackBuild
+++ b/games/golly/golly.SlackBuild
@@ -24,6 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #  Updated for golly 2.6 -- the source directory structure got changed a bit too!
 
+# 20211118 bkw: BUILD=2, new-style icons, tweak .desktop file.
 # 20201112 bkw: update for v4.0. Which adds a python3 dep.
 # 20181211 bkw:
 # - Take over maintenance.
@@ -39,7 +40,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=golly
 VERSION=${VERSION:-4.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -51,9 +52,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
@@ -126,18 +124,19 @@ cp -a Help Patterns Rules Scripts $PKG/$SHAREDIR
 # Don't need +x permissions on HTML pages, or even Lua/Python scripts.
 find $PKG/$SHAREDIR -type f -exec chmod 644 {} +
 
-cd gui-wx/icons
-for i in 16 32 48; do
-  convert appicon${i}.ico -resize ${i}x${i}! $PRGNAM-${i}.png
-  DIR=$PKG/usr/share/icons/hicolor/${i}x${i}/apps/
-  mkdir -p $DIR
-  install -m 0644 $PRGNAM-${i}.png $DIR/$PRGNAM.png
+# icons extracted from app.icns with icns2png, to get the 64x64 and 128x128 ones.
+for i in $CWD/icons/*.png; do
+  px="$( basename $i .png )"
+  size=${px}x${px}
+  dir=$PKG/usr/share/icons/hicolor/$size/apps
+  mkdir -p $dir
+  cat $i > $dir/$PRGNAM.png
 done
 
 mkdir -p $PKG/usr/share/pixmaps
 ln -s ../icons/hicolor/48x48/apps/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
 
-cd ../../docs
+cd docs
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a License.html ReadMe.html ToDo.html $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/games/golly/golly.desktop b/games/golly/golly.desktop
index b5d1f6baf6..9f7f091d4c 100644
--- a/games/golly/golly.desktop
+++ b/games/golly/golly.desktop
@@ -5,4 +5,4 @@ Comment=Cellular Automata Simulator
 Terminal=false
 Exec=/usr/games/golly
 Icon=golly
-Categories=Game;
+Categories=Game;Simulation;
diff --git a/games/golly/icons/128.png b/games/golly/icons/128.png
new file mode 100644
index 0000000000..d37e03e434
--- /dev/null
+++ b/games/golly/icons/128.png
diff --git a/games/golly/icons/16.png b/games/golly/icons/16.png
new file mode 100644
index 0000000000..681466fdd6
--- /dev/null
+++ b/games/golly/icons/16.png
diff --git a/games/golly/icons/32.png b/games/golly/icons/32.png
new file mode 100644
index 0000000000..cbeec1bed6
--- /dev/null
+++ b/games/golly/icons/32.png
diff --git a/games/golly/icons/48.png b/games/golly/icons/48.png
new file mode 100644
index 0000000000..b8c66370fd
--- /dev/null
+++ b/games/golly/icons/48.png