summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2018-04-24 11:55:32 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2018-04-24 11:56:04 +0200
commitbb7eff3f226488ac68f9164fce6123bfdba37302 (patch)
tree1d0b672c4e0d4fb24759962c94b801fc938125c1 /kde-apps/kopete
parentdev-cpp/catch: Remove old (diff)
downloadgentoo-bb7eff3f226488ac68f9164fce6123bfdba37302.tar.gz
gentoo-bb7eff3f226488ac68f9164fce6123bfdba37302.tar.bz2
gentoo-bb7eff3f226488ac68f9164fce6123bfdba37302.zip
kde-apps/kopete: Fix USE=oscar
Closes: https://bugs.gentoo.org/653626 Package-Manager: Portage-2.3.31, Repoman-2.3.9
Diffstat (limited to 'kde-apps/kopete')
-rw-r--r--kde-apps/kopete/files/kopete-18.04.0-oscar.patch29
-rw-r--r--kde-apps/kopete/kopete-18.04.0.ebuild2
2 files changed, 31 insertions, 0 deletions
diff --git a/kde-apps/kopete/files/kopete-18.04.0-oscar.patch b/kde-apps/kopete/files/kopete-18.04.0-oscar.patch
new file mode 100644
index 000000000000..0b88c1174b71
--- /dev/null
+++ b/kde-apps/kopete/files/kopete-18.04.0-oscar.patch
@@ -0,0 +1,29 @@
+From b1f4fa1401cba2e359e5a4b3ea2bafd119fca62b Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino@kde.org>
+Date: Tue, 24 Apr 2018 06:30:19 +0200
+Subject: oscar: include buffer.h
+
+This header uses Buffer as by-value parameter, so make sure it knows
+about it.
+
+BUG: 393372
+FIXED-IN: 18.04.1
+---
+ protocols/oscar/liboscar/tasks/messagereceivertask.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/protocols/oscar/liboscar/tasks/messagereceivertask.h b/protocols/oscar/liboscar/tasks/messagereceivertask.h
+index 8f52cd7..908e903 100644
+--- a/protocols/oscar/liboscar/tasks/messagereceivertask.h
++++ b/protocols/oscar/liboscar/tasks/messagereceivertask.h
+@@ -21,6 +21,7 @@
+ #include <QByteArray>
+ #include "oscarmessage.h"
+ #include "oscartypeclasses.h"
++#include "buffer.h"
+
+ class QTextCodec;
+
+--
+cgit v0.11.2
+
diff --git a/kde-apps/kopete/kopete-18.04.0.ebuild b/kde-apps/kopete/kopete-18.04.0.ebuild
index bfcb2c87d471..bc60afeea28e 100644
--- a/kde-apps/kopete/kopete-18.04.0.ebuild
+++ b/kde-apps/kopete/kopete-18.04.0.ebuild
@@ -137,6 +137,8 @@ DEPEND="${COMMONDEPEND}
jingle? ( dev-libs/jsoncpp )
"
+PATCHES=( "${FILESDIR}/${P}-oscar.patch" )
+
src_configure() {
local x x2
# Handle common stuff