gentoo auto-resync : 26:01:2023 - 01:54:54

4 files changed, 169 insertions, 1 deletions

diff --git a/kde-apps/gwenview/Manifest b/kde-apps/gwenview/Manifest
index bb842272f313..c552ed7cfd8f 100644
--- a/kde-apps/gwenview/Manifest
+++ b/kde-apps/gwenview/Manifest
@@ -1,6 +1,8 @@
+AUX gwenview-22.08.3-fix-raw-plugin-coexistence.patch 2536 BLAKE2B 767851191a080c7046528cd9f688750accacde1983bf523fac9c30c8470b8ca08cb77ceab1219bb130c1050f34df3abd9857632cbd6f6c663ae7135f3eb216f9 SHA512 0e405f4c6e9dd919772c82ab3e59ef43ac920367c1c2748a41b341396891ffe350580cfbc1008d6dca5bfdaff24c3b39d45bfeb9a2bafcf83015288e8d579c7b
 AUX gwenview-22.08.3-without_x11.patch 1872 BLAKE2B 3bf81001d4d27e1baa0f4a9e44fb0265eab29d60cd9befba3f6fc6e7a194f54ef36e32f8e03726bd46c5fe6a6d3577c6175a10ac5d3516f98b2498b7c3030be4 SHA512 93d271f4647aff5728c6be0d0732c60c3e670b63332195e480a8288b4d7d9e97187ad99c7ddf00631309e33ca60782eb1ff0c991b1d8b516fdce2acba17668fe
 DIST gwenview-22.08.3.tar.xz 6825392 BLAKE2B 60f7ea9623a88fc153e6ba60bd7f3ae8e76e5e3da95940578e89d41a90f401b48c927d15f3270cbf18ff93998e50b7fdefde6ad9944ee9a11733f12262df0f7f SHA512 1a450a6df3b5976cca2f4077695e7360e434fbe500d07b1d8f4adb72d3cad6caee8c886a89c2067082c721959f78fce6385fd561c8ec8916b3c6b0ceef2b6462
 DIST gwenview-22.12.1.tar.xz 6876404 BLAKE2B ee30f8955e1db0480d622ce0d7876e88b0c7ce9742768b2b7e54f4135b374613876e2a636e3eb69f9c6c873e518e641336f1032531a3aca8b43f2e52d482bb6c SHA512 b6a8297a68e4c8fbb223ac9dd28b17e3fef0d2b5606ec751118b105fe2a72b556e174af937e1bc6a13ea8e16a69c6f4b6f59db1ccf5e75e95cbbc36ed9baaec7
 EBUILD gwenview-22.08.3-r1.ebuild 2843 BLAKE2B e77d47dfe434c19954b514f43c37f220a49a3fcac59f2842b7cd33671d4bcfa8cd9d42bed7522b1fde926af9328a40ee1d2cea06561cb5db5a854da6be9b0381 SHA512 ad908f935e983ad8d26ea907f62f2fc12fba22a8604c434f63e822f7289e4b3f9c0e6e7d68582562c238a7d5783d15c108500d05b24e687bd786f29ae3a2ab61
-EBUILD gwenview-22.12.1.ebuild 2799 BLAKE2B a9abe23b0e6d5ce2995119674f036f6f35973d08820ac0e0f47bd9b03e777ee91bbfc9658d6f1884640c1ea3f354e82e82c8d6cf87b5d3c9dd321e017be36337 SHA512 07300b82fcf260fe76329ad8243eabd91d68b07d343698576013a9a3c4f3951abd027fe8c8a804a8aedaf33b64bced0d8d004d05c3482dc194652dd2f3f2c401
+EBUILD gwenview-22.08.3-r2.ebuild 2917 BLAKE2B 988550ded5dbef44aad363955b12836109734a63cd557900f3dbf9bc7b81c567707df8ec7b91bb195de3a4a431007f581326d06278b2d33cf15d972f0c7aa141 SHA512 3ad66d4d63b43a8be780a815ad2ea37d573dc2ab8d11afdbffd35968d458da1c9180cf7cf2b7d0ee7c945bd93e0814e6510155d0e4f5d5c3ede08a4af5d8a893
+EBUILD gwenview-22.12.1-r1.ebuild 2889 BLAKE2B 2c8e31dbca52de51c6471e065d390eb9768cff6406155406c91bf1adb873d2aca28f38f05131f1e77663b97fb0475aca35cb58f2fc00f4ae22fe00cdb71103f0 SHA512 f0d9a4128491b74decacacc27cf020d54dee50dee695b5618f7f6dc95760658fb8868cccb25fe03353f79e2117014617035d1be787df25277460463e0dc21ca4
 MISC metadata.xml 697 BLAKE2B 1b9d505c5490486b4a5b6e11447a8c0bf3d52f678f80a1825164458188cc4dee675b3f620818d6a402f7a4dc14498370efa0c08baacc7f78b928beda8f54b697 SHA512 4cf16eb17b7b10862f6268a2082dfaf808c00ae9342a2b864716a64c23dcfca6c837d39a2637d8b9a6c7ec391492b4c3fc7bfd5e21e81c97f21053ff4acd9aed
diff --git a/kde-apps/gwenview/files/gwenview-22.08.3-fix-raw-plugin-coexistence.patch b/kde-apps/gwenview/files/gwenview-22.08.3-fix-raw-plugin-coexistence.patch
new file mode 100644
index 000000000000..759b23095ff9
--- /dev/null
+++ b/kde-apps/gwenview/files/gwenview-22.08.3-fix-raw-plugin-coexistence.patch
@@ -0,0 +1,58 @@
+From c419ec4a052b39eae7c17caf2a89d39d76b43777 Mon Sep 17 00:00:00 2001
+From: Mirco Miranda <mirco.miranda@systemceramics.com>
+Date: Tue, 10 Jan 2023 14:53:30 +0000
+Subject: [PATCH] Fixed coexistence between Qt Raw plugin and KDcraw
+
+Use the RAW plugin to load raw images if installed:
+- Previews are always generated from the RAW image at the fastest possible speed.
+- Images are loaded in the highest possible quality (default plugin raw).
+- If the raw plugin is not installed everything works as before (use KDcraw).
+
+BUG: 463132
+FIXED-IN: 22.12.2
+
+
+(cherry picked from commit a7dc8feefc2147a08526b61bf361b63f78645ea0)
+---
+ lib/document/loadingdocumentimpl.cpp         | 3 ++-
+ lib/thumbnailprovider/thumbnailgenerator.cpp | 8 +++++++-
+ 2 files changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/lib/document/loadingdocumentimpl.cpp b/lib/document/loadingdocumentimpl.cpp
+index baa0542a..ece4d9e2 100644
+--- a/lib/document/loadingdocumentimpl.cpp
++++ b/lib/document/loadingdocumentimpl.cpp
+@@ -205,7 +205,8 @@ struct LoadingDocumentImplPrivate {
+         QImageReader reader;
+ 
+ #ifdef KDCRAW_FOUND
+-        if (KDcrawIface::KDcraw::rawFilesList().contains(QString::fromLatin1(mFormatHint))) {
++        if (!QImageReader::supportedImageFormats().contains(QByteArray("raw"))
++            && KDcrawIface::KDcraw::rawFilesList().contains(QString::fromLatin1(mFormatHint))) {
+             QByteArray previewData;
+ 
+             // if the image is in format supported by dcraw, fetch its embedded preview
+diff --git a/lib/thumbnailprovider/thumbnailgenerator.cpp b/lib/thumbnailprovider/thumbnailgenerator.cpp
+index 3179dfae..f01d5c04 100644
+--- a/lib/thumbnailprovider/thumbnailgenerator.cpp
++++ b/lib/thumbnailprovider/thumbnailgenerator.cpp
+@@ -70,9 +70,15 @@ bool ThumbnailContext::load(const QString &pixPath, int pixelSize)
+     QBuffer buffer;
+     int previewRatio = 1;
+ 
++    bool useRawPlugin = QImageReader::imageFormat(pixPath) == QByteArray("raw");
++    if (useRawPlugin) { // make preview generation faster (same as KDcrawIface::KDcraw::loadHalfPreview)
++        reader.setQuality(1);
++        previewRatio = 2;
++    }
++
+ #ifdef KDCRAW_FOUND
+     // raw images deserve special treatment
+-    if (KDcrawIface::KDcraw::rawFilesList().contains(QString::fromLatin1(formatHint))) {
++    if (!useRawPlugin && KDcrawIface::KDcraw::rawFilesList().contains(QString::fromLatin1(formatHint))) {
+         // use KDCraw to extract the preview
+         bool ret = KDcrawIface::KDcraw::loadEmbeddedPreview(data, pixPath);
+ 
+-- 
+GitLab
+
diff --git a/kde-apps/gwenview/gwenview-22.08.3-r2.ebuild b/kde-apps/gwenview/gwenview-22.08.3-r2.ebuild
new file mode 100644
index 000000000000..6ec7c9ce9c16
--- /dev/null
+++ b/kde-apps/gwenview/gwenview-22.08.3-r2.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.96.0
+QTMIN=5.15.5
+inherit ecm gear.kde.org optfeature
+
+DESCRIPTION="Image viewer by KDE"
+HOMEPAGE="https://apps.kde.org/gwenview/ https://userbase.kde.org/Gwenview"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="activities fits +mpris raw semantic-desktop share X"
+
+# requires running environment
+RESTRICT="test"
+
+COMMON_DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+	media-gfx/exiv2:=
+	media-libs/kcolorpicker
+	>=media-libs/kimageannotator-0.5.0
+	media-libs/lcms:2
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:0=
+	>=media-libs/phonon-4.11.0
+	media-libs/tiff:=
+	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
+	fits? ( sci-libs/cfitsio )
+	mpris? ( >=dev-qt/qtdbus-${QTMIN}:5 )
+	raw? ( >=kde-apps/libkdcraw-${PVCUT}:5 )
+	semantic-desktop? (
+		>=kde-frameworks/baloo-${KFMIN}:5
+		>=kde-frameworks/kfilemetadata-${KFMIN}:5
+	)
+	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
+	X? (
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		x11-libs/libX11
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtimageformats-${QTMIN}:5
+	>=kde-frameworks/kimageformats-${KFMIN}:5
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-without_x11.patch"
+	"${FILESDIR}/${P}-fix-raw-plugin-coexistence.patch" # KDE-bug 463132
+)
+
+src_prepare() {
+	ecm_src_prepare
+	if ! use mpris; then
+		# FIXME: upstream a better solution
+		sed -e "/set(HAVE_QTDBUS/s/\${Qt5DBus_FOUND}/0/" -i CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package activities KF5Activities)
+		$(cmake_use_find_package fits CFitsio)
+		$(cmake_use_find_package raw KF5KDcraw)
+		-DGWENVIEW_SEMANTICINFO_BACKEND=$(usex semantic-desktop Baloo None)
+		$(cmake_use_find_package share KF5Purpose)
+		-DWITHOUT_X11=$(usex !X)
+	)
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		optfeature "SVG support" kde-apps/svgpart:${SLOT}
+	fi
+	ecm_pkg_postinst
+}
diff --git a/kde-apps/gwenview/gwenview-22.12.1.ebuild b/kde-apps/gwenview/gwenview-22.12.1-r1.ebuild
index a8cced58e360..e049d2beb5ae 100644
--- a/kde-apps/gwenview/gwenview-22.12.1.ebuild
+++ b/kde-apps/gwenview/gwenview-22.12.1-r1.ebuild
@@ -73,6 +73,7 @@ RDEPEND="${COMMON_DEPEND}
 	>=dev-qt/qtimageformats-${QTMIN}:5
 	>=kde-frameworks/kimageformats-${KFMIN}:5
 "
+PATCHES=( "${FILESDIR}/${PN}-22.08.3-fix-raw-plugin-coexistence.patch" ) # KDE-bug 463132
 
 src_prepare() {
 	ecm_src_prepare