From 79a207b9fa1c3d52077cec7ef0d5b57c42a03a60 Mon Sep 17 00:00:00 2001 From: Heiko Becker Date: Sun, 30 Apr 2017 22:10:54 +0200 Subject: [PATCH 1/2] freeorion: Make tiff optional tiff isn't that common like jpeg or png and doesn't enjoy the best track record when it comes to security. Change-Id: I72f9ad45da2d796122756fd98ea3ce53334438e5 --- ...orion-0.4.7.1.exheres-0 => freeorion-0.4.7.1-r1.exheres-0} | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) rename packages/games-strategy/freeorion/{freeorion-0.4.7.1.exheres-0 => freeorion-0.4.7.1-r1.exheres-0} (93%) diff --git a/packages/games-strategy/freeorion/freeorion-0.4.7.1.exheres-0 b/packages/games-strategy/freeorion/freeorion-0.4.7.1-r1.exheres-0 similarity index 93% rename from packages/games-strategy/freeorion/freeorion-0.4.7.1.exheres-0 rename to packages/games-strategy/freeorion/freeorion-0.4.7.1-r1.exheres-0 index 6da4bd5f..9af8cc75 100644 --- a/packages/games-strategy/freeorion/freeorion-0.4.7.1.exheres-0 +++ b/packages/games-strategy/freeorion/freeorion-0.4.7.1-r1.exheres-0 @@ -20,6 +20,7 @@ LICENCES="GPL-2 LGPL-2.1 CCPL-Attribution-ShareAlike-3.0" SLOT="0" PLATFORMS="~amd64" MYOPTIONS=" + tiff [[ description = [ Enable TIFF texture support ] ]] ( providers: ijg-jpeg jpeg-turbo ) [[ number-selected = exactly-one ]] " @@ -36,11 +37,11 @@ DEPENDENCIES=" media-libs/libpng:= media-libs/libvorbis media-libs/openal - media-libs/tiff x11-dri/glu x11-dri/mesa providers:ijg-jpeg? ( media-libs/jpeg:= ) providers:jpeg-turbo? ( media-libs/libjpeg-turbo ) + tiff? ( media-libs/tiff ) " BUGS_TO="hasufell@posteo.de" @@ -49,6 +50,7 @@ CMAKE_SRC_CONFIGURE_PARAMS=( -DRELEASE_COMPILE_FLAGS="" -DCMAKE_SKIP_RPATH=ON ) +CMAKE_SRC_CONFIGURE_OPTION_ENABLES=( 'tiff TIFF_TEXTURES' ) src_prepare() { cmake_src_prepare From f9395c17ce26d2423c434bb62d468362a8e163d9 Mon Sep 17 00:00:00 2001 From: Heiko Becker Date: Fri, 11 May 2018 18:10:03 +0200 Subject: [PATCH 2/2] freeorion: Fix build with boost[>=1.66] Change-Id: I23871667af1c50a2d1105e9d818be1d12d10c4d0 --- ...lace-use-of-boost-system-posix_error.patch | 43 +++++++++++++++++++ .../freeorion/freeorion-0.4.7.1-r1.exheres-0 | 4 ++ 2 files changed, 47 insertions(+) create mode 100644 packages/games-strategy/freeorion/files/freeorion-0.4.7.1-Replace-use-of-boost-system-posix_error.patch 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 new file mode 100644 index 00000000..140b8b49 --- /dev/null +++ b/packages/games-strategy/freeorion/files/freeorion-0.4.7.1-Replace-use-of-boost-system-posix_error.patch @@ -0,0 +1,43 @@ +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.7.1-r1.exheres-0 index 9af8cc75..4ad01047 100644 --- a/packages/games-strategy/freeorion/freeorion-0.4.7.1-r1.exheres-0 +++ b/packages/games-strategy/freeorion/freeorion-0.4.7.1-r1.exheres-0 @@ -46,6 +46,10 @@ DEPENDENCIES=" BUGS_TO="hasufell@posteo.de" +DEFAULT_SRC_PREPARE_PATCHES=( + "${FILES}"/${PNV}-Replace-use-of-boost-system-posix_error.patch +) + CMAKE_SRC_CONFIGURE_PARAMS=( -DRELEASE_COMPILE_FLAGS="" -DCMAKE_SKIP_RPATH=ON