| 1 |
commit: b91a1822ce0249b16b22f2b309a68c8da61ae2dc |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Aug 16 16:00:43 2020 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Aug 16 16:00:43 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=b91a1822 |
| 7 |
|
| 8 |
kde-plasma/liboxygenstyle: Fix build in GCC 6 |
| 9 |
|
| 10 |
Thanks-to: Stas Cymbalov <dummyunit <AT> gmail.com> |
| 11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 12 |
|
| 13 |
.../liboxygenstyle/files/liboxygenstyle-4.11.22-gcc6.patch | 11 +++++++++++ |
| 14 |
kde-plasma/liboxygenstyle/liboxygenstyle-4.11.22.ebuild | 6 +++++- |
| 15 |
2 files changed, 16 insertions(+), 1 deletion(-) |
| 16 |
|
| 17 |
diff --git a/kde-plasma/liboxygenstyle/files/liboxygenstyle-4.11.22-gcc6.patch b/kde-plasma/liboxygenstyle/files/liboxygenstyle-4.11.22-gcc6.patch |
| 18 |
new file mode 100644 |
| 19 |
index 00000000..84908f98 |
| 20 |
--- /dev/null |
| 21 |
+++ b/kde-plasma/liboxygenstyle/files/liboxygenstyle-4.11.22-gcc6.patch |
| 22 |
@@ -0,0 +1,11 @@ |
| 23 |
+--- a/libs/oxygen/oxygenhelper.cpp |
| 24 |
++++ b/libs/oxygen/oxygenhelper.cpp |
| 25 |
+@@ -1089,7 +1089,7 @@ |
| 26 |
+ &data); |
| 27 |
+ |
| 28 |
+ // finish if no data is found |
| 29 |
+- if( data == None || n != 1 ) return false; |
| 30 |
++ if( !data || n != 1 ) return false; |
| 31 |
+ else return *data; |
| 32 |
+ |
| 33 |
+ } |
| 34 |
|
| 35 |
diff --git a/kde-plasma/liboxygenstyle/liboxygenstyle-4.11.22.ebuild b/kde-plasma/liboxygenstyle/liboxygenstyle-4.11.22.ebuild |
| 36 |
index 235a1c7d..0d334677 100644 |
| 37 |
--- a/kde-plasma/liboxygenstyle/liboxygenstyle-4.11.22.ebuild |
| 38 |
+++ b/kde-plasma/liboxygenstyle/liboxygenstyle-4.11.22.ebuild |
| 39 |
@@ -1,4 +1,4 @@ |
| 40 |
-# Copyright 1999-2017 Gentoo Foundation |
| 41 |
+# Copyright 1999-2018 Gentoo Foundation |
| 42 |
# Distributed under the terms of the GNU General Public License v2 |
| 43 |
|
| 44 |
EAPI=5 |
| 45 |
@@ -14,3 +14,7 @@ SLOT="4/${PV}" |
| 46 |
|
| 47 |
DEPEND="x11-libs/libX11" |
| 48 |
RDEPEND="${DEPEND}" |
| 49 |
+ |
| 50 |
+PATCHES=( |
| 51 |
+ "${FILESDIR}/${P}-gcc6.patch" |
| 52 |
+) |
Archives