From d5b511550f0f627be06db32e3bcb889109d8bad7c239d6f4f7d60dc3a9d6342f Mon Sep 17 00:00:00 2001 From: Ana Guerrero Date: Thu, 4 Apr 2024 20:25:01 +0000 Subject: [PATCH] Accepting request 1164338 from KDE:Extra OBS-URL: https://build.opensuse.org/request/show/1164338 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/digikam?expand=0&rev=221 --- ...k-for-each-akonadi-component-separately.patch | 15 +++++++-------- digiKam-8.2.0.tar.xz | 3 --- digiKam-8.2.0.tar.xz.sig | 16 ---------------- digiKam-8.3.0-1.tar.xz | 3 +++ digiKam-8.3.0-1.tar.xz.sig | 16 ++++++++++++++++ digikam.changes | 7 +++++++ digikam.spec | 10 ++++++---- 7 files changed, 39 insertions(+), 31 deletions(-) delete mode 100644 digiKam-8.2.0.tar.xz delete mode 100644 digiKam-8.2.0.tar.xz.sig create mode 100644 digiKam-8.3.0-1.tar.xz create mode 100644 digiKam-8.3.0-1.tar.xz.sig diff --git a/0001-Look-for-each-akonadi-component-separately.patch b/0001-Look-for-each-akonadi-component-separately.patch index 2a01917..df292c1 100644 --- a/0001-Look-for-each-akonadi-component-separately.patch +++ b/0001-Look-for-each-akonadi-component-separately.patch @@ -7,11 +7,11 @@ Subject: [PATCH] Look for each akonadi component separately core/cmake/rules/RulesKDEFramework.cmake | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) -diff --git a/core/cmake/rules/RulesKDEFramework.cmake b/core/cmake/rules/RulesKDEFramework.cmake -index 6100334..8a18288 100644 ---- a/core/cmake/rules/RulesKDEFramework.cmake -+++ b/core/cmake/rules/RulesKDEFramework.cmake -@@ -37,12 +37,9 @@ endif() +Index: digikam-8.3.0/core/cmake/rules/RulesKDEFramework.cmake +=================================================================== +--- digikam-8.3.0.orig/core/cmake/rules/RulesKDEFramework.cmake ++++ digikam-8.3.0/core/cmake/rules/RulesKDEFramework.cmake +@@ -37,14 +37,9 @@ endif() if(ENABLE_AKONADICONTACTSUPPORT) @@ -21,12 +21,11 @@ index 6100334..8a18288 100644 - AkonadiContact # For KDE Mail Contacts support. - Contacts # API for contacts/address book data. - ) +- find_package(KPim${QT_VERSION_MAJOR}Akonadi ${AKONADI_MIN_VERSION} QUIET) +- find_package(KPim${QT_VERSION_MAJOR}AkonadiContact ${AKONADI_MIN_VERSION} QUIET) + find_package(KF${QT_VERSION_MAJOR}Akonadi ${AKONADI_MIN_VERSION} REQUIRED) + find_package(KF${QT_VERSION_MAJOR}AkonadiContact ${AKONADI_MIN_VERSION} REQUIRED) # For KDE Mail Contacts support. + find_package(KF${QT_VERSION_MAJOR}Contacts ${AKONADI_MIN_VERSION} REQUIRED) # API for contacts/address book data. endif() --- -2.41.0 - diff --git a/digiKam-8.2.0.tar.xz b/digiKam-8.2.0.tar.xz deleted file mode 100644 index 9b184ff..0000000 --- a/digiKam-8.2.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2f7fcb559b123ed9ecae5a5aef6f4560eee5f49206d9d1746dec9ab6c8fb38bf -size 48172600 diff --git a/digiKam-8.2.0.tar.xz.sig b/digiKam-8.2.0.tar.xz.sig deleted file mode 100644 index 56c3729..0000000 --- a/digiKam-8.2.0.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAEBCgAdFiEE0c8kRKeFjF8vsJW3Snd0e8I4blAFAmVnoy8ACgkQSnd0e8I4 -blCfVQ/+KasLBXGBrCovoguW6P7p1gA2AacEzwMhQDn2YgoJpLkOwcw19g9kI5lG -cEpQ+l1yXb9Xo+6V0Ggg4BqYnGG1mxCKOGUqJ8duLA8mecmoETSy1X2+hatuSUOg -/UjX9ZgCkBpChnUm7oIZ+y+atR1VSNm51JVO401IpAaLY4R4B7UyLih4OwuUcpHb -jroWq/a8wdupHqc6j6tBTXIW9wqsq3V8ye51GulaAqI68P6gX3Ga+tBd0qTc/xS5 -MNDZOVDUva2Hlm7yQPGXcvk5gX98HJo4V/bybPikzkGoUWw7oc9VIp744LHTYeri -X9pNjoljzJEgz09X1q26CsKfLUyhd5Ymn+oT0YaaXjomD+2f7a5StML8VKN/KfPt -WdCFxHV4Wgh+17fOQuer8enklxETdPtFBQFbCkxltDjJ+nVLJJHGIl7P0Taxm/92 -VtJbLqjVC9Yz8vNP0jZr6Zy4fuHijRWb2P9zFu1cFb6E+99o7Ls1ipGCb+Nep5Ht -LiZqOHk50Htf5l94OKwfLgMRQ1tayyNyjK1K2E3wCIupqlllEtx1E29jSuwn+V2w -1wtWqWDW/5npQTIjAx+yaCTXeeGE9IvbwM/SZZmqZ3zlOAdBjnd2zwyyAdf1Qr9h -XxT7OOX+ufLvgmw7+XezUStefBMESoQUZCPSmr3Xgj9k6FmS31w= -=MJW3 ------END PGP SIGNATURE----- diff --git a/digiKam-8.3.0-1.tar.xz b/digiKam-8.3.0-1.tar.xz new file mode 100644 index 0000000..8b76033 --- /dev/null +++ b/digiKam-8.3.0-1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:05b145ff7f2f2005fa21bc579c152ab23c8191b678ff2944c8f0406d6b9de6d8 +size 55664168 diff --git a/digiKam-8.3.0-1.tar.xz.sig b/digiKam-8.3.0-1.tar.xz.sig new file mode 100644 index 0000000..b9ae924 --- /dev/null +++ b/digiKam-8.3.0-1.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAEBCgAdFiEE0c8kRKeFjF8vsJW3Snd0e8I4blAFAmX1RDwACgkQSnd0e8I4 +blAWfQ//WaksowRWfMgNA6IymcepGIceyau11MRRiJHZpnXc+8DbHOg5gZ1sf4e+ +3ySV5UTKQl3HhJmX1yBUWQECGv0wA/PH4ok/8ic1oFFsNWoL0nIxo2PWFyIC7Pdl +X+zKRLMeedOHE0ifzoc245j5L18ejimPDPivBBNHlNbAa+F+ToFQOG3F0eMYvb9Q +F9yGrrSgr9ZkmfruPGvHMG0NAPDdLrj8BdBA5YjCuTzafvV9Kx4VdNaNVk0Pyc+x +D38t5x+XgNRJ4n9pb3PAb+z1FlMyJUBGwDvYp9us7K0ECLlft8QoVZIwDBpEM1+3 +cn4/tzpf8FzIkirSCJjuOF+ak4LaxVFOksMNiAAwl0lYbt8k/lQFVTyXd9BjkBXO +ho6HQdiHlyjO5OAFekqsH+4AoSNohrcsd9r70YEjqTNvgWD5tP74Pr5kDRlPMH5T +cx/94YOU5911LNSrkcYQRlg94IUH8/rXNy39vCgs+mEaKRBxu3e18U9vDGG9S0go +4R4yzcwVgzzOFhSPtGdJ5VoO2hJ6aYGCOHvlw3jMG3F8ZewAq0yk3IYxI4hnbbNf +CYxoth/dlwA/LucubZH97bfQY4ilM7lH9eqJdqpvxRG7tzljpnd/zRbX3mvM+jpo +9LqtattWstG7+SpyvzUEpDtXqQ5s/tqtTz6yg6Vgv0PzcQcII6M= +=VGKT +-----END PGP SIGNATURE----- diff --git a/digikam.changes b/digikam.changes index 5b6815c..d8dff88 100644 --- a/digikam.changes +++ b/digikam.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Apr 2 21:52:10 UTC 2024 - Jaime Marquínez Ferrándiz + +- Update to 8.3.0: + https://www.digikam.org/news/2024-03-17-8.3.0_release_announcement/ +- Rebase 0001-Look-for-each-akonadi-component-separately.patch + ------------------------------------------------------------------- Mon Feb 26 22:17:07 UTC 2024 - Christophe Marin diff --git a/digikam.spec b/digikam.spec index 7a601a1..867d61f 100644 --- a/digikam.spec +++ b/digikam.spec @@ -16,18 +16,18 @@ # -%define soversion 8_2_0 +%define soversion 8_3_0 %bcond_without released %bcond_with apidocs Name: digikam -Version: 8.2.0 +Version: 8.3.0 Release: 0 Summary: A KDE Photo Manager License: GPL-2.0-or-later URL: https://www.digikam.org/ -Source0: https://download.kde.org/stable/%{name}/%{version}/digiKam-%{version}.tar.xz +Source0: https://download.kde.org/stable/%{name}/%{version}/digiKam-%{version}-1.tar.xz %if %{with released} -Source1: https://download.kde.org/stable/%{name}/%{version}/digiKam-%{version}.tar.xz.sig +Source1: https://download.kde.org/stable/%{name}/%{version}/digiKam-%{version}-1.tar.xz.sig Source2: %{name}.keyring %endif # PATCH-FIX-OPENSUSE @@ -76,11 +76,13 @@ BuildRequires: cmake(Qt5Concurrent) BuildRequires: cmake(Qt5Core) BuildRequires: cmake(Qt5DBus) BuildRequires: cmake(Qt5Gui) +BuildRequires: cmake(Qt5Multimedia) BuildRequires: cmake(Qt5Network) BuildRequires: cmake(Qt5NetworkAuth) BuildRequires: cmake(Qt5OpenGL) BuildRequires: cmake(Qt5PrintSupport) BuildRequires: cmake(Qt5Sql) +BuildRequires: cmake(Qt5Svg) BuildRequires: cmake(Qt5WebEngineWidgets) BuildRequires: cmake(Qt5Widgets) BuildRequires: cmake(Qt5X11Extras)