diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2020-06-30 23:20:54 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2020-06-30 23:44:04 +0200 |
| commit | 54c96702dba9bb8dc9fccd90ee19439ecc6a237e (patch) | |
| tree | c450b706e7807245ac312008d084f4d5c10f2655 /media-gfx | |
| parent | media-libs/mlt: Drop 6.20.0-r1 (diff) | |
| download | gentoo-54c96702dba9bb8dc9fccd90ee19439ecc6a237e.tar.gz gentoo-54c96702dba9bb8dc9fccd90ee19439ecc6a237e.tar.bz2 gentoo-54c96702dba9bb8dc9fccd90ee19439ecc6a237e.zip | |
media-gfx/digikam: Fix 6.4.0-r1 build w/ Qt-5.15
Thanks-to: Thomas Posch <bugs.gentoo.org@online.posch.name>
Closes: https://bugs.gentoo.org/729446
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'media-gfx')
| -rw-r--r-- | media-gfx/digikam/digikam-6.4.0-r1.ebuild | 5 | ||||
| -rw-r--r-- | media-gfx/digikam/files/digikam-6.4.0-qt-5.15.patch | 38 |
2 files changed, 42 insertions, 1 deletions
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 + |