Accepting request 810774 from games:tools

Automatic submission by obs-autosubmit

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

slade.changes

@@ -1,3 +1,26 @@
+-------------------------------------------------------------------
+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>
 

slade.spec

@@ -17,7 +17,7 @@
 
 
 Name:           slade
-Version:        3.1.11
+Version:        3.1.12
 Release:        0
 Summary:        An editor for DOOM maps and WAD/PK3 archives
 License:        GPL-2.0-or-later
@@ -34,6 +34,7 @@ BuildRequires:  cmake >= 3.1
 BuildRequires:  freeimage-devel
 BuildRequires:  gcc-c++ >= 6
 BuildRequires:  pkgconfig
+BuildRequires:  strip-nondeterminism
 BuildRequires:  update-desktop-files
 BuildRequires:  wxWidgets-3_0-devel
 BuildRequires:  zip
@@ -44,9 +45,6 @@ BuildRequires:  pkgconfig(glew)
 BuildRequires:  pkgconfig(libcurl)
 BuildRequires:  pkgconfig(sfml-all)
 BuildRequires:  pkgconfig(x11)
-%if 0%{?suse_version} > 1320
-BuildRequires:  strip-nondeterminism
-%endif
 
 %description
 SLADE3 is an editor for Doom-engine based games and source
@@ -67,10 +65,8 @@ from/to other generic formats such as PNG.
 make %{?_smp_mflags}
 
 %install
-%if 0%{?suse_version} > 1320
 strip-nondeterminism build/slade.pk3
-%endif
+b="%buildroot"
-b=%{buildroot}
 install -Dm755 build/slade "$b/%_bindir/slade"
 install -Dm644 build/slade.pk3 "$b/%_datadir/slade3/slade.pk3"
 
@@ -88,14 +84,6 @@ popd
 
 install -Dm644 "%_sourcedir/slade.desktop" "$b/%_datadir/applications/%name.desktop"
 
-%if 0%{?suse_version} <= 1320
-%post
-%desktop_database_post
-
-%postun
-%desktop_database_postun
-%endif
-
 %files
 %license gpl-2.0.txt
 %doc README.md

wx.diff

@@ -12,13 +12,13 @@ them => change to STATIC because I am too lazy.
 
 ---
  src/CMakeLists.txt          |    2 +-
- src/External/CMakeLists.txt |    4 ++--
+ src/External/CMakeLists.txt |    2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
+ 2 files changed, 2 insertions(+), 2 deletions(-)
 
-Index: SLADE-3.1.11/src/CMakeLists.txt
+Index: SLADE-3.1.12/src/CMakeLists.txt
 ===================================================================
---- SLADE-3.1.11.orig/src/CMakeLists.txt
+--- SLADE-3.1.12.orig/src/CMakeLists.txt
-+++ SLADE-3.1.11/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)
@@ -28,16 +28,14 @@ Index: SLADE-3.1.11/src/CMakeLists.txt
  if (NO_WEBVIEW)
  	SET(WX_LIBS ${WX_LIBS} html)
  else (NO_WEBVIEW)
-Index: SLADE-3.1.11/src/External/CMakeLists.txt
+Index: SLADE-3.1.12/src/External/CMakeLists.txt
 ===================================================================
---- SLADE-3.1.11.orig/src/External/CMakeLists.txt
+--- SLADE-3.1.12.orig/src/External/CMakeLists.txt
-+++ SLADE-3.1.11/src/External/CMakeLists.txt
++++ SLADE-3.1.12/src/External/CMakeLists.txt
-@@ -30,6 +30,6 @@ file(GLOB_RECURSE EXTERNAL_SOURCES
+@@ -31,5 +31,5 @@ file(GLOB_RECURSE EXTERNAL_SOURCES
- 	${SLADE_HEADERS}
  	)
  
--add_library(external ${EXTERNAL_SOURCES})
+ add_library(external STATIC ${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)