development/jeex: Fix -current build.

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

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

1 files changed, 24 insertions, 22 deletions

diff --git a/development/jeex/jeex.SlackBuild b/development/jeex/jeex.SlackBuild
index 09e574407866..792f621a7ead 100644
--- a/development/jeex/jeex.SlackBuild
+++ b/development/jeex/jeex.SlackBuild
@@ -2,27 +2,18 @@
 
 # Slackware build script for jeex
 
-# Originally by Luis Henrique <lmello.009@gmail.com>
-# Modified by Ryan P.C. McQuen | Everett, WA | ryanpcmcquen@member.fsf.org
+# Originally by Luis Henrique <email removed>
+# Modified by Ryan P.C. McQuen | Everett, WA | <email removed>
 # Now maintained by B. Watson (yalhcru@gmail.com)
 
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version, with the following exception:
-# the text of the GPL license may be omitted.
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
-# This program is distributed in the hope that it will be useful, but
-# without any warranty; without even the implied warranty of
-# merchantability or fitness for a particular purpose. Compiling,
-# interpreting, executing or merely reading the text of the program
-# may result in lapses of consciousness and/or very being, up to and
-# including the end of all existence and the Universe as we know it.
-# See the GNU General Public License for more details.
-
-# You may have received a copy of the GNU General Public License along
-# with this program (most likely, a file named COPYING). If not, see
-# <http://www.gnu.org/licenses/>.
+# 20210902 bkw:
+# - BUILD=4
+# - fix build on -current/15
+# - relicensed as WTFPL, with permission from Ryan. The original author,
+#   Luis, never included a license at all.
+# - Put .desktop file in the right place and fix its icon reference.
 
 # 20170309 bkw:
 # - take over maintenance
@@ -38,7 +29,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=jeex
 VERSION=${VERSION:-12.6.1}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -50,9 +41,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
@@ -96,6 +84,9 @@ touch NEWS AUTHORS
 rm -f configure
 autoreconf -if
 
+# 20210902 bkw: need for 15.0
+SLKCFLAGS+=" -fcommon"
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -114,6 +105,17 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a ChangeLog COPYING README  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+# 20210902 bkw: .desktop was being installed in wrong place, and needs
+# the icon fixed anyway.
+rm -rf $PKG/usr/share/jeex/applications
+mkdir -p $PKG/usr/share/applications
+sed '/^Icon/s,jeex,/usr/share/jeex/icons/jeex.png,' \
+    < jeex.desktop \
+    > $PKG/usr/share/applications/jeex.desktop
+
+# 20210902 bkw: don't need 2 actual copies of the icon.
+rm -f $PKG/usr/share/jeex/images/jeex.png
+ln -s ../icons/jeex.png $PKG/usr/share/jeex/images/jeex.png
 mv $PKG/etc/jeex.rc $PKG/etc/jeex.rc.new
 
 mkdir -p $PKG/install