From f00e2b94becbd8e86c0343b2924ce14b2d53de57 Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Sun, 16 Sep 2018 15:17:47 +0800 Subject: [PATCH] games-strategy/freeorion: bump to 0.4.8 --- ...-Fix-compatibility-with-boost-1.67.0.patch | 37 ---------------- ...mit-Spirit-workaround-for-Boost-1.67.patch | 27 ------------ ...lace-use-of-boost-system-posix_error.patch | 43 ------------------- ...r1.exheres-0 => freeorion-0.4.8.exheres-0} | 10 +---- 4 files changed, 2 insertions(+), 115 deletions(-) delete mode 100644 packages/games-strategy/freeorion/files/freeorion-0.4.7.1-Fix-compatibility-with-boost-1.67.0.patch delete mode 100644 packages/games-strategy/freeorion/files/freeorion-0.4.7.1-Limit-Spirit-workaround-for-Boost-1.67.patch delete mode 100644 packages/games-strategy/freeorion/files/freeorion-0.4.7.1-Replace-use-of-boost-system-posix_error.patch rename packages/games-strategy/freeorion/{freeorion-0.4.7.1-r1.exheres-0 => freeorion-0.4.8.exheres-0} (87%) diff --git a/packages/games-strategy/freeorion/files/freeorion-0.4.7.1-Fix-compatibility-with-boost-1.67.0.patch b/packages/games-strategy/freeorion/files/freeorion-0.4.7.1-Fix-compatibility-with-boost-1.67.0.patch deleted file mode 100644 index 59976783..00000000 --- a/packages/games-strategy/freeorion/files/freeorion-0.4.7.1-Fix-compatibility-with-boost-1.67.0.patch +++ /dev/null @@ -1,37 +0,0 @@ -Upstream: yes, will be in 0.4.8 - -From 618568705a0ca37ffd9e88d08cda3d3601d01d98 Mon Sep 17 00:00:00 2001 -From: Dmitry Marakasov -Date: Fri, 29 Jun 2018 19:42:52 +0300 -Subject: [PATCH] Fix compatibility with boost 1.67.0 - ---- - CMakeLists.txt | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5b2fe63a7..4d26e06a2 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -204,11 +204,17 @@ find_package(Boost ${MINIMUM_BOOST_VERSION} - log_setup - regex - serialization -- python - signals - system - thread - REQUIRED) -+if(${Boost_VERSION} GREATER 106699) # boost >= 1.67 -+ find_package(Boost COMPONENTS python27 REQUIRED) -+ set(Boost_PYTHON_LIBRARY ${Boost_PYTHON27_LIBRARY}) -+else() -+ find_package(Boost COMPONENTS python REQUIRED) -+endif() -+ - find_package(ZLIB REQUIRED) - if(NOT BUILD_HEADLESS) - find_package(Freetype REQUIRED) --- -2.18.0 - diff --git a/packages/games-strategy/freeorion/files/freeorion-0.4.7.1-Limit-Spirit-workaround-for-Boost-1.67.patch b/packages/games-strategy/freeorion/files/freeorion-0.4.7.1-Limit-Spirit-workaround-for-Boost-1.67.patch deleted file mode 100644 index 1b89c819..00000000 --- a/packages/games-strategy/freeorion/files/freeorion-0.4.7.1-Limit-Spirit-workaround-for-Boost-1.67.patch +++ /dev/null @@ -1,27 +0,0 @@ -Upstream: yes, will be in 0.4.8 - -From 9d55160487c658695cb86a57104e69833b287604 Mon Sep 17 00:00:00 2001 -From: Jan Beich -Date: Sat, 14 Jul 2018 13:33:24 +0000 -Subject: [PATCH] Limit Spirit workaround for Boost < 1.67 - ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5b2fe63a7..adde763a8 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -262,7 +262,7 @@ set_property(DIRECTORY APPEND - # boost::spirit relies on some API the old implementation provided. - # This define enables the usage of the old boost::optional - # implementation. Boost upstream tracks this bug as #12349 -- $<$:BOOST_OPTIONAL_CONFIG_USE_OLD_IMPLEMENTATION_OF_OPTIONAL> -+ $<$,$>:BOOST_OPTIONAL_CONFIG_USE_OLD_IMPLEMENTATION_OF_OPTIONAL> - - # We don't need localized output of Boost date_time and not setting - # the define causes the inclusion of code, which contains std::tolower. --- -2.18.0 - diff --git a/packages/games-strategy/freeorion/files/freeorion-0.4.7.1-Replace-use-of-boost-system-posix_error.patch b/packages/games-strategy/freeorion/files/freeorion-0.4.7.1-Replace-use-of-boost-system-posix_error.patch deleted file mode 100644 index 140b8b49..00000000 --- a/packages/games-strategy/freeorion/files/freeorion-0.4.7.1-Replace-use-of-boost-system-posix_error.patch +++ /dev/null @@ -1,43 +0,0 @@ -Upstream: yes -Reason: Fix build with boost[>=1.66.0] - -From c9b5b13fb81b1ed142dee0e843101c6b8832ca95 Mon Sep 17 00:00:00 2001 -From: D Benage -Date: Wed, 13 Dec 2017 18:53:55 -0600 -Subject: [PATCH] Replace use of boost::system::posix_error - -First deprecated in boost v1.37 ---- - GG/src/dialogs/FileDlg.cpp | 2 +- - UI/ClientUI.cpp | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/GG/src/dialogs/FileDlg.cpp b/GG/src/dialogs/FileDlg.cpp -index 9032aee58..17b923233 100644 ---- a/GG/src/dialogs/FileDlg.cpp -+++ b/GG/src/dialogs/FileDlg.cpp -@@ -746,7 +746,7 @@ void FileDlg::OpenDirectory() - try { - SetWorkingDirectory(fs::path(directory + "\\")); - } catch (const fs::filesystem_error& e) { -- if (e.code() == boost::system::posix_error::io_error) { -+ if (e.code() == boost::system::errc::io_error) { - m_in_win32_drive_selection = true; - m_files_edit->Clear(); - FilesEditChanged(m_files_edit->Text()); -diff --git a/UI/ClientUI.cpp b/UI/ClientUI.cpp -index f294e9116..f9709ad4e 100644 ---- a/UI/ClientUI.cpp -+++ b/UI/ClientUI.cpp -@@ -1136,7 +1136,7 @@ ClientUI::TexturesAndDist ClientUI::PrefixedTexturesAndDist(const boost::filesys - textures.push_back(ClientUI::GetTexture(*it, mipmap)); - } catch (const fs::filesystem_error& e) { - // ignore files for which permission is denied, and rethrow other exceptions -- if (e.code() != boost::system::posix_error::permission_denied) -+ if (e.code() != boost::system::errc::permission_denied) - throw; - } - } --- -2.17.0 - diff --git a/packages/games-strategy/freeorion/freeorion-0.4.7.1-r1.exheres-0 b/packages/games-strategy/freeorion/freeorion-0.4.8.exheres-0 similarity index 87% rename from packages/games-strategy/freeorion/freeorion-0.4.7.1-r1.exheres-0 rename to packages/games-strategy/freeorion/freeorion-0.4.8.exheres-0 index d6a9b10e..7944a8f9 100644 --- a/packages/games-strategy/freeorion/freeorion-0.4.7.1-r1.exheres-0 +++ b/packages/games-strategy/freeorion/freeorion-0.4.8.exheres-0 @@ -1,9 +1,9 @@ -# Copyright 2017 Julian Ospald +# Copyright 2017-2018 Julian Ospald # Distributed under the terms of the GNU General Public License v2 CMAKE_SOURCE=${WORKBASE}/src-tarball -require github [ user=${PN} release=v${PV} pnv=FreeOrion_v${PV}_2017-09-03.139ffd9_Source suffix=tar.gz ] +require github [ user=${PN} release=v${PV} pnv=FreeOrion_v${PV}_2018-08-23.26f16b0_Source suffix=tar.gz ] require cmake [ api=2 ] require gtk-icon-cache @@ -46,12 +46,6 @@ DEPENDENCIES=" BUGS_TO="hasufell@posteo.de" -DEFAULT_SRC_PREPARE_PATCHES=( - "${FILES}"/${PNV}-Replace-use-of-boost-system-posix_error.patch - "${FILES}"/${PNV}-Fix-compatibility-with-boost-1.67.0.patch - "${FILES}"/${PNV}-Limit-Spirit-workaround-for-Boost-1.67.patch -) - CMAKE_SRC_CONFIGURE_PARAMS=( -DRELEASE_COMPILE_FLAGS="" -DCMAKE_SKIP_RPATH=ON