From 625dcba314c505e774e08c43c327e09f4eb079e6 Mon Sep 17 00:00:00 2001 From: B. Watson Date: Sun, 6 Sep 2020 15:37:12 -0400 Subject: games/glestae: Fix build when wxGTK3 installed. Signed-off-by: B. Watson Signed-off-by: Willy Sudiarto Raharjo --- games/glestae/glestae.SlackBuild | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/games/glestae/glestae.SlackBuild b/games/glestae/glestae.SlackBuild index 21cf3b7933..3687ec0899 100644 --- a/games/glestae/glestae.SlackBuild +++ b/games/glestae/glestae.SlackBuild @@ -22,9 +22,12 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# 20200906 bkw: modified by SlackBuilds.org: the build was failing if +# wxGTK3 was installed, due to the /usr/bin/wx-config conflict. + PRGNAM=glestae VERSION=${VERSION:-0.3.93} -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -77,6 +80,7 @@ patch -p1 < $CWD/gcc-4.7.patch mkdir -p build cd build cmake -G "Unix Makefiles" \ + -DwxWidgets_CONFIG_OPTIONS="--version=2.8" \ -DCMAKE_INSTALL_PREFIX:PATH=/usr \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -std=c++11" \ -- cgit v1.2.3