diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-03-28 09:49:11 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-03-28 09:49:11 +0100 |
commit | 115dcc7054f5934a2c8e26fd8a8eed5f3e29e9ce (patch) | |
tree | c31afe35699960753f76770d6b0b4ea48af9f686 /kde-frameworks | |
parent | e292b671b113c2cc012beddad93a3df4f9410698 (diff) |
gentoo auto-resync : 28:03:2023 - 09:49:10
Diffstat (limited to 'kde-frameworks')
-rw-r--r-- | kde-frameworks/Manifest.gz | bin | 13742 -> 13737 bytes | |||
-rw-r--r-- | kde-frameworks/baloo/Manifest | 3 | ||||
-rw-r--r-- | kde-frameworks/baloo/baloo-5.104.0-r1.ebuild (renamed from kde-frameworks/baloo/baloo-5.104.0.ebuild) | 2 | ||||
-rw-r--r-- | kde-frameworks/baloo/files/baloo-5.104.0-skip-all-unprintable-chars.patch | 70 | ||||
-rw-r--r-- | kde-frameworks/kio/Manifest | 4 | ||||
-rw-r--r-- | kde-frameworks/kio/files/kio-5.104.0-fix-kstart5-not-returning.patch | 78 | ||||
-rw-r--r-- | kde-frameworks/kio/kio-5.104.0-r1.ebuild | 91 | ||||
-rw-r--r-- | kde-frameworks/kio/kio-5.104.0-r3.ebuild (renamed from kde-frameworks/kio/kio-5.104.0-r2.ebuild) | 1 |
8 files changed, 155 insertions, 94 deletions
diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz Binary files differindex 23a39f82da5b..29f3e6849e55 100644 --- a/kde-frameworks/Manifest.gz +++ b/kde-frameworks/Manifest.gz diff --git a/kde-frameworks/baloo/Manifest b/kde-frameworks/baloo/Manifest index 69838dfec6e1..dc675230c45d 100644 --- a/kde-frameworks/baloo/Manifest +++ b/kde-frameworks/baloo/Manifest @@ -1,5 +1,6 @@ +AUX baloo-5.104.0-skip-all-unprintable-chars.patch 2619 BLAKE2B faf3b9287d5ef10dd3f4be49cb15adfbccad602c067682b1f7d1db282afac1d003a351286e8514cc3596d8e708cd33a815bd701652b450ebeaa099cb2e843760 SHA512 55d319c7cb8fc05e5b60ac907169de2c37f04df1b98f19f38749a83fdd5321c1c4e7ccd5adf997bcae5e3c4dcf75a7f8cb88b580ea83055b9ba7ac2f54a2e063 DIST baloo-5.102.0.tar.xz 302812 BLAKE2B 9578facf3563f9d48595b5d41d588302c344b785ec0f8c29a5e03411e8165bceae7ccf57630d420acd1f19a4a129a73eca4b49d8763a602697c4706431b840f3 SHA512 ab2c2e5da169371e3bb27344f31b42f4ec63bc18fee0e3812a21e66e75c9e826f00f2e8ca8186b9660579b6990e67a162d0db14195b6b0b8de5fe9792966b25e DIST baloo-5.104.0.tar.xz 305536 BLAKE2B ea76fa769acfb79b4af1c5c5338ef15c39943828e9ce68078ded7ea4abf77110d15aa629a40ed9d1fa666ad546ad896d1b9e51ea43a66b0a992efae089d46d3c SHA512 80ecea86735606798f8500eafcceee5b5dda13c33c2707791baf88d6961d843d239264aea27c1d97c131d8558b4421a251e1c9aed823e3d9214f633488f860fa EBUILD baloo-5.102.0.ebuild 913 BLAKE2B 08a83cfd4a8add03e6d70ed24ba1454289d867612674f4242a579f633f36278769f9d6a140e730cfb8b79c51da5d2502117f9d58f8e549cfd729e375e3fc9790 SHA512 ae0a84a2f32b4cc4dc90d0e80eeecbb69b9e9240d666119a3758c1f2bf80aabdb656343bf6017f158f39decee5e93ce8374bd3c36e2049cb280cecddb43ed3fb -EBUILD baloo-5.104.0.ebuild 916 BLAKE2B c07ff2b5290c9d17640e3873aa96468d0c83b7957c9deeffd855e751827a3054ce3d7d4b9b7a5153866191264bdce1c62985dd09b795bf6f9ffaf398eb695621 SHA512 68f0a5c316596c25651a0bf681177aaaf5e9f0c73f615f8cc3441cf1572b2f59100180ccfd003019e386f5ba219112290caa4a0e9cf3c842a647fd713a1d630d +EBUILD baloo-5.104.0-r1.ebuild 981 BLAKE2B 9241f7c2c1409789957c2db56e760c4bee27a44e6663dafdb245b16230a0188e41a319b8650371af374565ad747820a1f7171341d79911876d453b8732abdc73 SHA512 bbf642b65e3cf2928d304abd523b3c32d6a8aa9bfec6f71c1545637b76a72570118ddf3146e6c9f744798b428d1b496946465f2a581996175f70f1d11505cfb6 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80 diff --git a/kde-frameworks/baloo/baloo-5.104.0.ebuild b/kde-frameworks/baloo/baloo-5.104.0-r1.ebuild index 8bc9a436ec63..ead3aed883ec 100644 --- a/kde-frameworks/baloo/baloo-5.104.0.ebuild +++ b/kde-frameworks/baloo/baloo-5.104.0-r1.ebuild @@ -33,3 +33,5 @@ DEPEND=" =kde-frameworks/solid-${PVCUT}*:5 " RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}/${P}-skip-all-unprintable-chars.patch" ) diff --git a/kde-frameworks/baloo/files/baloo-5.104.0-skip-all-unprintable-chars.patch b/kde-frameworks/baloo/files/baloo-5.104.0-skip-all-unprintable-chars.patch new file mode 100644 index 000000000000..7e9eb0d74c42 --- /dev/null +++ b/kde-frameworks/baloo/files/baloo-5.104.0-skip-all-unprintable-chars.patch @@ -0,0 +1,70 @@ +From 886aba423f3659ef591903f1f3dea87f8b4c6016 Mon Sep 17 00:00:00 2001 +From: Igor Poboiko <igor.poboiko@gmail.com> +Date: Mon, 20 Mar 2023 13:20:33 +0000 +Subject: [PATCH] [TermGenerator] Skip all unprintable characters + +Some extractors can produce text which includes special unicode +control characters (e.g. Poppler can give us 0x0001 from some PDFs). +TermGenerator then generates proper (yet meaningless) terms out of those +characters, and they end up in database. It should be safe to skip all +unprintable characters to avoid that (although surrogates are fine, they +are dealt with later via QString::normalize call). + +Character 0x0001 is the worst, as it is used internally in DocTermsCodec +for compactification. Such collision then leads to the corrupted database +(some terms from DocTermsDB are not present in PostingDB). + +The corruption is not hypothetical (although not critical), I've encountered bunch of broken DB entries for some PDF files on my machine. + + +(cherry picked from commit 492321e53a41762555ba6528e15cd0d0188ed153) +--- + autotests/unit/engine/termgeneratortest.cpp | 11 +++++++++++ + src/engine/termgenerator.cpp | 2 +- + 2 files changed, 12 insertions(+), 1 deletion(-) + +diff --git a/autotests/unit/engine/termgeneratortest.cpp b/autotests/unit/engine/termgeneratortest.cpp +index 361c4934c..69885c133 100644 +--- a/autotests/unit/engine/termgeneratortest.cpp ++++ b/autotests/unit/engine/termgeneratortest.cpp +@@ -31,6 +31,7 @@ private Q_SLOTS: + void testWordPositions(); + void testWordPositionsCJK(); + void testNumbers(); ++ void testControlCharacter(); + + QList<QByteArray> allWords(const QString& str) + { +@@ -213,6 +214,16 @@ void TermGeneratorTest::testNumbers() + QCOMPARE(words, expectedWords); + } + ++void TermGeneratorTest::testControlCharacter() ++{ ++ QString str = QString::fromUtf8("word1\u0001word2"); ++ ++ QList<QByteArray> words = allWords(str); ++ QList<QByteArray> expectedWords = { "word1", "word2" }; ++ ++ QCOMPARE(words, expectedWords); ++} ++ + QTEST_MAIN(TermGeneratorTest) + + #include "termgeneratortest.moc" +diff --git a/src/engine/termgenerator.cpp b/src/engine/termgenerator.cpp +index d98b28416..832962da1 100644 +--- a/src/engine/termgenerator.cpp ++++ b/src/engine/termgenerator.cpp +@@ -59,7 +59,7 @@ QByteArrayList TermGenerator::termList(const QString& text_) + int start = 0; + + auto isSkipChar = [] (const QChar& c) { +- return c.isPunct() || c.isMark() || c.isSpace(); ++ return c.isPunct() || c.isMark() || c.isSpace() || (!c.isPrint() && !c.isSurrogate()); + }; + + QByteArrayList list; +-- +GitLab + diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest index e2648140c8c7..2eeaf29485e5 100644 --- a/kde-frameworks/kio/Manifest +++ b/kde-frameworks/kio/Manifest @@ -1,9 +1,9 @@ AUX kio-5.102.0-add-missing-webdav-copyFromFile.patch 1247 BLAKE2B 3a1baff8fed9a4d23cbbfd7dc7492fa89de0135b30029ba5b73e3a62d1b7036762648e72bd6cdef2c0b730799e32d3bb11f72e5a3897633c703ed4893c0d7b9e SHA512 37956a2508a3e6dc9bf03d8e27938a64fd532357bfbf41d1f1727e1988dda01160a3891c8a82424ad9f19ea0502f0c80020a085d5fc59b3e6e15555c12ccb62a +AUX kio-5.104.0-fix-kstart5-not-returning.patch 2997 BLAKE2B a7f102e36cf2a6d553194c2844d672c94122e0fb981100fc92e0105bfa43d012db6b6455bc4aa687734f27170a61c96420eaa8fc3e67c6d4c1f6a408b998fbe9 SHA512 dc864518fafa802f4a61bcb6e71fa0b61df52cedd5018b9ec54c7a2cbe27ac7f5de47a8af1a586ad616d45590683b8529e06249c9d3b67284176f41e14351523 AUX kio-5.104.0-handle-copy_file_range-failing-w-ENOENT.patch 1415 BLAKE2B dd13229fa76bfb4edd8c2ca62f4538c0d91035b28470642188b2f91f221f5df00c5760426e5b19a5d4c5a8d3d59b8f35930a3b1646c415b505bb51b0261868f2 SHA512 ae530487705ee16ce19664864b3bdd2cd81f66ed6907523c7a8c665c2c1e2ef62f35d52fb1c1c99b162863f9cd3bf82c3771fad82b10a552eaa2c383b6901b56 AUX kio-5.104.0-renamefiledialog-fix-number-limit.patch 1112 BLAKE2B ee1a4249fc347644465a40c3ed001b0f212ffc96b1b7af4921cf885b94eef40eeefcb714be8443991f67cf4a3e906eeef1e62f633a67e76ff6af5a2a4004805a SHA512 471c2439bcc74f3e74cd80deb58913d083314c61ffff28f35a36e0a2a603d7d1bd0c4d9fc2200b2d724f6073367c064152e7ac62ac80aa7fcc7a20512f19eb9b DIST kio-5.102.0.tar.xz 3769416 BLAKE2B 432acbd7844539e7c2617ea5743449b7da4377235485644ab9066919ee7c4746388deb116ee6664c52bcefa35c54bda3dfcc6f2f58a03a1638fe6173e5a99330 SHA512 29f46ace3a902a24c3a266413b291eac43bcfc5da76dfbc927f3d0e36c3902f0abf195b0cd97fd163a62b85a3d0bbb006dc73bc0fc43a88e47f72e7991536dc4 DIST kio-5.104.0.tar.xz 3770264 BLAKE2B 5633873828eafbfc1438d898c7eee7cc4234d0612b636d9b086ec273527900a0f9cc5fb3aeac327c2d0a96ec00192377e27f44bb300c6e7209876826b77a9b22 SHA512 483edb57a9de8be37248b4bdbd442d55814e126348d6db8316c9bcd59be76620d44145760e31ba685ce3ae606451547c3c386f8049b47df1b7f4ef2f45c276b8 EBUILD kio-5.102.0-r1.ebuild 2435 BLAKE2B d30f8252fa6264f151844225512745cf39e3231c8ac2efd8a4185207b03b805ddbcadbeefc145de3842d4eac26ccc2f40bd9af31a660901dd78fd724c128bb22 SHA512 25757c6f692b89745d0b3b43c30d5f5c8d75cc09fcca71d6d3af6e46861606bc7417c77dd94b4111f37da969b89f4c31bf22c03975bccf7e4af15d2c4b807b92 -EBUILD kio-5.104.0-r1.ebuild 2440 BLAKE2B a6c334414667af173643d4fbd554589664433c8d8230d859d0ce393d56aad9d7b3ce2d05c66b5f07cdfc65e4026ef4f073285e8a39295d323e5515637d4be722 SHA512 7ae82d3b2d1c1f296b35b0274c31710ea8f40477804bd62415fa30c8bc6df2efc4a579d2d76dd3b7c7647b1b9bf938ddfd10d8beb265ebc380293900d30a31ce -EBUILD kio-5.104.0-r2.ebuild 2520 BLAKE2B adc3f40ea484253cfed5f858b5e39a5a171d76dd8507d020356e13c63517d582be9a407c7a140de0f951e16e1a317ab6d6aede0c37716d975f5a38c73bb3a534 SHA512 04fca40b22951902577997687f8caba86424dd727a9bfb30778ffd6c30d7808ac92715905e3a3e37d94b6a085cdc625899f78fa12c346120ee0d705884198498 +EBUILD kio-5.104.0-r3.ebuild 2589 BLAKE2B 70118b5a8f271107a932d28d7e18049e5d0e794265e67fba2561aad1f482f5291a61b0f1764402b32b54b244a1aee2ef6aa3daa3031272fa02e4e639653b0f77 SHA512 aeb29b194beb891fccb41bfc6d42e37139c9cb901eeb6eb1a972a521d15882f906abb7c2c915758cc7f2aa9f31649100416249d7a2add1baff08a8ba240c5639 MISC metadata.xml 672 BLAKE2B ed652f6e5751355ab96a5206da0184e37745e4b675e7f235648536931563b53c4f71112e81f809c88d02d01f9c77a20e9f41a2f6eb988b104636c8d450c50a18 SHA512 1fa6b33c8f146152015b0c8dbd70165022ceee580253850545c79eb3a74dbf44539e562014606a4ef4ea283a42f3946b1d3a79c0953a38fe10689137a53207ce diff --git a/kde-frameworks/kio/files/kio-5.104.0-fix-kstart5-not-returning.patch b/kde-frameworks/kio/files/kio-5.104.0-fix-kstart5-not-returning.patch new file mode 100644 index 000000000000..53df9fcc0a62 --- /dev/null +++ b/kde-frameworks/kio/files/kio-5.104.0-fix-kstart5-not-returning.patch @@ -0,0 +1,78 @@ +From fea052ba369e474a092516a4717556b52ff92e00 Mon Sep 17 00:00:00 2001 +From: Thenujan Sandramohan <sthenujan2002@gmail.com> +Date: Fri, 24 Mar 2023 22:33:19 +0000 +Subject: [PATCH] CommandLauncher: call emitResult() as soon as process has + started + +This MR makes `emitResult` get called as soon as the process has started instead of when the process has ended. It also changes `emitDelayedError` as a protected member of `KProcessRunner` to make it invokable by `ForkingProcessRunner`. It also removes `processFinished` signal as it's not used anymore. + +BUG: 466359 +--- + src/gui/commandlauncherjob.cpp | 2 -- + src/gui/kprocessrunner.cpp | 3 +-- + src/gui/kprocessrunner_p.h | 7 +------ + 3 files changed, 2 insertions(+), 10 deletions(-) + +diff --git a/src/gui/commandlauncherjob.cpp b/src/gui/commandlauncherjob.cpp +index c82a8ef56e..06deede116 100644 +--- a/src/gui/commandlauncherjob.cpp ++++ b/src/gui/commandlauncherjob.cpp +@@ -143,8 +143,6 @@ void KIO::CommandLauncherJob::start() + }); + connect(d->m_processRunner, &KProcessRunner::processStarted, this, [this](qint64 pid) { + d->m_pid = pid; +- }); +- connect(d->m_processRunner, &KProcessRunner::processFinished, this, [this]() { + emitResult(); + }); + } +diff --git a/src/gui/kprocessrunner.cpp b/src/gui/kprocessrunner.cpp +index 232b0e4caa..b97079c240 100644 +--- a/src/gui/kprocessrunner.cpp ++++ b/src/gui/kprocessrunner.cpp +@@ -472,9 +472,8 @@ void ForkingProcessRunner::slotProcessExited(int exitCode, QProcess::ExitStatus + if (exitCode == 9009) { + #endif + const QStringList args = m_cmd.split(QLatin1Char(' ')); +- Q_EMIT error(xi18nc("@info", "The command <command>%1</command> could not be found.", args[0])); ++ emitDelayedError(xi18nc("@info", "The command <command>%1</command> could not be found.", args[0])); + } +- Q_EMIT processFinished(); + } + + // This code is also used in klauncher (and KRun). +diff --git a/src/gui/kprocessrunner_p.h b/src/gui/kprocessrunner_p.h +index 84973547c6..65df04b073 100644 +--- a/src/gui/kprocessrunner_p.h ++++ b/src/gui/kprocessrunner_p.h +@@ -120,11 +120,6 @@ Q_SIGNALS: + */ + void processStarted(qint64 pid); + +- /** +- * @brief emitted when the process was finished +- */ +- void processFinished(); +- + /** + * Notifies about having received the token were waiting for. + * +@@ -142,6 +137,7 @@ protected: + QString name() const; + QString maybeAliasedName(const QString &pattern) const; + static QString escapeUnitName(const QString &input); ++ void emitDelayedError(const QString &errorMsg); + + std::unique_ptr<KProcess> m_process; + QString m_executable; // can be a full path +@@ -157,7 +153,6 @@ protected: + KStartupInfoId m_startupId; + + private: +- void emitDelayedError(const QString &errorMsg); + void initFromDesktopName(const QString &desktopName, + const QString &execName, + const QString &iconName, +-- +GitLab + diff --git a/kde-frameworks/kio/kio-5.104.0-r1.ebuild b/kde-frameworks/kio/kio-5.104.0-r1.ebuild deleted file mode 100644 index 0a8a61024856..000000000000 --- a/kde-frameworks/kio/kio-5.104.0-r1.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_DESIGNERPLUGIN="true" -ECM_TEST="forceoptional" -PVCUT=$(ver_cut 1-2) -QTMIN=5.15.5 -VIRTUALX_REQUIRED="test" -inherit ecm frameworks.kde.org xdg-utils - -DESCRIPTION="Framework providing transparent file and data management" - -LICENSE="LGPL-2+" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="acl +handbook kerberos +kwallet X" - -# tests hang -RESTRICT="test" - -RDEPEND=" - dev-libs/libxml2 - dev-libs/libxslt - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5[ssl] - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - =kde-frameworks/kauth-${PVCUT}*:5 - =kde-frameworks/karchive-${PVCUT}*:5 - =kde-frameworks/kbookmarks-${PVCUT}*:5 - =kde-frameworks/kcodecs-${PVCUT}*:5 - =kde-frameworks/kcompletion-${PVCUT}*:5 - =kde-frameworks/kconfig-${PVCUT}*:5 - =kde-frameworks/kconfigwidgets-${PVCUT}*:5 - =kde-frameworks/kcoreaddons-${PVCUT}*:5 - =kde-frameworks/kcrash-${PVCUT}*:5 - =kde-frameworks/kdbusaddons-${PVCUT}*:5 - =kde-frameworks/kguiaddons-${PVCUT}*:5 - =kde-frameworks/ki18n-${PVCUT}*:5 - =kde-frameworks/kiconthemes-${PVCUT}*:5 - =kde-frameworks/kitemviews-${PVCUT}*:5 - =kde-frameworks/kjobwidgets-${PVCUT}*:5 - =kde-frameworks/knotifications-${PVCUT}*:5 - =kde-frameworks/kservice-${PVCUT}*:5 - =kde-frameworks/ktextwidgets-${PVCUT}*:5 - =kde-frameworks/kwidgetsaddons-${PVCUT}*:5 - =kde-frameworks/kwindowsystem-${PVCUT}*:5[X?] - =kde-frameworks/kxmlgui-${PVCUT}*:5 - =kde-frameworks/solid-${PVCUT}*:5 - acl? ( - sys-apps/attr - virtual/acl - ) - handbook? ( =kde-frameworks/kdoctools-${PVCUT}*:5 ) - kerberos? ( virtual/krb5 ) - kwallet? ( =kde-frameworks/kwallet-${PVCUT}*:5 ) - X? ( >=dev-qt/qtx11extras-${QTMIN}:5 ) -" -DEPEND="${RDEPEND} - >=dev-qt/qtconcurrent-${QTMIN}:5 - test? ( sys-libs/zlib ) -" -PDEPEND=">=kde-frameworks/kded-${PVCUT}:5" - -PATCHES=( "${FILESDIR}/${P}-renamefiledialog-fix-number-limit.patch" ) # KDE-bug 466636 - -src_configure() { - local mycmakeargs=( - -DKIO_NO_PUBLIC_QTCONCURRENT=ON - $(cmake_use_find_package acl ACL) - $(cmake_use_find_package handbook KF5DocTools) - $(cmake_use_find_package kerberos GSSAPI) - $(cmake_use_find_package kwallet KF5Wallet) - -DWITH_X11=$(usex X) - ) - - ecm_src_configure -} - -pkg_postinst() { - ecm_pkg_postinst - xdg_desktop_database_update -} - -pkg_postrm() { - ecm_pkg_postrm - xdg_desktop_database_update -} diff --git a/kde-frameworks/kio/kio-5.104.0-r2.ebuild b/kde-frameworks/kio/kio-5.104.0-r3.ebuild index 4734831d6e8a..5be2f39055e0 100644 --- a/kde-frameworks/kio/kio-5.104.0-r2.ebuild +++ b/kde-frameworks/kio/kio-5.104.0-r3.ebuild @@ -68,6 +68,7 @@ PDEPEND=">=kde-frameworks/kded-${PVCUT}:5" PATCHES=( "${FILESDIR}/${P}-renamefiledialog-fix-number-limit.patch" # KDE-bug 466636 "${FILESDIR}/${P}-handle-copy_file_range-failing-w-ENOENT.patch" # bug 885793 + "${FILESDIR}/${P}-fix-kstart5-not-returning.patch" # KDE-bug 466359 ) src_configure() { |