gentoo auto-resync : 25:07:2023 - 22:29:01

6 files changed, 55 insertions, 46 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index a68c4b5cd97b..a4c7d3df0b92 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/chafa/Manifest b/media-gfx/chafa/Manifest
index 94950fed21ca..b9997fadb5d4 100644
--- a/media-gfx/chafa/Manifest
+++ b/media-gfx/chafa/Manifest
@@ -1,6 +1,4 @@
-DIST chafa-1.12.4.tar.xz 934272 BLAKE2B 57009e5b6c8cbb41643e94d224e9a4a7e3c2839ee79a6d4949b6d872ab9e10ab66fe7a609f448cad68ee930e5da84e31a1368c8f7ad6457c4c1583971f87f91e SHA512 2732ff380fc6d61124298ae3d9958d676fe6ca2887ee11df057d4efa6f4ae9c074a7e1920a6a3db1ffb21882432769967f4453d52a0344e581993984133a0e9b
 DIST chafa-1.12.5.tar.xz 939792 BLAKE2B 82fbcd7b071dba8534fdd391b6ce22f6de63b1e3eb30228ba1ce6e751c442efbc4a5141d30fa767cc0789b01518da016a4245f9c560837530daa4d92534a9eca SHA512 d0b719294bdc8880f2c65c1bd777ac0eb98d47d48147bc6f883f1917d4f9a6b246c4e9365bc0128b1332d4a268611ac7e479f346f13c49d2e56ff4f446f22d94
-EBUILD chafa-1.12.4.ebuild 751 BLAKE2B d13954072e8ebba7c9863bf556accd86e0fe1a2cf4765931fd27f32318d234f3872aa3d7c8e1031578de40b995788e0b112462fe2e4adb11ee9991268faeb8fb SHA512 7cd98c2475e767cbca08de78070712bff63c417815b2de893eb82512655b3b1fdea95f366fa890fab7deb88606b0308c0b946d3e6fdfabc0ee36d091ce6121f6
 EBUILD chafa-1.12.5-r1.ebuild 891 BLAKE2B f1b44c5b952efd33bf491aec620ce20b62369281e316c40ce11b6520cbc704daf55f7f5ecabbc89e8b451b226ca3b16c746ba34fe0a201e765c5cf2d68529c65 SHA512 b7a209e1c05aed1eaad03d9235ff1f766f3783b3f00f469e9e4ffa17fba7606d83f4ce0b9e03dcf160f400b8ae82678aa7d164ac902d78b3dfa5e64d54ff4fed
 EBUILD chafa-1.12.5.ebuild 751 BLAKE2B d13954072e8ebba7c9863bf556accd86e0fe1a2cf4765931fd27f32318d234f3872aa3d7c8e1031578de40b995788e0b112462fe2e4adb11ee9991268faeb8fb SHA512 7cd98c2475e767cbca08de78070712bff63c417815b2de893eb82512655b3b1fdea95f366fa890fab7deb88606b0308c0b946d3e6fdfabc0ee36d091ce6121f6
 MISC metadata.xml 396 BLAKE2B fc22be32275227f194b224a340dcd08e55a565fa68b102eb9cb55406402ed38d4f593aa6f59f3c40a24480c8d002ea0ce4a9a831055bb6821fdbe1a1dfd103ff SHA512 46617cd84ec16190865a896432df30443d31123b790d871bf634cd446b520ed9b1728951e49217b0619a91d0d46d3013ce7f41e142893298ad7e8c2522d1552d
diff --git a/media-gfx/chafa/chafa-1.12.4.ebuild b/media-gfx/chafa/chafa-1.12.4.ebuild
deleted file mode 100644
index 651857311f4a..000000000000
--- a/media-gfx/chafa/chafa-1.12.4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="versatile and fast Unicode/ASCII/ANSI graphics renderer"
-HOMEPAGE="https://hpjansson.org/chafa/ https://github.com/hpjansson/chafa"
-SRC_URI="https://hpjansson.org/chafa/releases/${P}.tar.xz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~riscv x86"
-IUSE="+tools"
-
-RDEPEND="
-	dev-libs/glib:2
-	media-gfx/imagemagick:0=
-	tools? ( >=media-libs/freetype-2.0.0 )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_configure() {
-	econf \
-		--disable-man \
-		$(use_with tools)
-}
-
-src_install() {
-	local DOCS=( AUTHORS NEWS README TODO )
-	default
-
-	use tools && doman docs/chafa.1
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 2d4b2e3b4683..4e17adcbef19 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -2,8 +2,9 @@ AUX digikam-7.10.0-gcc13.patch 728 BLAKE2B bb1322359978ba019689c1874a63a6ae218b3
 AUX digikam-7.8.0-cmake.patch 4066 BLAKE2B 3f18ad5c25629cf7f32ced42c55875e3158a68083c28ca70c5b6a32795117339aebf930753f82ad21cc57990d4a0f030f39583a7b318433e3feb47ed1c4a3ddd SHA512 83626bdeacb91afd069ce4b9023f4a62154a53b2de569fb24286153fd5083a1970e3b34d37abae61ed77928d9f22bde84622ad67fd8659fefd105c1c15ed34d0
 AUX digikam-7.9.0-akonadi-23.04.patch 1030 BLAKE2B 11996d57bfd2647a604d28f7fa976aeaa9cbe4329f266e813944320b3bdd7b1b8761685b670bbb4499181a77b5b8da49e65d4218014ce5e0124ff3dae346228a SHA512 52fbf63e46f50fde477266bc0b30888ae7bf83f6986294c17307705f536468889d312eba61647e125431dee4331cbd56a458c2999f31d29a0b1c989586732d6e
 AUX digikam-8.1.0-cmake.patch 5948 BLAKE2B c1fde60bf77039a4d4a974a9112237e014b27cbbdae0348965dcff97377e5a4929dc04a6c12e71e38534554e0bf55ef5cdd0e4a1c099996ca237f7dc3acb44f3 SHA512 65bbba111168809a6afea5c001b2af6cab8a04f9547abcec8adcd535d4631b28e274e0a93279519f7fef5b92aec1019e09973ec92e27d55a4292b7557ddcd4df
+AUX digikam-8.1.0-fix-config-for-scaling-high-res-icons.patch 1613 BLAKE2B 774c24f498c37ccc9a3eca7165734b870861f38b7d196f3b7ad75eef4340854be3c20988fc043b6e7c3a6ac53bf7529834f28daf8fabed9d8692dbd60016e65f SHA512 31197b360de14d858379cfd2a937a0a2a21e16b60ad7a82aafa3fb67ddeb2a3e9ecdf190fa4bec1a97bb912c44ed594104b1a5df40f1c317ea1b0e9f8e76cae3
 DIST digiKam-7.10.0.tar.xz 349238192 BLAKE2B 527d0c3ca2e2cc2ac4d3eff11ab4e6556d21f29c78b13f92c7a80ab2775c2ba838b0d94f1fd402533dc249148049be365e7f3798eb9a973ee9d38d682f33df64 SHA512 1a5f045161253d73c4012fa949ec718fcc6c6b292ee0557c8015bea81c95fa39d3034ad46a40fdb64221f59832dc8ecdc724e93929ad2c0e35cc51fc82d28f27
 DIST digiKam-8.1.0.tar.xz 35712348 BLAKE2B 0feaa66ec27b0c2a9e776f26c02987554e8653cda29ca1982182ec1a0f70783808cd2e269dcee1f2b65e6e29ba3bc483a2284a6a485c0b7cc46ae80dd2f87069 SHA512 cbf5a776b4138f4f05d074721324b046dfa07ddc01259f569ae46c46a6d5b0b00824ef0962a09041081703348e4defecf15cff800b2c6cf5e04a0e7e963a3ef4
 EBUILD digikam-7.10.0-r1.ebuild 4085 BLAKE2B 34243cd0aefd7d2468f1d84c825d4f1961862006ceac7bef3af74a6086de9413d12d60c054668084d5262590f723c5c5d6de8f6547b6cb4a031327b175825fdf SHA512 b89f4c518bb0f1db489f1457cd9e09472f01b52097d9cebe7b88bf595f1a02dbd8e0f80979cc1883c7da25cb469917e222e72117edae4890e1c135ede1e5d050
-EBUILD digikam-8.1.0.ebuild 4273 BLAKE2B bdddf67eacc3fb278ae6a60d97cbe47103a866a6a113572a48d0e2f4752f4b0b3a7d869520259f5ab6c7f89a26fc27790476085ec254ab286048f789825c75b0 SHA512 8d914e2e658a791ed0f9900fea5d2bc63eebc5d097cb89d58e7a81a5a242a3a28e2320c201e7b6606cd77dd3edefc7cbb27f8664728619e1f8072998a3fbbc17
+EBUILD digikam-8.1.0-r1.ebuild 4337 BLAKE2B f1ecd86a25c01eab8c289d75f076df6a2fae488da55b036816fd40782c769c0228c4b9a5bd3dc3eb03e83f9f2914bfa4f79853a69169fe88763e22c64a485747 SHA512 421aa3095a72e8da4b16b01f4e917d4a73b3f06c77bb78d530720fad6145bf50e5e2baf87a96c49387cb0b525a3f695ab4373489c57528917ca7a35b89c8816e
 MISC metadata.xml 955 BLAKE2B 49eb64d1179383122e4fe65b2edc22929b46dba0fdb44cbd6230b33268143a9c7d4dc56a7414029864bce0a06c60c56476abc0264f151fad356020b5998b79e3 SHA512 dbe088987df5f09a8d166a293423f006eb97ab57fd0415871dc30a1a066e33a7e9e4c13a5608dd69dd96b06082bac5c216c7d9506ca60d326ab10ade96b6af39
diff --git a/media-gfx/digikam/digikam-8.1.0.ebuild b/media-gfx/digikam/digikam-8.1.0-r1.ebuild
index eeb2f032ad56..25088c00bc1d 100644
--- a/media-gfx/digikam/digikam-8.1.0.ebuild
+++ b/media-gfx/digikam/digikam-8.1.0-r1.ebuild
@@ -23,7 +23,7 @@ HOMEPAGE="https://www.digikam.org/"
 
 LICENSE="GPL-2"
 SLOT="5"
-IUSE="addressbook calendar gphoto2 heif +imagemagick +lensfun marble mysql opengl openmp +panorama scanner semantic-desktop spell X"
+IUSE="addressbook calendar gphoto2 heif +imagemagick +lensfun marble mysql opengl openmp +panorama scanner semantic-desktop spell"
 
 # bug 366505
 RESTRICT="test"
@@ -39,6 +39,7 @@ COMMON_DEPEND="
 	>=dev-qt/qtsql-${QTMIN}:5[mysql?]
 	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
 	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
 	>=dev-qt/qtxml-${QTMIN}:5
 	>=dev-qt/qtxmlpatterns-${QTMIN}:5
 	>=kde-frameworks/kconfig-${KFMIN}:5
@@ -61,6 +62,7 @@ COMMON_DEPEND="
 	media-libs/libpng:=
 	>=media-libs/opencv-3.3.0:=[contrib,contribdnn,features2d]
 	media-libs/tiff:=
+	x11-libs/libX11
 	addressbook? (
 		>=kde-apps/akonadi-contacts-19.04.3:5
 		>=kde-frameworks/kcontacts-${KFMIN}:5
@@ -86,10 +88,6 @@ COMMON_DEPEND="
 	scanner? ( >=kde-apps/libksane-19.04.3:5 )
 	semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KFMIN}:5 )
 	spell? ( >=kde-frameworks/sonnet-${KFMIN}:5 )
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-	)
 "
 DEPEND="${COMMON_DEPEND}
 	dev-cpp/eigen:3
@@ -97,6 +95,7 @@ DEPEND="${COMMON_DEPEND}
 	addressbook? ( >=kde-apps/akonadi-19.04.3:5 )
 "
 RDEPEND="${COMMON_DEPEND}
+	media-libs/exiftool
 	mysql? ( virtual/mysql[server(+)] )
 	panorama? ( media-gfx/hugin )
 "
@@ -108,7 +107,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
@@ -144,7 +146,6 @@ src_configure() {
 		$(cmake_use_find_package scanner KF5Sane)
 		$(cmake_use_find_package spell KF5Sonnet)
 		-DENABLE_KFILEMETADATASUPPORT=$(usex semantic-desktop)
-		$(cmake_use_find_package X X11)
 	)
 
 	ecm_src_configure
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
+