diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2020-11-12 19:32:21 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2020-11-12 21:56:57 +0100 |
| commit | 4fa1aa29036ddd5aa09bf9bbae8bf0ce7c42e756 (patch) | |
| tree | bb7fee8df048004846ddf1ab5fb6eda433e74685 /media-gfx/digikam/files | |
| parent | dev-libs/isl: version bump to 0.23 (diff) | |
| download | gentoo-4fa1aa29036ddd5aa09bf9bbae8bf0ce7c42e756.tar.gz gentoo-4fa1aa29036ddd5aa09bf9bbae8bf0ce7c42e756.tar.bz2 gentoo-4fa1aa29036ddd5aa09bf9bbae8bf0ce7c42e756.zip | |
media-gfx/digikam: Drop 6.4.0-r1
Closes: https://bugs.gentoo.org/746596
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'media-gfx/digikam/files')
| -rw-r--r-- | media-gfx/digikam/files/digikam-6.3.0-cmake.patch | 66 | ||||
| -rw-r--r-- | media-gfx/digikam/files/digikam-6.4.0-qt-5.15.patch | 38 |
2 files changed, 0 insertions, 104 deletions
diff --git a/media-gfx/digikam/files/digikam-6.3.0-cmake.patch b/media-gfx/digikam/files/digikam-6.3.0-cmake.patch deleted file mode 100644 index f14f406d88d5..000000000000 --- a/media-gfx/digikam/files/digikam-6.3.0-cmake.patch +++ /dev/null @@ -1,66 +0,0 @@ -From beb8eb984aac519ed5dfd13615f430ec14e73f16 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> -Date: Sun, 17 Feb 2019 23:51:03 +0100 -Subject: [PATCH] Un-break optional Qt5 detection - ---- - core/CMakeLists.txt | 26 ++++++++++---------------- - 1 file changed, 10 insertions(+), 16 deletions(-) - -diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt -index 633760d194..736826d234 100644 ---- a/core/CMakeLists.txt -+++ b/core/CMakeLists.txt -@@ -136,16 +136,14 @@ find_package(Qt5 ${QT_MIN_VERSION} REQUIRED - ) - - if(ENABLE_QWEBENGINE) -- find_package(Qt5 ${QT_MIN_VERSION} NO_MODULE COMPONENTS WebEngineWidgets) -+ find_package(Qt5WebEngineWidgets ${QT_MIN_VERSION} NO_MODULE) - else() -- find_package(Qt5 ${QT_MIN_VERSION} NO_MODULE COMPONENTS WebKitWidgets) -+ find_package(Qt5WebKitWidgets ${QT_MIN_VERSION} NO_MODULE) - endif() - --find_package(Qt5 ${QT_MIN_VERSION} -- OPTIONAL_COMPONENTS -- DBus -- OpenGL --) -+find_package(Qt5DBus ${QT_MIN_VERSION}) -+ -+find_package(Qt5OpenGL ${QT_MIN_VERSION}) - - if(ENABLE_DBUS) - if(NOT Qt5DBus_FOUND) -@@ -156,14 +154,10 @@ endif() - # Dependencies For unit tests and CLI test tools - - if(BUILD_TESTING) -- find_package(Qt5 ${QT_MIN_VERSION} REQUIRED -- NO_MODULE COMPONENTS -- Test -- ) -- find_package(Qt5 ${QT_MIN_VERSION} -- OPTIONAL_COMPONENTS -- Qml WebView # Optional, for 'sialis' O2 library test tool. -- ) -+ find_package(Qt5Test ${QT_MIN_VERSION} NO_MODULE) -+ # Optional, for 'sialis' O2 library test tool. -+ find_package(Qt5Qml ${QT_MIN_VERSION} NO_MODULE) -+ find_package(Qt5WebView ${QT_MIN_VERSION} NO_MODULE) - endif() - - find_package(KF5 ${KF5_MIN_VERSION} REQUIRED -@@ -335,7 +329,7 @@ endif() - find_package(X11) - - if(X11_FOUND) -- find_package(Qt5 ${QT_MIN_VERSION} NO_MODULE COMPONENTS X11Extras) -+ find_package(Qt5X11Extras ${QT_MIN_VERSION} NO_MODULE) - set(HAVE_X11 TRUE) - else() - set(HAVE_X11 FALSE) --- -2.23.0 - 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 deleted file mode 100644 index c2d5154b5498..000000000000 --- a/media-gfx/digikam/files/digikam-6.4.0-qt-5.15.patch +++ /dev/null @@ -1,38 +0,0 @@ -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 - |