diff --git a/3.1.1.5.tar.gz b/3.1.1.5.tar.gz deleted file mode 100644 index 793f607..0000000 --- a/3.1.1.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1b1c9e8267d8749f6087297ec629d1ca81777bb1b74e51853508a570e4368e2a -size 4385905 diff --git a/3.1.11.tar.gz b/3.1.11.tar.gz new file mode 100644 index 0000000..54d94e7 --- /dev/null +++ b/3.1.11.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:83cea24520d57f6bd23f146925eab55e2413f7c91e24c84bcda550b94ecedc08 +size 5882401 diff --git a/basepk3.diff b/basepk3.diff index b009158..98ce621 100644 --- a/basepk3.diff +++ b/basepk3.diff @@ -8,22 +8,22 @@ which is not used in Linux distros.) src/Archive/ArchiveManager.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) -Index: SLADE-3.1.1.4/src/Archive/ArchiveManager.cpp +Index: SLADE-3.1.11/src/Archive/ArchiveManager.cpp =================================================================== ---- SLADE-3.1.1.4.orig/src/Archive/ArchiveManager.cpp -+++ SLADE-3.1.1.4/src/Archive/ArchiveManager.cpp -@@ -138,14 +138,12 @@ bool ArchiveManager::init() +--- 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 = appPath("slade.pk3", DIR_RES); -+ string dir_slade_pk3 = appPath("slade.pk3", DIR_USER); +- 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 = appPath("slade.pk3", DIR_DATA); + dir_slade_pk3 = App::path("slade.pk3", App::Dir::Data); if (!wxFileExists(dir_slade_pk3)) - dir_slade_pk3 = appPath("slade.pk3", DIR_APP); + dir_slade_pk3 = App::path("slade.pk3", App::Dir::Executable); if (!wxFileExists(dir_slade_pk3)) -- dir_slade_pk3 = appPath("slade.pk3", DIR_USER); +- dir_slade_pk3 = App::path("slade.pk3", App::Dir::User); - if (!wxFileExists(dir_slade_pk3)) dir_slade_pk3 = "slade.pk3"; diff --git a/reproducible.patch b/reproducible.patch deleted file mode 100644 index 25c0d67..0000000 --- a/reproducible.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 74a3129429a8f99dfcac78ac676d2ca845e05af6 Mon Sep 17 00:00:00 2001 -From: "Bernhard M. Wiedemann" -Date: Tue, 26 Jun 2018 12:36:57 +0200 -Subject: [PATCH] Do not save extra file attributes in .zip - -to make it easier to make a reproducible build -See https://reproducible-builds.org/ for why this is good. ---- - dist/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/dist/CMakeLists.txt b/dist/CMakeLists.txt -index 842d3cb1..a7c617bd 100644 ---- a/dist/CMakeLists.txt -+++ b/dist/CMakeLists.txt -@@ -4,7 +4,7 @@ find_program(ZIPTOOL_7Z_EXECUTABLE 7z "$ENV{ProgramFiles}/7-Zip") - if(ZIPTOOL_7Z_EXECUTABLE) - set(ZIP_COMMAND "${ZIPTOOL_7Z_EXECUTABLE}" u -tzip -r "${CMAKE_BINARY_DIR}/slade.pk3" .) - elseif(ZIPTOOL_ZIP_EXECUTABLE) -- set(ZIP_COMMAND "${ZIPTOOL_ZIP_EXECUTABLE}" -r "${CMAKE_BINARY_DIR}/slade.pk3" .) -+ set(ZIP_COMMAND "${ZIPTOOL_ZIP_EXECUTABLE}" -X -r "${CMAKE_BINARY_DIR}/slade.pk3" .) - else() - message(STATUS "no zip executable, slade.pk3 won't build") - endif() diff --git a/slade.changes b/slade.changes index d1ce78e..883ea00 100644 --- a/slade.changes +++ b/slade.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Sat Apr 18 17:06:32 UTC 2020 - Jan Engelhardt + +- 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) + ------------------------------------------------------------------- Tue Jun 26 10:46:19 UTC 2018 - bwiedemann@suse.com diff --git a/slade.spec b/slade.spec index d58e24e..1d67dc6 100644 --- a/slade.spec +++ b/slade.spec @@ -1,7 +1,7 @@ # # spec file for package slade # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,30 +12,27 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: slade -Version: 3.1.1.5 +Version: 3.1.11 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 +URL: https://github.com/sirjuddington/SLADE Source: https://github.com/sirjuddington/%name/archive/%version.tar.gz Source2: slade.desktop Source100: slade.appdata.xml Patch1: basepk3.diff -Patch2: wxChar.patch +Patch2: wx.diff Patch10: disable_sse.patch -# PATCH-FIX-UPSTREAM https://github.com/sirjuddington/SLADE/pull/892 -Patch11: reproducible.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: ImageMagick -BuildRequires: cmake +BuildRequires: cmake >= 3.1 BuildRequires: freeimage-devel -BuildRequires: gcc-c++ +BuildRequires: gcc-c++ >= 6 BuildRequires: update-desktop-files BuildRequires: wxWidgets-3_0-devel BuildRequires: zip @@ -51,7 +48,7 @@ BuildRequires: strip-nondeterminism %endif %description -SLADE3 is a modern editor for Doom-engine based games and source +SLADE3 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. @@ -59,13 +56,13 @@ from/to other generic formats such as PNG. %prep %setup -qn SLADE-%version %patch -P 1 -P 2 -p1 -%ifnarch %{ix86} x86_64 +%ifnarch %ix86 x86_64 %patch10 -p0 %endif -%patch11 -p1 %build -%cmake -DUSE_WEBKIT_STARTPAGE=ON +%define _lto_cflags %nil +%cmake -DNO_WEBVIEW=ON -DWX_GTK3=OFF make %{?_smp_mflags} %install @@ -99,8 +96,8 @@ install -Dm644 "%_sourcedir/slade.desktop" "$b/%_datadir/applications/%name.desk %endif %files -%defattr(-,root,root) -%doc gpl-2.0.txt README.md +%license gpl-2.0.txt +%doc README.md %_bindir/slade %_datadir/slade3/ %_datadir/pixmaps/%name.png diff --git a/wx.diff b/wx.diff new file mode 100644 index 0000000..a9cdf0c --- /dev/null +++ b/wx.diff @@ -0,0 +1,35 @@ + +[ 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': + +--- + src/CMakeLists.txt | 2 +- + src/External/CMakeLists.txt | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +Index: SLADE-3.1.11/src/CMakeLists.txt +=================================================================== +--- SLADE-3.1.11.orig/src/CMakeLists.txt ++++ SLADE-3.1.11/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.11/src/External/CMakeLists.txt +=================================================================== +--- SLADE-3.1.11.orig/src/External/CMakeLists.txt ++++ SLADE-3.1.11/src/External/CMakeLists.txt +@@ -30,6 +30,6 @@ file(GLOB_RECURSE EXTERNAL_SOURCES + ${SLADE_HEADERS} + ) + +-add_library(external ${EXTERNAL_SOURCES}) +-target_link_libraries(external ${ZLIB_LIBRARY}) ++add_library(external STATIC ${EXTERNAL_SOURCES}) ++target_link_libraries(external ${ZLIB_LIBRARY} ${wxWidgets_LIBRARIES}) + set(EXTERNAL_LIBRARIES external PARENT_SCOPE) diff --git a/wxChar.patch b/wxChar.patch deleted file mode 100644 index b79509c..0000000 --- a/wxChar.patch +++ /dev/null @@ -1,26 +0,0 @@ -From: Luke Jones -Date: Mon, 19 Dec 2016 21:33:56 +0000 - -Fix conversion from wxString to wxChar when using wxWidgets >= 3.0.2 - ---- - src/UI/Lists/ArchiveEntryList.cpp | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -Index: SLADE-3.1.1.4/src/UI/Lists/ArchiveEntryList.cpp -=================================================================== ---- SLADE-3.1.1.4.orig/src/UI/Lists/ArchiveEntryList.cpp -+++ SLADE-3.1.1.4/src/UI/Lists/ArchiveEntryList.cpp -@@ -584,8 +584,10 @@ bool ArchiveEntryList::entrySort(long le - result = 0; - - // Name sort -- else if (ael_current->col_name >= 0 && ael_current->col_name == lv_current->sortColumn()) -- result = le->getName().CompareTo(re->getName(), string::ignoreCase); -+ else if (ael_current->col_name >= 0 && ael_current->col_name == lv_current->sortColumn()) { -+ const wxChar *reName = re->getName().c_str(); -+ result = le->getName().CompareTo(reName, string::ignoreCase); -+ } - - // Other (default) sort - else