2 files changed, 24 insertions, 10 deletions
diff --git a/graphics/urbanlightscape/urbanlightscape.SlackBuild b/graphics/urbanlightscape/urbanlightscape.SlackBuild
index 970d4129da..9c8bee68d3 100644
--- a/graphics/urbanlightscape/urbanlightscape.SlackBuild
+++ b/graphics/urbanlightscape/urbanlightscape.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for urbanlightscape
 
@@ -22,10 +22,17 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220222 bkw: Modified by SlackBuilds.org:
+# - always use wxGTK3, regardless of /usr/bin/wx-config symlink.
+# - abs path to icon in .desktop.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=urbanlightscape
 VERSION=${VERSION:-1.4.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +42,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -65,9 +76,15 @@ cd $PRGNAM-$VERSION
 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 {} \+
+
+# 20220226 bkw: always use wxGTK3. this configure script has no
+# --with-wx-config or similar, so use PATH.
+mkdir -p wxtmp
+ln -s /usr/lib$LIBDIRSUFFIX/wx/config/gtk3-unicode-3.0 wxtmp/wx-config
+export PATH=$(pwd)/wxtmp:$PATH
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -81,10 +98,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --build=$ARCH-slackware-linux
 
 make
-make install DESTDIR=$PKG
-
-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
+make install-strip DESTDIR=$PKG
 
 mkdir -p $PKG/usr/share/applications
 install -D -m644 $CWD/$PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop
@@ -101,4 +115,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/graphics/urbanlightscape/urbanlightscape.desktop b/graphics/urbanlightscape/urbanlightscape.desktop
index 09f2c5d48a..1803e5ca51 100644
--- a/graphics/urbanlightscape/urbanlightscape.desktop
+++ b/graphics/urbanlightscape/urbanlightscape.desktop
@@ -2,7 +2,7 @@
 Name=Urban Lightscape
 Comment=A photo filter for exposure, brightness and lighting correction
 Exec=urbanlightscape
-Icon=urbanlightscape
+Icon=/usr/share/pixmaps/urbanlightscape.png
 Terminal=false
 Type=Application
 Categories=Graphics;Photography;