[arch-commits] Commit in digikam/trunk (PKGBUILD akonadi-22.04.patch)

[Antonio Rojas via arch-commits]

Date: Thursday, June 23, 2022 @ 15:20:06
  Author: arojas
Revision: 449365

Update to 7.7.0

Modified:
  digikam/trunk/PKGBUILD
Deleted:
  digikam/trunk/akonadi-22.04.patch

-+
 PKGBUILD|   16 +---
 akonadi-22.04.patch |   16 
 2 files changed, 5 insertions(+), 27 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-06-23 11:51:12 UTC (rev 449364)
+++ PKGBUILD2022-06-23 15:20:06 UTC (rev 449365)
@@ -5,9 +5,9 @@
 # Contributor: Tobias Powalowski 
 
 pkgname=digikam
-_pkgver=7.6.0
+_pkgver=7.7.0
 pkgver=${_pkgver//-/_} # for beta versions
-pkgrel=5
+pkgrel=1
 pkgdesc='An advanced digital photo management application'
 arch=(x86_64)
 license=(GPL)
@@ -19,21 +19,15 @@
 'rawtherapee: RAW import' 'darktable: RAW import'
 'perl: for digitaglinktree')
 
source=(https://download.kde.org/stable/$pkgname/$pkgver/digiKam-$_pkgver.tar.xz{,.sig}
-ffmpeg5.patch
-akonadi-22.04.patch
-https://invent.kde.org/graphics/digikam/-/commit/8d16ea2e.patch)
-sha256sums=('d8e1ee7321d3fc313916f515756e3029ac4187dc453b6933848d4de5314b6641'
+ffmpeg5.patch)
+sha256sums=('c0c6dd2ea8a07514acbf2462f3a54518e7e8099b3337f881336168cff63d771c'
 'SKIP'
-'ef2601f9b2e668116a3643b4bd7ddcfc233ccfc747d813955423ca17b6a23dee'
-'595f7e971c4f9784046ab7bcba0983305b990bdc21e6257d9ec81b013aab1dc3'
-'9f9d67c7edd7e9c1c5284b6e86337f09499d7bd0a59ea56d6ef31b05f7926687')
+'ef2601f9b2e668116a3643b4bd7ddcfc233ccfc747d813955423ca17b6a23dee')
 validpgpkeys=(D1CF2444A7858C5F2FB095B74A77747BC2386E50) # digiKam.org (digiKam 
project) 
 options=(debug)
 
 prepare() {
   patch -d $pkgname-$_pkgver -p1 < ffmpeg5.patch # Fix build with FFmpeg 5
-  patch -d $pkgname-$_pkgver -p1 < akonadi-22.04.patch # Fix build with 
akonadi 22.04
-  patch -d $pkgname-$_pkgver -p1 < 8d16ea2e.patch # Fix crash when upgrading 
to mariadb 10.8
 }
 
 build() {

Deleted: akonadi-22.04.patch
===
--- akonadi-22.04.patch 2022-06-23 11:51:12 UTC (rev 449364)
+++ akonadi-22.04.patch 2022-06-23 15:20:06 UTC (rev 449365)
@@ -1,16 +0,0 @@
-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 
- #endif
- 
-+#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 19, 80)
-+#include 
-+#else
- #include 
-+#endif
- #include 
- 
- #if defined(Q_OS_DARWIN) && defined(Q_CC_CLANG)

[arch-commits] Commit in digikam/trunk (PKGBUILD akonadi-22.04.patch)

[Antonio Rojas via arch-commits]

Date: Friday, April 22, 2022 @ 17:16:43
  Author: arojas
Revision: 443765

Rebuild with akonadi 22.04

Added:
  digikam/trunk/akonadi-22.04.patch
Modified:
  digikam/trunk/PKGBUILD

-+
 PKGBUILD|   11 +++
 akonadi-22.04.patch |   16 
 2 files changed, 23 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-04-22 16:59:17 UTC (rev 443764)
+++ PKGBUILD2022-04-22 17:16:43 UTC (rev 443765)
@@ -7,7 +7,7 @@
 pkgname=digikam
 _pkgver=7.6.0
 pkgver=${_pkgver//-/_} # for beta versions
-pkgrel=1
+pkgrel=2
 pkgdesc='An advanced digital photo management application'
 arch=(x86_64)
 license=(GPL)
@@ -19,15 +19,18 @@
 'rawtherapee: RAW import' 'darktable: RAW import'
 'perl: for digitaglinktree')
 
source=(https://download.kde.org/stable/$pkgname/$pkgver/digiKam-$_pkgver.tar.xz{,.sig}
-ffmpeg5.patch)
+ffmpeg5.patch
+akonadi-22.04.patch)
 sha256sums=('d8e1ee7321d3fc313916f515756e3029ac4187dc453b6933848d4de5314b6641'
 'SKIP'
-'ef2601f9b2e668116a3643b4bd7ddcfc233ccfc747d813955423ca17b6a23dee')
+'ef2601f9b2e668116a3643b4bd7ddcfc233ccfc747d813955423ca17b6a23dee'
+'595f7e971c4f9784046ab7bcba0983305b990bdc21e6257d9ec81b013aab1dc3')
 validpgpkeys=(D1CF2444A7858C5F2FB095B74A77747BC2386E50) # digiKam.org (digiKam 
project) 
 options=(debug)
 
 prepare() {
-  patch -d $pkgname-$_pkgver -p1 < ffmpeg5.patch
+  patch -d $pkgname-$_pkgver -p1 < ffmpeg5.patch # Fix build with FFmpeg 5
+  patch -d $pkgname-$_pkgver -p1 < akonadi-22.04.patch # Fix build with 
akonadi 22.04
 }
 
 build() {

Added: akonadi-22.04.patch
===
--- akonadi-22.04.patch (rev 0)
+++ akonadi-22.04.patch 2022-04-22 17:16:43 UTC (rev 443765)
@@ -0,0 +1,16 @@
+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 
+ #endif
+ 
++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 19, 80)
++#include 
++#else
+ #include 
++#endif
+ #include 
+ 
+ #if defined(Q_OS_DARWIN) && defined(Q_CC_CLANG)