gentoo resync : 18.08.2019

3 files changed, 98 insertions, 1 deletions

diff --git a/net-im/choqok/Manifest b/net-im/choqok/Manifest
index 9d12e8eb8ae4..d5d8847e7daa 100644
--- a/net-im/choqok/Manifest
+++ b/net-im/choqok/Manifest
@@ -1,5 +1,6 @@
+AUX choqok-1.6.0_p20190726-missing-header.patch 2633 BLAKE2B 337a69d5addaf10e55cda74d40f0ebf7e768be12cf9b9315a29b622fddb5e2ae0ade9107907b8be495ab285f8cc94bb556c1103191b884620e4469f9ec43c390 SHA512 31b87f27d697afabbc41516715e35b5c28a884db454275c22cc5014af965bcd8ba5faac7ef029754a9c706052972fac39df6e4320f346e450bb808a2f409932c
 DIST choqok-1.6.0.tar.xz 1170748 BLAKE2B 11d1546d9bdad12012860ad4b21ea988d21ce822e7afb246d65b27b7fe28620f390ee97e00e594102b173ade304adcce208a9092909ab0d3801fecfdcc309e61 SHA512 78c03689e40978213f2f9462780fe47507a2778985d4d5b940cab004f0ac52becfa76d7dbaa886df958134c65b27255e49ac68ddbb2a434131fffe9ca9280cbc
 DIST choqok-1.6.0_p20190726.tar.xz 1184148 BLAKE2B c0c0459de362aa58337ab2d0c4ea03ff516de87bded48f73c47aa48ed791cfeb82c4085c4d333bff4ac1489a27e038da29d5419569aacb17366dc119e776dd67 SHA512 6471d9b37cc78fd3a14cc970512db3a8d44b21d49efb503917a57332f229c34ed735edfea6a74d6c25d8ab8d153331226effd677405d447c4a2faea3e396decf
 EBUILD choqok-1.6.0-r1.ebuild 1735 BLAKE2B cb9ae5dd3846ccbb97c824daa3ab91db4d86aff61b68d1e23965a05996262e9d904a1cab2bdccfcad2d9febed7d832554c94d2a9ddabab70f1ac11acc1fb849e SHA512 eac4fae6a896ab75befd548942d9b2f6350b44376e48e380d4e2047186f43e25049545a2e3fe5ca6025928d40e8a1c3d13ff3a553ba2e1d9fb56f290d68933ef
-EBUILD choqok-1.6.0_p20190726.ebuild 1659 BLAKE2B b0668e8744b73678c0024c453dd59cb833a837b0f13f2828be4c597b66d6cae68e6dd0d5c88984499a6366dc4ae62a1089c832e9c17719e5920385556a955cea SHA512 ee3844eed59490c7074b1adfbe02bdbe29855a3a19a0ede023770a4b13999bcb78637ea6946f117e8c590065f0286ca0372b3464804bbe801907b2b4c64b4efb
+EBUILD choqok-1.6.0_p20190726.ebuild 1712 BLAKE2B 90d0b645c7cd08182b839f42a0a5dbbab476203cf54cb01eb4500e48975808009f91cf5f3769a0038bda62d1256e08cff684b3de03e4aa58e79589de06e1810a SHA512 0723d2df159590426cd78e1f96b03a0c90e49361b018d38852cc5b15c4b710b61d1d852f1bfa77ea2ace23b29b8bbcc5c85948a110a0339438d14d5425e5c2ec
 MISC metadata.xml 534 BLAKE2B 641e9a82e273a88f4ad7babec0ed86995e0a40a08a3b41207fb2139991857d6cb14392070cb7e81b89116b9e0cbc6a1fc7c2a4a4a9bd2e2a0d11489dc6ea03e9 SHA512 57e46f814444e2072218a78f3a668d50f8cc6f2e67a7c4560c9d06e03f6846c462186199b83dd008ca06c419e8c7b42654dec6cc782e19af188812b9020301bd
diff --git a/net-im/choqok/choqok-1.6.0_p20190726.ebuild b/net-im/choqok/choqok-1.6.0_p20190726.ebuild
index a24edf12236e..bb949cf2200d 100644
--- a/net-im/choqok/choqok-1.6.0_p20190726.ebuild
+++ b/net-im/choqok/choqok-1.6.0_p20190726.ebuild
@@ -59,3 +59,5 @@ src_configure() {
 
 	kde5_src_configure
 }
+
+PATCHES=( "${FILESDIR}"/${P}-missing-header.patch )
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
new file mode 100644
index 000000000000..d8b58183e2bf
--- /dev/null
+++ b/net-im/choqok/files/choqok-1.6.0_p20190726-missing-header.patch
@@ -0,0 +1,94 @@
+From 08fb06b63a78888e6703de6ac1a4fd6a0e2791eb Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@kde.org>
+Date: Sun, 28 Jul 2019 00:14:30 +0200
+Subject: Fix compile on CI
+
+plugins/uploaders/flickr/flickr.h:50:24: error: field mUrlMap has incomplete type QMap<KJob*, QUrl>
+plugins/uploaders/imageshack/imageshack.h:48:24: error: field mUrlMap has incomplete type QMap<KJob*, QUrl>
+---
+ plugins/uploaders/flickr/flickr.h         | 2 ++
+ plugins/uploaders/imageshack/imageshack.h | 2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/plugins/uploaders/flickr/flickr.h b/plugins/uploaders/flickr/flickr.h
+index 890219a..7b26609 100644
+--- a/plugins/uploaders/flickr/flickr.h
++++ b/plugins/uploaders/flickr/flickr.h
+@@ -26,6 +26,8 @@
+ 
+ #include "uploader.h"
+ 
++#include <QMap>
++
+ /**
+ @author Andrey Esin \<gmlastik@gmail.com\>
+ */
+diff --git a/plugins/uploaders/imageshack/imageshack.h b/plugins/uploaders/imageshack/imageshack.h
+index d9ddc88..63d0e3f 100644
+--- a/plugins/uploaders/imageshack/imageshack.h
++++ b/plugins/uploaders/imageshack/imageshack.h
+@@ -26,6 +26,8 @@
+ 
+ #include "uploader.h"
+ 
++#include <QMap>
++
+ /**
+ @author Mehrdad Momeny \<mehrdad.momeny@gmail.com\>
+ */
+-- 
+cgit v1.1
+
+From bef6784596bf0b41287ebad81f138e1c8c2a6be2 Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@kde.org>
+Date: Sun, 28 Jul 2019 00:20:34 +0200
+Subject: Fix build on CI
+
+Even more missing QMap includes
+---
+ plugins/uploaders/mobypicture/mobypicture.h | 2 ++
+ plugins/uploaders/posterous/posterous.h     | 2 ++
+ plugins/uploaders/twitgoo/twitgoo.h         | 2 ++
+ 3 files changed, 6 insertions(+)
+
+diff --git a/plugins/uploaders/mobypicture/mobypicture.h b/plugins/uploaders/mobypicture/mobypicture.h
+index 098f411..86f61fd 100644
+--- a/plugins/uploaders/mobypicture/mobypicture.h
++++ b/plugins/uploaders/mobypicture/mobypicture.h
+@@ -26,6 +26,8 @@
+ 
+ #include "uploader.h"
+ 
++#include <QMap>
++
+ class KJob;
+ 
+ class Mobypicture : public Choqok::Uploader
+diff --git a/plugins/uploaders/posterous/posterous.h b/plugins/uploaders/posterous/posterous.h
+index c7f6fe1..5c9442d 100644
+--- a/plugins/uploaders/posterous/posterous.h
++++ b/plugins/uploaders/posterous/posterous.h
+@@ -26,6 +26,8 @@
+ 
+ #include "uploader.h"
+ 
++#include <QMap>
++
+ class KJob;
+ 
+ class Posterous : public Choqok::Uploader
+diff --git a/plugins/uploaders/twitgoo/twitgoo.h b/plugins/uploaders/twitgoo/twitgoo.h
+index ee3f496..020080e 100644
+--- a/plugins/uploaders/twitgoo/twitgoo.h
++++ b/plugins/uploaders/twitgoo/twitgoo.h
+@@ -26,6 +26,8 @@
+ 
+ #include "uploader.h"
+ 
++#include <QMap>
++
+ class KJob;
+ 
+ class Twitgoo : public Choqok::Uploader
+-- 
+cgit v1.1