SLADE: update to 3.1.11.

Signed-off-by: John <johnz@posteo.net>
This commit is contained in:
John 2020-03-12 12:39:12 +01:00
parent af4fe26a1a
commit 27cf8c9818
2 changed files with 5 additions and 25 deletions

View file

@ -1,20 +0,0 @@
--- 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;

View file

@ -1,10 +1,9 @@
# Template file for 'SLADE'
pkgname=SLADE
version=3.1.10
version=3.1.11
revision=1
build_style=cmake
configure_args="-DCL_WX_CONFIG=wx-config-gtk3"
hostmakedepends="pkg-config p7zip"
hostmakedepends="pkg-config p7zip which"
makedepends="SFML-devel fluidsynth-devel freeimage-devel ftgl-devel glew-devel
gtk+3-devel libcurl-devel wxWidgets-gtk3-devel"
short_desc="Modern editor for Doom-engine based games"
@ -13,7 +12,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=5e543d845432c5b310b942908e0a6e5c32b3aec71c087935e5cb7fbc0982b311
checksum=83cea24520d57f6bd23f146925eab55e2413f7c91e24c84bcda550b94ecedc08
if [ -z "$CROSS_BUILD" ]; then
configure_args+=" -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-gtk3"
@ -22,6 +21,7 @@ fi
pre_configure() {
case $XBPS_TARGET_MACHINE in
x86_64* | i686*);;
*) sed -i '/D_USE_SSE/d' src/CMakeLists.txt;;
*) vsed -e '/D_USE_SSE/d' -i src/CMakeLists.txt;;
esac
vsed -e 's/wx-config/wx-config-gtk3/g' -i src/CMakeLists.txt
}