Hello community, here is the log from the commit of package freeorion for openSUSE:Factory checked in at 2019-08-24 18:50:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/freeorion (Old) and /work/SRC/openSUSE:Factory/.freeorion.new.7948 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "freeorion" Sat Aug 24 18:50:55 2019 rev:5 rq:725814 version:0.4.8 Changes: -------- --- /work/SRC/openSUSE:Factory/freeorion/freeorion.changes 2018-11-18 23:32:39.853447197 +0100 +++ /work/SRC/openSUSE:Factory/.freeorion.new.7948/freeorion.changes 2019-08-24 18:51:01.237730573 +0200 @@ -1,0 +2,6 @@ +Thu Aug 22 18:36:29 UTC 2019 - Antoine Belvire <[email protected]> + +- Fix build with boost 1.69: Add freeorion-0.4.8-remove-boost-signals.patch. +- Refresh spec file. + +------------------------------------------------------------------- New: ---- freeorion-0.4.8-remove-boost-signals.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ freeorion.spec ++++++ --- /var/tmp/diff_new_pack.i6ZH1I/_old 2019-08-24 18:51:02.801730421 +0200 +++ /var/tmp/diff_new_pack.i6ZH1I/_new 2019-08-24 18:51:02.805730421 +0200 @@ -1,7 +1,7 @@ # # spec file for package freeorion # -# 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 @@ -12,32 +12,28 @@ # 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: freeorion Version: 0.4.8 -Release: 1.1 +Release: 0 Summary: A turn-based space empire and galactic conquest (4X) computer game License: GPL-2.0-only Group: Amusements/Games/Strategy/Turn Based -Url: http://freeorion.org/ +URL: https://freeorion.org/ Source: FreeOrion_v0.4.8_2018-08-23.26f16b0_Source.tar.gz # PATCH-FIX-UPSTREAM https://github.com/freeorion/freeorion/pull/1657 Patch0: appdata.patch Patch1: cmake_boost_python.patch +# PATCH-FIX-UPSTREAM https://github.com/freeorion/freeorion/pull/2310 +Patch2: freeorion-0.4.8-remove-boost-signals.patch BuildRequires: cmake >= 2.8.5 BuildRequires: fdupes - -%if 0%{?gcc_version} >= 5 BuildRequires: gcc-c++ -%else -BuildRequires: gcc5-c++ -%endif - -%if 0%{suse_version} >= 1330 -# Split boost packages began at 1.62 so version check unneeded +BuildRequires: google-roboto-fonts +BuildRequires: hicolor-icon-theme BuildRequires: libboost_date_time-devel BuildRequires: libboost_filesystem-devel BuildRequires: libboost_iostreams-devel @@ -46,15 +42,8 @@ BuildRequires: libboost_python-devel BuildRequires: libboost_regex-devel BuildRequires: libboost_serialization-devel -BuildRequires: libboost_signals-devel BuildRequires: libboost_system-devel BuildRequires: libboost_thread-devel -%else -BuildRequires: boost-devel >= 1.56.0 -%endif - -BuildRequires: google-roboto-fonts -BuildRequires: hicolor-icon-theme BuildRequires: libpng-devel BuildRequires: python-devel >= 2.7 BuildRequires: pkgconfig(freetype2) @@ -66,14 +55,12 @@ BuildRequires: pkgconfig(zlib) Requires: %{name}-data = %{version} Requires: google-roboto-fonts -BuildRequires: update-desktop-files %description FreeOrion is a turn-based space empire and galactic conquest (4X) computer game. It is inspired by the tradition of the Master of Orion games, but is not a clone or remake of that series or any other game. - %package data Summary: Data files for FreeOrion, a turn-based space empire game License: CC-BY-SA-3.0 @@ -89,9 +76,7 @@ This package contains all the resource data necessary to run FreeOrion. %prep -%setup -q -n src-tarball -%patch0 -p1 -%patch1 -p1 +%autosetup -p1 -n src-tarball %build mkdir build @@ -103,10 +88,6 @@ -DCMAKE_INSTALL_LIBDIR=%{_lib} \ -DCMAKE_BUILD_WITH_INSTALL_RPATH=1 \ -DPYTHON_INCLUDE_DIR=$(python -c "from distutils.sysconfig import get_python_inc; print(get_python_inc())") \ -%if 0%{?gcc_version} < 5 --DCMAKE_CXX_COMPILER=g++-5 \ --DCMAKE_C_COMPILER=gcc-5 \ -%endif .. # Only try with one thread since each compilation unit is so large @@ -125,23 +106,14 @@ ln -s %{_datadir}/fonts/truetype/Roboto-Bold.ttf ln -s %{_datadir}/fonts/truetype/Roboto-Regular.ttf -%suse_update_desktop_file %{name} - %fdupes %{buildroot}/%{_datadir}/ -%post -/sbin/ldconfig -%desktop_database_post -%icon_theme_cache_post - -%postun -/sbin/ldconfig -%desktop_database_postun -%icon_theme_cache_postun +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig %files -%defattr(-,root,root) -%doc ChangeLog.md README.md default/COPYING +%license default/COPYING +%doc ChangeLog.md README.md %{_bindir}/* %dir %{_libdir}/%{name} %{_libdir}/%{name}/* @@ -151,8 +123,6 @@ %{_datadir}/appdata/freeorion.appdata.xml %files data -%defattr(-,root,root) -%dir %{_datadir}/%{name} -%{_datadir}/%{name}/* +%{_datadir}/%{name} %changelog ++++++ freeorion-0.4.8-remove-boost-signals.patch ++++++ >From 35863f31210b597045b24e8d08f4740a4426fc09 Mon Sep 17 00:00:00 2001 From: geoffthemedio <[email protected]> Date: Fri, 26 Oct 2018 09:06:46 +0200 Subject: [PATCH] Remove all references to signals library from CMakeLists.txt -- From: Antoine Belvire <[email protected]> Trivial rebase to apply on 0.48: In CMakeLists.txt, hunk #4, add "-vc90-mt-1_44" suffix to dlls. --- CMakeLists.txt | 5 ----- GG/CMakeLists.txt | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d61970734a..5b5bc42623 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -204,7 +204,6 @@ find_package(Boost ${MINIMUM_BOOST_VERSION} log_setup regex serialization - signals system thread REQUIRED) @@ -356,7 +355,6 @@ target_link_libraries(freeorioncommon ${Boost_LOG_SETUP_LIBRARY} ${Boost_REGEX_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} - ${Boost_SIGNALS_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${Boost_THREAD_LIBRARY} ${ZLIB_LIBRARIES} @@ -667,8 +665,6 @@ if(APPLE) ${CMAKE_COMMAND} -E copy_if_different "${Boost_PYTHON_LIBRARY}" "$<TARGET_FILE_DIR:freeorion>/../SharedSupport" COMMAND ${CMAKE_COMMAND} -E copy_if_different "${Boost_SERIALIZATION_LIBRARY}" "$<TARGET_FILE_DIR:freeorion>/../SharedSupport" - COMMAND - ${CMAKE_COMMAND} -E copy_if_different "${Boost_SIGNALS_LIBRARY}" "$<TARGET_FILE_DIR:freeorion>/../SharedSupport" COMMAND ${CMAKE_COMMAND} -E copy_if_different "${Boost_SYSTEM_LIBRARY}" "$<TARGET_FILE_DIR:freeorion>/../SharedSupport" COMMAND @@ -772,7 +768,6 @@ if(WIN32) boost_python-vc90-mt-1_44.dll boost_regex-vc90-mt-1_44.dll boost_serialization-vc90-mt-1_44.dll - boost_signals-vc90-mt-1_44.dll boost_system-vc90-mt-1_44.dll boost_thread-vc90-mt-1_44.dll glew32.dll diff --git a/GG/CMakeLists.txt b/GG/CMakeLists.txt index 1e5f29d93a..238cc44d00 100644 --- a/GG/CMakeLists.txt +++ b/GG/CMakeLists.txt @@ -91,7 +91,7 @@ if(NOT USE_STATIC_LIBS) endif() set(Boost_USE_STATIC_LIBS ${USE_STATIC_LIBS}) -find_package(Boost ${MINIMUM_BOOST_VERSION} COMPONENTS date_time filesystem regex signals system thread log REQUIRED) +find_package(Boost ${MINIMUM_BOOST_VERSION} COMPONENTS date_time filesystem regex system thread log REQUIRED) find_package(OpenGL REQUIRED) find_package(GLEW REQUIRED)
