1 |
commit: 88894187c72800cb4491cf3abf1e532197d45f75 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jun 5 16:03:50 2019 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jun 5 16:08:45 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88894187 |
7 |
|
8 |
x11-themes/qtcurve: Fix build with GCC-9 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/685794 |
11 |
Package-Manager: Portage-2.3.67, Repoman-2.3.14 |
12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
13 |
|
14 |
x11-themes/qtcurve/files/qtcurve-1.9.0-gcc9.patch | 26 +++++++++++++++++++++++ |
15 |
x11-themes/qtcurve/qtcurve-1.9.0.ebuild | 3 ++- |
16 |
2 files changed, 28 insertions(+), 1 deletion(-) |
17 |
|
18 |
diff --git a/x11-themes/qtcurve/files/qtcurve-1.9.0-gcc9.patch b/x11-themes/qtcurve/files/qtcurve-1.9.0-gcc9.patch |
19 |
new file mode 100644 |
20 |
index 00000000000..56bf30b4562 |
21 |
--- /dev/null |
22 |
+++ b/x11-themes/qtcurve/files/qtcurve-1.9.0-gcc9.patch |
23 |
@@ -0,0 +1,26 @@ |
24 |
+From ee2228ea2f18ac5da9b434ee6089381df815aa94 Mon Sep 17 00:00:00 2001 |
25 |
+From: Yichao Yu <yyc1992@×××××.com> |
26 |
+Date: Wed, 5 Jun 2019 09:03:40 -0400 |
27 |
+Subject: [utils/gtkprops] Remove unnecessary constexpr, this is not allowed in |
28 |
+ C++14 |
29 |
+ |
30 |
+BUG: 408286 |
31 |
+--- |
32 |
+ lib/utils/gtkprops.h | 2 +- |
33 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
34 |
+ |
35 |
+diff --git a/lib/utils/gtkprops.h b/lib/utils/gtkprops.h |
36 |
+index abc0675..e248255 100644 |
37 |
+--- a/lib/utils/gtkprops.h |
38 |
++++ b/lib/utils/gtkprops.h |
39 |
+@@ -74,7 +74,7 @@ class GtkWidgetProps { |
40 |
+ }; |
41 |
+ #define DEF_WIDGET_SIG_CONN_PROPS(name) \ |
42 |
+ struct _SigConn_##name##_ObjGetter { \ |
43 |
+- constexpr inline GObject* \ |
44 |
++ inline GObject* \ |
45 |
+ operator()(SigConn<_SigConn_##name##_ObjGetter> *p) const \ |
46 |
+ { \ |
47 |
+ return (GObject*)qtcContainerOf(p, Props, name)->m_w; \ |
48 |
+-- |
49 |
+cgit v1.1 |
50 |
|
51 |
diff --git a/x11-themes/qtcurve/qtcurve-1.9.0.ebuild b/x11-themes/qtcurve/qtcurve-1.9.0.ebuild |
52 |
index 85ce451395d..428c60441af 100644 |
53 |
--- a/x11-themes/qtcurve/qtcurve-1.9.0.ebuild |
54 |
+++ b/x11-themes/qtcurve/qtcurve-1.9.0.ebuild |
55 |
@@ -1,4 +1,4 @@ |
56 |
-# Copyright 1999-2018 Gentoo Authors |
57 |
+# Copyright 1999-2019 Gentoo Authors |
58 |
# Distributed under the terms of the GNU General Public License v2 |
59 |
|
60 |
EAPI=6 |
61 |
@@ -71,6 +71,7 @@ DOCS=( AUTHORS ChangeLog.md README.md TODO.md ) |
62 |
PATCHES=( |
63 |
"${FILESDIR}/${PN}-1.9.0-build_testing.patch" |
64 |
"${FILESDIR}/${PN}-1.9.0-no-X-buildfix.patch" |
65 |
+ "${FILESDIR}/${PN}-1.9.0-gcc9.patch" |
66 |
) |
67 |
|
68 |
src_configure() { |