Compare commits
18 Commits
| Author | SHA256 | Date | |
|---|---|---|---|
| 766d999d1d | |||
| 09745818b1 | |||
| 426d6d41e2 | |||
|
|
b9357b4eef | ||
| fa08cb764f | |||
|
|
4a1aeeff0c | ||
|
|
8fae588b64 | ||
| 5795bd32f1 | |||
|
|
3c511e3a2e | ||
| e6ed95b1ec | |||
|
|
4aa1c4caea | ||
| 70ce511458 | |||
|
|
acd85d46f0 | ||
|
|
97c78369f2 | ||
|
|
ffabc4be6e | ||
|
|
08d9977eb5 | ||
| 14d018e0ed | |||
| 8456157d39 |
@@ -18,11 +18,11 @@ Fixes: #1166
|
||||
src/CMakeLists.txt | 3 +++
|
||||
2 files changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
Index: SLADE-3.2.7/src/Application/SLADEWxApp.cpp
|
||||
Index: SLADE-3.2.8/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()
|
||||
--- SLADE-3.2.8.orig/src/Application/SLADEWxApp.cpp
|
||||
+++ SLADE-3.2.8/src/Application/SLADEWxApp.cpp
|
||||
@@ -452,7 +452,7 @@ bool SLADEWxApp::OnInit()
|
||||
#endif
|
||||
|
||||
// Handle exceptions using wxDebug stuff, but only in release mode
|
||||
@@ -31,14 +31,14 @@ Index: SLADE-3.2.7/src/Application/SLADEWxApp.cpp
|
||||
wxHandleFatalExceptions(true);
|
||||
#endif
|
||||
|
||||
Index: SLADE-3.2.7/src/CMakeLists.txt
|
||||
Index: SLADE-3.2.8/src/CMakeLists.txt
|
||||
===================================================================
|
||||
--- SLADE-3.2.7.orig/src/CMakeLists.txt
|
||||
+++ SLADE-3.2.7/src/CMakeLists.txt
|
||||
@@ -41,3 +41,6 @@ if(WIN32 AND MSVC)
|
||||
else()
|
||||
--- SLADE-3.2.8.orig/src/CMakeLists.txt
|
||||
+++ SLADE-3.2.8/src/CMakeLists.txt
|
||||
@@ -47,3 +47,6 @@ if (WIN32 AND MSVC)
|
||||
else ()
|
||||
include("unix") # Linux or MacOS
|
||||
endif()
|
||||
endif ()
|
||||
+if (NOT NO_CRASHHANDLER)
|
||||
+ add_definitions(-DUSE_CRASHHANDLER)
|
||||
+endif ()
|
||||
|
||||
BIN
3.2.7.tar.gz
LFS
BIN
3.2.7.tar.gz
LFS
Binary file not shown.
BIN
3.2.8.tar.gz
LFS
Normal file
BIN
3.2.8.tar.gz
LFS
Normal file
Binary file not shown.
4
_scmsync.obsinfo
Normal file
4
_scmsync.obsinfo
Normal file
@@ -0,0 +1,4 @@
|
||||
mtime: 1761066075
|
||||
commit: 2e771a1914a8de2797ef9c5131873a054dfa6793ac3b536ceb8e84d949fcb2e9
|
||||
url: https://src.opensuse.org/jengelh/slade
|
||||
revision: master
|
||||
3
build.specials.obscpio
Normal file
3
build.specials.obscpio
Normal file
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:d978ccfab8e2e031eeba0431d89eef9e8850c4b0614f2542f2d64fa52ede4913
|
||||
size 256
|
||||
@@ -1,9 +1,7 @@
|
||||
From: Jan Engelhardt <jengelh@inai.de>
|
||||
Date: 2020-06-22 21:16:10.343429323 +0200
|
||||
|
||||
Make use of the clzma library in openSUSE.
|
||||
[openSUSE-specific patch. I was under the impression that Debian and/or Ubuntu shipped
|
||||
lzma-sdk-dev too, but, upon checking, do not do so (anymore) as of 2024-11-27.]
|
||||
Make use of the system-provided lzma-sdk (in openSUSE, Fedora).
|
||||
---
|
||||
thirdparty/CMakeLists.txt | 3 +--
|
||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||
@@ -25,7 +23,7 @@ Index: SLADE-3.2.7/thirdparty/CMakeLists.txt
|
||||
|
||||
add_library(external STATIC ${EXTERNAL_SOURCES})
|
||||
-target_link_libraries(external ${ZLIB_LIBRARY} lunasvg fmt::fmt ${CMAKE_DL_LIBS})
|
||||
+target_link_libraries(external ${ZLIB_LIBRARY} -lclzma lunasvg fmt::fmt ${CMAKE_DL_LIBS})
|
||||
+target_link_libraries(external ${ZLIB_LIBRARY} -llzmasdk lunasvg fmt::fmt ${CMAKE_DL_LIBS})
|
||||
set(EXTERNAL_LIBRARIES external PARENT_SCOPE)
|
||||
|
||||
if(USE_SYSTEM_DUMB)
|
||||
|
||||
@@ -12,26 +12,26 @@ the test needs to happen at runtime.
|
||||
thirdparty/dumb/helpers/resampler.c | 2 +-
|
||||
2 files changed, 1 insertion(+), 6 deletions(-)
|
||||
|
||||
Index: SLADE-3.2.7/cmake/unix.cmake
|
||||
Index: SLADE-3.2.8/cmake/unix.cmake
|
||||
===================================================================
|
||||
--- SLADE-3.2.7.orig/cmake/unix.cmake
|
||||
+++ SLADE-3.2.7/cmake/unix.cmake
|
||||
@@ -133,11 +133,6 @@ endif(APPLE)
|
||||
--- SLADE-3.2.8.orig/cmake/unix.cmake
|
||||
+++ SLADE-3.2.8/cmake/unix.cmake
|
||||
@@ -133,11 +133,6 @@ endif (APPLE)
|
||||
|
||||
# Enable SSE instructions for dumb library
|
||||
include(CheckCCompilerFlag)
|
||||
-check_c_compiler_flag(-msse HAVE_SSE)
|
||||
-if(HAVE_SSE)
|
||||
-if (HAVE_SSE)
|
||||
- add_compile_options(-msse)
|
||||
- add_definitions(-D_USE_SSE)
|
||||
-endif()
|
||||
-endif ()
|
||||
|
||||
# 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
|
||||
Index: SLADE-3.2.8/thirdparty/dumb/helpers/resampler.c
|
||||
===================================================================
|
||||
--- SLADE-3.2.7.orig/thirdparty/dumb/helpers/resampler.c
|
||||
+++ SLADE-3.2.7/thirdparty/dumb/helpers/resampler.c
|
||||
--- SLADE-3.2.8.orig/thirdparty/dumb/helpers/resampler.c
|
||||
+++ SLADE-3.2.8/thirdparty/dumb/helpers/resampler.c
|
||||
@@ -2,7 +2,7 @@
|
||||
#include <string.h>
|
||||
#define _USE_MATH_DEFINES
|
||||
|
||||
@@ -1,3 +1,52 @@
|
||||
-------------------------------------------------------------------
|
||||
Sat Nov 22 21:41:25 CET 2025 - Stanislav Brabec <sbrabec@suse.com>
|
||||
|
||||
- Remove unused BuildRequires: update-desktop-files.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Oct 21 09:18:21 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
|
||||
|
||||
- Update to release 3.2.8
|
||||
* Updated DECOHack language definition
|
||||
* Added support for the Heretic (2025)/Hexen (2025) port
|
||||
* Resource editor:
|
||||
* Added ability to copy+paste gfx offsets
|
||||
* Fixed crashes on entry list updates (entry
|
||||
added/deleted, etc.) while filtering is active
|
||||
* Texture editor:
|
||||
* Double clicking a TEXTUREx entry will now open
|
||||
only that entry in the texture editor
|
||||
* Limited the number of TEXTUREx entries initially opened to 5
|
||||
when launching the texture editor via toolbar or menu
|
||||
* Fixed patch offsets being set to the wrong value when
|
||||
double-clicking a patch in the browser during 'replace patch'
|
||||
action
|
||||
* Map editor:
|
||||
* Added ability to auto-align on the Y-axis and improved X-axis
|
||||
auto alignment
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Aug 24 12:41:33 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
|
||||
|
||||
- Adjust clzma.diff for changes in the lzma-sdk package's
|
||||
lzma-sdk-shlib.patch.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 21 19:48:20 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
|
||||
|
||||
- Delete accidentally committed UBSAN flags from specfile
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Apr 15 15:50:26 UTC 2025 - Atri Bhattacharya <badshah400@gmail.com>
|
||||
|
||||
- Drop BuildRequires: pkgconfig(glew) as it is not used for build;
|
||||
GLAD is used instead.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 26 15:14:19 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
|
||||
|
||||
- Switch to wxGTK3 backend
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Dec 25 19:22:33 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
|
||||
|
||||
|
||||
31
slade.spec
31
slade.spec
@@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package slade
|
||||
#
|
||||
# Copyright (c) 2024 SUSE LLC
|
||||
# Copyright (c) 2025 SUSE LLC and contributors
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
|
||||
Name: slade
|
||||
Version: 3.2.7
|
||||
Version: 3.2.8
|
||||
Release: 0
|
||||
Summary: An editor for DOOM maps and WAD/PK3 archives
|
||||
License: GPL-2.0-or-later
|
||||
@@ -35,22 +35,28 @@ BuildRequires: freeimage-devel
|
||||
BuildRequires: gcc-c++ >= 8
|
||||
BuildRequires: pkg-config
|
||||
BuildRequires: strip-nondeterminism
|
||||
BuildRequires: update-desktop-files
|
||||
BuildRequires: wxWidgets-devel
|
||||
BuildRequires: wxGTK3-devel >= 3.1.6
|
||||
BuildRequires: zip
|
||||
BuildRequires: pkgconfig(clzma)
|
||||
BuildRequires: pkgconfig(fluidsynth)
|
||||
BuildRequires: pkgconfig(ftgl)
|
||||
BuildRequires: pkgconfig(gl)
|
||||
BuildRequires: pkgconfig(glew)
|
||||
BuildRequires: pkgconfig(libcurl)
|
||||
BuildRequires: pkgconfig(libmpg123)
|
||||
BuildRequires: pkgconfig(libmpg123) >= 1.28.1
|
||||
BuildRequires: pkgconfig(libwebp)
|
||||
BuildRequires: pkgconfig(sfml-all)
|
||||
BuildRequires: pkgconfig(x11)
|
||||
%if 0%{?suse_version} >= 1600
|
||||
BuildRequires: fmt-10-devel
|
||||
%if 0%{?suse_version} >= 1690
|
||||
BuildRequires: sfml3-devel
|
||||
%endif
|
||||
%if 0%{?suse_version} >= 1690
|
||||
BuildRequires: pkgconfig(lzma-sdk)
|
||||
%else
|
||||
Provides: bundled(fmt) = 10
|
||||
BuildRequires: pkgconfig(clzma)
|
||||
%endif
|
||||
%if 0%{?suse_version} >= 1600
|
||||
BuildRequires: fmt-devel
|
||||
%else
|
||||
Provides: bundled(fmt) = 11.1.3
|
||||
%endif
|
||||
Provides: bundled(dumb) = 0.9.3
|
||||
|
||||
@@ -65,8 +71,9 @@ 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"
|
||||
%if 0%{?suse_version} >= 1600 && 0%{?suse_version} < 1690
|
||||
perl -i -lpe 's{ -llzmasdk }{ -lclzma }g' thirdparty/CMakeLists.txt
|
||||
%endif
|
||||
%cmake -DNO_WEBVIEW=ON -DWX_GTK3=OFF -DNO_CRASHHANDLER=ON \
|
||||
-DCMAKE_C_FLAGS_RELWITHDEBINFO:STRING="$CFLAGS" \
|
||||
-DCMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING="$CFLAGS" \
|
||||
|
||||
Reference in New Issue
Block a user