gentoo auto-resync : 01:06:2024 - 00:07:06

6 files changed, 41 insertions, 103 deletions

diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index 698b0a72db54..4bfba41470f0 100644
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
diff --git a/kde-apps/kio-extras/Manifest b/kde-apps/kio-extras/Manifest
index 295a72374468..c208d970945f 100644
--- a/kde-apps/kio-extras/Manifest
+++ b/kde-apps/kio-extras/Manifest
@@ -1,7 +1,5 @@
-DIST kio-extras-23.08.5.tar.xz 1491032 BLAKE2B 657cda9dd5b00e9a5bf5d4136524350cdad27548f5c504aa403cae96acd9f03b345726de2c78c49fa0a25c978ef3ca64443a5503fd4d8045148ec516983df751 SHA512 8963e53f0be3e22a605ac35fd5596a73bead1b48b9ace152f38ffa76aba60fae7f9249d85c10296cf363a91063a26da064c4c02d1d1eab1a932cda987445bec8
 DIST kio-extras-24.05.0.tar.xz 3469712 BLAKE2B 2027b97c16147b343da153b2ec96cebbfc7a14b9491c8d44555f86ac3fe5365e4e6dfe9339129f65548c761e2943892cae810db0d82ab2bde01242043daace4c SHA512 c9a69bba458d3b32e8dba970fe7f061e5b12f605f6ce4de5b2db27b8fa7bba6715a424128102110664e4e75c17a79a340ebf309cef4b28e0ca080550109ec836
 DIST kio-extras-kf5-24.02.2.tar.xz 1468060 BLAKE2B a578cebef92e2531e7a1565109470585022ad740220d7cf11547c50e4f2cd4b0336619b76cdfb4cfa07c3c6a5db5e421d89f5e2caaa11d60dffd17047bd96304 SHA512 b8bb00d59d4f84d58ea22bdda6dccd5151a7e48f788fe8827ca9576cf7e287b91c08ebb77b76cd93007593f4d9f0210d75ef551a92e8448796b83b5ffd37255a
-EBUILD kio-extras-23.08.5.ebuild 2823 BLAKE2B 5434b3d595b3c4a9e252da31af6c097fb41f25994d72528e2b5223ff5fd583ac6d115a19ba7aedbde1331210e557e24c79912d942cc0dfc6518ec4e0479cbaef SHA512 52a8c233b862a6d396dbc30acb0d42216dfa120a90d816a71c57658ba67ff8d8072a5c0217f341e923aa296e1695b9a5bb2538bebc2f2761b523b10ad4a9977b
 EBUILD kio-extras-24.02.2-r1.ebuild 2843 BLAKE2B 41c52978899290cea78d185ed3d43c8f625d9d7685960f08842c42352bd2099a4118a7401af417756760ec9d90182d90539baea8015874a26605e32d6ccb8a22 SHA512 b59969562ac66cda1c827a96b95e3ea518941f3f61c6bd4abbbce53c2876106cf85a499e20d74262d7086068496247c49ecb3879798d65c5d205df7f80d258cb
 EBUILD kio-extras-24.05.0.ebuild 2595 BLAKE2B 58b468e2f91a2a0a731a1ff988014811d4a622442cd24aa01135dd66dedc3aa12a0344d5222c617971362528cda5bf53a7fd40c15b6192d4851fac5ac3a6c1a8 SHA512 121c54dc617c19df338c7fce09754cd933ccf0170553896d5e1938869780d5a9eafa331a35a733f8ebb2ea024fd0612b1756186cf71508b6d66d509618f87e5f
 MISC metadata.xml 1230 BLAKE2B 9b567eac809ae4520744b33f1bac2230e14e8666b7d12be0dab5b99a750626ff6f87b93f15c3ebfded9ca0540b6244105ec5531aa61778e052fe9610130f3a17 SHA512 60f5c4fe5c342680b50d3c8796142d41477468edab3aeb7b45f8e4d8ae932d2ee781bb49034272ca1d726031ab14c73fa137541318dcefd62f28aeba271c4295
diff --git a/kde-apps/kio-extras/kio-extras-23.08.5.ebuild b/kde-apps/kio-extras/kio-extras-23.08.5.ebuild
deleted file mode 100644
index 40dba3190273..000000000000
--- a/kde-apps/kio-extras/kio-extras-23.08.5.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="optional"
-KFMIN=5.106.0
-QTMIN=5.15.9
-inherit ecm gear.kde.org
-
-DESCRIPTION="KIO plugins present a filesystem-like view of arbitrary data"
-HOMEPAGE="https://invent.kde.org/network/kio-extras"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-IUSE="activities ios +man mtp nfs openexr phonon samba +sftp taglib X"
-
-# requires running Plasma environment
-RESTRICT="test"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	kde-apps/libkexiv2:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdnssd-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
-	activities? (
-		>=dev-qt/qtsql-${QTMIN}:5
-		>=kde-plasma/plasma-activities-${KFMIN}:5
-		>=kde-plasma/plasma-activities-stats-${KFMIN}:5
-	)
-	ios? (
-		app-pda/libimobiledevice:=
-		app-pda/libplist:=
-	)
-	mtp? ( >=media-libs/libmtp-1.1.16:= )
-	nfs? ( net-libs/libtirpc:= )
-	openexr? ( media-libs/openexr:= )
-	phonon? ( >=media-libs/phonon-4.11.0[qt5(+)] )
-	samba? (
-		net-fs/samba[client]
-		net-libs/kdsoap:=[qt5(+)]
-	)
-	sftp? ( net-libs/libssh:=[sftp] )
-	taglib? ( >=media-libs/taglib-1.11.1:= )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcursor
-	)
-"
-RDEPEND="${DEPEND}
-	>=kde-frameworks/kded-${KFMIN}:5
-"
-BDEPEND="man? ( dev-util/gperf )"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package activities KF5Activities)
-		$(cmake_use_find_package activities KF5ActivitiesStats)
-		$(cmake_use_find_package activities Qt5Sql)
-		$(cmake_use_find_package ios IMobileDevice)
-		$(cmake_use_find_package ios PList)
-		$(cmake_use_find_package man Gperf)
-		$(cmake_use_find_package mtp Libmtp)
-		$(cmake_use_find_package nfs TIRPC)
-		$(cmake_use_find_package openexr OpenEXR)
-		$(cmake_use_find_package phonon Phonon4Qt5)
-		$(cmake_use_find_package samba Samba)
-		$(cmake_use_find_package sftp libssh)
-		$(cmake_use_find_package taglib Taglib)
-		-DWITHOUT_X11=$(usex !X)
-	)
-
-	use samba && mycmakeargs+=(
-		# do not attempt to find now Qt6-based system version
-		-DCMAKE_DISABLE_FIND_PACKAGE_KDSoapWSDiscoveryClient=ON
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/kitinerary/Manifest b/kde-apps/kitinerary/Manifest
index 1765677ac316..8c37fd8a90a5 100644
--- a/kde-apps/kitinerary/Manifest
+++ b/kde-apps/kitinerary/Manifest
@@ -1,5 +1,6 @@
+AUX kitinerary-23.08.5-poppler-24.05.patch 1127 BLAKE2B ec95505a630378054ae1db4c542c9dd8e53a361db356011d0a80dae437d86c8b2aeee6d358ee30765902f819605c706fa77ff16742020b92144200438eff7608 SHA512 f20dfcff317a39c1e5bc5997f39d3d2a3fa5dec184c4d58eedaad6692652af4bbcf09dcda3ea3533cc9e647536a364da0d4f2b14b3e155b8b73cf3797b22dab0
 DIST kitinerary-23.08.5.tar.xz 1940264 BLAKE2B ed09bace93b45275c2a7d9106a737b808f9423f044cd36349daaa5c864e1e78bd8592fc95a232bd91927e7af8a4f583759b2db7855c52445c8911d2c6346e3fa SHA512 bf62f4c2fbfbaaafe1d6e3acebdf4b19dab9a2f3e0fb6a2ffa16917e91f27386d562a6a9f5676cdd0ab8c1451a0e7e0e9282a0bc481e1f1b538882db5e1c23df
 DIST kitinerary-24.05.0.tar.xz 1983276 BLAKE2B 0625de46f1a2833da581ca8def73d3074126ef8aca583f026b7f4ead3b473ff55dc5e9ef5194910656d69359a3ffe364650f837516c5cfe8d523045caac4fd68 SHA512 01c1536da65058d114da67167b335bc8430492d690812f80a2da25c76af207a029188c15339d1bee0fbdcc0a495e9894daf442407f4a133f9739a8ce51420862
-EBUILD kitinerary-23.08.5.ebuild 1106 BLAKE2B 1667c669f0e2ed11394b8c6c24d91f5bc5b807bbe510d4d083144baa9ddb05463f1e01b6e03c4d47d6712cca23948340915e09b3e18d242216a6e5af83a25cc0 SHA512 3472771874e03e814a13c4eb4695bf52d683a5512e4cbfb49ab5970b7fee7e832c9d9460152b521079d4386c90bd9fa5b44c882dff5e4d7079a48b428b52d5b2
+EBUILD kitinerary-23.08.5.ebuild 1171 BLAKE2B f13d223e03f20e5bdae84ab4b780a18edb6bebf312f93ad7292a44eb1aece6201fb0d08277ca0cae9ed81d7c959cbc2127296a155c4ebe424fc05889789016a4 SHA512 6cd1f0f8307eb206ab7a57505c79ec60ece9832ab358bea99a27e480e19d938b39006d05abb5f722b0f2834d10f285fab02c81ccf1a515e9fc856c3cc0178029
 EBUILD kitinerary-24.05.0.ebuild 1103 BLAKE2B d0535ead6aba24d24e5fe668d967283140509beb96b2d269720988822094612afc5805450183a12618aada6f357f58c5b0a7c1db856b01b02f32e031282b6eda SHA512 e87ab8e7cb9e85c2cf65b30676df53d1879d9bff1ec8b6cb5e3be12df88d58ee8bacbbe064e36c19973f55a1c3680b62394751f9ea3cc6b425d81cc9cdb5cc33
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kitinerary/files/kitinerary-23.08.5-poppler-24.05.patch b/kde-apps/kitinerary/files/kitinerary-23.08.5-poppler-24.05.patch
new file mode 100644
index 000000000000..969e19e79df2
--- /dev/null
+++ b/kde-apps/kitinerary/files/kitinerary-23.08.5-poppler-24.05.patch
@@ -0,0 +1,37 @@
+From 6a0a4f455d58b96b8965667a7eb057abd244d87e Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@kde.org>
+Date: Sun, 21 Apr 2024 11:14:42 +0200
+Subject: [PATCH] Compile with newer poppler
+
+And remove ancient poppler ifdefs
+---
+ src/lib/pdf/pdfdocument.cpp              | 5 +++++
+ 1 file changed, 5 insertions(+), 0 deletions(-)
+
+diff --git a/src/lib/pdf/pdfdocument.cpp b/src/lib/pdf/pdfdocument.cpp
+index 417a0b85..f829e645 100644
+--- a/src/lib/pdf/pdfdocument.cpp
++++ b/src/lib/pdf/pdfdocument.cpp
+@@ -22,6 +22,7 @@
+ #include <PDFDoc.h>
+ #include <PDFDocEncoding.h>
+ #include <Stream.h>
++#include <UTF.h>
+ 
+ #include <cmath>
+ 
+@@ -330,7 +307,11 @@ QString gooStringToUnicode(const std::unique_ptr<GooString> &s)
+         return {};
+     }
+ 
++#if KPOPPLER_VERSION >= QT_VERSION_CHECK(24, 5, 0)
++    if (hasUnicodeByteOrderMark(s->toStr()) || hasUnicodeByteOrderMarkLE(s->toStr())) {
++#else
+     if (s->hasUnicodeMarker() || s->hasUnicodeMarkerLE()) {
++#endif
+         return QString::fromUtf16(reinterpret_cast<const char16_t*>(s->toStr().c_str()), s->toStr().size() / 2);
+     } else {
+         int len = 0;
+-- 
+GitLab
+
diff --git a/kde-apps/kitinerary/kitinerary-23.08.5.ebuild b/kde-apps/kitinerary/kitinerary-23.08.5.ebuild
index 0f5a2ef14317..f67e43bb771f 100644
--- a/kde-apps/kitinerary/kitinerary-23.08.5.ebuild
+++ b/kde-apps/kitinerary/kitinerary-23.08.5.ebuild
@@ -39,6 +39,8 @@ DEPEND="
 RDEPEND="${DEPEND}"
 BDEPEND="x11-misc/shared-mime-info"
 
+PATCHES=( "${FILESDIR}/${P}-poppler-24.05.patch" ) # bug 933219
+
 src_configure() {
 	local mycmakeargs=(
 		# sci-geosciences/osmctools; TODO: useful at all?