1 |
commit: d76c46988a1a59df990efe2082f3267c0e6421dd |
2 |
Author: Harri Nieminen <moikkis <AT> gmail <DOT> com> |
3 |
AuthorDate: Sun Feb 26 16:46:13 2017 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Feb 28 19:10:53 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d76c4698 |
7 |
|
8 |
x11-misc/evolvotron: fix build with gcc6, bug #597266 |
9 |
|
10 |
Gentoo-Bug: https://bugs.gentoo.org/597266 |
11 |
|
12 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
13 |
Closes: https://github.com/gentoo/gentoo/pull/4085 |
14 |
|
15 |
x11-misc/evolvotron/evolvotron-0.6.3-r1.ebuild | 51 ++++++++++++++++++++++ |
16 |
.../evolvotron/files/evolvotron-0.6.3-gcc6.patch | 15 +++++++ |
17 |
2 files changed, 66 insertions(+) |
18 |
|
19 |
diff --git a/x11-misc/evolvotron/evolvotron-0.6.3-r1.ebuild b/x11-misc/evolvotron/evolvotron-0.6.3-r1.ebuild |
20 |
new file mode 100644 |
21 |
index 0000000000..6d52be1f0b |
22 |
--- /dev/null |
23 |
+++ b/x11-misc/evolvotron/evolvotron-0.6.3-r1.ebuild |
24 |
@@ -0,0 +1,51 @@ |
25 |
+# Copyright 1999-2017 Gentoo Foundation |
26 |
+# Distributed under the terms of the GNU General Public License v2 |
27 |
+# $Id$ |
28 |
+ |
29 |
+EAPI=6 |
30 |
+inherit qmake-utils |
31 |
+ |
32 |
+DESCRIPTION="Generative art image evolver" |
33 |
+HOMEPAGE="https://sourceforge.net/projects/evolvotron/" |
34 |
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" |
35 |
+ |
36 |
+LICENSE="GPL-2" |
37 |
+SLOT="0" |
38 |
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd" |
39 |
+IUSE="" |
40 |
+ |
41 |
+RDEPEND=" |
42 |
+ dev-libs/boost:= |
43 |
+ dev-qt/qtcore:4 |
44 |
+ dev-qt/qtgui:4 |
45 |
+" |
46 |
+DEPEND="${RDEPEND}" |
47 |
+ |
48 |
+S=${WORKDIR}/${PN} |
49 |
+ |
50 |
+PATCHES=( "${FILESDIR}"/${P}-gcc6.patch ) |
51 |
+ |
52 |
+DOCS=( BUGS NEWS README TODO USAGE ) |
53 |
+HTML_DOCS=( evolvotron.html ) |
54 |
+ |
55 |
+src_configure() { |
56 |
+ eqmake4 main.pro |
57 |
+} |
58 |
+ |
59 |
+src_compile() { |
60 |
+ local etsubdir |
61 |
+ for etsubdir in \ |
62 |
+ libfunction libevolvotron evolvotron evolvotron_render evolvotron_mutate |
63 |
+ do |
64 |
+ emake sub-${etsubdir} |
65 |
+ done |
66 |
+} |
67 |
+ |
68 |
+src_install() { |
69 |
+ local bin |
70 |
+ for bin in ${PN}{,_mutate,_render}; do |
71 |
+ dobin ${bin}/${bin} |
72 |
+ done |
73 |
+ doman man/man1/* |
74 |
+ einstalldocs |
75 |
+} |
76 |
|
77 |
diff --git a/x11-misc/evolvotron/files/evolvotron-0.6.3-gcc6.patch b/x11-misc/evolvotron/files/evolvotron-0.6.3-gcc6.patch |
78 |
new file mode 100644 |
79 |
index 0000000000..709d61b29a |
80 |
--- /dev/null |
81 |
+++ b/x11-misc/evolvotron/files/evolvotron-0.6.3-gcc6.patch |
82 |
@@ -0,0 +1,15 @@ |
83 |
+Description: Fix compilation with GCC6 by making implict conversion to bool explicit |
84 |
+Author: Axel Beckert <abe@××××××.org> |
85 |
+Bug-Debian: https://bugs.debian.org/811660 |
86 |
+ |
87 |
+--- a/libevolvotron/mutatable_image_computer.h |
88 |
++++ b/libevolvotron/mutatable_image_computer.h |
89 |
+@@ -193,7 +193,7 @@ |
90 |
+ //! Indicate whether computation us taking place (only intended for counting outstanding threads). |
91 |
+ bool active() const |
92 |
+ { |
93 |
+- return _task; |
94 |
++ return (bool)_task; |
95 |
+ } |
96 |
+ }; |
97 |
+ |