[arch-commits] Commit in digikam/repos (4 files)
Antonio Rojas
arojas at archlinux.org
Tue Jun 2 14:14:51 UTC 2020
Date: Tuesday, June 2, 2020 @ 14:14:50
Author: arojas
Revision: 388099
archrelease: copy trunk to staging-x86_64
Added:
digikam/repos/staging-x86_64/
digikam/repos/staging-x86_64/PKGBUILD
(from rev 388098, digikam/trunk/PKGBUILD)
digikam/repos/staging-x86_64/digikam-opencv-4.2.patch
(from rev 388098, digikam/trunk/digikam-opencv-4.2.patch)
digikam/repos/staging-x86_64/digikam-qt-5.15.patch
(from rev 388098, digikam/trunk/digikam-qt-5.15.patch)
--------------------------+
PKGBUILD | 61 +++++++++++++++++++++++++++++++++++++++++++++
digikam-opencv-4.2.patch | 35 +++++++++++++++++++++++++
digikam-qt-5.15.patch | 51 +++++++++++++++++++++++++++++++++++++
3 files changed, 147 insertions(+)
Copied: digikam/repos/staging-x86_64/PKGBUILD (from rev 388098, digikam/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2020-06-02 14:14:50 UTC (rev 388099)
@@ -0,0 +1,61 @@
+# $Id: PKGBUILD 320127 2018-03-24 09:48:28Z arojas $
+# Maintainer: Ronald van Haren <ronald at archlinux.org>
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Tobias Powalowski <tpowa at archlinux.org>
+
+pkgname=digikam
+_pkgver=6.4.0
+pkgver=${_pkgver//-/_} # for beta versions
+pkgrel=10
+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/stable/$pkgname/$_pkgver/$pkgname-$_pkgver.tar.xz"{,.sig}
+ initialize-imagemagick.patch::"https://cgit.kde.org/digikam.git/patch/?id=76ff65ae"
+ digikam-opencv-4.2.patch
+ digikam-qt-5.15.patch)
+sha256sums=('775012ff515bdd25a0b894c95bf5d33e7122b523da9c0f3af260ec3eff498d6f'
+ 'SKIP'
+ 'c559882c0df2243c5a5baab3373bda4084fb9a1d54959770b8846fe026eaf360'
+ 'fcd9a18dee3b4d009ec7256207d1b6645d2e2aa918b5cf9f9dc9b44db41f6a7b'
+ '3dd295fe3b49bf2140e44a86e65741522744034e0d204af12a642621feea81fc')
+validpgpkeys=(D1CF2444A7858C5F2FB095B74A77747BC2386E50) # digiKam.org (digiKam project) <digikamdeveloper at gmail.com>
+
+prepare() {
+ mkdir -p build
+
+ cd $pkgname-$pkgver
+ patch -p1 -i ../initialize-imagemagick.patch # Properly initialize exceptions in imagemagick
+ patch -p1 -i ../digikam-opencv-4.2.patch # Fix build with opencv 4.2
+ patch -p1 -i ../digikam-qt-5.15.patch # Fix build with qt 5.15
+}
+
+build() {
+ cd build
+
+ cmake ../$pkgname-$_pkgver \
+ -DBUILD_TESTING=OFF \
+ -DENABLE_KFILEMETADATASUPPORT=ON \
+ -DENABLE_MEDIAPLAYER=ON \
+ -DENABLE_AKONADICONTACTSUPPORT=ON \
+ -DENABLE_MYSQLSUPPORT=ON \
+ -DENABLE_APPSTYLES=ON \
+ -DENABLE_QWEBENGINE=ON
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="$pkgdir" install
+}
Copied: digikam/repos/staging-x86_64/digikam-opencv-4.2.patch (from rev 388098, digikam/trunk/digikam-opencv-4.2.patch)
===================================================================
--- staging-x86_64/digikam-opencv-4.2.patch (rev 0)
+++ staging-x86_64/digikam-opencv-4.2.patch 2020-06-02 14:14:50 UTC (rev 388099)
@@ -0,0 +1,35 @@
+diff --git a/core/libs/facesengine/detection/opencvfacedetector.cpp b/core/libs/facesengine/detection/opencvfacedetector.cpp
+index 46a56bb2f3..178d31f093 100644
+--- a/core/libs/facesengine/detection/opencvfacedetector.cpp
++++ b/core/libs/facesengine/detection/opencvfacedetector.cpp
+@@ -166,7 +166,7 @@ public:
+ * of the region of interest of this cascade (still relative to whole image).
+ * For frontal face cascades, returns the given parameter unchanged.
+ */
+- cv::Rect faceROI(const CvRect& faceRect) const
++ cv::Rect faceROI(const cv::Rect faceRect) const
+ {
+ return cv::Rect(lround(faceRect.x + roi.x() * faceRect.width),
+ lround(faceRect.y + roi.y() * faceRect.height),
+diff --git a/core/libs/facesengine/recognition/dlib-dnn/dnnface/dnn_base/cv_image.h b/core/libs/facesengine/recognition/dlib-dnn/dnnface/dnn_base/cv_image.h
+index 370aca14d6..1baf33c2bf 100644
+--- a/core/libs/facesengine/recognition/dlib-dnn/dnnface/dnn_base/cv_image.h
++++ b/core/libs/facesengine/recognition/dlib-dnn/dnnface/dnn_base/cv_image.h
+@@ -52,7 +52,7 @@ public:
+ << "\n\t img.channels(): " << img.channels()
+ << "\n\t img.pixel_traits<pixel_type>::num: " << pixel_traits<pixel_type>::num
+ );
+- IplImage temp = img;
++ IplImage temp = cvIplImage(img);
+ init(&temp);
+ }
+
+@@ -125,7 +125,7 @@ public:
+
+ cv_image& operator=( const cv::Mat img)
+ {
+- IplImage temp = img;
++ IplImage temp = cvIplImage(img);
+ init(&temp);
+ return *this;
+ }
Copied: digikam/repos/staging-x86_64/digikam-qt-5.15.patch (from rev 388098, digikam/trunk/digikam-qt-5.15.patch)
===================================================================
--- staging-x86_64/digikam-qt-5.15.patch (rev 0)
+++ staging-x86_64/digikam-qt-5.15.patch 2020-06-02 14:14:50 UTC (rev 388099)
@@ -0,0 +1,51 @@
+From 10fd663f43148fc96ed3afeecf70de15cadd0f8a Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm at 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 <asturm at 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
+
More information about the arch-commits
mailing list