Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
graphics/digikam: update to 8.2.0 release (+)
Release Notes: https://www.digikam.org/news/2023-12-03-8.2.0_release_announcement/ Sponsored by: Serenity Cybersecurity, LLC
- Loading branch information
Showing
8 changed files
with
100 additions
and
44 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,17 @@ | ||
| TIMESTAMP = 1689392235 | ||
| SHA256 (KDE/digikam/8.1.0/digiKam-8.1.0.tar.xz) = 0503c034e445ff424f18a6715c0a7a79be4a5e0c82b3ebc461a21cec3745a5b3 | ||
| SIZE (KDE/digikam/8.1.0/digiKam-8.1.0.tar.xz) = 35712348 | ||
| SHA256 (KDE/digikam/8.1.0/weights_inceptionv3_299.pb) = 8923e3daff71c07533b9023ef32c69d8c058d1e0931d76d8b81241a201138538 | ||
| SIZE (KDE/digikam/8.1.0/weights_inceptionv3_299.pb) = 88007527 | ||
| SHA256 (KDE/digikam/8.1.0/deploy.prototxt) = f62621cac923d6f37bd669298c428bb7ee72233b5f8c3389bb893e35ebbcf795 | ||
| SIZE (KDE/digikam/8.1.0/deploy.prototxt) = 28092 | ||
| SHA256 (KDE/digikam/8.1.0/openface_nn4.small2.v1.t7) = 9b72d54aeb24a64a8135dca8e792f7cc675c99a884a6940350a6cedcf7b7ba08 | ||
| SIZE (KDE/digikam/8.1.0/openface_nn4.small2.v1.t7) = 31510785 | ||
| SHA256 (KDE/digikam/8.1.0/res10_300x300_ssd_iter_140000_fp16.caffemodel) = 510ffd2471bd81e3fcc88a5beb4eae4fb445ccf8333ebc54e7302b83f4158a76 | ||
| SIZE (KDE/digikam/8.1.0/res10_300x300_ssd_iter_140000_fp16.caffemodel) = 5351047 | ||
| SHA256 (KDE/digikam/8.1.0/yolov3-face.cfg) = f6563bd6923fd6500d2c2d6025f32ebdba916a85e5c9798351d916909f62aaf5 | ||
| SIZE (KDE/digikam/8.1.0/yolov3-face.cfg) = 8334 | ||
| SHA256 (KDE/digikam/8.1.0/yolov3-wider_16000.weights) = a88f3b3882e3cce1e553a81d42beef6202cb9afc3db88e7944f9ffbcc369e7df | ||
| SIZE (KDE/digikam/8.1.0/yolov3-wider_16000.weights) = 246305388 | ||
| SHA256 (KDE/digikam/8.1.0/shapepredictor.dat) = 6f3d2a59dc30c7c9166983224dcf5732b25de734fff1e36ff1f3047ef90ed82b | ||
| SIZE (KDE/digikam/8.1.0/shapepredictor.dat) = 67740572 | ||
| TIMESTAMP = 1701611793 | ||
| SHA256 (KDE/digikam/8.2.0/digiKam-8.2.0.tar.xz) = 2f7fcb559b123ed9ecae5a5aef6f4560eee5f49206d9d1746dec9ab6c8fb38bf | ||
| SIZE (KDE/digikam/8.2.0/digiKam-8.2.0.tar.xz) = 48172600 | ||
| SHA256 (KDE/digikam/8.2.0/weights_inceptionv3_299.pb) = 8923e3daff71c07533b9023ef32c69d8c058d1e0931d76d8b81241a201138538 | ||
| SIZE (KDE/digikam/8.2.0/weights_inceptionv3_299.pb) = 88007527 | ||
| SHA256 (KDE/digikam/8.2.0/deploy.prototxt) = f62621cac923d6f37bd669298c428bb7ee72233b5f8c3389bb893e35ebbcf795 | ||
| SIZE (KDE/digikam/8.2.0/deploy.prototxt) = 28092 | ||
| SHA256 (KDE/digikam/8.2.0/openface_nn4.small2.v1.t7) = 9b72d54aeb24a64a8135dca8e792f7cc675c99a884a6940350a6cedcf7b7ba08 | ||
| SIZE (KDE/digikam/8.2.0/openface_nn4.small2.v1.t7) = 31510785 | ||
| SHA256 (KDE/digikam/8.2.0/res10_300x300_ssd_iter_140000_fp16.caffemodel) = 510ffd2471bd81e3fcc88a5beb4eae4fb445ccf8333ebc54e7302b83f4158a76 | ||
| SIZE (KDE/digikam/8.2.0/res10_300x300_ssd_iter_140000_fp16.caffemodel) = 5351047 | ||
| SHA256 (KDE/digikam/8.2.0/yolov3-face.cfg) = f6563bd6923fd6500d2c2d6025f32ebdba916a85e5c9798351d916909f62aaf5 | ||
| SIZE (KDE/digikam/8.2.0/yolov3-face.cfg) = 8334 | ||
| SHA256 (KDE/digikam/8.2.0/yolov3-wider_16000.weights) = a88f3b3882e3cce1e553a81d42beef6202cb9afc3db88e7944f9ffbcc369e7df | ||
| SIZE (KDE/digikam/8.2.0/yolov3-wider_16000.weights) = 246305388 | ||
| SHA256 (KDE/digikam/8.2.0/shapepredictor.dat) = 6f3d2a59dc30c7c9166983224dcf5732b25de734fff1e36ff1f3047ef90ed82b | ||
| SIZE (KDE/digikam/8.2.0/shapepredictor.dat) = 67740572 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,25 +1,11 @@ | ||
| core/cmake/modules/FindLQR-1.cmake fails to find LQR in the linking test | ||
| because the path to the library is not passed to the linker. This could | ||
| be addressed by running what pkg_check_modules() finds through find_library() | ||
| first or rewriting the module to avoid using pkgconf all together. | ||
|
|
||
| The local workaround is to set USES+=localbase:ldflags to avoid extra patches. | ||
|
|
||
| --- core/CMakeLists.txt.orig 2023-07-14 21:16:22 UTC | ||
| --- core/CMakeLists.txt.orig 2023-11-29 09:52:21 UTC | ||
| +++ core/CMakeLists.txt | ||
| @@ -142,13 +142,13 @@ find_package(Doxygen) | ||
|
|
||
| find_package(Doxygen) | ||
|
|
||
| -if(NOT CMAKE_SYSTEM_NAME STREQUAL FreeBSD) | ||
| +#if(NOT CMAKE_SYSTEM_NAME STREQUAL FreeBSD) | ||
|
|
||
| # Lqr-1 packaging and detection under FreeBSD is problematic since a very long time and break the Gitlab CI | ||
|
|
||
| find_package(LQR-1) | ||
|
|
||
| -endif() | ||
| +#endif() | ||
|
|
||
| if(BUILD_WITH_CCACHE) | ||
|
|
||
| @@ -270,7 +270,7 @@ PRINT_OPTIONAL_LIBRARY_STATUS("flex" "htt | ||
| PRINT_OPTIONAL_LIBRARY_STATUS("doxygen" "https://github.com/doxygen/doxygen" "(version >= 1.8.0)" "digiKam will be compiled without API documentation building support." Doxygen_FOUND) | ||
| PRINT_OPTIONAL_LIBRARY_STATUS("ccache" "https://ccache.dev" "(version >= 3.0.0)" "digiKam will be compiled without CCACHE build support." HAVE_CCACHE) | ||
| PRINT_OPTIONAL_LIBRARY_STATUS("flex" "https://github.com/westes/flex" "(version >= 2.5.0)" "digiKam will be compiled without Panorama support." FLEX_FOUND) | ||
| -PRINT_OPTIONAL_LIBRARY_STATUS("libakonadicontact" "https://invent.kde.org/pim/akonadi-contacts" "(version >= ${AKONADI_MIN_VERSION})" "digiKam will be compiled without KDE desktop address book support." KF${QT_VERSION_MAJOR}AkonadiContact_FOUND) | ||
| +PRINT_OPTIONAL_LIBRARY_STATUS("libakonadicontact" "https://invent.kde.org/pim/akonadi-contacts" "(version >= ${AKONADI_MIN_VERSION})" "digiKam will be compiled without KDE desktop address book support." KPim${QT_VERSION_MAJOR}AkonadiContact_FOUND) | ||
| PRINT_OPTIONAL_LIBRARY_STATUS("libimagemagick" "https://github.com/ImageMagick/ImageMagick.git" "(version >= 6.7.0)" "digiKam will be compiled without ImageMagick codecs." HAVE_IMAGE_MAGICK) | ||
| PRINT_OPTIONAL_LIBRARY_STATUS("libeigen3" "https://github.com/eigenteam/eigen-git-mirror" "(version >= 3.0.0)" "digiKam will be compiled without Refocus tool support." Eigen3_FOUND) | ||
| PRINT_OPTIONAL_LIBRARY_STATUS("libgphoto2" "https://github.com/gphoto/libgphoto2" "(version >= 2.4.0)" "digiKam will be compiled without GPhoto2 camera drivers support." Gphoto2_FOUND) |
25 changes: 25 additions & 0 deletions
25
graphics/digikam/files/patch-core_app_DigikamCoreTarget.cmake
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| --- core/app/DigikamCoreTarget.cmake.orig 2023-11-29 09:52:21 UTC | ||
| +++ core/app/DigikamCoreTarget.cmake | ||
| @@ -81,7 +81,7 @@ endif() | ||
|
|
||
| endif() | ||
|
|
||
| -if(KF${QT_VERSION_MAJOR}AkonadiContact_FOUND) | ||
| +if(KPim${QT_VERSION_MAJOR}AkonadiContact_FOUND) | ||
|
|
||
| set(DIGIKAMCORE_OBJECTS | ||
| ${DIGIKAMCORE_OBJECTS} | ||
| @@ -395,11 +395,11 @@ endif() | ||
|
|
||
| endif() | ||
|
|
||
| -if(KF${QT_VERSION_MAJOR}AkonadiContact_FOUND) | ||
| +if(KPim${QT_VERSION_MAJOR}AkonadiContact_FOUND) | ||
|
|
||
| target_link_libraries(digikamcore | ||
| PRIVATE | ||
| - KF${QT_VERSION_MAJOR}::AkonadiContact | ||
| + KPim${QT_VERSION_MAJOR}::AkonadiContact | ||
| ) | ||
|
|
||
| endif() |
14 changes: 14 additions & 0 deletions
14
graphics/digikam/files/patch-core_cmake_rules_RulesKDEFramework.cmake
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| --- core/cmake/rules/RulesKDEFramework.cmake.orig 2023-11-29 09:52:21 UTC | ||
| +++ core/cmake/rules/RulesKDEFramework.cmake | ||
| @@ -40,9 +40,9 @@ if(ENABLE_AKONADICONTACTSUPPORT) | ||
| find_package(KF${QT_VERSION_MAJOR} ${AKONADI_MIN_VERSION} QUIET | ||
| OPTIONAL_COMPONENTS | ||
| Akonadi | ||
| - 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) | ||
|
|
||
| endif() | ||
|
|
11 changes: 11 additions & 0 deletions
11
graphics/digikam/files/patch-core_utilities_extrasupport_CMakeLists.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| --- core/utilities/extrasupport/CMakeLists.txt.orig 2023-11-29 09:52:21 UTC | ||
| +++ core/utilities/extrasupport/CMakeLists.txt | ||
| @@ -4,7 +4,7 @@ | ||
| # SPDX-License-Identifier: BSD-3-Clause | ||
| # | ||
|
|
||
| -if(KF${QT_VERSION_MAJOR}AkonadiContact_FOUND) | ||
| +if(KPim${QT_VERSION_MAJOR}AkonadiContact_FOUND) | ||
| add_subdirectory(addressbook) | ||
| endif() | ||
|
|
22 changes: 22 additions & 0 deletions
22
graphics/digikam/files/patch-core_utilities_extrasupport_addressbook_CMakeLists.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| --- core/utilities/extrasupport/addressbook/CMakeLists.txt.orig 2023-11-29 09:52:21 UTC | ||
| +++ core/utilities/extrasupport/addressbook/CMakeLists.txt | ||
| @@ -14,7 +14,7 @@ include_directories($<TARGET_PROPERTY:Qt${QT_VERSION_M | ||
| $<TARGET_PROPERTY:KF${QT_VERSION_MAJOR}::I18n,INTERFACE_INCLUDE_DIRECTORIES> | ||
| ) | ||
|
|
||
| -if(KF${QT_VERSION_MAJOR}AkonadiContact_FOUND) | ||
| +if(KPim${QT_VERSION_MAJOR}AkonadiContact_FOUND) | ||
| include_directories( | ||
| $<TARGET_PROPERTY:KF${QT_VERSION_MAJOR}::AkonadiCore,INTERFACE_INCLUDE_DIRECTORIES> | ||
| $<TARGET_PROPERTY:KF${QT_VERSION_MAJOR}::Contacts,INTERFACE_INCLUDE_DIRECTORIES> | ||
| @@ -35,7 +35,7 @@ target_link_libraries(akonadiiface PRIVATE Qt${QT_VERS | ||
|
|
||
| target_link_libraries(akonadiiface PRIVATE Qt${QT_VERSION_MAJOR}::Core KF${QT_VERSION_MAJOR}::I18n) | ||
|
|
||
| -if(KF${QT_VERSION_MAJOR}AkonadiContact_FOUND) | ||
| - target_include_directories(core_akonadiiface_obj PRIVATE $<TARGET_PROPERTY:KF${QT_VERSION_MAJOR}::AkonadiContact,INTERFACE_INCLUDE_DIRECTORIES>) | ||
| - target_link_libraries(akonadiiface PRIVATE KF${QT_VERSION_MAJOR}::AkonadiContact KF${QT_VERSION_MAJOR}::Contacts) | ||
| +if(KPim${QT_VERSION_MAJOR}AkonadiContact_FOUND) | ||
| + target_include_directories(core_akonadiiface_obj PRIVATE $<TARGET_PROPERTY:KPim${QT_VERSION_MAJOR}::AkonadiContact,INTERFACE_INCLUDE_DIRECTORIES>) | ||
| + target_link_libraries(akonadiiface PRIVATE KPim${QT_VERSION_MAJOR}::AkonadiContact KF${QT_VERSION_MAJOR}::Contacts) | ||
| endif() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters