| 1 |
commit: 2df150c18b6db01faf4e0a7aedd191315e3fbf3f |
| 2 |
Author: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Dec 31 22:34:42 2015 +0000 |
| 4 |
Commit: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Dec 31 22:35:40 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2df150c1 |
| 7 |
|
| 8 |
games-board/ccgo: version bump and fix building with libsigc++-2.6 |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.24 |
| 11 |
|
| 12 |
games-board/ccgo/Manifest | 1 + |
| 13 |
games-board/ccgo/ccgo-0.3.6.4.ebuild | 7 ++++++- |
| 14 |
.../ccgo/{ccgo-0.3.6.4.ebuild => ccgo-0.3.6.5.ebuild} | 11 ++++++++--- |
| 15 |
games-board/ccgo/files/ccgo-0.3.6.4-gcc4.patch | 12 ++++++++++++ |
| 16 |
games-board/ccgo/files/ccgo-0.3.6.5-gcc4.patch | 12 ++++++++++++ |
| 17 |
5 files changed, 39 insertions(+), 4 deletions(-) |
| 18 |
|
| 19 |
diff --git a/games-board/ccgo/Manifest b/games-board/ccgo/Manifest |
| 20 |
index a3adc66..eebb9d7 100644 |
| 21 |
--- a/games-board/ccgo/Manifest |
| 22 |
+++ b/games-board/ccgo/Manifest |
| 23 |
@@ -1 +1,2 @@ |
| 24 |
DIST ccgo-0.3.6.4.tar.gz 620246 SHA256 1975a4e9b6661f6613dd3a00b3ee7e176b80244f555a184b258b50ef4352a890 SHA512 54625bbf7036c18f4a9e92df0d7f2d67772138a940c5fdbbffa3d1c2e5c558cad5394d2c556c06388516e53d1f3502cf6369bcd95b1139d4ca5ec4210dcac5c2 WHIRLPOOL dd1b63c6c4360da99f66772373d2b9a0b39b495c57893d89cd69a4db8c0b8c53db059350c906f17a9e1402bacd473827fcce1be4d607c4afa3b1b9eb36de8f9d |
| 25 |
+DIST ccgo-0.3.6.5.tar.gz 639238 SHA256 d12be7fb9170d650ae78197983fac05af21ddbf47f7b1a2a14de9aa832ed602c SHA512 268c228eee9c42e49df333bfa0707e7b72c39731ccd64239e3c426958f6c17b65658db91bc7ab89548c4cc647ade791a7c67c30c410a5b3935c8fd3f326bf36b WHIRLPOOL 2baa70d05da8698a6115096800ccfd64dfb825c6b819fe9141141334eda53195632ae3dd5ee0031e1c145dbd9e697d6a5bdb8d9f40218c3653dda10d814e9f8d |
| 26 |
|
| 27 |
diff --git a/games-board/ccgo/ccgo-0.3.6.4.ebuild b/games-board/ccgo/ccgo-0.3.6.4.ebuild |
| 28 |
index 680fdac..6d69784 100644 |
| 29 |
--- a/games-board/ccgo/ccgo-0.3.6.4.ebuild |
| 30 |
+++ b/games-board/ccgo/ccgo-0.3.6.4.ebuild |
| 31 |
@@ -3,7 +3,7 @@ |
| 32 |
# $Id$ |
| 33 |
|
| 34 |
EAPI=5 |
| 35 |
-inherit autotools toolchain-funcs games |
| 36 |
+inherit autotools eutils toolchain-funcs flag-o-matic games |
| 37 |
|
| 38 |
DESCRIPTION="An IGS client written in C++" |
| 39 |
HOMEPAGE="http://ccdw.org/~cjj/prog/ccgo/" |
| 40 |
@@ -31,6 +31,11 @@ src_prepare() { |
| 41 |
-e '/^appicondir/s:=.*:=/usr/share/pixmaps:' \ |
| 42 |
-e '/^desktopdir/s:=.*:=/usr/share/applications:' \ |
| 43 |
Makefile.am || die |
| 44 |
+ # cargo cult from bug #569528 |
| 45 |
+ append-cxxflags -std=c++11 -fpermissive |
| 46 |
+ find . -name '*.hh' -exec sed -i -e '/sigc++\/object.h/d' {} + |
| 47 |
+ find . -name '*.cc' -exec sed -i -e 's/(bind(/(sigc::bind(/' {} + |
| 48 |
+ epatch "${FILESDIR}"/${P}-gcc4.patch |
| 49 |
eautoreconf |
| 50 |
} |
| 51 |
|
| 52 |
|
| 53 |
diff --git a/games-board/ccgo/ccgo-0.3.6.4.ebuild b/games-board/ccgo/ccgo-0.3.6.5.ebuild |
| 54 |
similarity index 72% |
| 55 |
copy from games-board/ccgo/ccgo-0.3.6.4.ebuild |
| 56 |
copy to games-board/ccgo/ccgo-0.3.6.5.ebuild |
| 57 |
index 680fdac..bb3959f 100644 |
| 58 |
--- a/games-board/ccgo/ccgo-0.3.6.4.ebuild |
| 59 |
+++ b/games-board/ccgo/ccgo-0.3.6.5.ebuild |
| 60 |
@@ -3,15 +3,15 @@ |
| 61 |
# $Id$ |
| 62 |
|
| 63 |
EAPI=5 |
| 64 |
-inherit autotools toolchain-funcs games |
| 65 |
+inherit autotools eutils toolchain-funcs flag-o-matic games |
| 66 |
|
| 67 |
DESCRIPTION="An IGS client written in C++" |
| 68 |
HOMEPAGE="http://ccdw.org/~cjj/prog/ccgo/" |
| 69 |
SRC_URI="http://ccdw.org/~cjj/prog/ccgo/src/${P}.tar.gz" |
| 70 |
|
| 71 |
-LICENSE="GPL-3" |
| 72 |
+LICENSE="GPL-3+" |
| 73 |
SLOT="0" |
| 74 |
-KEYWORDS="amd64 ~ppc x86" |
| 75 |
+KEYWORDS="~amd64 ~ppc ~x86" |
| 76 |
IUSE="nls" |
| 77 |
|
| 78 |
RDEPEND=">=dev-cpp/gtkmm-2.4:2.4 |
| 79 |
@@ -31,6 +31,11 @@ src_prepare() { |
| 80 |
-e '/^appicondir/s:=.*:=/usr/share/pixmaps:' \ |
| 81 |
-e '/^desktopdir/s:=.*:=/usr/share/applications:' \ |
| 82 |
Makefile.am || die |
| 83 |
+ # cargo cult from bug #569528 |
| 84 |
+ append-cxxflags -std=c++11 -fpermissive |
| 85 |
+ find . -name '*.hh' -exec sed -i -e '/sigc++\/object.h/d' {} + |
| 86 |
+ find . -name '*.cc' -exec sed -i -e 's/(bind(/(sigc::bind(/' {} + |
| 87 |
+ epatch "${FILESDIR}"/${P}-gcc4.patch |
| 88 |
eautoreconf |
| 89 |
} |
| 90 |
|
| 91 |
|
| 92 |
diff --git a/games-board/ccgo/files/ccgo-0.3.6.4-gcc4.patch b/games-board/ccgo/files/ccgo-0.3.6.4-gcc4.patch |
| 93 |
new file mode 100644 |
| 94 |
index 0000000..f7a049d |
| 95 |
--- /dev/null |
| 96 |
+++ b/games-board/ccgo/files/ccgo-0.3.6.4-gcc4.patch |
| 97 |
@@ -0,0 +1,12 @@ |
| 98 |
+--- gtk/board.cc.orig |
| 99 |
++++ gtk/board.cc |
| 100 |
+@@ -20,9 +20,7 @@ |
| 101 |
+ */ |
| 102 |
+ |
| 103 |
+ #include <config.hh> |
| 104 |
+-extern "C" { |
| 105 |
+ #include <gettext.h> |
| 106 |
+-} |
| 107 |
+ #define _(String) Glib::locale_to_utf8(gettext(String)) |
| 108 |
+ |
| 109 |
+ #include <board.hh> |
| 110 |
|
| 111 |
diff --git a/games-board/ccgo/files/ccgo-0.3.6.5-gcc4.patch b/games-board/ccgo/files/ccgo-0.3.6.5-gcc4.patch |
| 112 |
new file mode 100644 |
| 113 |
index 0000000..f7a049d |
| 114 |
--- /dev/null |
| 115 |
+++ b/games-board/ccgo/files/ccgo-0.3.6.5-gcc4.patch |
| 116 |
@@ -0,0 +1,12 @@ |
| 117 |
+--- gtk/board.cc.orig |
| 118 |
++++ gtk/board.cc |
| 119 |
+@@ -20,9 +20,7 @@ |
| 120 |
+ */ |
| 121 |
+ |
| 122 |
+ #include <config.hh> |
| 123 |
+-extern "C" { |
| 124 |
+ #include <gettext.h> |
| 125 |
+-} |
| 126 |
+ #define _(String) Glib::locale_to_utf8(gettext(String)) |
| 127 |
+ |
| 128 |
+ #include <board.hh> |
Archives