gentoo resync : 03.11.2019

5 files changed, 85 insertions, 1 deletions

diff --git a/sci-mathematics/rkward/Manifest b/sci-mathematics/rkward/Manifest
index e0d7dc9e172a..a4735ab01c56 100644
--- a/sci-mathematics/rkward/Manifest
+++ b/sci-mathematics/rkward/Manifest
@@ -1,3 +1,6 @@
+AUX rkward-0.7.0b-qt-5.13-1.patch 678 BLAKE2B 5800aa876a5876167a0a7dac5e826b3a8fadc07f70bc763788c38c9e9b8b65a533f544d4c552d1eb873d28f9c76f7d882e46a1a517f335364e3e896bf27e6dc6 SHA512 2b854b829b7c1f02f64548b1cf535b6327085672ef600fb732e53b5015c6e1664c1d2acad8c6a4fe90a93bb2284a8093570f1fc494b168bd0a6fc8d69190df08
+AUX rkward-0.7.0b-qt-5.13-2.patch 683 BLAKE2B b21d5bb3bbcb46a9b4c9052b85e421f7fdc876bd70e7b6572bfb557c0c28570d7f4e3fe04ba6b2d850713eb55d70d89e010c37eb4f18d6e3c04181ad44cc66cf SHA512 66a05ab2a5f491784f5f8dc819ebae4f12472b45f8d83ffa7a1041be736f71301d6022c7ed66552277850cf2b2308079e9aaf37d6a20e1d05e49c7ae6181568e
+AUX rkward-0.7.0b-qt-5.13-3.patch 822 BLAKE2B c6f6de62562d1ae50ad04aed1acc3a5bf4a3c8bff5b34df79b0c2a86525b7c0313c1322de9004dc2b0148d98a8a73152966eea9e57278ffca757020842f06ada SHA512 1c4c398b34f3209a5840b7be6d803df5ed2788b84db78672ed3cd71eebee801e80843b01485bb990051e7567dc302c77d9ad9dbc981138a99702c2907f3a4df6
 DIST rkward-0.7.0b.tar.gz 3978972 BLAKE2B 268ebbcdd16d64f546ffc78bfaf0fbe1546d42b09f7d869a82b9f2df2104c5a449052409773b3b063e9f5ca12948d9a19065ebe57e79684e6eb0ad73dfa5791a SHA512 c582ea2d35371315d41664a8620693c82017bd98d6bb380e64dfd2dda8b34b8890aa1e50b9c4a03838b41f22a1983ee0a48b97b30670b6a15143198631ad49ed
-EBUILD rkward-0.7.0b.ebuild 1230 BLAKE2B 6d3794f828633e12f78b015fa86cfe08f492f6b882d6ca7d62fc7650cf254b7f7907200b1668db6b694fb9d4d6c58fa38c52e16d93f0cf2a002556a3ebd88d9c SHA512 c4d3fe54ef4bf3d86892c5b54bebaa1450419b3afd856feaa67f548a8125a90c1668cbaa9b19ac0699f390f653f780cdcb0083397d0135f339ad7289423723a4
+EBUILD rkward-0.7.0b.ebuild 1283 BLAKE2B fe2638d19323ef3db46cfb6d638f36531c322b7c76d4dcc28153f2aa25b6c6ea912d98a357788951cfd44f3994ff1c53beceb85547543a08c1bd8452c7ebd5bb SHA512 389a73470046ac7532c2d807e38e9b65e02706772062a009f2033d919a8a9063fd3a039716a611fbf134a44fedcfa4339968f6898ca7a0dbd63c4c3ca9488ff8
 MISC metadata.xml 592 BLAKE2B 887f22ad10d784dd1a12f50ab14ae07e9da5f90828b78027c08c864641e334cd1343bd4bbd197ccec086fe9e7d1e95602f8f78cc3f1316701900b73e266d763d SHA512 81c026c96614186bc6b31f9737b91692df82523d2179d467aeb663f10b7ce079a4b52354d8f744dedbe5bf5cf1939921a26f24f8deec9a170ac435da1f9863f6
diff --git a/sci-mathematics/rkward/files/rkward-0.7.0b-qt-5.13-1.patch b/sci-mathematics/rkward/files/rkward-0.7.0b-qt-5.13-1.patch
new file mode 100644
index 000000000000..af45406a417c
--- /dev/null
+++ b/sci-mathematics/rkward/files/rkward-0.7.0b-qt-5.13-1.patch
@@ -0,0 +1,23 @@
+From b51802243f478d1d89120edc343bec7eb5ef8285 Mon Sep 17 00:00:00 2001
+From: Thomas Friedrichsmeier <thomas.friedrichsmeier@ruhr-uni-bochum.de>
+Date: Wed, 24 Jul 2019 19:36:51 +0200
+Subject: Fix compilation
+
+---
+ rkward/windows/rkworkplace.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/rkward/windows/rkworkplace.cpp b/rkward/windows/rkworkplace.cpp
+index 0dbf36a..94b3378 100644
+--- a/rkward/windows/rkworkplace.cpp
++++ b/rkward/windows/rkworkplace.cpp
+@@ -31,6 +31,7 @@
+ #include <QDir>
+ #include <QApplication>
+ #include <QMimeDatabase>
++#include <QLayout>
+ 
+ #include "detachedwindowcontainer.h"
+ #include "rkcommandeditorwindow.h"
+-- 
+cgit v1.1
diff --git a/sci-mathematics/rkward/files/rkward-0.7.0b-qt-5.13-2.patch b/sci-mathematics/rkward/files/rkward-0.7.0b-qt-5.13-2.patch
new file mode 100644
index 000000000000..bbb07c1e8fca
--- /dev/null
+++ b/sci-mathematics/rkward/files/rkward-0.7.0b-qt-5.13-2.patch
@@ -0,0 +1,23 @@
+From d713ce77e077b426d9d81a22f558f71dfa832615 Mon Sep 17 00:00:00 2001
+From: Thomas Friedrichsmeier <thomas.friedrichsmeier@ruhr-uni-bochum.de>
+Date: Fri, 26 Jul 2019 22:32:42 +0200
+Subject: Another missing include file
+
+---
+ rkward/windows/rktoolwindowbar.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/rkward/windows/rktoolwindowbar.cpp b/rkward/windows/rktoolwindowbar.cpp
+index a8f5cbd..03c405e 100644
+--- a/rkward/windows/rktoolwindowbar.cpp
++++ b/rkward/windows/rktoolwindowbar.cpp
+@@ -27,6 +27,7 @@
+ 
+ #include <QSplitter>
+ #include <QContextMenuEvent>
++#include <QHBoxLayout>
+ 
+ #include "rkworkplace.h"
+ #include "rkworkplaceview.h"
+-- 
+cgit v1.1
diff --git a/sci-mathematics/rkward/files/rkward-0.7.0b-qt-5.13-3.patch b/sci-mathematics/rkward/files/rkward-0.7.0b-qt-5.13-3.patch
new file mode 100644
index 000000000000..e907f2877cec
--- /dev/null
+++ b/sci-mathematics/rkward/files/rkward-0.7.0b-qt-5.13-3.patch
@@ -0,0 +1,33 @@
+From 394128e8d58b58bbd7cef9a4523ae346f94cd456 Mon Sep 17 00:00:00 2001
+From: Thomas Friedrichsmeier <thomas.friedrichsmeier@ruhr-uni-bochum.de>
+Date: Sat, 27 Jul 2019 11:12:34 +0200
+Subject: Another include file fix
+
+---
+ rkward/rkward.cpp | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/rkward/rkward.cpp b/rkward/rkward.cpp
+index 1a4a7e3..bb2f69c 100644
+--- a/rkward/rkward.cpp
++++ b/rkward/rkward.cpp
+@@ -26,6 +26,9 @@
+ #include <QMenuBar>
+ #include <QStatusBar>
+ #include <QInputDialog>
++#include <QVBoxLayout>
++#include <QHBoxLayout>
++#include <QIcon>
+ 
+ // include files for KDE
+ #include <kmessagebox.h>
+@@ -41,7 +44,6 @@
+ #include <krecentfilesaction.h>
+ #include <ktoolbar.h>
+ #include <kactionmenu.h>
+-#include <QIcon>
+ #include <KSharedConfig>
+ #include <KConfigGroup>
+ 
+-- 
+cgit v1.1
diff --git a/sci-mathematics/rkward/rkward-0.7.0b.ebuild b/sci-mathematics/rkward/rkward-0.7.0b.ebuild
index 4c651729fa1d..ea892c6968ac 100644
--- a/sci-mathematics/rkward/rkward-0.7.0b.ebuild
+++ b/sci-mathematics/rkward/rkward-0.7.0b.ebuild
@@ -48,3 +48,5 @@ RDEPEND="${DEPEND}
 	virtual/libintl
 	!sci-mathematics/rkward:4
 "
+
+PATCHES=( "${FILESDIR}"/${P}-qt-5.13-{1,2,3}.patch)