diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-12-26 13:36:16 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-12-26 13:36:16 +0000 |
commit | c25546f65119d2fb9a2f79588fd130d62989eddb (patch) | |
tree | b81b1abf9674c2823ed5d307b8d05c88fe0e2797 /media-gfx/digikam/files | |
parent | 058e62d5e60f6fc7f010f73f4c1546e979344a0b (diff) |
gentoo auto-resync : 26:12:2023 - 13:36:16
Diffstat (limited to 'media-gfx/digikam/files')
-rw-r--r-- | media-gfx/digikam/files/digikam-8.2.0-akonadi.patch | 95 | ||||
-rw-r--r-- | media-gfx/digikam/files/digikam-8.2.0-cmake.patch | 181 |
2 files changed, 276 insertions, 0 deletions
diff --git a/media-gfx/digikam/files/digikam-8.2.0-akonadi.patch b/media-gfx/digikam/files/digikam-8.2.0-akonadi.patch new file mode 100644 index 000000000000..4e2954d0f0de --- /dev/null +++ b/media-gfx/digikam/files/digikam-8.2.0-akonadi.patch @@ -0,0 +1,95 @@ +From 90e00bb17bea76030c3b532c2156d040e202c4a2 Mon Sep 17 00:00:00 2001 +From: Antonio Rojas <arojas@archlinux.org> +Date: Fri, 1 Dec 2023 23:22:53 +0100 +Subject: [PATCH] Fix build against >=akonadi-contacts-23.08 + +--- + core/CMakeLists.txt | 2 +- + core/app/DigikamCoreTarget.cmake | 6 +++--- + core/utilities/extrasupport/CMakeLists.txt | 2 +- + core/utilities/extrasupport/addressbook/CMakeLists.txt | 10 +++++----- + 4 files changed, 10 insertions(+), 10 deletions(-) + +diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt +index 8115ddc6ca..c5940b1d6e 100644 +--- a/core/CMakeLists.txt ++++ b/core/CMakeLists.txt +@@ -270,7 +270,7 @@ PRINT_OPTIONAL_LIBRARY_STATUS("bison" "https://www.gnu.org/software/ + 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) +diff --git a/core/app/DigikamCoreTarget.cmake b/core/app/DigikamCoreTarget.cmake +index 5ba888e259..2cc8807079 100644 +--- a/core/app/DigikamCoreTarget.cmake ++++ b/core/app/DigikamCoreTarget.cmake +@@ -81,7 +81,7 @@ if(KF${QT_VERSION_MAJOR}FileMetaData_FOUND) + + endif() + +-if(KF${QT_VERSION_MAJOR}AkonadiContact_FOUND) ++if(KPim${QT_VERSION_MAJOR}AkonadiContact_FOUND) + + set(DIGIKAMCORE_OBJECTS + ${DIGIKAMCORE_OBJECTS} +@@ -395,11 +395,11 @@ if(KF${QT_VERSION_MAJOR}FileMetaData_FOUND) + + 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() +diff --git a/core/utilities/extrasupport/CMakeLists.txt b/core/utilities/extrasupport/CMakeLists.txt +index 910961937e..f911522b58 100644 +--- a/core/utilities/extrasupport/CMakeLists.txt ++++ b/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() + +diff --git a/core/utilities/extrasupport/addressbook/CMakeLists.txt b/core/utilities/extrasupport/addressbook/CMakeLists.txt +index e44a67d4dd..8ecc8fee4e 100644 +--- a/core/utilities/extrasupport/addressbook/CMakeLists.txt ++++ b/core/utilities/extrasupport/addressbook/CMakeLists.txt +@@ -14,9 +14,9 @@ include_directories($<TARGET_PROPERTY:Qt${QT_VERSION_MAJOR}::Widgets,INTERFACE_I + $<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:KPim${QT_VERSION_MAJOR}::AkonadiCore,INTERFACE_INCLUDE_DIRECTORIES> + $<TARGET_PROPERTY:KF${QT_VERSION_MAJOR}::Contacts,INTERFACE_INCLUDE_DIRECTORIES> + + $<TARGET_PROPERTY:KF${QT_VERSION_MAJOR}::CoreAddons,INTERFACE_INCLUDE_DIRECTORIES> +@@ -35,7 +35,7 @@ add_library(akonadiiface STATIC $<TARGET_OBJECTS:core_akonadiiface_obj>) + + 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() +-- +2.43.0 + diff --git a/media-gfx/digikam/files/digikam-8.2.0-cmake.patch b/media-gfx/digikam/files/digikam-8.2.0-cmake.patch new file mode 100644 index 000000000000..8ca9e4a3b8d2 --- /dev/null +++ b/media-gfx/digikam/files/digikam-8.2.0-cmake.patch @@ -0,0 +1,181 @@ +From 433d0148be1cedea7e318bf3603fd17f906e721c Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> +Date: Sun, 17 Feb 2019 23:51:03 +0100 +Subject: [PATCH] Un-break optional Qt/KF detection + +And if we enable an option, make the necessary libraries REQUIRED. +--- + core/cmake/rules/RulesKDEFramework.cmake | 41 +++------------- + core/cmake/rules/RulesQtFramework.cmake | 59 +++++------------------- + core/cmake/rules/RulesX11.cmake | 7 +-- + 3 files changed, 19 insertions(+), 88 deletions(-) + +diff --git a/core/cmake/rules/RulesKDEFramework.cmake b/core/cmake/rules/RulesKDEFramework.cmake +index 9c646d0112..defa399391 100644 +--- a/core/cmake/rules/RulesKDEFramework.cmake ++++ b/core/cmake/rules/RulesKDEFramework.cmake +@@ -26,35 +26,20 @@ find_package(KF${QT_VERSION_MAJOR} ${KF${QT_VERSION_MAJOR}_MIN_VERSION} QUIET + ) + + if(ENABLE_KFILEMETADATASUPPORT) +- +- find_package(KF${QT_VERSION_MAJOR} ${KF${QT_VERSION_MAJOR}_MIN_VERSION} QUIET +- OPTIONAL_COMPONENTS +- FileMetaData # For Plasma desktop file indexer support. +- ) +- ++ # For Plasma desktop file indexer support. ++ find_package(KF${QT_VERSION_MAJOR}FileMetaData ${KF${QT_VERSION_MAJOR}_MIN_VERSION} REQUIRED) + endif() + + + 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(KF${QT_VERSION_MAJOR}Contacts ${KF${QT_VERSION_MAJOR}_MIN_VERSION} REQUIRED) # API for contacts/address book data. ++ find_package(KPim${QT_VERSION_MAJOR}Akonadi ${AKONADI_MIN_VERSION} REQUIRED) ++ find_package(KPim${QT_VERSION_MAJOR}AkonadiContact ${AKONADI_MIN_VERSION} REQUIRED) # For KDE Mail Contacts support. + endif() + +-find_package(KF${QT_VERSION_MAJOR} ${KSANE_MIN_VERSION} QUIET +- OPTIONAL_COMPONENTS +- Sane # For digital scanner support. +-) ++find_package(KF${QT_VERSION_MAJOR}Sane ${KSANE_MIN_VERSION} QUIET) # For digital scanner support. + +-find_package(KF${QT_VERSION_MAJOR} ${CALENDAR_MIN_VERSION} QUIET +- OPTIONAL_COMPONENTS +- CalendarCore # For Calendar tool. +-) ++find_package(KF${QT_VERSION_MAJOR}CalendarCore ${CALENDAR_MIN_VERSION} QUIET) # For Calendar tool. + + if ("${KF${QT_VERSION_MAJOR}CalendarCore_VERSION}" VERSION_GREATER 5.6.40) + +@@ -62,18 +47,6 @@ if ("${KF${QT_VERSION_MAJOR}CalendarCore_VERSION}" VERSION_GREATER 5.6.40) + + endif() + +-if(ENABLE_AKONADICONTACTSUPPORT AND (NOT KF${QT_VERSION_MAJOR}AkonadiContact_FOUND OR NOT KF${QT_VERSION_MAJOR}Contacts_FOUND)) +- +- set(ENABLE_AKONADICONTACTSUPPORT OFF) +- +-endif() +- +-if(ENABLE_KFILEMETADATASUPPORT AND NOT KF${QT_VERSION_MAJOR}FileMetaData_FOUND) +- +- set(ENABLE_KFILEMETADATASUPPORT OFF) +- +-endif() +- + # Check if KIO have been compiled with KIOWidgets. digiKam only needs this one. + + if(KF${QT_VERSION_MAJOR}KIO_FOUND) +diff --git a/core/cmake/rules/RulesQtFramework.cmake b/core/cmake/rules/RulesQtFramework.cmake +index 495ce4f4ef..0c58f3552a 100644 +--- a/core/cmake/rules/RulesQtFramework.cmake ++++ b/core/cmake/rules/RulesQtFramework.cmake +@@ -18,48 +18,19 @@ find_package(Qt${QT_VERSION_MAJOR} REQUIRED + ) + + if(ENABLE_QWEBENGINE) +- +- find_package(Qt${QT_VERSION_MAJOR} REQUIRED +- NO_MODULE +- COMPONENTS +- WebEngineWidgets +- ) +- ++ find_package(Qt${QT_VERSION_MAJOR}WebEngineWidgets REQUIRED NO_MODULE) + else() +- +- find_package(Qt${QT_VERSION_MAJOR} REQUIRED +- NO_MODULE +- COMPONENTS +- WebKitWidgets +- ) +- ++ find_package(Qt${QT_VERSION_MAJOR}WebKitWidgets REQUIRED NO_MODULE) + endif() + +-find_package(Qt${QT_VERSION_MAJOR} +- OPTIONAL_COMPONENTS +- DBus +- OpenGL +-) ++find_package(Qt${QT_VERSION_MAJOR}DBus) ++find_package(Qt${QT_VERSION_MAJOR}OpenGL) + + if(Qt6_FOUND) +- +- find_package(Qt${QT_VERSION_MAJOR} REQUIRED +- NO_MODULE COMPONENTS +- StateMachine +- ) +- +- find_package(Qt${QT_VERSION_MAJOR} +- OPTIONAL_COMPONENTS +- OpenGLWidgets +- ) +- ++ find_package(Qt${QT_VERSION_MAJOR}StateMachine REQUIRED NO_MODULE) ++ find_package(Qt${QT_VERSION_MAJOR}OpenGLWidgets) + else() +- +- find_package(Qt${QT_VERSION_MAJOR} +- OPTIONAL_COMPONENTS +- XmlPatterns # For Rajce plugin +- ) +- ++ find_package(Qt${QT_VERSION_MAJOR}XmlPatterns) # For Rajce plugin + endif() + + if(ENABLE_DBUS) +@@ -75,17 +46,9 @@ endif() + # Qt Dependencies For unit tests and CLI test tools + + if(BUILD_TESTING) ++ find_package(Qt${QT_VERSION_MAJOR}Test REQUIRED NO_MODULE) + +- find_package(Qt${QT_VERSION_MAJOR} REQUIRED +- NO_MODULE +- COMPONENTS +- Test +- ) +- +- find_package(Qt${QT_VERSION_MAJOR} +- QUIET +- OPTIONAL_COMPONENTS +- Qml WebView # Optional, for 'sialis' O2 library test tool. +- ) +- ++ # Optional, for 'sialis' O2 library test tool. ++ find_package(Qt${QT_VERSION_MAJOR}Qml QUIET NO_MODULE) ++ find_package(Qt${QT_VERSION_MAJOR}WebView QUIET NO_MODULE) + endif() +diff --git a/core/cmake/rules/RulesX11.cmake b/core/cmake/rules/RulesX11.cmake +index d7659eed34..9c145970b2 100644 +--- a/core/cmake/rules/RulesX11.cmake ++++ b/core/cmake/rules/RulesX11.cmake +@@ -11,12 +11,7 @@ find_package(X11) + if(X11_FOUND) + + if(NOT Qt6_FOUND) +- +- find_package(Qt5 ${QT_MIN_VERSION} NO_MODULE +- COMPONENTS +- X11Extras +- ) +- ++ find_package(Qt5X11Extras ${QT_MIN_VERSION} NO_MODULE) + endif() + + set(HAVE_X11 TRUE) +-- +2.43.0 + |