summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2023-04-22 18:11:50 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2023-04-22 18:20:44 +0200
commitc66eb2f3808a57aa307e51a4456bb5079c0a9584 (patch)
treea50058ee15fce007de21ad10e7ce5066d1b95086
parentkde-frameworks/kdoctools: drop 5.102.0 (diff)
downloadgentoo-c66eb2f3808a57aa307e51a4456bb5079c0a9584.tar.gz
gentoo-c66eb2f3808a57aa307e51a4456bb5079c0a9584.tar.bz2
gentoo-c66eb2f3808a57aa307e51a4456bb5079c0a9584.zip
kde-frameworks/kfilemetadata: drop 5.102.0
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
-rw-r--r--kde-frameworks/kfilemetadata/Manifest1
-rw-r--r--kde-frameworks/kfilemetadata/files/kfilemetadata-5.102.0-fix-loading-external-plugins.patch86
-rw-r--r--kde-frameworks/kfilemetadata/kfilemetadata-5.102.0.ebuild68
3 files changed, 0 insertions, 155 deletions
diff --git a/kde-frameworks/kfilemetadata/Manifest b/kde-frameworks/kfilemetadata/Manifest
index 5d21314d429b..e1c5a9b4c2f5 100644
--- a/kde-frameworks/kfilemetadata/Manifest
+++ b/kde-frameworks/kfilemetadata/Manifest
@@ -1,3 +1,2 @@
-DIST kfilemetadata-5.102.0.tar.xz 469548 BLAKE2B 4b63c93e94e37a58e8d415c2fce7c83758abdcba91102eccb042a0ba80e6424f075abe0c1814341a4c13a65bdff227ef2eaea42d2b58bdb1da7477baa477b0c0 SHA512 2be85d8f80ecbc5b1337c621d3807cd40b5dac010ce73e97b248cbcb0eeef7e258a1086c7de5809c15ccf6d81bc4956f1e5d415388b995b94b751ad570177bdd
DIST kfilemetadata-5.104.0.tar.xz 469760 BLAKE2B 4cd1d17cac69b5069b212d390d09dca92a6d9745c163b26f44f6fd96c1a85de0b1e5cf34806c82be814361c70971295efe530dd3ad81163a099ae24c4c5fcee5 SHA512 4724826d16e867cbd5fef0b766d86ca791926aff3f93187660691e3d2bf5634980220b6e1d75143805834aff8f137cbbb493bddb5583bc087ab740267f560960
DIST kfilemetadata-5.105.0.tar.xz 469608 BLAKE2B a2baa33d31a562b87fc3977507a8a8c5ce3fdca62d008dae8f999ecfc1ed10efa911b113363ddfbcb70e23a7499a110fefef2acbe0fe4dd008bfcb637573a928 SHA512 9ff836a857b6a670a0cdac6080b4598715d2f9270ea3a90c587c93943cc72c8984a2d933daeb909971a93c74b0409af1ab46ab8c2070e3475f54bc7c110c8fab
diff --git a/kde-frameworks/kfilemetadata/files/kfilemetadata-5.102.0-fix-loading-external-plugins.patch b/kde-frameworks/kfilemetadata/files/kfilemetadata-5.102.0-fix-loading-external-plugins.patch
deleted file mode 100644
index 5a40d129bc40..000000000000
--- a/kde-frameworks/kfilemetadata/files/kfilemetadata-5.102.0-fix-loading-external-plugins.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From 543abf86e6747e406e176ac4e8fc52090bae373b Mon Sep 17 00:00:00 2001
-From: Alexander Lohnau <alexander.lohnau@gmx.de>
-Date: Thu, 5 Jan 2023 20:57:54 +0100
-Subject: [PATCH] Fix loading of external extractors and writers
-
-In 5bbdfc4749f92c510cc82dbd66f5d3b2bc3763ac, the external extractors were mistakenly ported to KPluginMetaData::findPlugins.
-
-However, the logic was broken before, because the dir entries must *not* be plugins, but normal files.
-This was introduced in 73da9a53cb500da000c50b164dd5693ef7474041.
-
-Considering that we tell QDir to only list dirs, the check if we have a plugin or not doesn't make sense anyways.
-
-BUG: 463598
-(cherry picked from commit 5bd67e925db7db2f9619139f7e8000ce0321d52d)
----
- src/extractorcollection.cpp | 23 ++++++++++++-----------
- src/writercollection.cpp | 3 ---
- 2 files changed, 12 insertions(+), 14 deletions(-)
-
-
-From 36efc6c632ad88bf6b1f16649ec28cc78dad5c15 Mon Sep 17 00:00:00 2001
-From: Alexander Lohnau <alexander.lohnau@gmx.de>
-Date: Thu, 12 Jan 2023 15:15:14 +0100
-Subject: [PATCH] Also add external extractors to vector of all plugins
-
-Amends 5bd67e925db7db2f9619139f7e8000ce0321d52d
-
-BUG: 463598
-
-
-(cherry picked from commit 34637beb6bb4dbaf80377f12142c799ed9e000d5)
----
- src/extractorcollection.cpp | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/src/extractorcollection.cpp b/src/extractorcollection.cpp
---- a/src/extractorcollection.cpp
-+++ b/src/extractorcollection.cpp
-@@ -72,19 +72,30 @@
- }
- }
-
-- const QVector<KPluginMetaData> externalExtractors =
-- KPluginMetaData::findPlugins(QStringLiteral(LIBEXEC_INSTALL_DIR "/kfilemetadata/externalextractors"), {}, KPluginMetaData::AllowEmptyMetaData);
-- for (const KPluginMetaData &externalPlugin : externalExtractors) {
-- qCDebug(KFILEMETADATA_LOG) << "Adding plugin - " << externalPlugin.fileName();
-+ QStringList externalPlugins;
-+ const QDir externalPluginDir(QStringLiteral(LIBEXEC_INSTALL_DIR "/kfilemetadata/externalextractors"));
-+ qCDebug(KFILEMETADATA_LOG) << "Searching for external extractors:" << externalPluginDir.path();
-+ // For external plugins, we look into the directories
-+ const QStringList externalPluginEntryList = externalPluginDir.entryList(QDir::Dirs | QDir::NoDotAndDotDot);
-+ for (const QString &externalPlugin : externalPluginEntryList) {
-+ if (externalPlugins.contains(externalPlugin)) {
-+ qCDebug(KFILEMETADATA_LOG) << "Skipping duplicate - " << externalPluginDir.path() << ":" << externalPlugin;
-+ continue;
-+ }
-+
-+ qCDebug(KFILEMETADATA_LOG) << "Adding plugin - " << externalPluginDir.path() << ":" << externalPlugin;
-+ externalPlugins << externalPlugin;
-
- Extractor extractor;
-- ExternalExtractor *plugin = new ExternalExtractor(externalPlugin.fileName());
-+ auto pluginPath = externalPluginDir.absoluteFilePath(externalPlugin);
-+ ExternalExtractor *plugin = new ExternalExtractor(pluginPath);
- if (plugin && !plugin->mimetypes().isEmpty()) {
- extractor.setExtractorPlugin(plugin);
- extractor.setAutoDeletePlugin(Extractor::AutoDeletePlugin);
- m_allExtractors.push_back(std::move(extractor));
- }
- }
-+ externalPlugins.clear();
-
- for (Extractor& extractor : m_allExtractors) {
- auto pluginProperties = extractor.extractorProperties();
---- a/src/writercollection.cpp
-+++ b/src/writercollection.cpp
-@@ -68,9 +68,6 @@ void WriterCollectionPrivate::findWriters()
- // For external plugins, we look into the directories. Those are executables and not C++ plugins.
- const QStringList externalPluginEntryList = externalPluginDir.entryList(QDir::Dirs | QDir::NoDotAndDotDot);
- for (const QString& externalPlugin : externalPluginEntryList) {
-- if (!QLibrary::isLibrary(externalPlugin)) {
-- continue;
-- }
- if (externalPlugins.contains(externalPlugin)) {
- continue;
- }
diff --git a/kde-frameworks/kfilemetadata/kfilemetadata-5.102.0.ebuild b/kde-frameworks/kfilemetadata/kfilemetadata-5.102.0.ebuild
deleted file mode 100644
index 359e0377e52d..000000000000
--- a/kde-frameworks/kfilemetadata/kfilemetadata-5.102.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.5
-inherit ecm frameworks.kde.org optfeature python-any-r1
-
-DESCRIPTION="Library for extracting file metadata"
-
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-IUSE="epub exif ffmpeg mobi pdf taglib"
-
-RESTRICT="test"
-
-RDEPEND="
- >=dev-qt/qtxml-${QTMIN}:5
- =kde-frameworks/karchive-${PVCUT}*:5
- =kde-frameworks/kcoreaddons-${PVCUT}*:5
- =kde-frameworks/ki18n-${PVCUT}*:5
- epub? ( app-text/ebook-tools )
- exif? ( media-gfx/exiv2:= )
- ffmpeg? ( media-video/ffmpeg:0= )
- mobi? ( kde-apps/kdegraphics-mobipocket:5 )
- pdf? ( app-text/poppler[qt5] )
- taglib? ( media-libs/taglib )
-"
-DEPEND="${RDEPEND}
- kernel_linux? ( sys-apps/attr )
-"
-BDEPEND="test? ( ${PYTHON_DEPS} )"
-
-PATCHES=( "${FILESDIR}/${P}-fix-loading-external-plugins.patch" ) # KDE-bug 463598
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
- ecm_pkg_setup
-}
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package epub EPub)
- $(cmake_use_find_package exif LibExiv2)
- $(cmake_use_find_package ffmpeg FFmpeg)
- $(cmake_use_find_package mobi QMobipocket)
- $(cmake_use_find_package pdf Poppler)
- $(cmake_use_find_package taglib Taglib)
- )
-
- ecm_src_configure
-}
-
-src_test() {
- # FIXME: bug 644650, fails on tmpfs (but not for everyone)
- local myctestargs=( -E "(usermetadatawritertest)" )
- ecm_src_test
-}
-
-pkg_postinst() {
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
- optfeature "Microsoft Word/Powerpoint file indexing" app-text/catdoc
- optfeature "Microsoft Excel file indexing" dev-libs/libxls
- fi
- ecm_pkg_postinst
-}