summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2022-06-12 18:26:44 -0500
committerZach van Rijn <me@zv.io>2022-10-21 18:34:01 -0500
commit176185bed4f79fb31bbe70d0467b8e9a2130aea5 (patch)
tree3dc4da9bdf4ced43606858dca09971211631d162
parentce07012fbda53a7ae2eb7ad4198390072374076c (diff)
downloadpackages-176185bed4f79fb31bbe70d0467b8e9a2130aea5.tar.gz
packages-176185bed4f79fb31bbe70d0467b8e9a2130aea5.tar.bz2
packages-176185bed4f79fb31bbe70d0467b8e9a2130aea5.tar.xz
packages-176185bed4f79fb31bbe70d0467b8e9a2130aea5.zip
user/digikam: Update to 7.6.0
-rw-r--r--user/digikam/APKBUILD12
-rw-r--r--user/digikam/backport.patch28
-rw-r--r--user/digikam/opencv42.patch11
3 files changed, 34 insertions, 17 deletions
diff --git a/user/digikam/APKBUILD b/user/digikam/APKBUILD
index 7d512cb13..cc07d001f 100644
--- a/user/digikam/APKBUILD
+++ b/user/digikam/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=digikam
-pkgver=6.4.0
+pkgver=7.6.0
pkgrel=0
pkgdesc="Professional photo management and digital camera import"
url="https://www.digikam.org/"
@@ -20,8 +20,8 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtxmlpatterns-dev
opencv opencv-dev imagemagick-dev kcalendarcore-dev marble-dev"
# YES, both are needed. opencv-dev only pulls in -libs; CMake module in opencv
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/digikam/$pkgver/digikam-$pkgver.tar.xz
- opencv42.patch
+source="https://download.kde.org/stable/digikam/$pkgver/digiKam-$pkgver.tar.xz
+ backport.patch
"
build() {
@@ -39,8 +39,8 @@ build() {
-DENABLE_FACESENGINE_DNN=OFF \
-DENABLE_MYSQLSUPPORT=OFF \
-DEIGEN3_INCLUDE_DIR=/usr/include/eigen3 \
- -DENABLE_OPENCV3=ON \
-DBUILD_TESTING=OFF \
+ -DENABLE_QWEBENGINE=OFF \
${CMAKE_CROSSOPTS} .
make
}
@@ -49,5 +49,5 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="b3b5e9903538d110613aa872c9215f5e7c19f7520a2b9060c24e686f20f72075378b447239dd3e17cb8860cdd35c699399994199b848757f0497ad25a7805e42 digikam-6.4.0.tar.xz
-55b61bd67a25a4a1ec149205fd66c234a283a57f80c0070f95f085ae5e8f6cf5b9b5ed0a85a427ef58bd0f471d784555293b7fc61cf98eeb2ab84789da1979b1 opencv42.patch"
+sha512sums="72cae1f36249687d2c82392b7d5bcede39364372f935a2d09ba561d0b7f51b6f9a1e6a83a8974616061a8200f3d997b96fb021a16323a2f30b404cf628188216 digiKam-7.6.0.tar.xz
+44f33f77b327f384764d74aade0567560f2f8cf34f53a9391da42ade06b08d9edc858c8b48cb0f2677dce8fa195e31d866585ee287a49a765d3fd2f8d5ed3c41 backport.patch"
diff --git a/user/digikam/backport.patch b/user/digikam/backport.patch
new file mode 100644
index 000000000..a2933bc71
--- /dev/null
+++ b/user/digikam/backport.patch
@@ -0,0 +1,28 @@
+From 51efe295a222070743187af0367b0bf957879337 Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Fri, 22 Apr 2022 19:13:28 +0200
+Subject: [PATCH] Fix build with akonadi-contacts 22.04
+
+---
+ core/utilities/extrasupport/addressbook/akonadiiface.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/core/utilities/extrasupport/addressbook/akonadiiface.cpp b/core/utilities/extrasupport/addressbook/akonadiiface.cpp
+index 6a78863cf6..8e65a405da 100644
+--- a/core/utilities/extrasupport/addressbook/akonadiiface.cpp
++++ b/core/utilities/extrasupport/addressbook/akonadiiface.cpp
+@@ -49,7 +49,11 @@
+ #include <AkonadiCore/Item>
+ #endif
+
++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 19, 80)
++#include <Akonadi/ContactSearchJob>
++#else
+ #include <Akonadi/Contact/ContactSearchJob>
++#endif
+ #include <KContacts/Addressee>
+
+ #if defined(Q_OS_DARWIN) && defined(Q_CC_CLANG)
+--
+GitLab
+
diff --git a/user/digikam/opencv42.patch b/user/digikam/opencv42.patch
deleted file mode 100644
index d4d80a85f..000000000
--- a/user/digikam/opencv42.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- digikam-6.4.0/core/libs/facesengine/detection/opencvfacedetector.cpp.old 2019-11-03 09:04:00.000000000 +0000
-+++ digikam-6.4.0/core/libs/facesengine/detection/opencvfacedetector.cpp 2020-02-08 12:43:42.707340488 +0000
-@@ -166,7 +166,7 @@
- * 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),