[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/files/, media-gfx/digikam/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     568b05e64aaeb061f7acd7647185a07c199e054c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 25 09:52:59 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jul 25 10:02:10 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=568b05e6

media-gfx/digikam: Fix default config for scaling w/ high-res support

Upstream commit 35e5817353709c5c16521fee116bb3c70196aa0f
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=457272

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-gfx/digikam/digikam-8.1.0-r1.ebuild          |  5 ++-
 ...1.0-fix-config-for-scaling-high-res-icons.patch | 45 ++++++++++++++++++++++
 2 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/media-gfx/digikam/digikam-8.1.0-r1.ebuild b/media-gfx/digikam/digikam-8.1.0-r1.ebuild
index 06c5f19b3377..8f9f07301fc9 100644
--- a/media-gfx/digikam/digikam-8.1.0-r1.ebuild
+++ b/media-gfx/digikam/digikam-8.1.0-r1.ebuild
@@ -109,7 +109,10 @@ BDEPEND="
 	)
 "
 
-PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-cmake.patch"
+	"${FILESDIR}/${P}-fix-config-for-scaling-high-res-icons.patch" # 8.2.0, KDE-bug #457272
+)
 
 pkg_pretend() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp

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
new file mode 100644
index 000000000000..3ec2889d4090
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-8.1.0-fix-config-for-scaling-high-res-icons.patch
@@ -0,0 +1,45 @@
+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
+