Gentoo Archives: gentoo-commits

From: NP Hardass <np-hardass@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-strategy/freeorion/files/
Date: Sun, 01 Oct 2017 18:38:40
Message-Id: 1506883110.0189177348e883ee5450119543fc220a33b88d18.np-hardass@gentoo
1 commit: 0189177348e883ee5450119543fc220a33b88d18
2 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Sun Oct 1 18:09:24 2017 +0000
4 Commit: NP Hardass <np-hardass <AT> gentoo <DOT> org>
5 CommitDate: Sun Oct 1 18:38:30 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01891773
7
8 games-strategy/freeorion: remove unused patch
9
10 Signed-off-by: NP-Hardass <NP-Hardass <AT> gentoo.org>
11
12 Closes: https://github.com/gentoo/gentoo/pull/5834
13
14 .../files/freeorion-0.4.6-boost-1.62.patch | 123 ---------------------
15 1 file changed, 123 deletions(-)
16
17 diff --git a/games-strategy/freeorion/files/freeorion-0.4.6-boost-1.62.patch b/games-strategy/freeorion/files/freeorion-0.4.6-boost-1.62.patch
18 deleted file mode 100644
19 index 5d5fa8bc45f..00000000000
20 --- a/games-strategy/freeorion/files/freeorion-0.4.6-boost-1.62.patch
21 +++ /dev/null
22 @@ -1,123 +0,0 @@
23 -From 6b971f65dbef4614cd0c9020bcc6670d3f11b961 Mon Sep 17 00:00:00 2001
24 -From: geoffthemedio <geoffthemedio@×××××.com>
25 -Date: Thu, 20 Oct 2016 13:27:23 +0200
26 -Subject: [PATCH] Made Boost version-specific changes more flexible, as they
27 - reportedly are needed for 1.62 as well.
28 -
29 ----
30 - universe/Building.h | 4 ++--
31 - universe/Field.h | 4 ++--
32 - universe/Fleet.h | 4 ++--
33 - universe/Planet.h | 4 ++--
34 - universe/Ship.h | 4 ++--
35 - universe/System.h | 4 ++--
36 - 6 files changed, 12 insertions(+), 12 deletions(-)
37 -
38 -diff --git a/universe/Building.h b/universe/Building.h
39 -index 18d4810..b34f400 100644
40 ---- a/universe/Building.h
41 -+++ b/universe/Building.h
42 -@@ -69,11 +69,11 @@ class FO_COMMON_API Building : public UniverseObject {
43 - template <class T> friend void boost::python::detail::value_destroyer<false>::execute(T const volatile* p);
44 - template <class T> friend void boost::checked_delete(T* x);
45 -
46 --#if BOOST_VERSION == 106100
47 -+#if BOOST_VERSION >= 106100
48 - public:
49 - #endif
50 - ~Building() {}
51 --#if BOOST_VERSION == 106100
52 -+#if BOOST_VERSION >= 106100
53 - protected:
54 - #endif
55 -
56 -diff --git a/universe/Field.h b/universe/Field.h
57 -index f1d454e..5cf67c1 100644
58 ---- a/universe/Field.h
59 -+++ b/universe/Field.h
60 -@@ -48,11 +48,11 @@ class FO_COMMON_API Field : public UniverseObject {
61 - template <class T> friend void boost::python::detail::value_destroyer<false>::execute(T const volatile* p);
62 - template <class T> friend void boost::checked_delete(T* x);
63 -
64 --#if BOOST_VERSION == 106100
65 -+#if BOOST_VERSION >= 106100
66 - public:
67 - #endif
68 - ~Field() {}
69 --#if BOOST_VERSION == 106100
70 -+#if BOOST_VERSION >= 106100
71 - protected:
72 - #endif
73 -
74 -diff --git a/universe/Fleet.h b/universe/Fleet.h
75 -index a6a1fe0..7b5121c 100644
76 ---- a/universe/Fleet.h
77 -+++ b/universe/Fleet.h
78 -@@ -150,11 +150,11 @@ class FO_COMMON_API Fleet : public UniverseObject {
79 - template <class T> friend void boost::python::detail::value_destroyer<false>::execute(T const volatile* p);
80 - template <class T> friend void boost::checked_delete(T* x);
81 -
82 --#if BOOST_VERSION == 106100
83 -+#if BOOST_VERSION >= 106100
84 - public:
85 - #endif
86 - ~Fleet() {}
87 --#if BOOST_VERSION == 106100
88 -+#if BOOST_VERSION >= 106100
89 - protected:
90 - #endif
91 -
92 -diff --git a/universe/Planet.h b/universe/Planet.h
93 -index 3b3848e..267e2b1 100644
94 ---- a/universe/Planet.h
95 -+++ b/universe/Planet.h
96 -@@ -128,11 +128,11 @@ class FO_COMMON_API Planet :
97 - template <class T> friend void boost::python::detail::value_destroyer<false>::execute(T const volatile* p);
98 - template <class T> friend void boost::checked_delete(T* x);
99 -
100 --#if BOOST_VERSION == 106100
101 -+#if BOOST_VERSION >= 106100
102 - public:
103 - #endif
104 - ~Planet() {}
105 --#if BOOST_VERSION == 106100
106 -+#if BOOST_VERSION >= 106100
107 - protected:
108 - #endif
109 -
110 -diff --git a/universe/Ship.h b/universe/Ship.h
111 -index 4881086..db0d5d7 100644
112 ---- a/universe/Ship.h
113 -+++ b/universe/Ship.h
114 -@@ -104,11 +104,11 @@ class FO_COMMON_API Ship : public UniverseObject {
115 - template <class T> friend void boost::python::detail::value_destroyer<false>::execute(T const volatile* p);
116 - template <class T> friend void boost::checked_delete(T* x);
117 -
118 --#if BOOST_VERSION == 106100
119 -+#if BOOST_VERSION >= 106100
120 - public:
121 - #endif
122 - ~Ship() {}
123 --#if BOOST_VERSION == 106100
124 -+#if BOOST_VERSION >= 106100
125 - protected:
126 - #endif
127 -
128 -diff --git a/universe/System.h b/universe/System.h
129 -index 1563347..47ee4f1 100644
130 ---- a/universe/System.h
131 -+++ b/universe/System.h
132 -@@ -134,11 +134,11 @@ class FO_COMMON_API System : public UniverseObject {
133 - template <class T> friend void boost::python::detail::value_destroyer<false>::execute(T const volatile* p);
134 - template <class T> friend void boost::checked_delete(T* x);
135 -
136 --#if BOOST_VERSION == 106100
137 -+#if BOOST_VERSION >= 106100
138 - public:
139 - #endif
140 - ~System() {}
141 --#if BOOST_VERSION == 106100
142 -+#if BOOST_VERSION >= 106100
143 - protected:
144 - #endif
145 -