Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/choqok/files/, net-im/choqok/
Date: Sun, 11 Aug 2019 10:17:20
Message-Id: 1565518625.7bdba88ae5f2a20fac20464472b107924a4d8d88.asturm@gentoo
1 commit: 7bdba88ae5f2a20fac20464472b107924a4d8d88
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sun Aug 11 10:15:32 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sun Aug 11 10:17:05 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bdba88a
7
8 net-im/choqok: Fix missing header with Frameworks 5.61
9
10 Package-Manager: Portage-2.3.71, Repoman-2.3.17
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 net-im/choqok/choqok-1.6.0_p20190726.ebuild | 2 +
14 .../choqok-1.6.0_p20190726-missing-header.patch | 94 ++++++++++++++++++++++
15 2 files changed, 96 insertions(+)
16
17 diff --git a/net-im/choqok/choqok-1.6.0_p20190726.ebuild b/net-im/choqok/choqok-1.6.0_p20190726.ebuild
18 index a24edf12236..bb949cf2200 100644
19 --- a/net-im/choqok/choqok-1.6.0_p20190726.ebuild
20 +++ b/net-im/choqok/choqok-1.6.0_p20190726.ebuild
21 @@ -59,3 +59,5 @@ src_configure() {
22
23 kde5_src_configure
24 }
25 +
26 +PATCHES=( "${FILESDIR}"/${P}-missing-header.patch )
27
28 diff --git a/net-im/choqok/files/choqok-1.6.0_p20190726-missing-header.patch b/net-im/choqok/files/choqok-1.6.0_p20190726-missing-header.patch
29 new file mode 100644
30 index 00000000000..d8b58183e2b
31 --- /dev/null
32 +++ b/net-im/choqok/files/choqok-1.6.0_p20190726-missing-header.patch
33 @@ -0,0 +1,94 @@
34 +From 08fb06b63a78888e6703de6ac1a4fd6a0e2791eb Mon Sep 17 00:00:00 2001
35 +From: Albert Astals Cid <aacid@×××.org>
36 +Date: Sun, 28 Jul 2019 00:14:30 +0200
37 +Subject: Fix compile on CI
38 +
39 +plugins/uploaders/flickr/flickr.h:50:24: error: field mUrlMap has incomplete type QMap<KJob*, QUrl>
40 +plugins/uploaders/imageshack/imageshack.h:48:24: error: field mUrlMap has incomplete type QMap<KJob*, QUrl>
41 +---
42 + plugins/uploaders/flickr/flickr.h | 2 ++
43 + plugins/uploaders/imageshack/imageshack.h | 2 ++
44 + 2 files changed, 4 insertions(+)
45 +
46 +diff --git a/plugins/uploaders/flickr/flickr.h b/plugins/uploaders/flickr/flickr.h
47 +index 890219a..7b26609 100644
48 +--- a/plugins/uploaders/flickr/flickr.h
49 ++++ b/plugins/uploaders/flickr/flickr.h
50 +@@ -26,6 +26,8 @@
51 +
52 + #include "uploader.h"
53 +
54 ++#include <QMap>
55 ++
56 + /**
57 + @author Andrey Esin \<gmlastik@×××××.com\>
58 + */
59 +diff --git a/plugins/uploaders/imageshack/imageshack.h b/plugins/uploaders/imageshack/imageshack.h
60 +index d9ddc88..63d0e3f 100644
61 +--- a/plugins/uploaders/imageshack/imageshack.h
62 ++++ b/plugins/uploaders/imageshack/imageshack.h
63 +@@ -26,6 +26,8 @@
64 +
65 + #include "uploader.h"
66 +
67 ++#include <QMap>
68 ++
69 + /**
70 + @author Mehrdad Momeny \<mehrdad.momeny@×××××.com\>
71 + */
72 +--
73 +cgit v1.1
74 +
75 +From bef6784596bf0b41287ebad81f138e1c8c2a6be2 Mon Sep 17 00:00:00 2001
76 +From: Albert Astals Cid <aacid@×××.org>
77 +Date: Sun, 28 Jul 2019 00:20:34 +0200
78 +Subject: Fix build on CI
79 +
80 +Even more missing QMap includes
81 +---
82 + plugins/uploaders/mobypicture/mobypicture.h | 2 ++
83 + plugins/uploaders/posterous/posterous.h | 2 ++
84 + plugins/uploaders/twitgoo/twitgoo.h | 2 ++
85 + 3 files changed, 6 insertions(+)
86 +
87 +diff --git a/plugins/uploaders/mobypicture/mobypicture.h b/plugins/uploaders/mobypicture/mobypicture.h
88 +index 098f411..86f61fd 100644
89 +--- a/plugins/uploaders/mobypicture/mobypicture.h
90 ++++ b/plugins/uploaders/mobypicture/mobypicture.h
91 +@@ -26,6 +26,8 @@
92 +
93 + #include "uploader.h"
94 +
95 ++#include <QMap>
96 ++
97 + class KJob;
98 +
99 + class Mobypicture : public Choqok::Uploader
100 +diff --git a/plugins/uploaders/posterous/posterous.h b/plugins/uploaders/posterous/posterous.h
101 +index c7f6fe1..5c9442d 100644
102 +--- a/plugins/uploaders/posterous/posterous.h
103 ++++ b/plugins/uploaders/posterous/posterous.h
104 +@@ -26,6 +26,8 @@
105 +
106 + #include "uploader.h"
107 +
108 ++#include <QMap>
109 ++
110 + class KJob;
111 +
112 + class Posterous : public Choqok::Uploader
113 +diff --git a/plugins/uploaders/twitgoo/twitgoo.h b/plugins/uploaders/twitgoo/twitgoo.h
114 +index ee3f496..020080e 100644
115 +--- a/plugins/uploaders/twitgoo/twitgoo.h
116 ++++ b/plugins/uploaders/twitgoo/twitgoo.h
117 +@@ -26,6 +26,8 @@
118 +
119 + #include "uploader.h"
120 +
121 ++#include <QMap>
122 ++
123 + class KJob;
124 +
125 + class Twitgoo : public Choqok::Uploader
126 +--
127 +cgit v1.1