From 1201ba5d91138fda0045a41de1d205f4baa94575 Mon Sep 17 00:00:00 2001
From: "B. Watson" <yalhcru@gmail.com>
Date: Sat, 26 Feb 2022 13:18:02 -0500
Subject: graphics/xpe: Fix 15.0 build.

Signed-off-by: B. Watson <yalhcru@gmail.com>
---
 graphics/xpe/xpe.SlackBuild | 22 ++++++++++++----------
 graphics/xpe/xpe.desktop    |  2 +-
 2 files changed, 13 insertions(+), 11 deletions(-)

(limited to 'graphics')

diff --git a/graphics/xpe/xpe.SlackBuild b/graphics/xpe/xpe.SlackBuild
index 1c3be22de73d5..9a20c52d61052 100644
--- a/graphics/xpe/xpe.SlackBuild
+++ b/graphics/xpe/xpe.SlackBuild
@@ -6,11 +6,17 @@
 # Written by Niels Horn - niels.horn@gmail.com
 # revision date 2009/10/07
 
+# 20220222 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - fix build on 15.0 (-std=c++11).
+# - use correct version of wxPython, regardless of /usr/bin/wx-config.
+# - do not install useless INSTALL in doc dir.
+# - absolute path to icon in .desktop.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=xpe
 VERSION=${VERSION:-0.9.5b}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -28,9 +34,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
@@ -64,13 +67,14 @@ cd ${SRCPRGNAM}
 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 {} \+
 
 CFLAGS="$SLKCFLAGS" \
-CPPFLAGS="$SLKCFLAGS" \
+CPPFLAGS="$SLKCFLAGS -std=c++11" \
   ./configure \
+  --with-wx-config=/usr/lib$LIBDIRSUFFIX/wx/config/gtk2-unicode-release-2.8 \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
@@ -91,9 +95,7 @@ cat $CWD/xpe.desktop > $PKG/usr/share/applications/xpe.desktop
 cat $CWD/xpe.png > $PKG/usr/share/pixmaps/xpe.png
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  AUTHORS COPYING INSTALL TODO \
-    $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING TODO $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 644 {} \;
 
diff --git a/graphics/xpe/xpe.desktop b/graphics/xpe/xpe.desktop
index 46486005d7cc4..f25e8e48f875f 100644
--- a/graphics/xpe/xpe.desktop
+++ b/graphics/xpe/xpe.desktop
@@ -5,6 +5,6 @@ Name=xpe
 Comment=neXtgen Povray Editor
 Categories=Graphics;
 Exec=/usr/bin/xpe
-Icon=xpe
+Icon=/usr/share/pixmaps/xpe.png
 Terminal=false
 StartupNotify=false
-- 
cgit v1.2.3