summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /games-strategy/freeorion/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'games-strategy/freeorion/files')
-rw-r--r--games-strategy/freeorion/files/freeorion-0.4.5_pre-boost-1.57.patch32
-rw-r--r--games-strategy/freeorion/files/freeorion-0.4.5_pre-boost-1.58.patch57
2 files changed, 89 insertions, 0 deletions
diff --git a/games-strategy/freeorion/files/freeorion-0.4.5_pre-boost-1.57.patch b/games-strategy/freeorion/files/freeorion-0.4.5_pre-boost-1.57.patch
new file mode 100644
index 000000000000..73e9b4b568a4
--- /dev/null
+++ b/games-strategy/freeorion/files/freeorion-0.4.5_pre-boost-1.57.patch
@@ -0,0 +1,32 @@
+From d963b4883c9be2911d791e7daa3ed0f495bc5181 Mon Sep 17 00:00:00 2001
+From: Dilvish-fo <dilvish.fo@gmail.com>
+Date: Sat, 11 Apr 2015 10:25:55 -0700
+Subject: [PATCH] work-around for a boost 1.57 bug (missing a shard_ptr
+ serialization include)
+
+---
+ util/Process.h | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/util/Process.h b/util/Process.h
+index ff72445..f9927cc 100644
+--- a/util/Process.h
++++ b/util/Process.h
+@@ -3,12 +3,16 @@
+ #define _Process_h_
+
+ // HACK: The following two includes work around a bug in boost 1.56,
+-// which uses them without including. They can be removed once the bug is gone.
++// which uses them without including.
+ #include <boost/version.hpp>
+ #if BOOST_VERSION == 105600
+ #include <boost/serialization/singleton.hpp> // This
+ #include <boost/serialization/extended_type_info.hpp> //This
+ #endif
++// HACK: For a similar boost 1.57 bug
++#if BOOST_VERSION == 105700
++#include <boost/serialization/type_info_implementation.hpp> // This
++#endif
+
+ #include <boost/serialization/shared_ptr.hpp>
+
diff --git a/games-strategy/freeorion/files/freeorion-0.4.5_pre-boost-1.58.patch b/games-strategy/freeorion/files/freeorion-0.4.5_pre-boost-1.58.patch
new file mode 100644
index 000000000000..3044c81eb28f
--- /dev/null
+++ b/games-strategy/freeorion/files/freeorion-0.4.5_pre-boost-1.58.patch
@@ -0,0 +1,57 @@
+From 8cb623ceecaf00e29f273225eb37602e26e1a6d0 Mon Sep 17 00:00:00 2001
+From: Dilvish-fo <dilvish.fo@gmail.com>
+Date: Sat, 6 Jun 2015 08:04:56 -0700
+Subject: [PATCH] workarounds for missing includes with boost 1.58
+
+---
+ util/Process.h | 6 ++++++
+ util/Serialize.ipp | 9 ++++++++-
+ 2 files changed, 14 insertions(+), 1 deletion(-)
+
+diff --git a/util/Process.h b/util/Process.h
+index f9927cc..25cec56 100644
+--- a/util/Process.h
++++ b/util/Process.h
+@@ -14,6 +14,12 @@
+ #include <boost/serialization/type_info_implementation.hpp> // This
+ #endif
+
++#if BOOST_VERSION == 105800
++// HACK: The following two includes work around a bug in boost 1.58
++#include <boost/serialization/type_info_implementation.hpp>
++#include <boost/archive/basic_archive.hpp>
++#endif
++
+ #include <boost/serialization/shared_ptr.hpp>
+
+ #include <vector>
+diff --git a/util/Serialize.ipp b/util/Serialize.ipp
+index b4027b2..c3c87db 100644
+--- a/util/Serialize.ipp
++++ b/util/Serialize.ipp
+@@ -1,17 +1,24 @@
++// -*- C++ -*-
+ #if defined(_MSC_VER) && defined(int64_t)
+ #undef int64_t
+ #endif
+
+ #include <boost/static_assert.hpp>
+ #include <boost/detail/endian.hpp>
++#include <boost/version.hpp>
+
+ #if BOOST_VERSION == 105600
+ // HACK: The following two includes work around a bug in boost 1.56,
+-// which uses them without including. They can be removed once the bug is gone.
+ #include <boost/serialization/singleton.hpp> // This
+ #include <boost/serialization/extended_type_info.hpp> //This
+ #endif
+
++#if BOOST_VERSION == 105800
++// HACK: The following two includes work around a bug in boost 1.58
++#include <boost/serialization/type_info_implementation.hpp>
++#include <boost/archive/basic_archive.hpp>
++#endif
++
+ #include <boost/serialization/export.hpp>
+ #include <boost/serialization/deque.hpp>
+ #include <boost/serialization/list.hpp>