From 6afcedf9d0b7885795def3786913f969d817beb225f1b65cafc17c693734d514 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Wed, 27 Nov 2024 16:03:11 +0000
Subject: [PATCH 1/6] NOTE: This is untested!

- Update to version 3.2.6:
  * Please see Release Notes upstream at
    https://github.com/sirjuddington/SLADE/releases
- Drop patches fixed upstream:
  * disable_sse.patch
  * 0001-build-add-cmake-option-to-skip-Lua-components-1175.patch
- Disable patches that needs rebase or dropping:
  * basepk3.diff
  * wx.diff
  * clzma.diff
- Rebase  0001-build-allow-deactivating-the-crash-handler-at-build-.patch
- Replace wxWidgets-3_0-devel for wxWidgets-devel BuildRequires:
  Package builds just fine with the newer 3.2 version.
- Add pkgconfig(libmpg123) BuildRequires: New dependency.

OBS-URL: https://build.opensuse.org/package/show/games:tools/slade?expand=0&rev=44
---
 .gitattributes                                |  23 ++
 .gitignore                                    |   1 +
 ...e-option-to-skip-Lua-components-1175.patch | 231 ++++++++++++++++++
 ...tivating-the-crash-handler-at-build-.patch |  46 ++++
 3.1.13.tar.gz                                 |   3 +
 3.2.6.tar.gz                                  |   3 +
 basepk3.diff                                  |  30 +++
 clzma.diff                                    |  24 ++
 disable_sse.patch                             |  12 +
 slade.changes                                 | 189 ++++++++++++++
 slade.spec                                    |  84 +++++++
 wx.diff                                       |  41 ++++
 12 files changed, 687 insertions(+)
 create mode 100644 .gitattributes
 create mode 100644 .gitignore
 create mode 100644 0001-build-add-cmake-option-to-skip-Lua-components-1175.patch
 create mode 100644 0001-build-allow-deactivating-the-crash-handler-at-build-.patch
 create mode 100644 3.1.13.tar.gz
 create mode 100644 3.2.6.tar.gz
 create mode 100644 basepk3.diff
 create mode 100644 clzma.diff
 create mode 100644 disable_sse.patch
 create mode 100644 slade.changes
 create mode 100644 slade.spec
 create mode 100644 wx.diff

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..9b03811
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,23 @@
+## Default LFS
+*.7z filter=lfs diff=lfs merge=lfs -text
+*.bsp filter=lfs diff=lfs merge=lfs -text
+*.bz2 filter=lfs diff=lfs merge=lfs -text
+*.gem filter=lfs diff=lfs merge=lfs -text
+*.gz filter=lfs diff=lfs merge=lfs -text
+*.jar filter=lfs diff=lfs merge=lfs -text
+*.lz filter=lfs diff=lfs merge=lfs -text
+*.lzma filter=lfs diff=lfs merge=lfs -text
+*.obscpio filter=lfs diff=lfs merge=lfs -text
+*.oxt filter=lfs diff=lfs merge=lfs -text
+*.pdf filter=lfs diff=lfs merge=lfs -text
+*.png filter=lfs diff=lfs merge=lfs -text
+*.rpm filter=lfs diff=lfs merge=lfs -text
+*.tbz filter=lfs diff=lfs merge=lfs -text
+*.tbz2 filter=lfs diff=lfs merge=lfs -text
+*.tgz filter=lfs diff=lfs merge=lfs -text
+*.ttf filter=lfs diff=lfs merge=lfs -text
+*.txz filter=lfs diff=lfs merge=lfs -text
+*.whl filter=lfs diff=lfs merge=lfs -text
+*.xz filter=lfs diff=lfs merge=lfs -text
+*.zip filter=lfs diff=lfs merge=lfs -text
+*.zst filter=lfs diff=lfs merge=lfs -text
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..57affb6
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.osc
diff --git a/0001-build-add-cmake-option-to-skip-Lua-components-1175.patch b/0001-build-add-cmake-option-to-skip-Lua-components-1175.patch
new file mode 100644
index 0000000..a618942
--- /dev/null
+++ b/0001-build-add-cmake-option-to-skip-Lua-components-1175.patch
@@ -0,0 +1,231 @@
+From a54f12b4c29e949458949d5bede2f74b1aa8a34a Mon Sep 17 00:00:00 2001
+From: jengelh <jengelh@inai.de>
+Date: Mon, 29 Jun 2020 03:43:01 +0200
+Subject: [PATCH] build: add cmake option to skip Lua components (#1175)
+
+sol.hpp has a lot of templates which, when building with -g
+-fsanitize=address -fsanitize=undefined, incur long compile time and
+high memory usage (~8500MB) [applies to Scripting/Export/Archive.cpp
+and Scripting/Export/Graphics.cpp].
+
+Add a cmake option so I can skip building some parts and focus on
+the rest.
+
+Co-authored-by: Simon Judd <sirjuddington@gmail.com>
+---
+ src/Application/App.cpp              |    8 ++++++++
+ src/CMakeLists.txt                   |   11 ++++++++++-
+ src/MainEditor/UI/ArchivePanel.cpp   |   10 ++++++++++
+ src/MainEditor/UI/MainWindow.cpp     |    2 ++
+ src/MapEditor/UI/MapEditorWindow.cpp |    6 ++++++
+ 5 files changed, 36 insertions(+), 1 deletion(-)
+
+Index: SLADE-3.1.12/src/Application/App.cpp
+===================================================================
+--- SLADE-3.1.12.orig/src/Application/App.cpp
++++ SLADE-3.1.12/src/Application/App.cpp
+@@ -450,8 +450,10 @@ bool App::init(vector<string>& args, dou
+ 	SAction::setBaseWxId(26000);
+ 	SAction::initActions();
+ 
++#ifdef USE_LUA
+ 	// Init lua
+ 	Lua::init();
++#endif
+ 
+ 	// Init UI
+ 	UI::init(ui_scale);
+@@ -515,8 +517,10 @@ bool App::init(vector<string>& args, dou
+ 	Log::info("Loading game configurations");
+ 	Game::init();
+ 
++#ifdef USE_LUA
+ 	// Init script manager
+ 	ScriptManager::init();
++#endif
+ 
+ 	// Show the main window
+ 	MainEditor::windowWx()->Show(true);
+@@ -644,8 +648,10 @@ void App::exit(bool save_config)
+ 		// Save custom special presets
+ 		Game::saveCustomSpecialPresets();
+ 
++#ifdef USE_LUA
+ 		// Save custom scripts
+ 		ScriptManager::saveUserScripts();
++#endif
+ 	}
+ 
+ 	// Close all open archives
+@@ -666,8 +672,10 @@ void App::exit(bool save_config)
+ 		files = temp.GetNext(&filename);
+ 	}
+ 
++#ifdef USE_LUA
+ 	// Close lua
+ 	Lua::close();
++#endif
+ 
+ 	// Close DUMB
+ 	dumb_exit();
+Index: SLADE-3.1.12/src/CMakeLists.txt
+===================================================================
+--- SLADE-3.1.12.orig/src/CMakeLists.txt
++++ SLADE-3.1.12/src/CMakeLists.txt
+@@ -105,6 +105,9 @@ find_package(OpenGL REQUIRED)
+ find_package(GLEW REQUIRED)
+ find_package(Freetype REQUIRED)
+ find_package(CURL REQUIRED)
++if (NOT NO_LUA)
++	find_package(Lua REQUIRED)
++endif()
+ include_directories(
+ 	${FREEIMAGE_INCLUDE_DIR}
+ 	${SFML_INCLUDE_DIR}
+@@ -133,6 +136,7 @@ endif ()
+ 
+ set(SLADE_SOURCES
+ )
++set(SLADE_SCRIPTING_SOURCES)
+ # Don't include external libraries here as they should be compiled separately
+ file(GLOB_RECURSE SLADE_SOURCES
+ 	Application/*.cpp
+@@ -147,9 +151,14 @@ file(GLOB_RECURSE SLADE_SOURCES
+ 	OpenGL/*.cpp
+ 	UI/*.cpp
+ 	Utility/*.cpp
+-	Scripting/*.cpp
+ 	TextEditor/*.cpp
+ 	)
++if (NOT NO_LUA)
++	file(GLOB_RECURSE SLADE_SCRIPTING_SOURCES Scripting/*.cpp)
++	set(SLADE_SOURCES ${SLADE_SOURCES} ${SLADE_SCRIPTING_SOURCES})
++	ADD_DEFINITIONS(-DUSE_LUA)
++else ()
++endif ()
+ set(SLADE_HEADERS
+ )
+ file(GLOB_RECURSE SLADE_HEADERS *.h *.hpp)
+Index: SLADE-3.1.12/src/MainEditor/UI/ArchivePanel.cpp
+===================================================================
+--- SLADE-3.1.12.orig/src/MainEditor/UI/ArchivePanel.cpp
++++ SLADE-3.1.12/src/MainEditor/UI/ArchivePanel.cpp
+@@ -522,7 +522,9 @@ void ArchivePanel::addMenus()
+ 		SAction::fromId("arch_replace_maps")->addToMenu(menu_clean);
+ 		menu_archive->AppendSubMenu(menu_clean, "&Maintenance");
+ 		auto menu_scripts = new wxMenu();
++#ifdef USE_LUA
+ 		ScriptManager::populateEditorScriptMenu(menu_scripts, ScriptManager::ScriptType::Archive, "arch_script");
++#endif
+ 		menu_archive->AppendSubMenu(menu_scripts, "&Run Script");
+ 	}
+ 	if (!menu_entry)
+@@ -546,7 +548,9 @@ void ArchivePanel::addMenus()
+ 		menu_entry->AppendSeparator();
+ 		SAction::fromId("arch_entry_bookmark")->addToMenu(menu_entry);
+ 		auto menu_scripts = new wxMenu();
++#ifdef USE_LUA
+ 		ScriptManager::populateEditorScriptMenu(menu_scripts, ScriptManager::ScriptType::Entry, "arch_entry_script");
++#endif
+ 		menu_entry->AppendSubMenu(menu_scripts, "&Run Script");
+ 	}
+ 
+@@ -3189,9 +3193,11 @@ bool ArchivePanel::handleAction(string i
+ 		dlg.ShowModal();
+ 	}
+ 
++#ifdef USE_LUA
+ 	// Archive->Scripts->...
+ 	else if (id == "arch_script")
+ 		ScriptManager::runArchiveScript(archive_, wx_id_offset);
++#endif
+ 
+ 
+ 	// ------------------------------------------------------------------------
+@@ -3269,9 +3275,11 @@ bool ArchivePanel::handleAction(string i
+ 	else if (id == "arch_entry_openext")
+ 		openEntryExternal();
+ 
++#ifdef USE_LUA
+ 	// Entry->Run Script
+ 	else if (id == "arch_entry_script")
+ 		ScriptManager::runEntryScript(entry_list_->getSelectedEntries(), wx_id_offset, MainEditor::windowWx());
++#endif
+ 
+ 
+ 	// Context menu actions
+@@ -3785,6 +3793,7 @@ void ArchivePanel::onEntryListRightClick
+ #endif
+ 	}
+ 
++#ifdef USE_LUA
+ 	// Entry scripts
+ 	if (!ScriptManager::editorScripts(ScriptManager::ScriptType::Entry).empty())
+ 	{
+@@ -3793,6 +3802,7 @@ void ArchivePanel::onEntryListRightClick
+ 		context.AppendSeparator();
+ 		context.AppendSubMenu(menu_scripts, "Run &Script");
+ 	}
++#endif
+ 
+ 	// Popup the context menu
+ 	PopupMenu(&context);
+Index: SLADE-3.1.12/src/MainEditor/UI/MainWindow.cpp
+===================================================================
+--- SLADE-3.1.12.orig/src/MainEditor/UI/MainWindow.cpp
++++ SLADE-3.1.12/src/MainEditor/UI/MainWindow.cpp
+@@ -661,12 +661,14 @@ bool MainWindow::handleAction(string id)
+ 	if (id == "main_showstartpage")
+ 		openStartPageTab();
+ 
++#ifdef USE_LUA
+ 	// Tools->Run Script
+ 	if (id == "main_runscript")
+ 	{
+ 		ScriptManager::open();
+ 		return true;
+ 	}
++#endif
+ 
+ 	// Help->About
+ 	if (id == "main_about")
+Index: SLADE-3.1.12/src/MapEditor/UI/MapEditorWindow.cpp
+===================================================================
+--- SLADE-3.1.12.orig/src/MapEditor/UI/MapEditorWindow.cpp
++++ SLADE-3.1.12/src/MapEditor/UI/MapEditorWindow.cpp
+@@ -269,7 +269,9 @@ void MapEditorWindow::setupMenu()
+ 	// Tools menu
+ 	wxMenu* menu_tools = new wxMenu("");
+ 	menu_scripts_ = new wxMenu();
++#ifdef USE_LUA
+ 	ScriptManager::populateEditorScriptMenu(menu_scripts_, ScriptManager::ScriptType::Map, "mapw_script");
++#endif
+ 	menu_tools->AppendSubMenu(menu_scripts_, "Run Script");
+ 	SAction::fromId("mapw_runscript")->addToMenu(menu_tools);
+ 	menu->Append(menu_tools, "&Tools");
+@@ -1136,7 +1138,9 @@ void MapEditorWindow::reloadScriptsMenu(
+ 	while (menu_scripts_->FindItemByPosition(0))
+ 		menu_scripts_->Delete(menu_scripts_->FindItemByPosition(0));
+ 
++#ifdef USE_LUA
+ 	ScriptManager::populateEditorScriptMenu(menu_scripts_, ScriptManager::ScriptType::Map, "mapw_script");
++#endif
+ }
+ 
+ // ----------------------------------------------------------------------------
+@@ -1436,6 +1440,7 @@ bool MapEditorWindow::handleAction(strin
+ 		return true;
+ 	}
+ 
++#ifdef USE_LUA
+ 	// Tools->Run Script
+ 	else if (id == "mapw_script")
+ 	{
+@@ -1449,6 +1454,7 @@ bool MapEditorWindow::handleAction(strin
+ 		ScriptManager::open();
+ 		return true;
+ 	}
++#endif
+ 	
+ 	return false;
+ }
diff --git a/0001-build-allow-deactivating-the-crash-handler-at-build-.patch b/0001-build-allow-deactivating-the-crash-handler-at-build-.patch
new file mode 100644
index 0000000..c34cbdd
--- /dev/null
+++ b/0001-build-allow-deactivating-the-crash-handler-at-build-.patch
@@ -0,0 +1,46 @@
+From 519a5a5f87527a344ab04efa0947d5d8e75294e5 Mon Sep 17 00:00:00 2001
+From: Jan Engelhardt <jengelh@inai.de>
+Date: Sun, 28 Jun 2020 12:38:40 +0200
+Subject: [PATCH] build: allow deactivating the crash handler at build time
+ (#1166)
+
+SLADE's own crash handler has two problems:
+
+  * it inhibits the generation of a proper crashdump
+
+  * it calls functions that not async-signal safe and/or re-entrant,
+    such as malloc (by way of backtrace(3)), which can lead to a hang
+    when the initial crash happened in malloc,
+
+Fixes: #1166
+---
+ COMPILE.md                     | 1 +
+ src/Application/SLADEWxApp.cpp | 2 +-
+ src/CMakeLists.txt             | 4 ++++
+ 3 files changed, 6 insertions(+), 1 deletion(-)
+
+Index: SLADE-3.2.6/src/Application/SLADEWxApp.cpp
+===================================================================
+--- SLADE-3.2.6.orig/src/Application/SLADEWxApp.cpp
++++ SLADE-3.2.6/src/Application/SLADEWxApp.cpp
+@@ -449,7 +449,7 @@ bool SLADEWxApp::OnInit()
+ #endif
+ 
+ 	// Handle exceptions using wxDebug stuff, but only in release mode
+-#ifdef NDEBUG
++#if defined(USE_CRASHHANDLER) && defined(NDEBUG)
+ 	wxHandleFatalExceptions(true);
+ #endif
+ 
+Index: SLADE-3.2.6/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 ()
++if (NOT NO_CRASHHANDLER)
++	add_definitions(-DUSE_CRASHHANDLER)
++endif ()
++
diff --git a/3.1.13.tar.gz b/3.1.13.tar.gz
new file mode 100644
index 0000000..f61cb02
--- /dev/null
+++ b/3.1.13.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a9719f8639ae579c9671fda8c8ccbcc1ed55f7c98208fdeb439fb8d52fe340d7
+size 5890835
diff --git a/3.2.6.tar.gz b/3.2.6.tar.gz
new file mode 100644
index 0000000..fe419c2
--- /dev/null
+++ b/3.2.6.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0412de60517f4301881b048aee271bd45bacc1374b1955284647e9bd6732d2ff
+size 7027328
diff --git a/basepk3.diff b/basepk3.diff
new file mode 100644
index 0000000..98ce621
--- /dev/null
+++ b/basepk3.diff
@@ -0,0 +1,30 @@
+From: Jan Engelhardt <jengelh@inai.de>
+
+Search for the resource file in /usr/share/slade, and prefer ~/.slade
+over anything else.
+(DIR_RES is /usr/share/appinfo according to wxWidgets,
+which is not used in Linux distros.)
+---
+ src/Archive/ArchiveManager.cpp |    4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+Index: SLADE-3.1.11/src/Archive/ArchiveManager.cpp
+===================================================================
+--- SLADE-3.1.11.orig/src/Archive/ArchiveManager.cpp
++++ SLADE-3.1.11/src/Archive/ArchiveManager.cpp
+@@ -153,14 +153,12 @@ bool ArchiveManager::init()
+ 	}
+ 
+ 	// Find slade3.pk3 directory
+-	string dir_slade_pk3 = App::path("slade.pk3", App::Dir::Resources);
++	string dir_slade_pk3 = App::path("slade.pk3", App::Dir::User);
+ 	if (!wxFileExists(dir_slade_pk3))
+ 		dir_slade_pk3 = App::path("slade.pk3", App::Dir::Data);
+ 	if (!wxFileExists(dir_slade_pk3))
+ 		dir_slade_pk3 = App::path("slade.pk3", App::Dir::Executable);
+ 	if (!wxFileExists(dir_slade_pk3))
+-		dir_slade_pk3 = App::path("slade.pk3", App::Dir::User);
+-	if (!wxFileExists(dir_slade_pk3))
+ 		dir_slade_pk3 = "slade.pk3";
+ 
+ 	// Open slade.pk3
diff --git a/clzma.diff b/clzma.diff
new file mode 100644
index 0000000..535b786
--- /dev/null
+++ b/clzma.diff
@@ -0,0 +1,24 @@
+From: Jan Engelhardt <jengelh@inai.de>
+Date: 2020-06-22 21:16:10.343429323 +0200
+
+Make use of the clzma library in openSUSE.
+---
+ src/External/CMakeLists.txt |    3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+Index: SLADE-3.1.12/src/External/CMakeLists.txt
+===================================================================
+--- SLADE-3.1.12.orig/src/External/CMakeLists.txt
++++ SLADE-3.1.12/src/External/CMakeLists.txt
+@@ -26,10 +26,9 @@ file(GLOB_RECURSE EXTERNAL_SOURCES
+ 	*.cxx
+ 	dumb/*.c
+ 	lua/*.c
+-	lzma/C/LzmaDec.c
+ 	${SLADE_HEADERS}
+ 	)
+ 
+ add_library(external STATIC ${EXTERNAL_SOURCES})
+-target_link_libraries(external ${ZLIB_LIBRARY} ${wxWidgets_LIBRARIES})
++target_link_libraries(external ${ZLIB_LIBRARY} ${wxWidgets_LIBRARIES} -lclzma)
+ set(EXTERNAL_LIBRARIES external PARENT_SCOPE)
diff --git a/disable_sse.patch b/disable_sse.patch
new file mode 100644
index 0000000..2a5b138
--- /dev/null
+++ b/disable_sse.patch
@@ -0,0 +1,12 @@
+--- SLADE-3.1.13/src/CMakeLists.txt.orig	2021-06-15 14:13:13.473287606 +0200
++++ SLADE-3.1.13/src/CMakeLists.txt	2021-06-15 14:13:28.233451010 +0200
+@@ -159,9 +159,6 @@ if(APPLE)
+ 	set_source_files_properties(${OSX_ICON} PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
+ endif(APPLE)
+ 
+-# enable SSE instructions for dumb library
+-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_USE_SSE -msse")
+-
+ if(USE_SANITIZER)
+ 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address")
+ 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address")
diff --git a/slade.changes b/slade.changes
new file mode 100644
index 0000000..c78777a
--- /dev/null
+++ b/slade.changes
@@ -0,0 +1,189 @@
+-------------------------------------------------------------------
+Wed Nov 27 12:15:46 UTC 2024 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 3.2.6:
+  * Please see Release Notes upstream at
+    https://github.com/sirjuddington/SLADE/releases
+- Drop patches fixed upstream:
+  * disable_sse.patch
+  * 0001-build-add-cmake-option-to-skip-Lua-components-1175.patch
+- Disable patches that needs rebase or dropping:
+  * basepk3.diff
+  * wx.diff
+  * clzma.diff
+- Rebase  0001-build-allow-deactivating-the-crash-handler-at-build-.patch
+- Replace wxWidgets-3_0-devel for wxWidgets-devel BuildRequires:
+  Package builds just fine with the newer 3.2 version.
+- Add pkgconfig(libmpg123) BuildRequires: New dependency.
+
+-------------------------------------------------------------------
+Mon Feb 26 13:25:20 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Use %patch -P N instead of deprecated %patchN.
+
+-------------------------------------------------------------------
+Tue Jun 15 12:14:46 UTC 2021 - Guillaume GARDET <guillaume.gardet@opensuse.org>
+
+- Refresh patch to fix build on aarch64:
+  * disable_sse.patch
+
+-------------------------------------------------------------------
+Tue Jun  1 11:00:31 UTC 2021 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 3.1.13
+  * Updated ZDoom, MAPINFO and ACS language definitions
+  * Added extra UDMF flags
+  * Fixed an issue with the "optional" keyword in TEXTURES
+
+-------------------------------------------------------------------
+Thu Apr 29 10:58:07 UTC 2021 - Ferdinand Thiessen <rpm@fthiessen.de>
+
+- Update to 3.1.12a
+  * Provide metainfo
+- Install upstream provided metainfo and desktop file
+  * Drop our versions
+- Use cmake_install macro
+
+-------------------------------------------------------------------
+Sun Oct 11 09:18:41 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
+
+- Disable Lua bindings as those fail to build
+- Add 0001-build-add-cmake-option-to-skip-Lua-components-1175.patch
+  for Factory.
+
+-------------------------------------------------------------------
+Sun Jun 28 10:44:36 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
+
+- Add 0001-build-allow-deactivating-the-crash-handler-at-build-.patch
+  Deactivate the crash handler, because it hangs. Let the kernel
+  generate a standard dump instead.
+
+-------------------------------------------------------------------
+Mon Jun 22 20:16:13 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
+
+- Add clzma.diff to use system-provided clzma library.
+
+-------------------------------------------------------------------
+Tue May 26 08:26:11 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 3.1.12
+  * 'Run Archive' and 'Run Map' configurations have been
+    separated, so they should now make more sense for each
+    context.
+  * Fixed an issue where clicking a toolbar and pressing enter
+    would show/hide the 2nd group in the toolbar (this is what
+    was causing some people to randomly lose the zoom slider in
+    the gfx editor, for example).
+  * Added SRB2 .dta as a valid wad file extension.
+  * Resource Editor:
+  * Fixed adjusted offsets not being saved after cropping an
+    image.
+  * Fixed wrong files being deleted in some situations when
+    saving a directory.
+  * Fixed "Open map in DB2" not working for maps in zip/directory
+    archives.
+  * Map Editor:
+  * Added support for GZDoom slope plane UDMF properties.
+  * Added basic support for ZScript inheritance for thing types.
+
+-------------------------------------------------------------------
+Wed Apr 29 12:45:36 UTC 2020 - Guillaume GARDET <guillaume.gardet@opensuse.org>
+
+- Refresh disable_sse.patch
+
+-------------------------------------------------------------------
+Sat Apr 18 17:06:32 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 3.1.11
+  * Added a Lua scripting engine
+  * Updated the start page with a new look and layout
+  * Improved console panel
+  * Improved support for high DPI displays
+  * Added support for vanilla-compatible tall gfx patches
+  * Added support for SiN archives
+  * Translations now work on truecolour images
+  * ZScript parsing
+- Remove reproducible.patch (merged), wxChar.patch (no longer
+  applicable), added wx.diff
+
+-------------------------------------------------------------------
+Tue Jun 26 10:46:19 UTC 2018 - bwiedemann@suse.com
+
+- Add reproducible.patch to not store extra timestamps in zip
+  to make build reproducible
+
+-------------------------------------------------------------------
+Tue Jun 12 12:46:57 UTC 2018 - jengelh@inai.de
+
+- Fix build failure... slade wants zip, not p7zip.
+- Wrap %desktop_* into a 42.x/13.x guard.
+
+-------------------------------------------------------------------
+Wed Apr 18 14:26:53 UTC 2018 - guillaume.gardet@opensuse.org
+
+- Disable SSE with disable_sse.patch on non x86* archs
+
+-------------------------------------------------------------------
+Tue Jun 27 23:26:49 UTC 2017 - luke.nukem.jones@gmail.com
+
+- Fix broken appdata xml
+
+-------------------------------------------------------------------
+Sun May  7 09:00:30 UTC 2017 - bwiedemann@suse.com
+
+- use p7zip for deterministic archive file order
+  and strip-nondeterminism to have fully reproducible builds
+
+-------------------------------------------------------------------
+Tue May  2 13:04:33 UTC 2017 - bwiedemann@suse.com
+
+- use convert -strip to make build more reproducible
+
+-------------------------------------------------------------------
+Fri Feb 10 01:19:39 UTC 2017 - luke.nukem.jones@gmail.com
+
+- Update to 3.1.1.5
+- Add appdata.xml
+- General
+  * Added an option to always show acc compiler output, even on
+    success
+  * Various updates to game and language configurations
+- Resource Editor
+  * Added a button to clear the entry list filter
+  * Fixed some issues when importing a palette from a PNG
+  * Fixed some potential crashes when loading corrupted Doom gfx
+    entries
+  * Fixed some issues with converting to doom flat format
+- Texture Editor
+  * Patch and texture operations should now work on the correct
+    item when the texture or patch list is sorted
+  * Fixed PNG alpha channel being ignored for CopyAlpha/Overlay
+    patches
+- Map Editor
+  * Added the option not to build nodes when saving a map (select
+    "Don't build nodes" as the node builder)
+  * Fixed a potential crash when building nodes
+
+-------------------------------------------------------------------
+Wed Dec 28 19:57:42 UTC 2016 - jengelh@inai.de
+
+- Restore basepk3.diff for proper search order
+
+-------------------------------------------------------------------
+Mon Dec 19 05:19:27 UTC 2016 - luke.nukem.jones@gmail.com
+
+- Update to version 3.1.1.4
+- Remove patch basepk3.diff
+- Add patch wxChar.diff
+    + Corrects an issue with conversion from wxString to wxChar in
+    column sort
+
+-------------------------------------------------------------------
+Sun Jul 17 01:15:06 UTC 2016 - jengelh@inai.de
+
+- Add basepk3.diff
+
+-------------------------------------------------------------------
+Tue Oct 20 14:31:10 UTC 2015 - jengelh@inai.de
+
+- Initial package (version 3.1.0.5) for build.opensuse.org
diff --git a/slade.spec b/slade.spec
new file mode 100644
index 0000000..6e1f24d
--- /dev/null
+++ b/slade.spec
@@ -0,0 +1,84 @@
+#
+# spec file for package slade
+#
+# Copyright (c) 2024 SUSE LLC
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
+#
+
+
+Name:           slade
+Version:        3.2.6
+Release:        0
+Summary:        An editor for DOOM maps and WAD/PK3 archives
+License:        GPL-2.0-or-later
+Group:          Amusements/Games/3D/Shoot
+URL:            https://github.com/sirjuddington/SLADE
+Source:         %{url}/archive/refs/tags/%version.tar.gz
+Patch1:         basepk3.diff
+Patch2:         wx.diff
+Patch3:         clzma.diff
+Patch4:         0001-build-allow-deactivating-the-crash-handler-at-build-.patch
+
+BuildRequires:  ImageMagick
+BuildRequires:  cmake >= 3.1
+BuildRequires:  freeimage-devel
+BuildRequires:  gcc-c++ >= 8
+BuildRequires:  pkg-config
+BuildRequires:  strip-nondeterminism
+BuildRequires:  update-desktop-files
+BuildRequires:  wxWidgets-devel
+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(sfml-all)
+BuildRequires:  pkgconfig(x11)
+Provides:       bundled(dumb) = 0.9.3
+
+%description
+SLADE is an editor for Doom-engine based games and source
+ports. It has the ability to view, modify, and write many different
+game-specific formats, and even convert between some of them, or
+from/to other generic formats such as PNG.
+
+%prep
+%setup -q -n SLADE-%version
+#%%patch -P 1 -P 2 -P 3 -p1
+%patch -P 4 -p1
+
+%build
+%define _lto_cflags %nil
+%cmake -DNO_WEBVIEW=ON -DWX_GTK3=OFF -DNO_CRASHHANDLER=ON \
+	-DCMAKE_C_FLAGS_RELWITHDEBINFO:STRING="%optflags" \
+	-DCMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING="%optflags" \
+	-DNO_LUA:BOOL=TRUE
+%cmake_build
+
+%install
+strip-nondeterminism build/slade.pk3
+%cmake_install
+
+%files
+%license LICENSE
+%doc README.md
+%_bindir/slade
+%_datadir/slade3/
+%_datadir/icons/hicolor/scalable/apps/net.mancubus.SLADE.svg
+%_datadir/applications/net.mancubus.SLADE.desktop
+%_datadir/metainfo/net.mancubus.SLADE.metainfo.xml
+
+%changelog
diff --git a/wx.diff b/wx.diff
new file mode 100644
index 0000000..4d0c8fd
--- /dev/null
+++ b/wx.diff
@@ -0,0 +1,41 @@
+From: Jan Engelhardt <jengelh@inai.de>
+Date: 2020-04-18 20:10:34.215071041 +0200
+
+external.so references wx functions (including those present in base), but does
+not link them => add wx libs to the link.
+
+[   12s] /usr/include/wx-3.0/wx/filename.h:139: undefined reference to `wxFileName::Assign(wxString const&, wxPathFormat)'
+[   12s] /usr/lib64/gcc/x86_64-suse-linux/9/../../../../x86_64-suse-linux/bin/ld: CMakeFiles/external.dir/email/wxEmailMessage.o: in function `wxEmailMessage::DoAddAttachment(wxString const&, wxString&) const':
+
+Furthermore, external.so references MemChunk:: functions, but does not link
+them => change to STATIC because I am too lazy.
+
+---
+ src/CMakeLists.txt          |    2 +-
+ src/External/CMakeLists.txt |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+Index: SLADE-3.1.12/src/CMakeLists.txt
+===================================================================
+--- SLADE-3.1.12.orig/src/CMakeLists.txt
++++ SLADE-3.1.12/src/CMakeLists.txt
+@@ -52,7 +52,7 @@ if (WX_GTK3)
+ 	set(wxWidgets_CONFIG_OPTIONS --toolkit=gtk3)
+ endif (WX_GTK3)
+ 
+-SET(WX_LIBS std aui gl stc richtext propgrid media)
++SET(WX_LIBS base std aui gl stc richtext propgrid media)
+ if (NO_WEBVIEW)
+ 	SET(WX_LIBS ${WX_LIBS} html)
+ else (NO_WEBVIEW)
+Index: SLADE-3.1.12/src/External/CMakeLists.txt
+===================================================================
+--- SLADE-3.1.12.orig/src/External/CMakeLists.txt
++++ SLADE-3.1.12/src/External/CMakeLists.txt
+@@ -31,5 +31,5 @@ file(GLOB_RECURSE EXTERNAL_SOURCES
+ 	)
+ 
+ add_library(external STATIC ${EXTERNAL_SOURCES})
+-target_link_libraries(external ${ZLIB_LIBRARY})
++target_link_libraries(external ${ZLIB_LIBRARY} ${wxWidgets_LIBRARIES})
+ set(EXTERNAL_LIBRARIES external PARENT_SCOPE)

From 95bbd13df6bdf8b221c5c653d418e0cf5e4f97b628cd585d839b8c53f792d293 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Wed, 27 Nov 2024 16:37:19 +0000
Subject: [PATCH 2/6] 
 [info=7968d9c2a230f8cd2caf90abd31d4ad81e55a88779bbc57b8dd9f6585583fbe7]

OBS-URL: https://build.opensuse.org/package/show/games:tools/slade?expand=0&rev=45
---
 _scmsync.obsinfo       | 4 ++++
 build.specials.obscpio | 3 +++
 2 files changed, 7 insertions(+)
 create mode 100644 _scmsync.obsinfo
 create mode 100644 build.specials.obscpio

diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo
new file mode 100644
index 0000000..a77150a
--- /dev/null
+++ b/_scmsync.obsinfo
@@ -0,0 +1,4 @@
+mtime: 1732723392
+commit: 7968d9c2a230f8cd2caf90abd31d4ad81e55a88779bbc57b8dd9f6585583fbe7
+url: https://src.opensuse.org/jengelh/slade
+revision: master
diff --git a/build.specials.obscpio b/build.specials.obscpio
new file mode 100644
index 0000000..376b9d6
--- /dev/null
+++ b/build.specials.obscpio
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ca276bd705bcbab200fdc7237b3002788db6b75b09c1b439614b00689a26c3cc
+size 256

From 80a871a0bf01400bc5ae0094e05a44585c282f723e0ae3091b4ca37d17c3f43f Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Wed, 27 Nov 2024 18:03:40 +0000
Subject: [PATCH 3/6] 
 [info=2cdd65b84473dbea37548c24060ae134a7276999e6af045d084f919072b40ccd]

OBS-URL: https://build.opensuse.org/package/show/games:tools/slade?expand=0&rev=46
---
 ...tivating-the-crash-handler-at-build-.patch |  7 ++--
 _scmsync.obsinfo                              |  4 +-
 basepk3.diff                                  | 26 ++++++-------
 build.specials.obscpio                        |  2 +-
 clzma.diff                                    | 31 +++++++++------
 disable_sse.patch                             | 39 +++++++++++++------
 slade.changes                                 | 23 ++++++-----
 slade.spec                                    |  8 ++--
 wx.diff                                       | 35 ++++++-----------
 9 files changed, 93 insertions(+), 82 deletions(-)

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 c34cbdd..ea20b39 100644
--- a/0001-build-allow-deactivating-the-crash-handler-at-build-.patch
+++ b/0001-build-allow-deactivating-the-crash-handler-at-build-.patch
@@ -14,10 +14,9 @@ SLADE's own crash handler has two problems:
 
 Fixes: #1166
 ---
- COMPILE.md                     | 1 +
- src/Application/SLADEWxApp.cpp | 2 +-
- src/CMakeLists.txt             | 4 ++++
- 3 files changed, 6 insertions(+), 1 deletion(-)
+ src/Application/SLADEWxApp.cpp |    2 +-
+ src/CMakeLists.txt             |    4 ++++
+ 2 files changed, 5 insertions(+), 1 deletion(-)
 
 Index: SLADE-3.2.6/src/Application/SLADEWxApp.cpp
 ===================================================================
diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo
index a77150a..c5f156f 100644
--- a/_scmsync.obsinfo
+++ b/_scmsync.obsinfo
@@ -1,4 +1,4 @@
-mtime: 1732723392
-commit: 7968d9c2a230f8cd2caf90abd31d4ad81e55a88779bbc57b8dd9f6585583fbe7
+mtime: 1732730602
+commit: 2cdd65b84473dbea37548c24060ae134a7276999e6af045d084f919072b40ccd
 url: https://src.opensuse.org/jengelh/slade
 revision: master
diff --git a/basepk3.diff b/basepk3.diff
index 98ce621..63326f1 100644
--- a/basepk3.diff
+++ b/basepk3.diff
@@ -8,23 +8,23 @@ which is not used in Linux distros.)
  src/Archive/ArchiveManager.cpp |    4 +---
  1 file changed, 1 insertion(+), 3 deletions(-)
 
-Index: SLADE-3.1.11/src/Archive/ArchiveManager.cpp
+Index: SLADE-3.2.6/src/Archive/ArchiveManager.cpp
 ===================================================================
---- SLADE-3.1.11.orig/src/Archive/ArchiveManager.cpp
-+++ SLADE-3.1.11/src/Archive/ArchiveManager.cpp
-@@ -153,14 +153,12 @@ bool ArchiveManager::init()
+--- SLADE-3.2.6.orig/src/Archive/ArchiveManager.cpp
++++ SLADE-3.2.6/src/Archive/ArchiveManager.cpp
+@@ -132,14 +132,12 @@ bool ArchiveManager::init()
  	}
  
  	// Find slade3.pk3 directory
--	string dir_slade_pk3 = App::path("slade.pk3", App::Dir::Resources);
-+	string dir_slade_pk3 = App::path("slade.pk3", App::Dir::User);
- 	if (!wxFileExists(dir_slade_pk3))
- 		dir_slade_pk3 = App::path("slade.pk3", App::Dir::Data);
- 	if (!wxFileExists(dir_slade_pk3))
- 		dir_slade_pk3 = App::path("slade.pk3", App::Dir::Executable);
- 	if (!wxFileExists(dir_slade_pk3))
--		dir_slade_pk3 = App::path("slade.pk3", App::Dir::User);
--	if (!wxFileExists(dir_slade_pk3))
+-	auto dir_slade_pk3 = app::path("slade.pk3", app::Dir::Resources);
++	auto dir_slade_pk3 = app::path("slade.pk3", app::Dir::User);
+ 	if (!fileutil::fileExists(dir_slade_pk3))
+ 		dir_slade_pk3 = app::path("slade.pk3", app::Dir::Data);
+ 	if (!fileutil::fileExists(dir_slade_pk3))
+ 		dir_slade_pk3 = app::path("slade.pk3", app::Dir::Executable);
+ 	if (!fileutil::fileExists(dir_slade_pk3))
+-		dir_slade_pk3 = app::path("slade.pk3", app::Dir::User);
+-	if (!fileutil::fileExists(dir_slade_pk3))
  		dir_slade_pk3 = "slade.pk3";
  
  	// Open slade.pk3
diff --git a/build.specials.obscpio b/build.specials.obscpio
index 376b9d6..9e4947f 100644
--- a/build.specials.obscpio
+++ b/build.specials.obscpio
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ca276bd705bcbab200fdc7237b3002788db6b75b09c1b439614b00689a26c3cc
+oid sha256:e7fcafcf3f496e3e034224321301e77e5811a29d187ee66aebe794ba873abc3c
 size 256
diff --git a/clzma.diff b/clzma.diff
index 535b786..6a6a0f8 100644
--- a/clzma.diff
+++ b/clzma.diff
@@ -2,23 +2,30 @@ 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.]
 ---
- src/External/CMakeLists.txt |    3 +--
+ thirdparty/CMakeLists.txt |    3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
 
-Index: SLADE-3.1.12/src/External/CMakeLists.txt
+Index: SLADE-3.2.6/thirdparty/CMakeLists.txt
 ===================================================================
---- SLADE-3.1.12.orig/src/External/CMakeLists.txt
-+++ SLADE-3.1.12/src/External/CMakeLists.txt
-@@ -26,10 +26,9 @@ file(GLOB_RECURSE EXTERNAL_SOURCES
- 	*.cxx
- 	dumb/*.c
- 	lua/*.c
+--- SLADE-3.2.6.orig/thirdparty/CMakeLists.txt
++++ SLADE-3.2.6/thirdparty/CMakeLists.txt
+@@ -17,7 +17,6 @@ endif()
+ set(EXTERNAL_SOURCES
+ )
+ file(GLOB_RECURSE EXTERNAL_SOURCES
 -	lzma/C/LzmaDec.c
- 	${SLADE_HEADERS}
- 	)
+ 	mus2mid/mus2mid.cpp
+ 	zreaders/*.cpp
+ 	glad/src/*.c
+@@ -43,7 +42,7 @@ add_subdirectory(lunasvg/3rdparty/softwa
+ add_subdirectory(lunasvg/3rdparty/plutovg)
  
  add_library(external STATIC ${EXTERNAL_SOURCES})
--target_link_libraries(external ${ZLIB_LIBRARY} ${wxWidgets_LIBRARIES})
-+target_link_libraries(external ${ZLIB_LIBRARY} ${wxWidgets_LIBRARIES} -lclzma)
+-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})
  set(EXTERNAL_LIBRARIES external PARENT_SCOPE)
+ 
+ if(USE_SYSTEM_DUMB)
diff --git a/disable_sse.patch b/disable_sse.patch
index 2a5b138..71c9897 100644
--- a/disable_sse.patch
+++ b/disable_sse.patch
@@ -1,12 +1,29 @@
---- SLADE-3.1.13/src/CMakeLists.txt.orig	2021-06-15 14:13:13.473287606 +0200
-+++ SLADE-3.1.13/src/CMakeLists.txt	2021-06-15 14:13:28.233451010 +0200
-@@ -159,9 +159,6 @@ if(APPLE)
- 	set_source_files_properties(${OSX_ICON} PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
- endif(APPLE)
+From: Jan Engelhardt <ej@inai.de>
+Date: 2024-11-27 17:12:00 +0100
+Original-Submitter: guillaume.gardet@opensuse.org
+Original-Date: 2018-04-18 14:26:53
+
+SSE is not guaranteed to be available on i586.
+Testing the compiler for SSE availability is wrong — if anything,
+the test needs to happen at runtime.
+
+---
+ cmake/unix.cmake |    5 -----
+ 1 file changed, 5 deletions(-)
+
+Index: SLADE-3.2.6/cmake/unix.cmake
+===================================================================
+--- SLADE-3.2.6.orig/cmake/unix.cmake
++++ SLADE-3.2.6/cmake/unix.cmake
+@@ -150,11 +150,6 @@ endif(APPLE)
  
--# enable SSE instructions for dumb library
--set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_USE_SSE -msse")
--
- if(USE_SANITIZER)
- 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address")
- 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address")
+ # Enable SSE instructions for dumb library
+ include(CheckCCompilerFlag)
+-check_c_compiler_flag(-msse HAVE_SSE)
+-if(HAVE_SSE)
+-	add_compile_options(-msse)
+-	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")
diff --git a/slade.changes b/slade.changes
index c78777a..72c5cad 100644
--- a/slade.changes
+++ b/slade.changes
@@ -2,16 +2,19 @@
 Wed Nov 27 12:15:46 UTC 2024 - Bjørn Lie <bjorn.lie@gmail.com>
 
 - Update to version 3.2.6:
-  * Please see Release Notes upstream at
-    https://github.com/sirjuddington/SLADE/releases
-- Drop patches fixed upstream:
-  * disable_sse.patch
-  * 0001-build-add-cmake-option-to-skip-Lua-components-1175.patch
-- Disable patches that needs rebase or dropping:
-  * basepk3.diff
-  * wx.diff
-  * clzma.diff
-- Rebase  0001-build-allow-deactivating-the-crash-handler-at-build-.patch
+  * Support for vertical toolbars in the UI
+  * Support creation of Quake PAK archives. Support for reading
+    WebP and Ion Fury .art files.
+  * Added EDGE-Classic support
+  * Added support for Doom 32X map format
+  * Added support for MBF21 features via new 'Boom + MBF21' port
+    configuration
+  * Added missing ZDoom special 107
+  * mapeditor: Moving a sector now also moves things within it
+  * ME: Added keybinds to rotate things in 2d mode (< and > by default)
+  * ME: Added toggleable point light previews in 2D things mode
+  * Added (experimental, unfinished) 3d floor preview support in
+    3D mode (turned off by default)
 - Replace wxWidgets-3_0-devel for wxWidgets-devel BuildRequires:
   Package builds just fine with the newer 3.2 version.
 - Add pkgconfig(libmpg123) BuildRequires: New dependency.
diff --git a/slade.spec b/slade.spec
index 6e1f24d..795f760 100644
--- a/slade.spec
+++ b/slade.spec
@@ -23,12 +23,12 @@ Summary:        An editor for DOOM maps and WAD/PK3 archives
 License:        GPL-2.0-or-later
 Group:          Amusements/Games/3D/Shoot
 URL:            https://github.com/sirjuddington/SLADE
-Source:         %{url}/archive/refs/tags/%version.tar.gz
+Source:         https://github.com/sirjuddington/SLADE/archive/refs/tags/%version.tar.gz
 Patch1:         basepk3.diff
 Patch2:         wx.diff
 Patch3:         clzma.diff
 Patch4:         0001-build-allow-deactivating-the-crash-handler-at-build-.patch
-
+Patch10:        disable_sse.patch
 BuildRequires:  ImageMagick
 BuildRequires:  cmake >= 3.1
 BuildRequires:  freeimage-devel
@@ -56,9 +56,7 @@ game-specific formats, and even convert between some of them, or
 from/to other generic formats such as PNG.
 
 %prep
-%setup -q -n SLADE-%version
-#%%patch -P 1 -P 2 -P 3 -p1
-%patch -P 4 -p1
+%autosetup -p1 -n SLADE-%version
 
 %build
 %define _lto_cflags %nil
diff --git a/wx.diff b/wx.diff
index 4d0c8fd..1e38f00 100644
--- a/wx.diff
+++ b/wx.diff
@@ -1,41 +1,28 @@
 From: Jan Engelhardt <jengelh@inai.de>
 Date: 2020-04-18 20:10:34.215071041 +0200
 
-external.so references wx functions (including those present in base), but does
-not link them => add wx libs to the link.
+Under SLADE 3.1.x, I observed:
 
 [   12s] /usr/include/wx-3.0/wx/filename.h:139: undefined reference to `wxFileName::Assign(wxString const&, wxPathFormat)'
 [   12s] /usr/lib64/gcc/x86_64-suse-linux/9/../../../../x86_64-suse-linux/bin/ld: CMakeFiles/external.dir/email/wxEmailMessage.o: in function `wxEmailMessage::DoAddAttachment(wxString const&, wxString&) const':
 
-Furthermore, external.so references MemChunk:: functions, but does not link
-them => change to STATIC because I am too lazy.
+While external.so is gone in SLADE 3.2.6, the function is still used,
+and so we should add "base" to WX_LIBS regardless.
 
 ---
- src/CMakeLists.txt          |    2 +-
- src/External/CMakeLists.txt |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
+ cmake/unix.cmake |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: SLADE-3.1.12/src/CMakeLists.txt
+Index: SLADE-3.2.6/cmake/unix.cmake
 ===================================================================
---- SLADE-3.1.12.orig/src/CMakeLists.txt
-+++ SLADE-3.1.12/src/CMakeLists.txt
-@@ -52,7 +52,7 @@ if (WX_GTK3)
+--- SLADE-3.2.6.orig/cmake/unix.cmake
++++ SLADE-3.2.6/cmake/unix.cmake
+@@ -65,7 +65,7 @@ if (WX_GTK3)
  	set(wxWidgets_CONFIG_OPTIONS --toolkit=gtk3)
  endif (WX_GTK3)
  
--SET(WX_LIBS std aui gl stc richtext propgrid media)
-+SET(WX_LIBS base std aui gl stc richtext propgrid media)
+-SET(WX_LIBS std aui gl stc richtext propgrid)
++SET(WX_LIBS base std aui gl stc richtext propgrid)
  if (NO_WEBVIEW)
  	SET(WX_LIBS ${WX_LIBS} html)
  else (NO_WEBVIEW)
-Index: SLADE-3.1.12/src/External/CMakeLists.txt
-===================================================================
---- SLADE-3.1.12.orig/src/External/CMakeLists.txt
-+++ SLADE-3.1.12/src/External/CMakeLists.txt
-@@ -31,5 +31,5 @@ file(GLOB_RECURSE EXTERNAL_SOURCES
- 	)
- 
- add_library(external STATIC ${EXTERNAL_SOURCES})
--target_link_libraries(external ${ZLIB_LIBRARY})
-+target_link_libraries(external ${ZLIB_LIBRARY} ${wxWidgets_LIBRARIES})
- set(EXTERNAL_LIBRARIES external PARENT_SCOPE)

From a6d7ea9a85fe22b28f0fc050167a07917cfe1101a120ff8e20451327f3cfedaf Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Wed, 27 Nov 2024 20:48:53 +0000
Subject: [PATCH 4/6] 
 [info=ae3a81c72830eaea789c5acec04582893b2059d8060a8fa981fe3e682d3edd15]

OBS-URL: https://build.opensuse.org/package/show/games:tools/slade?expand=0&rev=47
---
 _scmsync.obsinfo       |  4 ++--
 build.specials.obscpio |  2 +-
 slade.spec             | 10 +++++++++-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo
index c5f156f..b316f01 100644
--- a/_scmsync.obsinfo
+++ b/_scmsync.obsinfo
@@ -1,4 +1,4 @@
-mtime: 1732730602
-commit: 2cdd65b84473dbea37548c24060ae134a7276999e6af045d084f919072b40ccd
+mtime: 1732740518
+commit: ae3a81c72830eaea789c5acec04582893b2059d8060a8fa981fe3e682d3edd15
 url: https://src.opensuse.org/jengelh/slade
 revision: master
diff --git a/build.specials.obscpio b/build.specials.obscpio
index 9e4947f..7c8e983 100644
--- a/build.specials.obscpio
+++ b/build.specials.obscpio
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e7fcafcf3f496e3e034224321301e77e5811a29d187ee66aebe794ba873abc3c
+oid sha256:c6530bb0df280fa6d99c6c2af4c8af8862d03b71f8025954f8bd6059ddb55b6f
 size 256
diff --git a/slade.spec b/slade.spec
index 795f760..0f037d2 100644
--- a/slade.spec
+++ b/slade.spec
@@ -47,6 +47,11 @@ BuildRequires:  pkgconfig(libcurl)
 BuildRequires:  pkgconfig(libmpg123)
 BuildRequires:  pkgconfig(sfml-all)
 BuildRequires:  pkgconfig(x11)
+%if 0%{?suse_version} >= 1600
+BuildRequires:  fmt-10-devel
+%else
+Provides:       bundled(fmt) = 10
+%endif
 Provides:       bundled(dumb) = 0.9.3
 
 %description
@@ -63,7 +68,10 @@ from/to other generic formats such as PNG.
 %cmake -DNO_WEBVIEW=ON -DWX_GTK3=OFF -DNO_CRASHHANDLER=ON \
 	-DCMAKE_C_FLAGS_RELWITHDEBINFO:STRING="%optflags" \
 	-DCMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING="%optflags" \
-	-DNO_LUA:BOOL=TRUE
+%if 0%{?suse_version} >= 1600
+	-DUSE_SYSTEM_FMT:BOOL=ON \
+%endif
+	-DNO_LUA:BOOL=ON
 %cmake_build
 
 %install

From 4febfd31501ca4327a14e24bcc398bfc9761c66f7297217aa11cbb2fc39febd1 Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Wed, 27 Nov 2024 22:31:46 +0000
Subject: [PATCH 5/6] 
 [info=c54c8654e835f3914bed4556799cc04785968d12bb30e89ef503c755df608b89]

OBS-URL: https://build.opensuse.org/package/show/games:tools/slade?expand=0&rev=48
---
 _scmsync.obsinfo       |  4 ++--
 build.specials.obscpio |  2 +-
 disable_sse.patch      | 18 ++++++++++++++++--
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo
index b316f01..c6c790c 100644
--- a/_scmsync.obsinfo
+++ b/_scmsync.obsinfo
@@ -1,4 +1,4 @@
-mtime: 1732740518
-commit: ae3a81c72830eaea789c5acec04582893b2059d8060a8fa981fe3e682d3edd15
+mtime: 1732746692
+commit: c54c8654e835f3914bed4556799cc04785968d12bb30e89ef503c755df608b89
 url: https://src.opensuse.org/jengelh/slade
 revision: master
diff --git a/build.specials.obscpio b/build.specials.obscpio
index 7c8e983..27447d7 100644
--- a/build.specials.obscpio
+++ b/build.specials.obscpio
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c6530bb0df280fa6d99c6c2af4c8af8862d03b71f8025954f8bd6059ddb55b6f
+oid sha256:ea2366b166512e4f2b9c37ff6874cdd0044559dd4debf966ab673642aa133181
 size 256
diff --git a/disable_sse.patch b/disable_sse.patch
index 71c9897..3c69c85 100644
--- a/disable_sse.patch
+++ b/disable_sse.patch
@@ -8,8 +8,9 @@ Testing the compiler for SSE availability is wrong — if anything,
 the test needs to happen at runtime.
 
 ---
- cmake/unix.cmake |    5 -----
- 1 file changed, 5 deletions(-)
+ cmake/unix.cmake                    |    5 -----
+ thirdparty/dumb/helpers/resampler.c |    2 +-
+ 2 files changed, 1 insertion(+), 6 deletions(-)
 
 Index: SLADE-3.2.6/cmake/unix.cmake
 ===================================================================
@@ -27,3 +28,16 @@ Index: SLADE-3.2.6/cmake/unix.cmake
  
  # 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
+===================================================================
+--- SLADE-3.2.6.orig/thirdparty/dumb/helpers/resampler.c
++++ SLADE-3.2.6/thirdparty/dumb/helpers/resampler.c
+@@ -2,7 +2,7 @@
+ #include <string.h>
+ #define _USE_MATH_DEFINES
+ #include <math.h>
+-#if (defined(_M_IX86) || defined(__i386__) || defined(_M_X64) || defined(__amd64__))
++#if defined(_USE_SSE) && (defined(_M_IX86) || defined(__i386__) || defined(_M_X64) || defined(__amd64__))
+ #include <xmmintrin.h>
+ #define RESAMPLER_SSE
+ #endif

From 517b679cdfada62b3f7c69bb1b21218e2bd54489350cc8642da44559516265a4 Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Thu, 28 Nov 2024 20:45:42 +0000
Subject: [PATCH 6/6] 
 [info=660aab5cf295b570fdec6cb717962d47960d9db53e8bd082b26e19b0b4a2bb89]

OBS-URL: https://build.opensuse.org/package/show/games:tools/slade?expand=0&rev=49
---
 _scmsync.obsinfo       | 4 ++--
 build.specials.obscpio | 2 +-
 slade.changes          | 2 ++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo
index c6c790c..76febc2 100644
--- a/_scmsync.obsinfo
+++ b/_scmsync.obsinfo
@@ -1,4 +1,4 @@
-mtime: 1732746692
-commit: c54c8654e835f3914bed4556799cc04785968d12bb30e89ef503c755df608b89
+mtime: 1732826729
+commit: 660aab5cf295b570fdec6cb717962d47960d9db53e8bd082b26e19b0b4a2bb89
 url: https://src.opensuse.org/jengelh/slade
 revision: master
diff --git a/build.specials.obscpio b/build.specials.obscpio
index 27447d7..e6ca210 100644
--- a/build.specials.obscpio
+++ b/build.specials.obscpio
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ea2366b166512e4f2b9c37ff6874cdd0044559dd4debf966ab673642aa133181
+oid sha256:961a33826b87f6a82bf708e28134394c2ae843741cae83abd58aa41d0d520710
 size 256
diff --git a/slade.changes b/slade.changes
index 72c5cad..27bbf5c 100644
--- a/slade.changes
+++ b/slade.changes
@@ -15,6 +15,8 @@ Wed Nov 27 12:15:46 UTC 2024 - Bjørn Lie <bjorn.lie@gmail.com>
   * ME: Added toggleable point light previews in 2D things mode
   * Added (experimental, unfinished) 3d floor preview support in
     3D mode (turned off by default)
+- Drop patches fixed upstream:
+  * 0001-build-add-cmake-option-to-skip-Lua-components-1175.patch
 - Replace wxWidgets-3_0-devel for wxWidgets-devel BuildRequires:
   Package builds just fine with the newer 3.2 version.
 - Add pkgconfig(libmpg123) BuildRequires: New dependency.