Compare commits

...

3 Commits

Author SHA1 Message Date
Heiko Becker
202a8fd01b
dianara: Remove bogus qjson dependency
It's no longer needed after the port to Qt5, which has JSON support
of it's own (although qjson has also been ported to qt5 in the
meantime, but our exheres doesn't provide that version nor does
any package use it AFAIK).
2019-04-03 10:31:59 +08:00
Heiko Becker
0e8300cc25
dianara: Adapt to the removal of app-crypt/qca[qt5]
The qt5 option is now hard-enabled.
2019-04-03 10:31:55 +08:00
Heiko Becker
b88462c4c0
freeorion: Fix build with boost[>=1.69.0] 2019-04-03 10:31:47 +08:00
3 changed files with 71 additions and 2 deletions

View File

@ -0,0 +1,66 @@
Upstream: yes, cherrry-picked from master
Reason: Fix build with boost[>=1.69.0] which removed the signals lib
From 72a634ef6262dc1401298adb28000d1c89442482 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 927c8c165..8d3832049 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -205,7 +205,6 @@ find_package(Boost ${MINIMUM_BOOST_VERSION}
log_setup
regex
serialization
- signals
system
thread
REQUIRED)
@@ -357,7 +356,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}
@@ -668,8 +666,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
@@ -769,7 +765,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 1e5f29d93..238cc44d0 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)
--
2.20.1

View File

@ -46,6 +46,10 @@ DEPENDENCIES="
BUGS_TO="hasufell@posteo.de"
DEFAULT_SRC_PREPARE_PATCHES=(
"${FILES}"/${PN}-Remove-all-references-to-signals-library-from-CMakeL.patch
)
CMAKE_SRC_CONFIGURE_PARAMS=(
-DRELEASE_COMPILE_FLAGS=""
-DCMAKE_SKIP_RPATH=ON

View File

@ -17,8 +17,7 @@ MYOPTIONS=""
DEPENDENCIES="
build+run:
app-crypt/qca:2[qt5]
dev-libs/qjson
app-crypt/qca:2[qt5(+)]
sys-apps/file
sys-auth/qoauth[>=2.0.0]
x11-libs/qtbase:5