aboutsummaryrefslogtreecommitdiff
path: root/www/choqok
diff options
context:
space:
mode:
authorAdriaan de Groot <adridg@FreeBSD.org>2019-08-15 10:01:34 +0000
committerAdriaan de Groot <adridg@FreeBSD.org>2019-08-15 10:01:34 +0000
commit0a7455c83ce45910f0ee6965d5db7b95bc54c9db (patch)
treeba72125e7521f7704b77323205dcde5c796ca7bb /www/choqok
parent949aa029a9916060e028096dff572f2f2fceebb7 (diff)
downloadports-0a7455c83ce45910f0ee6965d5db7b95bc54c9db.tar.gz
ports-0a7455c83ce45910f0ee6965d5db7b95bc54c9db.zip
Update KDE Frameworks to latest upstream release, 5.61
Release notes at https://kde.org/announcements/kde-frameworks-5.61.0.php Thanks to antoine@ for the exp-runs, tcberner@ for most of the prep-work, the Gentoo community for cherry-picking patches There are a bunch of changes in (implicitly included) headers, which broke existing KDE Applications builds; that's why there are a whole bunch of "patch-gentoo-kf5-5.61-headers" patches (taken from Gentoo packaging). Those will go away with the next KDE Applications release, PR: 239777 Submitted by: tcberner
Notes
Notes: svn path=/head/; revision=508988
Diffstat (limited to 'www/choqok')
-rw-r--r--www/choqok/files/patch-gentoo-kf5-5.61-headers94
-rw-r--r--www/choqok/files/patch-kf5-5.61-headers20
2 files changed, 114 insertions, 0 deletions
diff --git a/www/choqok/files/patch-gentoo-kf5-5.61-headers b/www/choqok/files/patch-gentoo-kf5-5.61-headers
new file mode 100644
index 000000000000..3666922f1e55
--- /dev/null
+++ b/www/choqok/files/patch-gentoo-kf5-5.61-headers
@@ -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
+--- plugins/uploaders/flickr/flickr.h
++++ 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
+--- plugins/uploaders/imageshack/imageshack.h
++++ 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
+--- plugins/uploaders/mobypicture/mobypicture.h
++++ 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
+--- plugins/uploaders/posterous/posterous.h
++++ 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
+--- plugins/uploaders/twitgoo/twitgoo.h
++++ plugins/uploaders/twitgoo/twitgoo.h
+@@ -26,6 +26,8 @@
+
+ #include "uploader.h"
+
++#include <QMap>
++
+ class KJob;
+
+ class Twitgoo : public Choqok::Uploader
+--
+cgit v1.1
diff --git a/www/choqok/files/patch-kf5-5.61-headers b/www/choqok/files/patch-kf5-5.61-headers
new file mode 100644
index 000000000000..fd987baeb514
--- /dev/null
+++ b/www/choqok/files/patch-kf5-5.61-headers
@@ -0,0 +1,20 @@
+--- plugins/betternotify/notify.h.orig 2019-08-14 20:27:53.253748000 +0000
++++ plugins/betternotify/notify.h 2019-08-14 20:28:19.765006000 +0000
+@@ -23,6 +23,7 @@
+ #ifndef NOTIFY_H
+ #define NOTIFY_H
+
++#include <QMap>
+ #include <QQueue>
+ #include <QPoint>
+ #include <QPointer>
+--- plugins/untiny/untiny.h.orig 2019-08-14 20:29:41.454765000 +0000
++++ plugins/untiny/untiny.h 2019-08-14 20:30:33.646732000 +0000
+@@ -27,6 +27,7 @@
+
+ #include "plugin.h"
+
++#include <QMap>
+ #include <QQueue>
+ #include <QUrl>
+ #include <QPointer>