| 1 |
commit: bb7eff3f226488ac68f9164fce6123bfdba37302 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Apr 24 09:55:32 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Apr 24 09:56:04 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb7eff3f |
| 7 |
|
| 8 |
kde-apps/kopete: Fix USE=oscar |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/653626 |
| 11 |
Package-Manager: Portage-2.3.31, Repoman-2.3.9 |
| 12 |
|
| 13 |
kde-apps/kopete/files/kopete-18.04.0-oscar.patch | 29 ++++++++++++++++++++++++ |
| 14 |
kde-apps/kopete/kopete-18.04.0.ebuild | 2 ++ |
| 15 |
2 files changed, 31 insertions(+) |
| 16 |
|
| 17 |
diff --git a/kde-apps/kopete/files/kopete-18.04.0-oscar.patch b/kde-apps/kopete/files/kopete-18.04.0-oscar.patch |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..0b88c1174b7 |
| 20 |
--- /dev/null |
| 21 |
+++ b/kde-apps/kopete/files/kopete-18.04.0-oscar.patch |
| 22 |
@@ -0,0 +1,29 @@ |
| 23 |
+From b1f4fa1401cba2e359e5a4b3ea2bafd119fca62b Mon Sep 17 00:00:00 2001 |
| 24 |
+From: Pino Toscano <pino@×××.org> |
| 25 |
+Date: Tue, 24 Apr 2018 06:30:19 +0200 |
| 26 |
+Subject: oscar: include buffer.h |
| 27 |
+ |
| 28 |
+This header uses Buffer as by-value parameter, so make sure it knows |
| 29 |
+about it. |
| 30 |
+ |
| 31 |
+BUG: 393372 |
| 32 |
+FIXED-IN: 18.04.1 |
| 33 |
+--- |
| 34 |
+ protocols/oscar/liboscar/tasks/messagereceivertask.h | 1 + |
| 35 |
+ 1 file changed, 1 insertion(+) |
| 36 |
+ |
| 37 |
+diff --git a/protocols/oscar/liboscar/tasks/messagereceivertask.h b/protocols/oscar/liboscar/tasks/messagereceivertask.h |
| 38 |
+index 8f52cd7..908e903 100644 |
| 39 |
+--- a/protocols/oscar/liboscar/tasks/messagereceivertask.h |
| 40 |
++++ b/protocols/oscar/liboscar/tasks/messagereceivertask.h |
| 41 |
+@@ -21,6 +21,7 @@ |
| 42 |
+ #include <QByteArray> |
| 43 |
+ #include "oscarmessage.h" |
| 44 |
+ #include "oscartypeclasses.h" |
| 45 |
++#include "buffer.h" |
| 46 |
+ |
| 47 |
+ class QTextCodec; |
| 48 |
+ |
| 49 |
+-- |
| 50 |
+cgit v0.11.2 |
| 51 |
+ |
| 52 |
|
| 53 |
diff --git a/kde-apps/kopete/kopete-18.04.0.ebuild b/kde-apps/kopete/kopete-18.04.0.ebuild |
| 54 |
index bfcb2c87d47..bc60afeea28 100644 |
| 55 |
--- a/kde-apps/kopete/kopete-18.04.0.ebuild |
| 56 |
+++ b/kde-apps/kopete/kopete-18.04.0.ebuild |
| 57 |
@@ -137,6 +137,8 @@ DEPEND="${COMMONDEPEND} |
| 58 |
jingle? ( dev-libs/jsoncpp ) |
| 59 |
" |
| 60 |
|
| 61 |
+PATCHES=( "${FILESDIR}/${P}-oscar.patch" ) |
| 62 |
+ |
| 63 |
src_configure() { |
| 64 |
local x x2 |
| 65 |
# Handle common stuff |
Archives