tombriden/hasufell-repository
1
1
Fork 0
forked from hasufell/hasufell-repository
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'remotes/gitlab/merge-requests/2'

Browse Source
This commit is contained in:
Julian Ospald 2018-05-13 13:56:53 +02:00
commit d0ae60b479
No known key found for this signature in database
GPG Key ID: 511B62C09D50CD28
2 changed files with 50 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
packages/games-strategy/freeorion/files/freeorion-0.4.7.1-Replace-use-of-boost-system-posix_error.patch Normal file
View File

@ -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 <dbenage.cx@gmail.com>
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

8
packages/games-strategy/freeorion/freeorion-0.4.7.1.exheres-0 → packages/games-strategy/freeorion/freeorion-0.4.7.1-r1.exheres-0
View File

@ -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,19 +37,24 @@ 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"
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
)
CMAKE_SRC_CONFIGURE_OPTION_ENABLES=( 'tiff TIFF_TEXTURES' )
src_prepare() {
cmake_src_prepare