commit: b91a1822ce0249b16b22f2b309a68c8da61ae2dc
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 16 16:00:43 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Aug 16 16:00:43 2020 +0000
URL: https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=b91a1822
kde-plasma/liboxygenstyle: Fix build in GCC 6
Thanks-to: Stas Cymbalov <dummyunit <AT> gmail.com>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../liboxygenstyle/files/liboxygenstyle-4.11.22-gcc6.patch | 11 +++++++++++
kde-plasma/liboxygenstyle/liboxygenstyle-4.11.22.ebuild | 6 +++++-
2 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/kde-plasma/liboxygenstyle/files/liboxygenstyle-4.11.22-gcc6.patch
b/kde-plasma/liboxygenstyle/files/liboxygenstyle-4.11.22-gcc6.patch
new file mode 100644
index 00000000..84908f98
--- /dev/null
+++ b/kde-plasma/liboxygenstyle/files/liboxygenstyle-4.11.22-gcc6.patch
@@ -0,0 +1,11 @@
+--- a/libs/oxygen/oxygenhelper.cpp
++++ b/libs/oxygen/oxygenhelper.cpp
+@@ -1089,7 +1089,7 @@
+ &data);
+
+ // finish if no data is found
+- if( data == None || n != 1 ) return false;
++ if( !data || n != 1 ) return false;
+ else return *data;
+
+ }
diff --git a/kde-plasma/liboxygenstyle/liboxygenstyle-4.11.22.ebuild
b/kde-plasma/liboxygenstyle/liboxygenstyle-4.11.22.ebuild
index 235a1c7d..0d334677 100644
--- a/kde-plasma/liboxygenstyle/liboxygenstyle-4.11.22.ebuild
+++ b/kde-plasma/liboxygenstyle/liboxygenstyle-4.11.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -14,3 +14,7 @@ SLOT="4/${PV}"
DEPEND="x11-libs/libX11"
RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-gcc6.patch"
+)
