Date: Tuesday, June 2, 2020 @ 14:33:39 Author: arojas Revision: 388102
archrelease: copy kde-unstable to kde-unstable-x86_64 Added: digikam/repos/kde-unstable-x86_64/ digikam/repos/kde-unstable-x86_64/PKGBUILD (from rev 388101, digikam/kde-unstable/PKGBUILD) digikam/repos/kde-unstable-x86_64/digikam-qt-5.15.patch (from rev 388101, digikam/kde-unstable/digikam-qt-5.15.patch) -----------------------+ PKGBUILD | 49 ++++++++++++++++++++++++++++++++++++++++++++++ digikam-qt-5.15.patch | 51 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 100 insertions(+) Copied: digikam/repos/kde-unstable-x86_64/PKGBUILD (from rev 388101, digikam/kde-unstable/PKGBUILD) =================================================================== --- kde-unstable-x86_64/PKGBUILD (rev 0) +++ kde-unstable-x86_64/PKGBUILD 2020-06-02 14:33:39 UTC (rev 388102) @@ -0,0 +1,49 @@ +# $Id: PKGBUILD 320127 2018-03-24 09:48:28Z arojas $ +# Maintainer: Ronald van Haren <ron...@archlinux.org> +# Maintainer: Antonio Rojas <aro...@archlinux.org> +# Contributor: Andrea Scarpino <and...@archlinux.org> +# Contributor: Tobias Powalowski <tp...@archlinux.org> + +pkgname=digikam +_pkgver=7.0.0-beta3 +pkgver=${_pkgver//-/_} # for beta versions +pkgrel=1 +pkgdesc="An advanced digital photo management application" +arch=(x86_64) +license=(GPL) +url="https://www.digikam.org/" +depends=(lensfun opencv akonadi-contacts knotifyconfig libksane kfilemetadata qtav marble-common threadweaver kcalendarcore + qt5-xmlpatterns imagemagick glu) +makedepends=(extra-cmake-modules doxygen eigen boost kdoctools libkvkontakte jasper) +optdepends=('hugin: panorama tool' 'qt5-imageformats: support for additional image formats (WEBP, TIFF)' + 'jasper: openJPEG support' + 'libkvkontakte: VKontakte plugin' + 'rawtherapee: RAW import' 'darktable: RAW import' + "digikam-plugin-gmic: G'MIC plugin" + 'perl: for digitaglinktree') +source=("https://download.kde.org/unstable/$pkgname/$pkgname-$_pkgver.tar.xz"{,.sig} + digikam-qt-5.15.patch) +sha256sums=('97b2f768674afaaca6feb6e661d5c8fc6b88b08f4d4bbab8a6bcc94c19914893' + 'SKIP' + '3dd295fe3b49bf2140e44a86e65741522744034e0d204af12a642621feea81fc') +validpgpkeys=(D1CF2444A7858C5F2FB095B74A77747BC2386E50) # digiKam.org (digiKam project) <digikamdevelo...@gmail.com> + +prepare() { + patch -d $pkgname-$_pkgver -p1 -i ../digikam-qt-5.15.patch # Fix build with qt 5.15 +} + +build() { + cmake -B build -S $pkgname-$_pkgver \ + -DBUILD_TESTING=OFF \ + -DENABLE_KFILEMETADATASUPPORT=ON \ + -DENABLE_MEDIAPLAYER=ON \ + -DENABLE_AKONADICONTACTSUPPORT=ON \ + -DENABLE_MYSQLSUPPORT=ON \ + -DENABLE_APPSTYLES=ON \ + -DENABLE_QWEBENGINE=ON + cmake --build build +} + +package() { + DESTDIR="$pkgdir" cmake --install build +} Copied: digikam/repos/kde-unstable-x86_64/digikam-qt-5.15.patch (from rev 388101, digikam/kde-unstable/digikam-qt-5.15.patch) =================================================================== --- kde-unstable-x86_64/digikam-qt-5.15.patch (rev 0) +++ kde-unstable-x86_64/digikam-qt-5.15.patch 2020-06-02 14:33:39 UTC (rev 388102) @@ -0,0 +1,51 @@ +From 10fd663f43148fc96ed3afeecf70de15cadd0f8a Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <ast...@gentoo.org> +Date: Sun, 19 Apr 2020 09:55:03 +0200 +Subject: [PATCH] Fix build with Qt 5.15.0 + +Signed-off-by: Andreas Sturmlechner <ast...@gentoo.org> +--- + .../dplugins/generic/view/presentation/opengl/presentationgl.cpp | 1 + + core/libs/dimg/filters/curves/curveswidget.cpp | 1 + + core/libs/dimg/filters/levels/histogrampainter.cpp | 1 + + 3 files changed, 3 insertions(+) + +diff --git a/core/dplugins/generic/view/presentation/opengl/presentationgl.cpp b/core/dplugins/generic/view/presentation/opengl/presentationgl.cpp +index b37699436e..6a4f173ab0 100644 +--- a/core/dplugins/generic/view/presentation/opengl/presentationgl.cpp ++++ b/core/dplugins/generic/view/presentation/opengl/presentationgl.cpp +@@ -44,6 +44,7 @@ + #include <QMatrix> + #include <QMouseEvent> + #include <QPainter> ++#include <QPainterPath> + #include <QPixmap> + #include <QTimer> + #include <QWheelEvent> +diff --git a/core/libs/dimg/filters/curves/curveswidget.cpp b/core/libs/dimg/filters/curves/curveswidget.cpp +index cccccbd156..d0beef9bf2 100644 +--- a/core/libs/dimg/filters/curves/curveswidget.cpp ++++ b/core/libs/dimg/filters/curves/curveswidget.cpp +@@ -40,6 +40,7 @@ + #include <QColor> + #include <QFont> + #include <QFontMetrics> ++#include <QPainterPath> + #include <QPaintEvent> + #include <QMouseEvent> + +diff --git a/core/libs/dimg/filters/levels/histogrampainter.cpp b/core/libs/dimg/filters/levels/histogrampainter.cpp +index 241d5fc4c8..f11ad4b560 100644 +--- a/core/libs/dimg/filters/levels/histogrampainter.cpp ++++ b/core/libs/dimg/filters/levels/histogrampainter.cpp +@@ -30,6 +30,7 @@ + // Qt includes + + #include <QPainter> ++#include <QPainterPath> + + // KDE includes + +-- +2.26.1 +