From 22555f0baf770b0e7075e6e3b57bd1fd2e55c8bb Mon Sep 17 00:00:00 2001
From: B. Watson
Date: Fri, 12 Sep 2014 01:47:09 +0700
Subject: games/openyahtzee: Don't trust wx-config.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 games/openyahtzee/openyahtzee.SlackBuild | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

(limited to 'games')

diff --git a/games/openyahtzee/openyahtzee.SlackBuild b/games/openyahtzee/openyahtzee.SlackBuild
index 0952178d78..f3202f796e 100644
--- a/games/openyahtzee/openyahtzee.SlackBuild
+++ b/games/openyahtzee/openyahtzee.SlackBuild
@@ -6,9 +6,14 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20140909 bkw: if wx(Widgets|Python) 2.x and wxGTK 3.x are installed, in that
+# order, the symlink at /usr/bin/wx-config will point to the 3.x config script.
+# openyahtzee won't build against wx 3, so this script now uses the 2.x script
+# explicitly.
+
 PRGNAM=openyahtzee
 VERSION=${VERSION:-1.9.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -40,6 +45,14 @@ fi
 
 set -e
 
+# We can't trust the /usr/bin/wx-config symlink.
+# Find the correct wx-config, if it exists. User can override by setting WXVER
+# in the env, or by setting WXCONFIG to the full path.
+WXVER=${WXVER:-2.8}
+WXMAYBE="$( ls /usr/lib$LIBDIRSUFFIX/wx/config/*-$WXVER 2>/dev/null | head -1 )"
+WXCONFIG=${WXCONFIG:-$WXMAYBE}
+WXCONFIG=${WXCONFIG:-/usr/bin/wx-config}
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
@@ -51,7 +64,7 @@ find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -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" \
 CXXFLAGS="$SLKCFLAGS" \
-- 
cgit v1.2.3