freeorion: rebuild against boost-1.69.0

This commit is contained in:
John 2018-12-12 12:12:57 +01:00 committed by maxice8
parent fe2ffb92b3
commit 98f28f9aba
No known key found for this signature in database
GPG Key ID: 543B9D4F4299F06B
2 changed files with 54 additions and 2 deletions

View File

@ -0,0 +1,52 @@
From 35863f31210b597045b24e8d08f4740a4426fc09 Mon Sep 17 00:00:00 2001
From: geoffthemedio <geoffthemedio@gmail.com>
Date: Fri, 26 Oct 2018 09:06:46 +0200
Subject: [PATCH] Remove all references to signals library from CMakeLists.txt
---
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
--- CMakeLists.txt
+++ 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
diff --git a/GG/CMakeLists.txt b/GG/CMakeLists.txt
index 1e5f29d93a..238cc44d00 100644
--- GG/CMakeLists.txt
+++ 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)

View File

@ -1,12 +1,12 @@
# Template file for 'freeorion'
pkgname=freeorion
version=0.4.8
revision=2
revision=3
_release=${version}_2018-08-23.26f16b0
wrksrc="src-tarball"
build_style=cmake
hostmakedepends="cppcheck doxygen python-pycodestyle"
makedepends="boost-devel boost-python freetype-devel glew-devel
makedepends="boost-devel freetype-devel glew-devel
libopenal-devel python-devel SDL2-devel"
depends="${pkgname}-data desktop-file-utils hicolor-icon-theme"
short_desc="Turn-based space empire and galactic conquest (4X) computer game"