SLADE: update to 3.1.10.
This commit is contained in:
parent
03c543349a
commit
a304cd5889
3 changed files with 22 additions and 34 deletions
|
@ -1,32 +0,0 @@
|
|||
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
|
||||
|
20
srcpkgs/SLADE/patches/signed-char.patch
Normal file
20
srcpkgs/SLADE/patches/signed-char.patch
Normal file
|
@ -0,0 +1,20 @@
|
|||
--- src/Utility/Colour.h 2020-02-19 07:13:08.000000000 +0100
|
||||
+++ - 2020-02-23 02:52:05.896845977 +0100
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
// Constructors
|
||||
ColRGBA() = default;
|
||||
- ColRGBA(uint8_t r, uint8_t g, uint8_t b, uint8_t a = 255, char blend = -1, short index = -1) :
|
||||
+ ColRGBA(uint8_t r, uint8_t g, uint8_t b, uint8_t a = 255, signed char blend = -1, short index = -1) :
|
||||
r{ r },
|
||||
g{ g },
|
||||
b{ b },
|
||||
@@ -22,7 +22,7 @@
|
||||
ColRGBA(const ColRGBA& c) : r{ c.r }, g{ c.g }, b{ c.b }, a{ c.a }, index{ c.index } {}
|
||||
|
||||
// Functions
|
||||
- void set(uint8_t r, uint8_t g, uint8_t b, uint8_t a = 255, char blend = -1, short index = -1)
|
||||
+ void set(uint8_t r, uint8_t g, uint8_t b, uint8_t a = 255, signed char blend = -1, short index = -1)
|
||||
{
|
||||
this->r = r;
|
||||
this->g = g;
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'SLADE'
|
||||
pkgname=SLADE
|
||||
version=3.1.9
|
||||
version=3.1.10
|
||||
revision=1
|
||||
build_style=cmake
|
||||
configure_args="-DCL_WX_CONFIG=wx-config-gtk3"
|
||||
|
@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
|
|||
homepage="https://github.com/sirjuddington/SLADE"
|
||||
changelog="https://github.com/sirjuddington/SLADE/releases/tag/${version}"
|
||||
distfiles="https://github.com/sirjuddington/SLADE/archive/${version}.tar.gz"
|
||||
checksum=4b03081e3a6021ae8b921f70bae7522ae848bc58fb29d1098ba086cb230648e6
|
||||
checksum=5e543d845432c5b310b942908e0a6e5c32b3aec71c087935e5cb7fbc0982b311
|
||||
|
||||
if [ -z "$CROSS_BUILD" ]; then
|
||||
configure_args+=" -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-gtk3"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue