Accepting request 1325458 from games:tools

- Update to release 3.2.10

OBS-URL: https://build.opensuse.org/request/show/1325458
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/slade?expand=0&rev=22

0001-build-allow-deactivating-the-crash-handler-at-build-.patch

@@ -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 ()

_scmsync.obsinfo

@@ -0,0 +1,4 @@
+mtime: 1767628255
+commit: 7f2c924a2926d40368bb3913e8c1aa6ad0c8718480419903ca86dc66916f4ab7
+url: https://src.opensuse.org/jengelh/slade
+revision: master

basepk3.diff

@@ -8,11 +8,11 @@ which is not used in Linux distros.)
  src/Archive/ArchiveManager.cpp |    4 +---
  1 file changed, 1 insertion(+), 3 deletions(-)
 
-Index: SLADE-3.2.6/src/Archive/ArchiveManager.cpp
+Index: SLADE-3.2.10/src/Archive/ArchiveManager.cpp
 ===================================================================
---- SLADE-3.2.6.orig/src/Archive/ArchiveManager.cpp
-+++ SLADE-3.2.6/src/Archive/ArchiveManager.cpp
-@@ -132,14 +132,12 @@ bool ArchiveManager::init()
+--- SLADE-3.2.10.orig/src/Archive/ArchiveManager.cpp
++++ SLADE-3.2.10/src/Archive/ArchiveManager.cpp
+@@ -133,14 +133,12 @@ bool ArchiveManager::init()
  	}
  
  	// Find slade3.pk3 directory
@@ -27,4 +27,4 @@ Index: SLADE-3.2.6/src/Archive/ArchiveManager.cpp
 -	if (!fileutil::fileExists(dir_slade_pk3))
  		dir_slade_pk3 = "slade.pk3";
  
- 	// Open slade.pk3
+ 	// If still not found, try $APPDIR/usr/share/slade3/slade.pk3

build.specials.obscpio

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7e541a7602f6f9d64e9312b7f8677fa28f066bbd5a6d8f513aec27ec327bbc42
+size 256

clzma.diff

@@ -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)

disable_sse.patch

@@ -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

slade.changes

@@ -1,3 +1,83 @@
+-------------------------------------------------------------------
+Mon Jan  5 15:06:29 UTC 2026 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 3.2.10
+  * Fixed SLADE launching another copy when opening archives via a
+    file manager if SLADE is already running.
+  * PNG format handling has been reworked to use libpng instead of
+    wxWidgets. This should fix some issues related to PNGs saving
+    with compressed palettes.
+  * Heretic+Hexen (2025) widescreen raw gfx are now correctly
+    recognised and displayed.
+  * Fixed a freeze when using "Check Duplicate Entry Content"
+    maintenance tool with lots of duplicates
+  * Offsets are now kept when exporting a TEXTURES texture to an
+    individual image.
+
+-------------------------------------------------------------------
+Sun Nov 16 08:01:48 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 3.2.9
+  * A soundfont is now included with SLADE, which will be used as
+    the fallback soundfont for MIDI playback if none is set up in
+    preferences.
+  * Improved OpenGL initialization to hopefully fix issues some
+    users were having with graphical views.
+  * When saving a zip archive with duplicate named entries, added a
+    prompt to auto-rename the duplicates.
+  * Dark Forces graphic formats can now be viewed again.
+  * Improved speed of "Convert All" function in the Gfx Conversion
+    dialog.
+  * Fixed blank palettes on colour remap for paletted PNGs
+  * Fixed broken texture properties layout
+  * Fixed 3D mode camera spinning on Wayland (note that this fix
+    requires a new enough DE that implements the wp_pointer_warp_v1
+    Wayland protocol).
+
+-------------------------------------------------------------------
+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>
 

slade.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package slade
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2026 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.10
 Release:        0
 Summary:        An editor for DOOM maps and WAD/PK3 archives
 License:        GPL-2.0-or-later
@@ -36,21 +36,28 @@ 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 +72,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" \