gentoo resync : 28.04.2018

4 files changed, 33 insertions, 1 deletions

diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index 445fff256a2a..3596bef3e807 100644
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
diff --git a/kde-apps/kopete/Manifest b/kde-apps/kopete/Manifest
index 2b1113329352..60cf6124ab01 100644
--- a/kde-apps/kopete/Manifest
+++ b/kde-apps/kopete/Manifest
@@ -1,3 +1,4 @@
+AUX kopete-18.04.0-oscar.patch 814 BLAKE2B a098ed38f9781f1f51a4d656cef8849da61fafac72371905061cfe1ea3d10f558c1d5227556a486b80f464d95cd0937b4ba0de5c9b891d8ef087cd8bb90dcc42 SHA512 d09dd7353380f6e6e5cc934831f8125c96077a754bb570118af2724fcdc7b83401a36ef03ce31ba99d0204fa35f6b2b395f980a98a52bc4ac9e9ca62c5baab7b
 DIST kopete-18.04.0.tar.xz 9748688 BLAKE2B e4fb74b1dfa8627c8d47000f0841c5d51c18098fb8ed20c14742fb63aa2f078366202dede55a92e6572ded532cb67fe9af320b308128702764e7e566e85a4e49 SHA512 50b7d4e7d219a723d721ae979c310e0b8d80a616876d833d1ea13d3c074b1cb16c08c4909849f42b292e8482b439070c054fd83c721c9128455eaf0bc75b18bb
-EBUILD kopete-18.04.0.ebuild 4620 BLAKE2B a7fd22b2d45058a1c44804d410b26fd4aa67b79d731859086b90f8d5a33df3e80b00daa173612e675db438dd320ef508951335a284450bedbd8eacc7e2a63ed2 SHA512 cddcb6e66a0212a720c10bee82c7730856a22dc31dc16fc03466430e178e36bcb1a20202e9370e09097068e5b1f4012a91b800b3b8efb513b39f69b3ba513576
+EBUILD kopete-18.04.0.ebuild 4664 BLAKE2B 1a11015093fcde521c639c62005f773b8450632c3c47e55942205c555a5be597b71c15ee112f1b5a79b87831f588da3e1cb737d2005fc54ccb22fb0cd7b59c38 SHA512 8189303d0b63055d688ca8a9da7eabde9b3fd70227b9a3c12bf0c5b84223285d32c25774dc8b7225228e5cfe869c59d21f2f5182b32f80c9f2a5c1b440bc8c79
 MISC metadata.xml 2351 BLAKE2B 0f8ef4e3906f98a4be58f252fe1beb8ff8a9bb872584e5be9432d63a4932872a81c3036a9cd0d72d98a1ce961ef79194b613b5115e19970e352d5b832bcb6b44 SHA512 2b0350f15c75e45326fc0a6c16f875a2b923726de45ff8558e55c7a592c3c033c0f518f85f9cb4dea3bf54b9c182ec0ea083f3b11b878d398df6d7429a3f75d1
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