summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Kahle <tomka@gentoo.org>2016-08-21 18:05:50 +0200
committerThomas Kahle <tomka@gentoo.org>2016-08-21 18:06:11 +0200
commitfb2b8d78ac7b8c63f10efa41e259a083d08f0b60 (patch)
tree844e478407020e808acbfc9d5639a27b5b8dac6d /games-strategy/freeorion/files
parentgames-strategy/freeorion: Fix boost-1.61 compat (diff)
downloadgentoo-fb2b8d78ac7b8c63f10efa41e259a083d08f0b60.tar.gz
gentoo-fb2b8d78ac7b8c63f10efa41e259a083d08f0b60.tar.bz2
gentoo-fb2b8d78ac7b8c63f10efa41e259a083d08f0b60.zip
games-strategy/freeorion: remove old
Package-Manager: portage-2.3.0
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, 0 insertions, 89 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
deleted file mode 100644
index 73e9b4b568a4..000000000000
--- a/games-strategy/freeorion/files/freeorion-0.4.5_pre-boost-1.57.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-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
deleted file mode 100644
index 3044c81eb28f..000000000000
--- a/games-strategy/freeorion/files/freeorion-0.4.5_pre-boost-1.58.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-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>