diff --git a/0001-build-allow-deactivating-the-crash-handler-at-build-.patch b/0001-build-allow-deactivating-the-crash-handler-at-build-.patch index ea20b39..2830139 100644 --- a/0001-build-allow-deactivating-the-crash-handler-at-build-.patch +++ b/0001-build-allow-deactivating-the-crash-handler-at-build-.patch @@ -15,13 +15,13 @@ SLADE's own crash handler has two problems: Fixes: #1166 --- src/Application/SLADEWxApp.cpp | 2 +- - src/CMakeLists.txt | 4 ++++ - 2 files changed, 5 insertions(+), 1 deletion(-) + src/CMakeLists.txt | 3 +++ + 2 files changed, 4 insertions(+), 1 deletion(-) -Index: SLADE-3.2.6/src/Application/SLADEWxApp.cpp +Index: SLADE-3.2.7/src/Application/SLADEWxApp.cpp =================================================================== ---- SLADE-3.2.6.orig/src/Application/SLADEWxApp.cpp -+++ SLADE-3.2.6/src/Application/SLADEWxApp.cpp +--- SLADE-3.2.7.orig/src/Application/SLADEWxApp.cpp ++++ SLADE-3.2.7/src/Application/SLADEWxApp.cpp @@ -449,7 +449,7 @@ bool SLADEWxApp::OnInit() #endif @@ -31,15 +31,14 @@ Index: SLADE-3.2.6/src/Application/SLADEWxApp.cpp wxHandleFatalExceptions(true); #endif -Index: SLADE-3.2.6/src/CMakeLists.txt +Index: SLADE-3.2.7/src/CMakeLists.txt =================================================================== ---- SLADE-3.2.6.orig/src/CMakeLists.txt -+++ SLADE-3.2.6/src/CMakeLists.txt -@@ -41,3 +41,7 @@ if (WIN32 AND MSVC) - else () - include("unix") # Linux or MacOS - endif () +--- SLADE-3.2.7.orig/src/CMakeLists.txt ++++ SLADE-3.2.7/src/CMakeLists.txt +@@ -41,3 +41,6 @@ if(WIN32 AND MSVC) + else() + include("unix") # Linux or MacOS + endif() +if (NOT NO_CRASHHANDLER) + add_definitions(-DUSE_CRASHHANDLER) +endif () -+ diff --git a/3.2.6.tar.gz b/3.2.6.tar.gz deleted file mode 100644 index fe419c2..0000000 --- a/3.2.6.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0412de60517f4301881b048aee271bd45bacc1374b1955284647e9bd6732d2ff -size 7027328 diff --git a/3.2.7.tar.gz b/3.2.7.tar.gz new file mode 100644 index 0000000..f992caa --- /dev/null +++ b/3.2.7.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:842aa562dc0aa39627866babe0ea3bb033aac3a2be2c2aaa71d8be3664f617ad +size 6419781 diff --git a/clzma.diff b/clzma.diff index 6a6a0f8..f1fd569 100644 --- a/clzma.diff +++ b/clzma.diff @@ -8,19 +8,19 @@ lzma-sdk-dev too, but, upon checking, do not do so (anymore) as of 2024-11-27.] thirdparty/CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -Index: SLADE-3.2.6/thirdparty/CMakeLists.txt +Index: SLADE-3.2.7/thirdparty/CMakeLists.txt =================================================================== ---- SLADE-3.2.6.orig/thirdparty/CMakeLists.txt -+++ SLADE-3.2.6/thirdparty/CMakeLists.txt +--- SLADE-3.2.7.orig/thirdparty/CMakeLists.txt ++++ SLADE-3.2.7/thirdparty/CMakeLists.txt @@ -17,7 +17,6 @@ endif() set(EXTERNAL_SOURCES ) file(GLOB_RECURSE EXTERNAL_SOURCES - lzma/C/LzmaDec.c - mus2mid/mus2mid.cpp - zreaders/*.cpp glad/src/*.c -@@ -43,7 +42,7 @@ add_subdirectory(lunasvg/3rdparty/softwa + ${DUMB_SOURCES} + ${SLADE_HEADERS} +@@ -41,7 +40,7 @@ add_subdirectory(lunasvg/3rdparty/softwa add_subdirectory(lunasvg/3rdparty/plutovg) add_library(external STATIC ${EXTERNAL_SOURCES}) diff --git a/disable_sse.patch b/disable_sse.patch index 3c69c85..3e14c10 100644 --- a/disable_sse.patch +++ b/disable_sse.patch @@ -12,11 +12,11 @@ the test needs to happen at runtime. thirdparty/dumb/helpers/resampler.c | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) -Index: SLADE-3.2.6/cmake/unix.cmake +Index: SLADE-3.2.7/cmake/unix.cmake =================================================================== ---- SLADE-3.2.6.orig/cmake/unix.cmake -+++ SLADE-3.2.6/cmake/unix.cmake -@@ -150,11 +150,6 @@ endif(APPLE) +--- SLADE-3.2.7.orig/cmake/unix.cmake ++++ SLADE-3.2.7/cmake/unix.cmake +@@ -133,11 +133,6 @@ endif(APPLE) # Enable SSE instructions for dumb library include(CheckCCompilerFlag) @@ -26,12 +26,12 @@ Index: SLADE-3.2.6/cmake/unix.cmake - add_definitions(-D_USE_SSE) -endif() - # Enable debug symbols for glib (so gdb debugging works properly with strings etc.) - set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_GLIBCXX_DEBUG") -Index: SLADE-3.2.6/thirdparty/dumb/helpers/resampler.c + # Define a SLADE_DEBUG macro + set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSLADE_DEBUG") +Index: SLADE-3.2.7/thirdparty/dumb/helpers/resampler.c =================================================================== ---- SLADE-3.2.6.orig/thirdparty/dumb/helpers/resampler.c -+++ SLADE-3.2.6/thirdparty/dumb/helpers/resampler.c +--- SLADE-3.2.7.orig/thirdparty/dumb/helpers/resampler.c ++++ SLADE-3.2.7/thirdparty/dumb/helpers/resampler.c @@ -2,7 +2,7 @@ #include #define _USE_MATH_DEFINES diff --git a/slade.changes b/slade.changes index 27bbf5c..f2425fd 100644 --- a/slade.changes +++ b/slade.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Wed Dec 25 19:22:33 UTC 2024 - Jan Engelhardt + +- Update to release 3.2.7 + * Added support for DECOHack + * Added Blasphemer palette + * Added support for versions 0x200 and 0x300 of + Blood RFF archives + * Map editor: + * Added ability to filter the action specials list by name + ------------------------------------------------------------------- Wed Nov 27 12:15:46 UTC 2024 - Bjørn Lie diff --git a/slade.spec b/slade.spec index 0f037d2..1e133ab 100644 --- a/slade.spec +++ b/slade.spec @@ -17,7 +17,7 @@ Name: slade -Version: 3.2.6 +Version: 3.2.7 Release: 0 Summary: An editor for DOOM maps and WAD/PK3 archives License: GPL-2.0-or-later @@ -65,9 +65,11 @@ from/to other generic formats such as PNG. %build %define _lto_cflags %nil +export CFLAGS="%optflags -O0 -ggdb3 -fsanitize=address,undefined" +export CXXFLAGS="%optflags -O0 -ggdb3 -fsanitize=address,undefined" %cmake -DNO_WEBVIEW=ON -DWX_GTK3=OFF -DNO_CRASHHANDLER=ON \ - -DCMAKE_C_FLAGS_RELWITHDEBINFO:STRING="%optflags" \ - -DCMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING="%optflags" \ + -DCMAKE_C_FLAGS_RELWITHDEBINFO:STRING="$CFLAGS" \ + -DCMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING="$CFLAGS" \ %if 0%{?suse_version} >= 1600 -DUSE_SYSTEM_FMT:BOOL=ON \ %endif