Hello community, here is the log from the commit of package widelands for openSUSE:Factory checked in at 2019-07-15 22:44:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/widelands (Old) and /work/SRC/openSUSE:Factory/.widelands.new.1887 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "widelands" Mon Jul 15 22:44:07 2019 rev:5 rq:714521 version:build20 Changes: -------- --- /work/SRC/openSUSE:Factory/widelands/widelands.changes 2018-10-09 15:54:28.406260986 +0200 +++ /work/SRC/openSUSE:Factory/.widelands.new.1887/widelands.changes 2019-07-15 22:44:14.307899116 +0200 @@ -1,0 +2,8 @@ +Wed Jul 10 16:50:24 UTC 2019 - Dirk Stoecker <[email protected]> + +- update to build 20 + Changelog see https://www.widelands.org/changelog/ + Drop patch widelands-build19-fix-build-icu.patch (included upstream) + Add build20-libGL.patch to fix build order + +------------------------------------------------------------------- Old: ---- widelands-build19-fix-build-icu.patch widelands-build19-src.tar.bz2 New: ---- build20-libGL.patch widelands-build20.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ widelands.spec ++++++ --- /var/tmp/diff_new_pack.Z473bI/_old 2019-07-15 22:44:17.851898274 +0200 +++ /var/tmp/diff_new_pack.Z473bI/_new 2019-07-15 22:44:17.855898273 +0200 @@ -1,7 +1,7 @@ # # spec file for package widelands # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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,15 +17,15 @@ Name: widelands -Version: build19 +Version: build20 Release: 0 Summary: Realtime strategy game involving map control License: GPL-2.0-or-later Group: Amusements/Games/Strategy/Other Url: http://www.widelands.org -Source: https://launchpad.net/%{name}/%{version}/%{version}/+download/%{name}-%{version}-src.tar.bz2 -# PATCH-FIX-UPSTREAM widelands-build19-fix-build-icu.patch -- https://bugs.launchpad.net/widelands/+bug/1760581 -Patch0: widelands-build19-fix-build-icu.patch +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_image-devel BuildRequires: SDL2_mixer-devel @@ -37,22 +37,19 @@ BuildRequires: gcc-c++ BuildRequires: gettext BuildRequires: glew-devel +BuildRequires: graphviz-gnome BuildRequires: hicolor-icon-theme -# use more specific boost dependencies where possible to avoid redundant -# dependencies (boo#1062802) -%if 0%{?suse_version} >= 1330 BuildRequires: libboost_headers-devel BuildRequires: libboost_regex-devel +BuildRequires: libboost_system-devel BuildRequires: libboost_test-devel -%else -BuildRequires: boost-devel -%endif BuildRequires: libicu-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: libtiff-devel BuildRequires: lua51-devel BuildRequires: ninja +BuildRequires: openSUSE-release BuildRequires: optipng BuildRequires: python-devel BuildRequires: update-desktop-files @@ -87,8 +84,8 @@ operation. %prep -%setup -q -n %{name}-%{version}-src -%patch0 +%setup -q +%patch1 -p1 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 @@ -114,7 +111,7 @@ install -D -m 0644 data/images/logos/wl-ico-${i}.png %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps/%{name}.png done -install -D -m 0644 debian/widelands.desktop %{buildroot}%{_datadir}/applications/%{name}.desktop +install -D -m 0644 debian/org.widelands.widelands.desktop %{buildroot}%{_datadir}/applications/%{name}.desktop %suse_update_desktop_file %{name} -r Game StrategyGame desktop-file-edit --set-icon=%{name} %{buildroot}%{_datadir}/applications/%{name}.desktop ++++++ build20-libGL.patch ++++++ 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() ++++++ widelands-build19-src.tar.bz2 -> widelands-build20.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/widelands/widelands-build19-src.tar.bz2 /work/SRC/openSUSE:Factory/.widelands.new.1887/widelands-build20.tar.bz2 differ: char 11, line 1
