Hello community, here is the log from the commit of package slade for openSUSE:Factory checked in at 2020-04-22 20:50:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/slade (Old) and /work/SRC/openSUSE:Factory/.slade.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "slade" Wed Apr 22 20:50:40 2020 rev:8 rq:795413 version:3.1.11 Changes: -------- --- /work/SRC/openSUSE:Factory/slade/slade.changes 2018-06-27 10:23:09.752227928 +0200 +++ /work/SRC/openSUSE:Factory/.slade.new.2738/slade.changes 2020-04-22 20:51:02.615163325 +0200 @@ -1,0 +2,15 @@ +Sat Apr 18 17:06:32 UTC 2020 - Jan Engelhardt <[email protected]> + +- 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 + +------------------------------------------------------------------- Old: ---- 3.1.1.5.tar.gz reproducible.patch wxChar.patch New: ---- 3.1.11.tar.gz wx.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ slade.spec ++++++ --- /var/tmp/diff_new_pack.mFcbTn/_old 2020-04-22 20:51:03.447164953 +0200 +++ /var/tmp/diff_new_pack.mFcbTn/_new 2020-04-22 20:51:03.451164961 +0200 @@ -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 @@ %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 @@ %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 @@ %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 ++++++ 3.1.1.5.tar.gz -> 3.1.11.tar.gz ++++++ ++++ 252657 lines of diff (skipped) ++++++ basepk3.diff ++++++ --- /var/tmp/diff_new_pack.mFcbTn/_old 2020-04-22 20:51:04.231166488 +0200 +++ /var/tmp/diff_new_pack.mFcbTn/_new 2020-04-22 20:51:04.231166488 +0200 @@ -8,22 +8,22 @@ 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"; ++++++ wx.diff ++++++ From: Jan Engelhardt <[email protected]> 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 | 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)
