Accepting request 1234416 from games:tools

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/1234416
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/slade?expand=0&rev=17
This commit is contained in:
Ana Guerrero 2025-01-02 18:22:25 +00:00 committed by Git OBS Bridge
commit 6a1bda14b9
9 changed files with 49 additions and 37 deletions

View File

@ -15,13 +15,13 @@ SLADE's own crash handler has two problems:
Fixes: #1166 Fixes: #1166
--- ---
src/Application/SLADEWxApp.cpp | 2 +- src/Application/SLADEWxApp.cpp | 2 +-
src/CMakeLists.txt | 4 ++++ src/CMakeLists.txt | 3 +++
2 files changed, 5 insertions(+), 1 deletion(-) 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.7.orig/src/Application/SLADEWxApp.cpp
+++ SLADE-3.2.6/src/Application/SLADEWxApp.cpp +++ SLADE-3.2.7/src/Application/SLADEWxApp.cpp
@@ -449,7 +449,7 @@ bool SLADEWxApp::OnInit() @@ -449,7 +449,7 @@ bool SLADEWxApp::OnInit()
#endif #endif
@ -31,15 +31,14 @@ Index: SLADE-3.2.6/src/Application/SLADEWxApp.cpp
wxHandleFatalExceptions(true); wxHandleFatalExceptions(true);
#endif #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.7.orig/src/CMakeLists.txt
+++ SLADE-3.2.6/src/CMakeLists.txt +++ SLADE-3.2.7/src/CMakeLists.txt
@@ -41,3 +41,7 @@ if (WIN32 AND MSVC) @@ -41,3 +41,6 @@ if(WIN32 AND MSVC)
else () else()
include("unix") # Linux or MacOS include("unix") # Linux or MacOS
endif () endif()
+if (NOT NO_CRASHHANDLER) +if (NOT NO_CRASHHANDLER)
+ add_definitions(-DUSE_CRASHHANDLER) + add_definitions(-DUSE_CRASHHANDLER)
+endif () +endif ()
+

BIN
3.2.6.tar.gz (Stored with Git LFS)

Binary file not shown.

BIN
3.2.7.tar.gz (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -1,4 +1,4 @@
mtime: 1732826729 mtime: 1735155456
commit: 660aab5cf295b570fdec6cb717962d47960d9db53e8bd082b26e19b0b4a2bb89 commit: eeb37b47fa1bd23cf516ff18c99af4dbec4f4a61f8c72066097f4a27db7cf041
url: https://src.opensuse.org/jengelh/slade url: https://src.opensuse.org/jengelh/slade
revision: master revision: master

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:961a33826b87f6a82bf708e28134394c2ae843741cae83abd58aa41d0d520710 oid sha256:707511f9d91cc4377883b0ac66a8ab5fb3a30a62583ae2b8d280bdada3ad1a5d
size 256 size 256

View File

@ -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 +-- thirdparty/CMakeLists.txt | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-) 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.7.orig/thirdparty/CMakeLists.txt
+++ SLADE-3.2.6/thirdparty/CMakeLists.txt +++ SLADE-3.2.7/thirdparty/CMakeLists.txt
@@ -17,7 +17,6 @@ endif() @@ -17,7 +17,6 @@ endif()
set(EXTERNAL_SOURCES set(EXTERNAL_SOURCES
) )
file(GLOB_RECURSE EXTERNAL_SOURCES file(GLOB_RECURSE EXTERNAL_SOURCES
- lzma/C/LzmaDec.c - lzma/C/LzmaDec.c
mus2mid/mus2mid.cpp
zreaders/*.cpp
glad/src/*.c 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_subdirectory(lunasvg/3rdparty/plutovg)
add_library(external STATIC ${EXTERNAL_SOURCES}) add_library(external STATIC ${EXTERNAL_SOURCES})

View File

@ -12,11 +12,11 @@ the test needs to happen at runtime.
thirdparty/dumb/helpers/resampler.c | 2 +- thirdparty/dumb/helpers/resampler.c | 2 +-
2 files changed, 1 insertion(+), 6 deletions(-) 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.7.orig/cmake/unix.cmake
+++ SLADE-3.2.6/cmake/unix.cmake +++ SLADE-3.2.7/cmake/unix.cmake
@@ -150,11 +150,6 @@ endif(APPLE) @@ -133,11 +133,6 @@ endif(APPLE)
# Enable SSE instructions for dumb library # Enable SSE instructions for dumb library
include(CheckCCompilerFlag) include(CheckCCompilerFlag)
@ -26,12 +26,12 @@ Index: SLADE-3.2.6/cmake/unix.cmake
- add_definitions(-D_USE_SSE) - add_definitions(-D_USE_SSE)
-endif() -endif()
# Enable debug symbols for glib (so gdb debugging works properly with strings etc.) # Define a SLADE_DEBUG macro
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_GLIBCXX_DEBUG") set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSLADE_DEBUG")
Index: SLADE-3.2.6/thirdparty/dumb/helpers/resampler.c Index: SLADE-3.2.7/thirdparty/dumb/helpers/resampler.c
=================================================================== ===================================================================
--- SLADE-3.2.6.orig/thirdparty/dumb/helpers/resampler.c --- SLADE-3.2.7.orig/thirdparty/dumb/helpers/resampler.c
+++ SLADE-3.2.6/thirdparty/dumb/helpers/resampler.c +++ SLADE-3.2.7/thirdparty/dumb/helpers/resampler.c
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
#include <string.h> #include <string.h>
#define _USE_MATH_DEFINES #define _USE_MATH_DEFINES

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Wed Dec 25 19:22:33 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
- 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 <bjorn.lie@gmail.com> Wed Nov 27 12:15:46 UTC 2024 - Bjørn Lie <bjorn.lie@gmail.com>

View File

@ -17,7 +17,7 @@
Name: slade Name: slade
Version: 3.2.6 Version: 3.2.7
Release: 0 Release: 0
Summary: An editor for DOOM maps and WAD/PK3 archives Summary: An editor for DOOM maps and WAD/PK3 archives
License: GPL-2.0-or-later License: GPL-2.0-or-later
@ -65,9 +65,11 @@ from/to other generic formats such as PNG.
%build %build
%define _lto_cflags %nil %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 \ %cmake -DNO_WEBVIEW=ON -DWX_GTK3=OFF -DNO_CRASHHANDLER=ON \
-DCMAKE_C_FLAGS_RELWITHDEBINFO:STRING="%optflags" \ -DCMAKE_C_FLAGS_RELWITHDEBINFO:STRING="$CFLAGS" \
-DCMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING="%optflags" \ -DCMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING="$CFLAGS" \
%if 0%{?suse_version} >= 1600 %if 0%{?suse_version} >= 1600
-DUSE_SYSTEM_FMT:BOOL=ON \ -DUSE_SYSTEM_FMT:BOOL=ON \
%endif %endif