From 424680bd9ac849fb42aa2757a43f874746af7ee7 Mon Sep 17 00:00:00 2001
From: Julian Ospald <hasufell@posteo.de>
Date: Sun, 11 Sep 2016 18:43:27 +0200
Subject: [PATCH] games-strategy/zod-engine: improve wx-config invocation

---
 .../zod-engine/files/zod-engine-20110906-build.patch   | 10 ++++++----
 ...0906.exheres-0 => zod-engine-20110906-r1.exheres-0} |  5 ++---
 2 files changed, 8 insertions(+), 7 deletions(-)
 rename packages/games-strategy/zod-engine/{zod-engine-20110906.exheres-0 => zod-engine-20110906-r1.exheres-0} (89%)

diff --git a/packages/games-strategy/zod-engine/files/zod-engine-20110906-build.patch b/packages/games-strategy/zod-engine/files/zod-engine-20110906-build.patch
index 6fcf427e..f6fb0c1f 100644
--- a/packages/games-strategy/zod-engine/files/zod-engine-20110906-build.patch
+++ b/packages/games-strategy/zod-engine/files/zod-engine-20110906-build.patch
@@ -1,7 +1,7 @@
 From: Julian Ospald <hasufell@gentoo.org>
 Date: Sun Aug 12 09:26:49 UTC 2012
 Subject: build system
-Upstream: yes
+Upstream: yes/partly (upstream is dead anyway)
 
 respect CXX and CXXFLAGS
 
@@ -579,10 +579,11 @@ respect CXX and CXXFLAGS
  	zip zod_src_${DATE}.zip *.cpp *.h makefile
 --- zod_engine/zod_launcher_src/makefile
 +++ zod_engine/zod_launcher_src/makefile
-@@ -1,2 +1,11 @@
+@@ -1,2 +1,13 @@
++WX_CONFIG ?= wx-config
 +CXX ?= g++
-+CXXFLAGS += `wx-config --cppflags`
-+LIBS += `wx-config --libs`
++CXXFLAGS += `$(WX_CONFIG) --cppflags`
++LIBS += `$(WX_CONFIG) --libs`
 +EXENAME = zod_launcher
 +
 +ifdef DATA_PATH
@@ -592,3 +593,4 @@ respect CXX and CXXFLAGS
  default:
 -	g++ -g -o zod_launcher *.cpp `wx-config --cppflags` `wx-config --libs`
 +	$(CXX) $(CXXFLAGS) -o $(EXENAME) *.cpp  $(LDFLAGS) $(LIBS)
++
diff --git a/packages/games-strategy/zod-engine/zod-engine-20110906.exheres-0 b/packages/games-strategy/zod-engine/zod-engine-20110906-r1.exheres-0
similarity index 89%
rename from packages/games-strategy/zod-engine/zod-engine-20110906.exheres-0
rename to packages/games-strategy/zod-engine/zod-engine-20110906-r1.exheres-0
index b76757ed..61ee02c4 100644
--- a/packages/games-strategy/zod-engine/zod-engine-20110906.exheres-0
+++ b/packages/games-strategy/zod-engine/zod-engine-20110906-r1.exheres-0
@@ -37,15 +37,14 @@ src_prepare() {
     edo find "${WORK}" -type f \( -name Thumbs.db -o -name "*.xcf" -o -name "*.ico" \) -delete
     edo rm assets/{splash.png,WebCamScene.icescene}
 
-    # fix some tool invocations
-    eval $(eclectic wxwidgets script 2.8-gtk2) # FIXME: this probably breaks multiarch?
     edo sed -i -e "s#-lmysqlclient#\$\(shell /usr/$(exhost --target)/bin/mysql_config \-\-libs\)#" \
         zod_src/makefile
 }
 
 src_compile() {
     emake -C zod_src DATA_PATH="\"/usr/share/${PN}\"" main map_editor
-    emake -C zod_launcher_src DATA_PATH="\"/usr/share/${PN}\""
+    WX_CONFIG="/usr/$(exhost --target)/bin/wx-config-2.8" \
+        emake -C zod_launcher_src DATA_PATH="\"/usr/share/${PN}\""
 }
 
 src_install() {