Accepting request 900156 from games:tools

OBS-URL: https://build.opensuse.org/request/show/900156
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/slade?expand=0&rev=14
This commit is contained in:
Dominique Leuenberger 2021-06-15 14:38:17 +00:00 committed by Git OBS Bridge
commit 12d57aa343
3 changed files with 12 additions and 6 deletions

View File

@ -1,5 +1,5 @@
--- src/CMakeLists.txt.orig 2020-04-29 12:44:22.087112317 +0000 --- SLADE-3.1.13/src/CMakeLists.txt.orig 2021-06-15 14:13:13.473287606 +0200
+++ src/CMakeLists.txt 2020-04-29 12:44:38.886604020 +0000 +++ SLADE-3.1.13/src/CMakeLists.txt 2021-06-15 14:13:28.233451010 +0200
@@ -159,9 +159,6 @@ if(APPLE) @@ -159,9 +159,6 @@ if(APPLE)
set_source_files_properties(${OSX_ICON} PROPERTIES MACOSX_PACKAGE_LOCATION Resources) set_source_files_properties(${OSX_ICON} PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
endif(APPLE) endif(APPLE)
@ -7,6 +7,6 @@
-# enable SSE instructions for dumb library -# enable SSE instructions for dumb library
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_USE_SSE -msse") -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_USE_SSE -msse")
- -
# External libraries are compiled separately to enable unity builds if(USE_SANITIZER)
add_subdirectory(External) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address")

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
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> Tue Jun 1 11:00:31 UTC 2021 - Jan Engelhardt <jengelh@inai.de>

View File

@ -60,7 +60,7 @@ from/to other generic formats such as PNG.
%setup -q -n SLADE-%version %setup -q -n SLADE-%version
%patch -P 1 -P 2 -P 3 -P 4 -p1 %patch -P 1 -P 2 -P 3 -P 4 -p1
%ifnarch %ix86 x86_64 %ifnarch %ix86 x86_64
%patch10 -p0 %patch10 -p1
%endif %endif
%if 0%{?suse_version} >= 1550 %if 0%{?suse_version} >= 1550
%patch -P 11 -p1 %patch -P 11 -p1