diff options
Diffstat (limited to 'media-gfx/digikam')
| -rw-r--r-- | media-gfx/digikam/files/digikam-8.1.0-cmake.patch | 180 | ||||
| -rw-r--r-- | media-gfx/digikam/files/digikam-8.1.0-fix-config-for-scaling-high-res-icons.patch | 45 |
2 files changed, 0 insertions, 225 deletions
diff --git a/media-gfx/digikam/files/digikam-8.1.0-cmake.patch b/media-gfx/digikam/files/digikam-8.1.0-cmake.patch deleted file mode 100644 index 8e1f71e661a1..000000000000 --- a/media-gfx/digikam/files/digikam-8.1.0-cmake.patch +++ /dev/null @@ -1,180 +0,0 @@ -From 5171575601ebc553cb747a2757caf63b433820b3 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/KF5 detection - -And if we enable an option, make the necessary libraries REQUIRED. ---- - core/cmake/rules/RulesKDEFramework.cmake | 41 +++-------------- - core/cmake/rules/RulesQtFramework.cmake | 58 +++++------------------- - core/cmake/rules/RulesX11.cmake | 7 +-- - 3 files changed, 19 insertions(+), 87 deletions(-) - -diff --git a/core/cmake/rules/RulesKDEFramework.cmake b/core/cmake/rules/RulesKDEFramework.cmake -index 610033425c..3ea9b1351d 100644 ---- a/core/cmake/rules/RulesKDEFramework.cmake -+++ b/core/cmake/rules/RulesKDEFramework.cmake -@@ -26,35 +26,20 @@ find_package(KF5 ${KF5_MIN_VERSION} QUIET - ) - - if(ENABLE_KFILEMETADATASUPPORT) -- -- find_package(KF5 ${KF5_MIN_VERSION} QUIET -- OPTIONAL_COMPONENTS -- FileMetaData # For Plasma destop file indexer support. -- ) -- -+ # For Plasma desktop file indexer support. -+ find_package(KF5FileMetaData ${KF5_MIN_VERSION} REQUIRED) - endif() - - - if(ENABLE_AKONADICONTACTSUPPORT) -- -- find_package(KF5 ${AKONADI_MIN_VERSION} QUIET -- OPTIONAL_COMPONENTS -- Akonadi -- AkonadiContact # For KDE Mail Contacts support. -- Contacts # API for contacts/address book data. -- ) -- -+ find_package(KF5Akonadi ${AKONADI_MIN_VERSION} REQUIRED) -+ find_package(KF5AkonadiContact ${AKONADI_MIN_VERSION} REQUIRED) # For KDE Mail Contacts support. -+ find_package(KF5Contacts ${AKONADI_MIN_VERSION} REQUIRED) # API for contacts/address book data. - endif() - --find_package(KF5 ${KSANE_MIN_VERSION} QUIET -- OPTIONAL_COMPONENTS -- Sane # For digital scanner support. --) -+find_package(KF5Sane ${KSANE_MIN_VERSION} QUIET) # For digital scanner support. - --find_package(KF5 ${CALENDAR_MIN_VERSION} QUIET -- OPTIONAL_COMPONENTS -- CalendarCore # For Calendar tool. --) -+find_package(KF5CalendarCore ${CALENDAR_MIN_VERSION} QUIET) # For Calendar tool. - - if ("${KF5CalendarCore_VERSION}" VERSION_GREATER 5.6.40) - -@@ -62,18 +47,6 @@ if ("${KF5CalendarCore_VERSION}" VERSION_GREATER 5.6.40) - - endif() - --if(ENABLE_AKONADICONTACTSUPPORT AND (NOT KF5AkonadiContact_FOUND OR NOT KF5Contacts_FOUND)) -- -- set(ENABLE_AKONADICONTACTSUPPORT OFF) -- --endif() -- --if(ENABLE_KFILEMETADATASUPPORT AND NOT KF5FileMetaData_FOUND) -- -- set(ENABLE_KFILEMETADATASUPPORT OFF) -- --endif() -- - # Check if KIO have been compiled with KIOWidgets. digiKam only needs this one. - - if(KF5KIO_FOUND) -diff --git a/core/cmake/rules/RulesQtFramework.cmake b/core/cmake/rules/RulesQtFramework.cmake -index e6e1670ed3..1ab57af4d4 100644 ---- a/core/cmake/rules/RulesQtFramework.cmake -+++ b/core/cmake/rules/RulesQtFramework.cmake -@@ -18,47 +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) -@@ -74,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.42.0 - diff --git a/media-gfx/digikam/files/digikam-8.1.0-fix-config-for-scaling-high-res-icons.patch b/media-gfx/digikam/files/digikam-8.1.0-fix-config-for-scaling-high-res-icons.patch deleted file mode 100644 index 3ec2889d4090..000000000000 --- a/media-gfx/digikam/files/digikam-8.1.0-fix-config-for-scaling-high-res-icons.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 35e5817353709c5c16521fee116bb3c70196aa0f Mon Sep 17 00:00:00 2001 -From: Maik Qualmann <metzpinguin@gmail.com> -Date: Tue, 18 Jul 2023 18:31:51 +0200 -Subject: [PATCH] for a new config under Linux scaling and high-resolution - icons are enabled BUGS: 457272 FIXED-IN: 8.2.0 - ---- - core/utilities/setup/misc/systemsettings.cpp | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/core/utilities/setup/misc/systemsettings.cpp b/core/utilities/setup/misc/systemsettings.cpp -index f4e15803a11..c164bb0cd36 100644 ---- a/core/utilities/setup/misc/systemsettings.cpp -+++ b/core/utilities/setup/misc/systemsettings.cpp -@@ -22,6 +22,7 @@ - // Local includes - - #include "digikam_debug.h" -+#include "digikam_config.h" - - namespace Digikam - { -@@ -56,8 +57,19 @@ void SystemSettings::readSettings() - QSettings settings(m_path, QSettings::IniFormat); - - settings.beginGroup(QLatin1String("System")); -+ -+#ifdef Q_OS_LINUX -+ -+ useHighDpiScaling = settings.value(QLatin1String("useHighDpiScaling"), true).toBool(); -+ useHighDpiPixmaps = settings.value(QLatin1String("useHighDpiPixmaps"), true).toBool(); -+ -+#else -+ - useHighDpiScaling = settings.value(QLatin1String("useHighDpiScaling"), false).toBool(); - useHighDpiPixmaps = settings.value(QLatin1String("useHighDpiPixmaps"), false).toBool(); -+ -+#endif -+ - disableFaceEngine = settings.value(QLatin1String("disableFaceEngine"), false).toBool(); - enableLogging = settings.value(QLatin1String("enableLogging"), false).toBool(); - disableOpenCL = settings.value(QLatin1String("disableOpenCL"), true).toBool(); --- -GitLab - |