From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 934E71382C5 for ; Tue, 24 Apr 2018 09:56:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ABCDCE098F; Tue, 24 Apr 2018 09:56:21 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 83104E098F for ; Tue, 24 Apr 2018 09:56:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B79BA335C43 for ; Tue, 24 Apr 2018 09:56:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9DF6D27C for ; Tue, 24 Apr 2018 09:56:17 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1524563764.bb7eff3f226488ac68f9164fce6123bfdba37302.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-apps/kopete/files/, kde-apps/kopete/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-apps/kopete/files/kopete-18.04.0-oscar.patch kde-apps/kopete/kopete-18.04.0.ebuild X-VCS-Directories: kde-apps/kopete/ kde-apps/kopete/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: bb7eff3f226488ac68f9164fce6123bfdba37302 X-VCS-Branch: master Date: Tue, 24 Apr 2018 09:56:17 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 13fe4073-140a-4867-b517-aab7a94cb0a8 X-Archives-Hash: b48e6eacf95bb4b156d833034cf07efc commit: bb7eff3f226488ac68f9164fce6123bfdba37302 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Apr 24 09:55:32 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Apr 24 09:56:04 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb7eff3f kde-apps/kopete: Fix USE=oscar Closes: https://bugs.gentoo.org/653626 Package-Manager: Portage-2.3.31, Repoman-2.3.9 kde-apps/kopete/files/kopete-18.04.0-oscar.patch | 29 ++++++++++++++++++++++++ kde-apps/kopete/kopete-18.04.0.ebuild | 2 ++ 2 files changed, 31 insertions(+) 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 00000000000..0b88c1174b7 --- /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 +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 + #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 bfcb2c87d47..bc60afeea28 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