commit slade for openSUSE:Factory
Hello community,
here is the log from the commit of package slade for openSUSE:Factory checked
in at 2020-10-12 13:59:08
Comparing /work/SRC/openSUSE:Factory/slade (Old)
and /work/SRC/openSUSE:Factory/.slade.new.3486 (New)
Package is "slade"
Mon Oct 12 13:59:08 2020 rev:11 rq:841069 version:3.1.12
Changes:
--- /work/SRC/openSUSE:Factory/slade/slade.changes 2020-06-02
14:43:39.480473300 +0200
+++ /work/SRC/openSUSE:Factory/.slade.new.3486/slade.changes2020-10-12
13:59:59.138232882 +0200
@@ -1,0 +2,19 @@
+Sun Oct 11 09:18:41 UTC 2020 - Jan Engelhardt
+
+- 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
+
+- 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
+
+- Add clzma.diff to use system-provided clzma library.
+
+---
New:
0001-build-add-cmake-option-to-skip-Lua-components-1175.patch
0001-build-allow-deactivating-the-crash-handler-at-build-.patch
clzma.diff
Other differences:
--
++ slade.spec ++
--- /var/tmp/diff_new_pack.2LAtBj/_old 2020-10-12 13:59:59.810233162 +0200
+++ /var/tmp/diff_new_pack.2LAtBj/_new 2020-10-12 13:59:59.810233162 +0200
@@ -28,16 +28,21 @@
Source100: slade.appdata.xml
Patch1: basepk3.diff
Patch2: wx.diff
+Patch3: clzma.diff
+Patch4: 0001-build-allow-deactivating-the-crash-handler-at-build-.patch
Patch10:disable_sse.patch
+Patch11:0001-build-add-cmake-option-to-skip-Lua-components-1175.patch
+# slade 3.2 will need gcc-c++>=8 and pkgconfig(fmt)>=6
BuildRequires: ImageMagick
BuildRequires: cmake >= 3.1
BuildRequires: freeimage-devel
BuildRequires: gcc-c++ >= 6
-BuildRequires: pkgconfig
+BuildRequires: pkg-config
BuildRequires: strip-nondeterminism
BuildRequires: update-desktop-files
BuildRequires: wxWidgets-3_0-devel
BuildRequires: zip
+BuildRequires: pkgconfig(clzma)
BuildRequires: pkgconfig(fluidsynth)
BuildRequires: pkgconfig(ftgl)
BuildRequires: pkgconfig(gl)
@@ -45,24 +50,31 @@
BuildRequires: pkgconfig(libcurl)
BuildRequires: pkgconfig(sfml-all)
BuildRequires: pkgconfig(x11)
+Provides: bundled(dumb) = 0.9.3
%description
-SLADE3 is an editor for Doom-engine based games and source
+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 -p1
+%patch -P 1 -P 2 -P 3 -P 4 -p1
%ifnarch %ix86 x86_64
%patch10 -p0
%endif
+%if 0%{?suse_version} >= 1550
+%patch -P 11 -p1
+%endif
%build
%define _lto_cflags %nil
-%cmake -DNO_WEBVIEW=ON -DWX_GTK3=OFF
-make %{?_smp_mflags}
+%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
@@ -75,10 +87,10 @@
install -Dpm0644 %{SOURCE100} "$b/%_datadir/appdata/%name.appdata.xml"
pushd misc
-for txtfile in detect_functions.txt old-simage-formats.txt stuff.txt
udmf11.txt \
- udmf_zdoom.txt usdf.txt usdf_zdoom.txt
+for txtfile in detect_functions.txt old-simage-formats.txt stuff.txt \
+udmf11.txt udmf_zdoom.txt usdf.txt usdf_zdoom.txt
do
- install -Dm644 $txtfile "$b/%_datadir/slade3/misc/$txtfile"
+ install -Dm644 "$txtfile" "$b/%_datadir/slade3/misc/$txtfile"
done
popd
++ 0001-build-add-cmake-option-to-skip-Lua-components-1175.patch ++
>From a54f12b4c29e949458949d5bede2f74b1aa8a34a Mon Sep 17 00:00:00 2001
From: jengelh
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
---
src/Application/App.cpp |8
src/CMakeLists.txt | 11 ++-
commit slade for openSUSE:Factory
Hello community,
here is the log from the commit of package slade for openSUSE:Factory checked
in at 2020-06-02 14:42:43
Comparing /work/SRC/openSUSE:Factory/slade (Old)
and /work/SRC/openSUSE:Factory/.slade.new.3606 (New)
Package is "slade"
Tue Jun 2 14:42:43 2020 rev:10 rq:810774 version:3.1.12
Changes:
--- /work/SRC/openSUSE:Factory/slade/slade.changes 2020-04-29
20:54:47.093328073 +0200
+++ /work/SRC/openSUSE:Factory/.slade.new.3606/slade.changes2020-06-02
14:43:39.480473300 +0200
@@ -1,0 +2,23 @@
+Tue May 26 08:26:11 UTC 2020 - Jan Engelhardt
+
+- 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.
+
+---
Old:
3.1.11.tar.gz
New:
3.1.12.tar.gz
Other differences:
--
++ slade.spec ++
--- /var/tmp/diff_new_pack.fcWVWW/_old 2020-06-02 14:43:42.780483732 +0200
+++ /var/tmp/diff_new_pack.fcWVWW/_new 2020-06-02 14:43:42.780483732 +0200
@@ -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: 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(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 @@
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 @@
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
++ 3.1.11.tar.gz -> 3.1.12.tar.gz ++
2267 lines of diff (skipped)
++ wx.diff ++
--- /var/tmp/diff_new_pack.fcWVWW/_old 2020-06-02 14:43:43.360485565 +0200
+++ /var/tmp/diff_new_pack.fcWVWW/_new 2020-06-02 14:43:43.360485565 +0200
@@ -12,13 +12,13 @@
---
src/CMakeLists.txt |2 +-
- src/External/CMakeLists.txt |4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
+ src/External/CMakeLists.txt |2 +-
+ 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.11/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)
@@ -28,16 +28,14 @@
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.11/src/External/CMakeLists.txt
-@@ -30,6 +30,6 @@ file(GLOB_RECURSE EXTERNAL_SOURCES
- ${SLADE_HEADERS}
+--- 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 ${EXTERNAL_SOURCES})
+ add_library(external STATIC ${EXTERNAL_SOURCES})
-target_link_libraries(external ${ZLIB_LIBRARY})
-+add_library(external STATIC ${EXTERNAL_SOURCES})
commit slade for openSUSE:Factory
Hello community,
here is the log from the commit of package slade for openSUSE:Factory checked
in at 2020-04-29 20:53:35
Comparing /work/SRC/openSUSE:Factory/slade (Old)
and /work/SRC/openSUSE:Factory/.slade.new.2738 (New)
Package is "slade"
Wed Apr 29 20:53:35 2020 rev:9 rq:798915 version:3.1.11
Changes:
--- /work/SRC/openSUSE:Factory/slade/slade.changes 2020-04-22
20:51:02.615163325 +0200
+++ /work/SRC/openSUSE:Factory/.slade.new.2738/slade.changes2020-04-29
20:54:47.093328073 +0200
@@ -1,0 +2,5 @@
+Wed Apr 29 12:45:36 UTC 2020 - Guillaume GARDET
+
+- Refresh disable_sse.patch
+
+---
Other differences:
--
++ slade.spec ++
--- /var/tmp/diff_new_pack.DsM25d/_old 2020-04-29 20:54:48.161330520 +0200
+++ /var/tmp/diff_new_pack.DsM25d/_new 2020-04-29 20:54:48.161330520 +0200
@@ -33,6 +33,7 @@
BuildRequires: cmake >= 3.1
BuildRequires: freeimage-devel
BuildRequires: gcc-c++ >= 6
+BuildRequires: pkgconfig
BuildRequires: update-desktop-files
BuildRequires: wxWidgets-3_0-devel
BuildRequires: zip
@@ -54,7 +55,7 @@
from/to other generic formats such as PNG.
%prep
-%setup -qn SLADE-%version
+%setup -q -n SLADE-%version
%patch -P 1 -P 2 -p1
%ifnarch %ix86 x86_64
%patch10 -p0
@@ -69,7 +70,7 @@
%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"
++ disable_sse.patch ++
--- /var/tmp/diff_new_pack.DsM25d/_old 2020-04-29 20:54:48.185330575 +0200
+++ /var/tmp/diff_new_pack.DsM25d/_new 2020-04-29 20:54:48.185330575 +0200
@@ -1,12 +1,12 @@
src/CMakeLists.txt.orig2018-04-18 16:11:00.227988702 +0200
-+++ src/CMakeLists.txt 2018-04-18 16:11:14.228041424 +0200
-@@ -97,9 +97,6 @@ if(APPLE)
+--- src/CMakeLists.txt.orig2020-04-29 12:44:22.087112317 +
src/CMakeLists.txt 2020-04-29 12:44:38.886604020 +
+@@ -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")
-
- add_executable(slade WIN32 MACOSX_BUNDLE
- External/lzma/C/LzmaDec.c
- External/mus2mid/mus2mid.cpp
+ # External libraries are compiled separately to enable unity builds
+ add_subdirectory(External)
+
commit slade for openSUSE:Factory
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.changes2020-04-22
20:51:02.615163325 +0200
@@ -1,0 +2,15 @@
+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), 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
commit slade for openSUSE:Factory
Hello community,
here is the log from the commit of package slade for openSUSE:Factory checked
in at 2018-06-27 10:23:06
Comparing /work/SRC/openSUSE:Factory/slade (Old)
and /work/SRC/openSUSE:Factory/.slade.new (New)
Package is "slade"
Wed Jun 27 10:23:06 2018 rev:7 rq:619219 version:3.1.1.5
Changes:
--- /work/SRC/openSUSE:Factory/slade/slade.changes 2018-06-19
11:56:24.998176179 +0200
+++ /work/SRC/openSUSE:Factory/.slade.new/slade.changes 2018-06-27
10:23:09.752227928 +0200
@@ -1,0 +2,6 @@
+Tue Jun 26 10:46:19 UTC 2018 - bwiedem...@suse.com
+
+- Add reproducible.patch to not store extra timestamps in zip
+ to make build reproducible
+
+---
New:
reproducible.patch
Other differences:
--
++ slade.spec ++
--- /var/tmp/diff_new_pack.pU1HtW/_old 2018-06-27 10:23:10.392204591 +0200
+++ /var/tmp/diff_new_pack.pU1HtW/_new 2018-06-27 10:23:10.396204445 +0200
@@ -29,6 +29,8 @@
Patch1: basepk3.diff
Patch2: wxChar.patch
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
@@ -60,6 +62,7 @@
%ifnarch %{ix86} x86_64
%patch10 -p0
%endif
+%patch11 -p1
%build
%cmake -DUSE_WEBKIT_STARTPAGE=ON
++ reproducible.patch ++
>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()
commit slade for openSUSE:Factory
Hello community,
here is the log from the commit of package slade for openSUSE:Factory checked
in at 2018-06-19 11:56:24
Comparing /work/SRC/openSUSE:Factory/slade (Old)
and /work/SRC/openSUSE:Factory/.slade.new (New)
Package is "slade"
Tue Jun 19 11:56:24 2018 rev:6 rq:616318 version:3.1.1.5
Changes:
--- /work/SRC/openSUSE:Factory/slade/slade.changes 2018-04-20
17:32:54.167069947 +0200
+++ /work/SRC/openSUSE:Factory/.slade.new/slade.changes 2018-06-19
11:56:24.998176179 +0200
@@ -1,0 +2,6 @@
+Tue Jun 12 12:46:57 UTC 2018 - jeng...@inai.de
+
+- Fix build failure... slade wants zip, not p7zip.
+- Wrap %desktop_* into a 42.x/13.x guard.
+
+---
Other differences:
--
++ slade.spec ++
--- /var/tmp/diff_new_pack.jFTOrV/_old 2018-06-19 11:56:25.638152419 +0200
+++ /var/tmp/diff_new_pack.jFTOrV/_new 2018-06-19 11:56:25.642152271 +0200
@@ -34,9 +34,9 @@
BuildRequires: cmake
BuildRequires: freeimage-devel
BuildRequires: gcc-c++
-BuildRequires: p7zip
BuildRequires: update-desktop-files
BuildRequires: wxWidgets-3_0-devel
+BuildRequires: zip
BuildRequires: pkgconfig(fluidsynth)
BuildRequires: pkgconfig(ftgl)
BuildRequires: pkgconfig(gl)
@@ -87,11 +87,13 @@
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
%defattr(-,root,root)
commit slade for openSUSE:Factory
Hello community,
here is the log from the commit of package slade for openSUSE:Factory checked
in at 2018-04-20 17:30:25
Comparing /work/SRC/openSUSE:Factory/slade (Old)
and /work/SRC/openSUSE:Factory/.slade.new (New)
Package is "slade"
Fri Apr 20 17:30:25 2018 rev:5 rq:598020 version:3.1.1.5
Changes:
--- /work/SRC/openSUSE:Factory/slade/slade.changes 2017-06-28
10:38:03.844287612 +0200
+++ /work/SRC/openSUSE:Factory/.slade.new/slade.changes 2018-04-20
17:32:54.167069947 +0200
@@ -1,0 +2,5 @@
+Wed Apr 18 14:26:53 UTC 2018 - guillaume.gar...@opensuse.org
+
+- Disable SSE with disable_sse.patch on non x86* archs
+
+---
New:
disable_sse.patch
Other differences:
--
++ slade.spec ++
--- /var/tmp/diff_new_pack.SSXz0p/_old 2018-04-20 17:32:55.135034845 +0200
+++ /var/tmp/diff_new_pack.SSXz0p/_new 2018-04-20 17:32:55.139034700 +0200
@@ -1,7 +1,7 @@
#
# spec file for package slade
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,7 +20,7 @@
Version:3.1.1.5
Release:0
Summary:An editor for DOOM maps and WAD/PK3 archives
-License:GPL-2.0+
+License:GPL-2.0-or-later
Group: Amusements/Games/3D/Shoot
Url:https://github.com/sirjuddington/SLADE
Source: https://github.com/sirjuddington/%name/archive/%version.tar.gz
@@ -28,14 +28,15 @@
Source100: slade.appdata.xml
Patch1: basepk3.diff
Patch2: wxChar.patch
+Patch10:disable_sse.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: ImageMagick
BuildRequires: cmake
BuildRequires: freeimage-devel
BuildRequires: gcc-c++
+BuildRequires: p7zip
BuildRequires: update-desktop-files
BuildRequires: wxWidgets-3_0-devel
-BuildRequires: p7zip
BuildRequires: pkgconfig(fluidsynth)
BuildRequires: pkgconfig(ftgl)
BuildRequires: pkgconfig(gl)
@@ -56,6 +57,9 @@
%prep
%setup -qn SLADE-%version
%patch -P 1 -P 2 -p1
+%ifnarch %{ix86} x86_64
+%patch10 -p0
+%endif
%build
%cmake -DUSE_WEBKIT_STARTPAGE=ON
++ disable_sse.patch ++
--- src/CMakeLists.txt.orig 2018-04-18 16:11:00.227988702 +0200
+++ src/CMakeLists.txt 2018-04-18 16:11:14.228041424 +0200
@@ -97,9 +97,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")
-
add_executable(slade WIN32 MACOSX_BUNDLE
External/lzma/C/LzmaDec.c
External/mus2mid/mus2mid.cpp
commit slade for openSUSE:Factory
Hello community, here is the log from the commit of package slade for openSUSE:Factory checked in at 2017-06-28 10:37:54 Comparing /work/SRC/openSUSE:Factory/slade (Old) and /work/SRC/openSUSE:Factory/.slade.new (New) Package is "slade" Wed Jun 28 10:37:54 2017 rev:4 rq:506596 version:3.1.1.5 Changes: --- /work/SRC/openSUSE:Factory/slade/slade.changes 2017-05-08 19:05:02.346979679 +0200 +++ /work/SRC/openSUSE:Factory/.slade.new/slade.changes 2017-06-28 10:38:03.844287612 +0200 @@ -1,0 +2,5 @@ +Tue Jun 27 23:26:49 UTC 2017 - luke.nukem.jo...@gmail.com + +- Fix broken appdata xml + +--- Other differences: -- ++ slade.appdata.xml ++ --- /var/tmp/diff_new_pack.dVl0mm/_old 2017-06-28 10:38:04.400208965 +0200 +++ /var/tmp/diff_new_pack.dVl0mm/_new 2017-06-28 10:38:04.404208399 +0200 @@ -1,29 +1,27 @@ - slade.desktop - CC0 - GPL-2.0+ - SLADE 3 - An editor for games using the Doom engine - - - - SLADE3 is a modern editor for Doom-engine based games and source + slade.desktop + CC0 + GPL-2.0+ + SLADE 3 + An editor for games using the Doom engine + + + SLADE3 is a modern 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. - - - - - Map Editor - http://slade.mancubus.net/shots/map_t.png - - + + + + Map Editor + http://slade.mancubus.net/shots/map_t.png + + 3D Map Editor - http://slade.mancubus.net/shots/map3d_t.png - + http://slade.mancubus.net/shots/map3d_t.png + Basic Editor View http://slade.mancubus.net/shots/gfx_t.png @@ -32,15 +30,13 @@ Advanced Text Editor http://slade.mancubus.net/shots/text.png + Texture Editor http://slade.mancubus.net/shots/textures.png - - - - http://slade.mancubus.net/ - - -slade - - - + + + http://slade.mancubus.net/ + + slade + +
commit slade for openSUSE:Factory
Hello community,
here is the log from the commit of package slade for openSUSE:Factory checked
in at 2017-05-08 19:04:34
Comparing /work/SRC/openSUSE:Factory/slade (Old)
and /work/SRC/openSUSE:Factory/.slade.new (New)
Package is "slade"
Mon May 8 19:04:34 2017 rev:3 rq:493393 version:3.1.1.5
Changes:
--- /work/SRC/openSUSE:Factory/slade/slade.changes 2017-02-21
13:38:35.695784433 +0100
+++ /work/SRC/openSUSE:Factory/.slade.new/slade.changes 2017-05-08
19:05:02.346979679 +0200
@@ -1,0 +2,11 @@
+Sun May 7 09:00:30 UTC 2017 - bwiedem...@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 - bwiedem...@suse.com
+
+- use convert -strip to make build more reproducible
+
+---
Other differences:
--
++ slade.spec ++
--- /var/tmp/diff_new_pack.mLvoma/_old 2017-05-08 19:05:03.282847471 +0200
+++ /var/tmp/diff_new_pack.mLvoma/_new 2017-05-08 19:05:03.286846906 +0200
@@ -35,7 +35,7 @@
BuildRequires: gcc-c++
BuildRequires: update-desktop-files
BuildRequires: wxWidgets-3_0-devel
-BuildRequires: zip
+BuildRequires: p7zip
BuildRequires: pkgconfig(fluidsynth)
BuildRequires: pkgconfig(ftgl)
BuildRequires: pkgconfig(gl)
@@ -43,6 +43,9 @@
BuildRequires: pkgconfig(libcurl)
BuildRequires: pkgconfig(sfml-all)
BuildRequires: pkgconfig(x11)
+%if 0%{?suse_version} > 1320
+BuildRequires: strip-nondeterminism
+%endif
%description
SLADE3 is a modern editor for Doom-engine based games and source
@@ -59,11 +62,14 @@
make %{?_smp_mflags}
%install
+%if 0%{?suse_version} > 1320
+strip-nondeterminism build/slade.pk3
+%endif
b="%buildroot"
install -Dm755 build/slade "$b/%_bindir/slade"
install -Dm644 build/slade.pk3 "$b/%_datadir/slade3/slade.pk3"
-convert "build/msvc/slade.ico[0]" -alpha on "%name.png"
+convert -strip "build/msvc/slade.ico[0]" -alpha on "%name.png"
install -Dpm0644 "%name.png" "$b/%_datadir/pixmaps/%name.png"
install -Dpm0644 %{SOURCE100} "$b/%_datadir/appdata/%name.appdata.xml"
commit slade for openSUSE:Factory
Hello community,
here is the log from the commit of package slade for openSUSE:Factory checked
in at 2017-02-21 13:38:35
Comparing /work/SRC/openSUSE:Factory/slade (Old)
and /work/SRC/openSUSE:Factory/.slade.new (New)
Package is "slade"
Changes:
--- /work/SRC/openSUSE:Factory/slade/slade.changes 2017-01-25
23:24:02.456394251 +0100
+++ /work/SRC/openSUSE:Factory/.slade.new/slade.changes 2017-02-21
13:38:35.695784433 +0100
@@ -1,0 +2,25 @@
+Fri Feb 10 01:19:39 UTC 2017 - luke.nukem.jo...@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
+
+---
Old:
3.1.1.4.tar.gz
New:
3.1.1.5.tar.gz
slade.appdata.xml
Other differences:
--
++ slade.spec ++
--- /var/tmp/diff_new_pack.qBR2wR/_old 2017-02-21 13:38:36.335694159 +0100
+++ /var/tmp/diff_new_pack.qBR2wR/_new 2017-02-21 13:38:36.339693595 +0100
@@ -1,7 +1,7 @@
#
# spec file for package slade
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# 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.1.1.4
+Version:3.1.1.5
Release:0
Summary:An editor for DOOM maps and WAD/PK3 archives
License:GPL-2.0+
@@ -25,22 +25,23 @@
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
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: ImageMagick
BuildRequires: cmake
BuildRequires: freeimage-devel
-BuildRequires: ftgl-devel
BuildRequires: gcc-c++
-BuildRequires: sfml2-devel
BuildRequires: update-desktop-files
BuildRequires: wxWidgets-3_0-devel
BuildRequires: zip
BuildRequires: pkgconfig(fluidsynth)
+BuildRequires: pkgconfig(ftgl)
BuildRequires: pkgconfig(gl)
BuildRequires: pkgconfig(glew)
BuildRequires: pkgconfig(libcurl)
+BuildRequires: pkgconfig(sfml-all)
BuildRequires: pkgconfig(x11)
%description
@@ -64,6 +65,7 @@
convert "build/msvc/slade.ico[0]" -alpha on "%name.png"
install -Dpm0644 "%name.png" "$b/%_datadir/pixmaps/%name.png"
+install -Dpm0644 %{SOURCE100} "$b/%_datadir/appdata/%name.appdata.xml"
pushd misc
for txtfile in detect_functions.txt old-simage-formats.txt stuff.txt
udmf11.txt \
@@ -88,5 +90,6 @@
%_datadir/slade3/
%_datadir/pixmaps/%name.png
%_datadir/applications/%name.desktop
+%_datadir/appdata/%name.appdata.xml
%changelog
++ 3.1.1.4.tar.gz -> 3.1.1.5.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/SLADE-3.1.1.4/build/msvc/SLADE.rc
new/SLADE-3.1.1.5/build/msvc/SLADE.rc
--- old/SLADE-3.1.1.4/build/msvc/SLADE.rc 2016-09-26 06:00:29.0
+0200
+++ new/SLADE-3.1.1.5/build/msvc/SLADE.rc 2017-01-17 15:25:52.0
+0100
@@ -60,8 +60,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,1,1,4
- PRODUCTVERSION 3,1,1,4
+ FILEVERSION 3,1,1,5
+ PRODUCTVERSION 3,1,1,5
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -77,12 +77,12 @@
BLOCK "0c0904b0"
BEGIN
VALUE "FileDescription", "SLADE"
-VALUE "FileVersion", "3.1.1.4"
+VALUE "FileVersion", "3.1.1.5"
VALUE "InternalName", "SLADE.exe"
-VALUE "LegalCopyright", "Copyright (C) 2016"
+VALUE "LegalCopyright", "Copyright (C) 2017"
VALUE "OriginalFilename", "SLADE.exe"
VALUE "ProductName", "SLADE"
-VALUE "ProductVersion", "3.1.1.4"
+VALUE "ProductVersion", "3.1.1.5"
END
END
BLOCK "VarFileInfo"
diff -urN
