pool/widelands
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix Tumbleweed

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/games/widelands?expand=0&rev=49
This commit is contained in:
Dirk Stoecker 2019-07-10 20:01:32 +00:00 committed by Git OBS Bridge
parent 9e64bc305d
commit 276d31da9a
3 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build20-libGL.patch Normal file
View File

@ -0,0 +1,12 @@
diff -ur widelands-build20/CMakeLists.txt widelands-build20_fix/CMakeLists.txt
--- widelands-build20/CMakeLists.txt 2019-05-02 07:23:39.000000000 +0200
+++ widelands-build20_fix/CMakeLists.txt 2019-07-10 21:43:46.945029296 +0200
@@ -181,7 +181,7 @@
# This is set to avoid linker errors when using GLVND-libs on Linux
if("${OpenGL_GL_PREFERENCE}" STREQUAL "GLVND")
- set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lGL")
+ link_libraries("GL")
add_compile_definitions(WL_USE_GLVND)
message(STATUS "Adding linker flags for GLVND.")
endif()

1
widelands.changes
View File

@ -4,6 +4,7 @@ Wed Jul 10 16:50:24 UTC 2019 - Dirk Stoecker <opensuse@dstoecker.de>
- update to build 20 - update to build 20
Changelog see https://www.widelands.org/changelog/ Changelog see https://www.widelands.org/changelog/
Drop patch widelands-build19-fix-build-icu.patch (included upstream) Drop patch widelands-build19-fix-build-icu.patch (included upstream)
Add build20-libGL.patch to fix build order
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Oct 9 08:25:07 UTC 2018 - Guillaume GARDET <guillaume.gardet@opensuse.org> Tue Oct 9 08:25:07 UTC 2018 - Guillaume GARDET <guillaume.gardet@opensuse.org>

3
widelands.spec
View File

@ -24,6 +24,8 @@ License: GPL-2.0-or-later
Group: Amusements/Games/Strategy/Other Group: Amusements/Games/Strategy/Other
Url: http://www.widelands.org Url: http://www.widelands.org
Source: https://launchpad.net/%{name}/%{version}/%{version}/+download/%{name}-%{version}.tar.bz2 Source: https://launchpad.net/%{name}/%{version}/%{version}/+download/%{name}-%{version}.tar.bz2
# PATCH-FIX-UPSTREAM properly add -lGL as library for correct argument order
Patch1: build20-libGL.patch
BuildRequires: SDL2_gfx-devel BuildRequires: SDL2_gfx-devel
BuildRequires: SDL2_image-devel BuildRequires: SDL2_image-devel
BuildRequires: SDL2_mixer-devel BuildRequires: SDL2_mixer-devel
@ -83,6 +85,7 @@ operation.
%prep %prep
%setup -q %setup -q
%patch1 -p1
sed -i '/wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=uninitialized")/d' CMakeLists.txt sed -i '/wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=uninitialized")/d' CMakeLists.txt
sed -i 's/\(install(TARGETS ${NAME} DESTINATION \)"."\( COMPONENT ExecutableFiles)\)/\1bin\2/' cmake/WlFunctions.cmake sed -i 's/\(install(TARGETS ${NAME} DESTINATION \)"."\( COMPONENT ExecutableFiles)\)/\1bin\2/' cmake/WlFunctions.cmake