diff --git a/srcpkgs/SLADE/patches/pointer-decay.patch b/srcpkgs/SLADE/patches/pointer-decay.patch deleted file mode 100644 index 7719471b03f..00000000000 --- a/srcpkgs/SLADE/patches/pointer-decay.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/src/External/sol/sol.hpp -+++ b/src/External/sol/sol.hpp -@@ -6818,7 +6818,7 @@ - } - - static int push(lua_State* L, const wchar_t(&str)[N], std::size_t sz) { -- return stack::push(L, str, str + sz); -+ return stack::push(L, str + 0, str + sz); - } - }; - -@@ -6829,7 +6829,7 @@ - } - - static int push(lua_State* L, const char16_t(&str)[N], std::size_t sz) { -- return stack::push(L, str, str + sz); -+ return stack::push(L, str + 0, str + sz); - } - }; - -@@ -6840,7 +6840,7 @@ - } - - static int push(lua_State* L, const char32_t(&str)[N], std::size_t sz) { -- return stack::push(L, str, str + sz); -+ return stack::push(L, str + 0, str + sz); - } - }; - diff --git a/srcpkgs/SLADE/patches/signed....patch b/srcpkgs/SLADE/patches/signed....patch new file mode 100644 index 00000000000..fafceaf0053 --- /dev/null +++ b/srcpkgs/SLADE/patches/signed....patch @@ -0,0 +1,20 @@ +--- a/src/Utility/Colour.h 2022-05-13 15:08:51.000000000 +0200 ++++ - 2023-01-02 14:26:37.082908132 +0100 +@@ -13,7 +13,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 }, a{ a }, index{ index } + { + } +@@ -21,7 +21,7 @@ + explicit ColRGBA(const wxColour& c) : r{ c.Red() }, g{ c.Green() }, b{ c.Blue() }, a{ c.Alpha() } {} + + // 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; diff --git a/srcpkgs/SLADE/patches/system-libraries.patch b/srcpkgs/SLADE/patches/system-libraries.patch index d2a0ca72471..f9393b24431 100644 --- a/srcpkgs/SLADE/patches/system-libraries.patch +++ b/srcpkgs/SLADE/patches/system-libraries.patch @@ -1,17 +1,48 @@ -lzma is p7zip not liblzma ---- a/src/External/CMakeLists.txt -+++ b/src/External/CMakeLists.txt -@@ -24,12 +24,10 @@ +--- a/src/Audio/ModMusic.cpp 2022-05-13 15:08:51.000000000 +0200 ++++ - 2023-01-02 14:13:21.643696778 +0100 +@@ -32,7 +32,7 @@ + // ----------------------------------------------------------------------------- + #include "Main.h" + #include "ModMusic.h" +-#include "thirdparty/dumb/dumb.h" ++#include + + using namespace slade; + using namespace audio; +--- a/src/Application/App.cpp 2022-05-13 15:08:51.000000000 +0200 ++++ - 2023-01-02 14:13:44.631508582 +0100 +@@ -60,7 +60,7 @@ + #include "UI/WxUtils.h" + #include "Utility/StringUtils.h" + #include "Utility/Tokenizer.h" +-#include "thirdparty/dumb/dumb.h" ++#include + #include + + using namespace slade; +--- a/thirdparty/CMakeLists.txt 2022-05-13 15:08:51.000000000 +0200 ++++ - 2023-01-02 14:14:00.580831197 +0100 +@@ -10,7 +10,6 @@ + set(EXTERNAL_SOURCES + ) file(GLOB_RECURSE EXTERNAL_SOURCES - *.cpp - *.cxx - dumb/*.c -- lua/*.c lzma/C/LzmaDec.c - ${SLADE_HEADERS} - ) + mus2mid/mus2mid.cpp + zreaders/*.cpp +@@ -30,4 +29,4 @@ add_library(external STATIC ${EXTERNAL_SOURCES}) - target_link_libraries(external ${ZLIB_LIBRARY}) + target_link_libraries(external ${ZLIB_LIBRARY} lunasvg fmt ${CMAKE_DL_LIBS}) -set(EXTERNAL_LIBRARIES external PARENT_SCOPE) -+set(EXTERNAL_LIBRARIES external dumb lua5.3 PARENT_SCOPE) ++set(EXTERNAL_LIBRARIES external dumb PARENT_SCOPE) +--- a/src/CMakeLists.txt 2022-05-13 15:08:51.000000000 +0200 ++++ - 2023-01-02 14:17:00.363717559 +0100 +@@ -116,7 +116,6 @@ + ${MPG123_INCLUDE_DIR} + . + .. +- ../thirdparty/dumb + ../thirdparty/glad/include + ./Application + ) diff --git a/srcpkgs/SLADE/template b/srcpkgs/SLADE/template index f7c5d5cd9ff..8b680574c3b 100644 --- a/srcpkgs/SLADE/template +++ b/srcpkgs/SLADE/template @@ -1,6 +1,6 @@ # Template file for 'SLADE' pkgname=SLADE -version=3.1.13 +version=3.2.1 revision=1 build_style=cmake build_helper=cmake-wxWidgets-gtk3 @@ -14,7 +14,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=a9719f8639ae579c9671fda8c8ccbcc1ed55f7c98208fdeb439fb8d52fe340d7 +checksum=c327fa62ba491ac481d769700261d810128910007297fd9d9dbe26ac0e78bb2c pre_configure() { case $XBPS_TARGET_MACHINE in