summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorB. Watson <yalhcru@gmail.com>2022-02-22 15:50:47 -0500
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2022-02-23 20:10:24 +0700
commitb0e5411c5fa1aed9b4b012ee1bcd930745d299ea (patch)
tree6ac90da8d2328b507a63f6d27d9018891b0bb830
parentfa54ad7bcaecbe1e67466e54e3c5d7b6abf691ad (diff)
downloadslackbuilds-b0e5411c5fa1aed9b4b012ee1bcd930745d299ea.tar.gz
games/megaglest: Fix 15.0 build.
Signed-off-by: B. Watson <yalhcru@gmail.com> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--games/megaglest/megaglest.SlackBuild14
1 files changed, 12 insertions, 2 deletions
diff --git a/games/megaglest/megaglest.SlackBuild b/games/megaglest/megaglest.SlackBuild
index 3401809f47..b1797cf35b 100644
--- a/games/megaglest/megaglest.SlackBuild
+++ b/games/megaglest/megaglest.SlackBuild
@@ -22,6 +22,8 @@
# 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: fix build on 15.0.
+
# 20210215 bkw: modified by SlackBuilds.org: This build was broken for
# *3 years* and nobody ever complained...
# - Add -std=c++11 to CXXFLAGS.
@@ -87,9 +89,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 {} \+
+
+# 20220222 bkw: force cmake to find wxPython (wx version 2), regardless
+# of the /usr/bin/wx-config symlink.
+mkdir -p wxtmp
+ln -s /usr/lib$LIBDIRSUFFIX/wx/config/gtk2-unicode-release-2.8 wxtmp/wx-config
+export PATH=$(pwd)/wxtmp:$PATH
# Fix megaglest help2man when no X display is available. Use a wrapper
# script from upstream for Xvfb that creates a temporary *fake* framebuffer.
@@ -98,6 +106,8 @@ export PATH="$PATH:$TMP/$PRGNAM-$VERSION/bin"
patch -p1 < $CWD/megaglest-help2man.patch
patch -p1 < $CWD/megaglest-underlink.patch
+SLKCFLAGS+=" -fcommon"
+
mkdir build
cd build
cmake -G "Unix Makefiles" \