Date: Friday, April 22, 2022 @ 17:16:59
Author: arojas
Revision: 443766
archrelease: copy trunk to extra-x86_64
Added:
digikam/repos/extra-x86_64/PKGBUILD
(from rev 443765, digikam/trunk/PKGBUILD)
digikam/repos/extra-x86_64/akonadi-22.04.patch
(from rev 443765, digikam/trunk/akonadi-22.04.patch)
digikam/repos/extra-x86_64/ffmpeg5.patch
(from rev 443765, digikam/trunk/ffmpeg5.patch)
Deleted:
digikam/repos/extra-x86_64/PKGBUILD
digikam/repos/extra-x86_64/ffmpeg5.patch
---------------------+
PKGBUILD | 97 +++++++++++++++++++++++++-------------------------
akonadi-22.04.patch | 16 ++++++++
ffmpeg5.patch | 26 ++++++-------
3 files changed, 79 insertions(+), 60 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-04-22 17:16:43 UTC (rev 443765)
+++ PKGBUILD 2022-04-22 17:16:59 UTC (rev 443766)
@@ -1,47 +0,0 @@
-# $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.6.0
-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 jasper glu perl-image-exiftool)
-makedepends=(extra-cmake-modules doxygen eigen boost kdoctools)
-optdepends=('hugin: panorama tool' 'qt5-imageformats: support for additional
image formats (WEBP, TIFF)'
- 'rawtherapee: RAW import' 'darktable: RAW import'
- 'perl: for digitaglinktree')
-source=(https://download.kde.org/stable/$pkgname/$pkgver/digiKam-$_pkgver.tar.xz{,.sig}
- ffmpeg5.patch)
-sha256sums=('d8e1ee7321d3fc313916f515756e3029ac4187dc453b6933848d4de5314b6641'
- 'SKIP'
- 'ef2601f9b2e668116a3643b4bd7ddcfc233ccfc747d813955423ca17b6a23dee')
-validpgpkeys=(D1CF2444A7858C5F2FB095B74A77747BC2386E50) # digiKam.org (digiKam
project) <digikamdevelo...@gmail.com>
-options=(debug)
-
-prepare() {
- patch -d $pkgname-$_pkgver -p1 < ffmpeg5.patch
-}
-
-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/extra-x86_64/PKGBUILD (from rev 443765,
digikam/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-04-22 17:16:59 UTC (rev 443766)
@@ -0,0 +1,50 @@
+# $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.6.0
+pkgver=${_pkgver//-/_} # for beta versions
+pkgrel=2
+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 jasper glu perl-image-exiftool)
+makedepends=(extra-cmake-modules doxygen eigen boost kdoctools)
+optdepends=('hugin: panorama tool' 'qt5-imageformats: support for additional
image formats (WEBP, TIFF)'
+ '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)
+sha256sums=('d8e1ee7321d3fc313916f515756e3029ac4187dc453b6933848d4de5314b6641'
+ 'SKIP'
+ 'ef2601f9b2e668116a3643b4bd7ddcfc233ccfc747d813955423ca17b6a23dee'
+ '595f7e971c4f9784046ab7bcba0983305b990bdc21e6257d9ec81b013aab1dc3')
+validpgpkeys=(D1CF2444A7858C5F2FB095B74A77747BC2386E50) # digiKam.org (digiKam
project) <digikamdevelo...@gmail.com>
+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
+}
+
+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/extra-x86_64/akonadi-22.04.patch (from rev 443765,
digikam/trunk/akonadi-22.04.patch)
===================================================================
--- akonadi-22.04.patch (rev 0)
+++ akonadi-22.04.patch 2022-04-22 17:16:59 UTC (rev 443766)
@@ -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 <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)
Deleted: ffmpeg5.patch
===================================================================
--- ffmpeg5.patch 2022-04-22 17:16:43 UTC (rev 443765)
+++ ffmpeg5.patch 2022-04-22 17:16:59 UTC (rev 443766)
@@ -1,13 +0,0 @@
-diff --git a/core/libs/threadimageio/video/videodecoder_p.h
b/core/libs/threadimageio/video/videodecoder_p.h
-index 251e092809..d82926b77e 100644
---- a/core/libs/threadimageio/video/videodecoder_p.h
-+++ b/core/libs/threadimageio/video/videodecoder_p.h
-@@ -56,7 +56,7 @@ public:
- AVFormatContext* pFormatContext;
- AVCodecContext* pVideoCodecContext;
- AVCodecParameters* pVideoCodecParameters;
-- AVCodec* pVideoCodec;
-+ const AVCodec* pVideoCodec;
- AVStream* pVideoStream;
- AVFrame* pFrame;
- quint8* pFrameBuffer;
Copied: digikam/repos/extra-x86_64/ffmpeg5.patch (from rev 443765,
digikam/trunk/ffmpeg5.patch)
===================================================================
--- ffmpeg5.patch (rev 0)
+++ ffmpeg5.patch 2022-04-22 17:16:59 UTC (rev 443766)
@@ -0,0 +1,13 @@
+diff --git a/core/libs/threadimageio/video/videodecoder_p.h
b/core/libs/threadimageio/video/videodecoder_p.h
+index 251e092809..d82926b77e 100644
+--- a/core/libs/threadimageio/video/videodecoder_p.h
++++ b/core/libs/threadimageio/video/videodecoder_p.h
+@@ -56,7 +56,7 @@ public:
+ AVFormatContext* pFormatContext;
+ AVCodecContext* pVideoCodecContext;
+ AVCodecParameters* pVideoCodecParameters;
+- AVCodec* pVideoCodec;
++ const AVCodec* pVideoCodec;
+ AVStream* pVideoStream;
+ AVFrame* pFrame;
+ quint8* pFrameBuffer;
