Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-themes/qtcurve/, x11-themes/qtcurve/files/
Date: Sun, 28 May 2017 15:15:06
Message-Id: 1495984490.ae7fdd079f7fcaf1063c609ab3942155f4daf942.kensington@gentoo
1 commit: ae7fdd079f7fcaf1063c609ab3942155f4daf942
2 Author: Ivan Savyhin <bendertron <AT> gmail <DOT> com>
3 AuthorDate: Sun May 28 15:14:20 2017 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Sun May 28 15:14:50 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae7fdd07
7
8 x11-themes/qtcurve: add patch to fix build with glibc-2.23
9
10 Gentoo-bug: 606564
11 Package-Manager: Portage-2.3.5, Repoman-2.3.2
12
13 x11-themes/qtcurve/files/qtcurve-1.8.18-glibc-2.23.patch | 13 +++++++++++++
14 x11-themes/qtcurve/qtcurve-1.8.18-r1.ebuild | 3 ++-
15 2 files changed, 15 insertions(+), 1 deletion(-)
16
17 diff --git a/x11-themes/qtcurve/files/qtcurve-1.8.18-glibc-2.23.patch b/x11-themes/qtcurve/files/qtcurve-1.8.18-glibc-2.23.patch
18 new file mode 100644
19 index 00000000000..06a27d5a885
20 --- /dev/null
21 +++ b/x11-themes/qtcurve/files/qtcurve-1.8.18-glibc-2.23.patch
22 @@ -0,0 +1,13 @@
23 +--- a/lib/utils/color.h.orig 2017-02-16 00:55:24.000000000 +0300
24 ++++ b/lib/utils/color.h 2017-02-16 01:00:40.176467232 +0300
25 +@@ -25,6 +25,10 @@
26 +
27 + #include <math.h>
28 +
29 ++#if __cplusplus >= 201103L && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 23))
30 ++#include <cmath>
31 ++#endif
32 ++
33 + #include "utils.h"
34 + #include "options.h"
35 +
36
37 diff --git a/x11-themes/qtcurve/qtcurve-1.8.18-r1.ebuild b/x11-themes/qtcurve/qtcurve-1.8.18-r1.ebuild
38 index 7eee61a30f2..7a9617a62d9 100644
39 --- a/x11-themes/qtcurve/qtcurve-1.8.18-r1.ebuild
40 +++ b/x11-themes/qtcurve/qtcurve-1.8.18-r1.ebuild
41 @@ -1,4 +1,4 @@
42 -# Copyright 1999-2016 Gentoo Foundation
43 +# Copyright 1999-2017 Gentoo Foundation
44 # Distributed under the terms of the GNU General Public License v2
45
46 EAPI=5
47 @@ -50,6 +50,7 @@ PATCHES=(
48 "${FILESDIR}/${P}-remove_qt_filedialog_api.patch"
49 "${FILESDIR}/${P}-gtk2_segfault.patch"
50 "${FILESDIR}/${P}-std_isnan.patch"
51 + "${FILESDIR}/${P}-glibc-2.23.patch"
52 )
53
54 pkg_setup() {