gentoo resync : 04.07.2020

3 files changed, 44 insertions, 2 deletions

diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index bdc918a075af..37da0c42d90b 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,6 +1,7 @@
 AUX digikam-6.3.0-cmake.patch 2038 BLAKE2B 73c6c7d008c3b76f9347f4192d435e10aa3607abf62436372ef131ac034ef538c1baa8d0d03e6b587b771fb766fa3286c649a6ffc7640a2f21e292b1e524cab6 SHA512 c8e6d2fd6c18d8c8e8733dffd1e0e2fb66b8bf3496aa6f767a4c633a56733c85bc53bdceaf689e84beca672a5013a02349cfca73d9f1e89a99252c7bac526a4d
+AUX digikam-6.4.0-qt-5.15.patch 1499 BLAKE2B 8d82d27d0b5376d5974dbc4d244dc1e3c683b8bfe392956b2d13cf30753984dd84746aaca049284a2c10f5074a1a9a51b228114c0b3eb02f8ae5ceb20abc00fc SHA512 3794b43734258112dfa693795d62887e66b8c99ffe339de3baa91fcd750d409962934e9bfcfc02f253ff9b4b04241eb5c4f983dc8a1b88a8f15d94d7cd3812ac
 DIST digikam-6.4.0.tar.xz 340146992 BLAKE2B ca1bc8b0d165f9774354d8489a11d46d8d7467edd3c1e90fd3a96024c4b7cd23bfd5c813251183bcca6d4beac9bffeb9d921beaa9a3752f75f1918796aacd719 SHA512 b3b5e9903538d110613aa872c9215f5e7c19f7520a2b9060c24e686f20f72075378b447239dd3e17cb8860cdd35c699399994199b848757f0497ad25a7805e42
 DIST digikam-7.0.0-rc.tar.xz 566061948 BLAKE2B 0f167387c7110223764f203c829079eb677de0251f440b65d7dbc9c6b6e49a77d7e7bdd44d3f578338b7a06a3a7f694402b7a406537075c4cc32a3abb59cf159 SHA512 fbfb3b91038fa76b3f699304318f91e429f6ac51424f9895d48cf30b5319029a8e2b3791adba56b444329916d51fae5a8adc8f6aedbeae36fd165e781742119e
-EBUILD digikam-6.4.0-r1.ebuild 4310 BLAKE2B 9c69ad526cedaac830105b620f2ee096504ca4e78c4ee4a6db60ac1398602be51bf1fe38a5b5dc338af2ae87ea041c93f3d1861352303c709121673034962133 SHA512 02d6beb8875c218acfe8f42d7c08715b53282b6d9a57949c8eb70176be6680a5b752719087f26b4cfa6bcae47e055c37db62d55cbec80ee6ddb4539ef2423b98
+EBUILD digikam-6.4.0-r1.ebuild 4358 BLAKE2B ca4ffa68ef7be1191439f94f3d52916c2ef4cb06c1fca12017989290c55ae5f2e819d74286ebac80835792df81a895b3c7d002205c44d698129887e36ddc5ddc SHA512 dc14d9384b6c4ee943dd63ec5a6eb6f5fcde9539cbdc4a34d2e5f2467c83eacb9acbabfcba93ea731b5b97a0a7e5fb07e02dbbe4a35f0bc956883a9ff88bfceb
 EBUILD digikam-7.0.0_rc.ebuild 4084 BLAKE2B fab6cca649fa9ff160e754ec45a5c70a45139c92fc79d8b740c2e24250931a43d6a304c506445db8c4ae1cac3958dce5634ba2cca43719373a0f62617b6b5523 SHA512 3bb5113b79604ae17fdfeee9fffa730dbbb06e884033c9ecb7ab9d23bcc1e30f70d5cabf9d8535503170d953be6abefe21c59f9409aa33dd3946eccd656ba600
 MISC metadata.xml 1368 BLAKE2B 5dec50abba4f748e1f8eb465807c719f4b81759277241169d9e721749a1ba807425f7d46e9feb1edb4dcf3b4dd00b40bfbb353fe479e29c8a1878ad1fbfb5082 SHA512 4cd1ada9c4274338e49a692095d80b572c309bd34c838e2663a18ec1e7230de87e27087febfedde46a0f6af19f1a3f440335750375117d20eacd0c756db8b2f8
diff --git a/media-gfx/digikam/digikam-6.4.0-r1.ebuild b/media-gfx/digikam/digikam-6.4.0-r1.ebuild
index f89120250bc7..870d93f3a99d 100644
--- a/media-gfx/digikam/digikam-6.4.0-r1.ebuild
+++ b/media-gfx/digikam/digikam-6.4.0-r1.ebuild
@@ -109,7 +109,10 @@ RDEPEND="${COMMON_DEPEND}
 RESTRICT+=" test"
 # bug 366505
 
-PATCHES=( "${FILESDIR}/${PN}-6.3.0-cmake.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-6.3.0-cmake.patch"
+	"${FILESDIR}/${P}-qt-5.15.patch" # bug 730298
+)
 
 pkg_pretend() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
diff --git a/media-gfx/digikam/files/digikam-6.4.0-qt-5.15.patch b/media-gfx/digikam/files/digikam-6.4.0-qt-5.15.patch
new file mode 100644
index 000000000000..c2d5154b5498
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-6.4.0-qt-5.15.patch
@@ -0,0 +1,38 @@
+Fix build with Qt 5.15
+
+Authored-by: Thomas Posch <bugs.gentoo.org@online.posch.name>
+
+diff -Naur a/core/dplugins/generic/view/presentation/opengl/presentationgl.cpp b/core/dplugins/generic/view/presentation/opengl/presentationgl.cpp
+--- a/core/dplugins/generic/view/presentation/opengl/presentationgl.cpp	2020-06-30 22:48:50.477149053 +0200
++++ b/core/dplugins/generic/view/presentation/opengl/presentationgl.cpp	2020-06-30 22:49:52.217439213 +0200
+@@ -44,6 +44,8 @@
+ #include <QMatrix>
+ #include <QMouseEvent>
+ #include <QPainter>
++#include <QPainterPath>
++#include <QPainterPathStroker>
+ #include <QPixmap>
+ #include <QTimer>
+ #include <QWheelEvent>
+diff -Naur a/core/libs/dimg/filters/curves/curveswidget.cpp b/core/libs/dimg/filters/curves/curveswidget.cpp
+--- a/core/libs/dimg/filters/curves/curveswidget.cpp	2020-06-30 22:48:50.374150231 +0200
++++ b/core/libs/dimg/filters/curves/curveswidget.cpp	2020-06-30 22:49:17.219842551 +0200
+@@ -41,6 +41,7 @@
+ #include <QFont>
+ #include <QFontMetrics>
+ #include <QPaintEvent>
++#include <QPainterPath>
+ #include <QMouseEvent>
+ 
+ // KDE includes
+diff -Naur a/core/libs/dimg/filters/levels/histogrampainter.cpp b/core/libs/dimg/filters/levels/histogrampainter.cpp
+--- a/core/libs/dimg/filters/levels/histogrampainter.cpp	2020-06-30 22:48:50.374150231 +0200
++++ b/core/libs/dimg/filters/levels/histogrampainter.cpp	2020-06-30 22:49:17.219842551 +0200
+@@ -30,6 +30,7 @@
+ // Qt includes
+ 
+ #include <QPainter>
++#include <QPainterPath>
+ 
+ // KDE includes
+