SLADE: update to 3.1.2.
This commit is contained in:
parent
b94fc1485b
commit
737fc18b99
@ -0,0 +1,32 @@
|
|||||||
|
From 817186687e4b600637366a6977d96939cc6ababb Mon Sep 17 00:00:00 2001
|
||||||
|
From: John Zimmermann <johnz@posteo.net>
|
||||||
|
Date: Wed, 28 Nov 2018 16:22:45 +0100
|
||||||
|
Subject: [PATCH] Use wxWidgets_CONFIG_EXECUTABLE in cmake when it is set
|
||||||
|
|
||||||
|
This variable does already get used by find_package(wxWidgets...), this
|
||||||
|
enusres that the additional version checks do also use the correct
|
||||||
|
wx-config executable
|
||||||
|
---
|
||||||
|
src/CMakeLists.txt | 6 +++++-
|
||||||
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git src/CMakeLists.txt src/CMakeLists.txt
|
||||||
|
index 2a0349d5..04634448 100644
|
||||||
|
--- src/CMakeLists.txt
|
||||||
|
+++ src/CMakeLists.txt
|
||||||
|
@@ -16,7 +16,11 @@ unset(WITH_WXPATH CACHE)
|
||||||
|
set( CL_WX_CONFIG wx-config )
|
||||||
|
|
||||||
|
if (UNIX OR MINGW)
|
||||||
|
- execute_process(COMMAND which ${CL_WX_CONFIG} OUTPUT_VARIABLE WX_TOOL OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||||
|
+ if(NOT wxWidgets_CONFIG_EXECUTABLE)
|
||||||
|
+ execute_process(COMMAND which ${CL_WX_CONFIG} OUTPUT_VARIABLE WX_TOOL OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||||
|
+ else()
|
||||||
|
+ set(WX_TOOL ${wxWidgets_CONFIG_EXECUTABLE})
|
||||||
|
+ endif()
|
||||||
|
if (NOT WX_TOOL)
|
||||||
|
message(FATAL_ERROR
|
||||||
|
"\nNo functional wx_config script was found in your PATH.\nIs the wxWidgets development package installed?\nIf you built wxWidgets yourself, you can specify the path to your built wx-config executable via WITH_WXPATH\neg. -DWITH_WXPATH=\"/path/to/wx-config/\""
|
||||||
|
--
|
||||||
|
2.19.2
|
||||||
|
|
@ -1,19 +1,22 @@
|
|||||||
# Template file for 'SLADE'
|
# Template file for 'SLADE'
|
||||||
pkgname=SLADE
|
pkgname=SLADE
|
||||||
version=3.1.1.5
|
version=3.1.2
|
||||||
revision=4
|
revision=1
|
||||||
build_style=cmake
|
build_style=cmake
|
||||||
configure_args="-DUSE_WEBVIEW_STARTPAGE=OFF"
|
hostmakedepends="pkg-config p7zip"
|
||||||
hostmakedepends="pkg-config zip"
|
|
||||||
makedepends="SFML-devel fluidsynth-devel freeimage-devel ftgl-devel glew-devel
|
makedepends="SFML-devel fluidsynth-devel freeimage-devel ftgl-devel glew-devel
|
||||||
gtk+-devel libcurl-devel wxWidgets-devel"
|
gtk+3-devel libcurl-devel wxWidgets-gtk3-devel"
|
||||||
short_desc="Modern editor for Doom-engine based games"
|
short_desc="Modern editor for Doom-engine based games"
|
||||||
maintainer="John <johnz@posteo.net>"
|
maintainer="John <johnz@posteo.net>"
|
||||||
license="GPL-2.0-or-later"
|
license="GPL-2.0-or-later"
|
||||||
homepage="https://github.com/sirjuddington/SLADE"
|
homepage="https://github.com/sirjuddington/SLADE"
|
||||||
changelog="https://github.com/sirjuddington/SLADE/releases/tag/${version}"
|
changelog="https://github.com/sirjuddington/SLADE/releases/tag/${version}"
|
||||||
distfiles="https://github.com/sirjuddington/SLADE/archive/${version}.tar.gz"
|
distfiles="https://github.com/sirjuddington/SLADE/archive/${version}.tar.gz"
|
||||||
checksum=1b1c9e8267d8749f6087297ec629d1ca81777bb1b74e51853508a570e4368e2a
|
checksum=213d8ac065e3ec06e7e7df39695a58296f7ca435c10244389b21d9f91ed49724
|
||||||
|
|
||||||
|
if [ -z "$CROSS_BUILD" ]; then
|
||||||
|
configure_args+=" -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-gtk3"
|
||||||
|
fi
|
||||||
|
|
||||||
pre_configure() {
|
pre_configure() {
|
||||||
case $XBPS_TARGET_MACHINE in
|
case $XBPS_TARGET_MACHINE in
|
||||||
|
Loading…
x
Reference in New Issue
Block a user