summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Huber <johu@gentoo.org>2017-01-25 17:32:49 +0100
committerJohannes Huber <johu@gentoo.org>2017-01-25 18:00:27 +0100
commit778e641bccb7b78418ac8afb74f247095783fc1e (patch)
treee56ce48b70ef51a555977135fdef8f817bec83cd /kde-frameworks/kfilemetadata
parentapp-backup/kfoldersync: remove old (diff)
downloadgentoo-778e641bccb7b78418ac8afb74f247095783fc1e.tar.gz
gentoo-778e641bccb7b78418ac8afb74f247095783fc1e.tar.bz2
gentoo-778e641bccb7b78418ac8afb74f247095783fc1e.zip
kde-frameworks: Remove KDE Frameworks 5.26.0
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Diffstat (limited to 'kde-frameworks/kfilemetadata')
-rw-r--r--kde-frameworks/kfilemetadata/Manifest1
-rw-r--r--kde-frameworks/kfilemetadata/files/kfilemetadata-5.26.0-epubextractor-segfault.patch149
-rw-r--r--kde-frameworks/kfilemetadata/files/kfilemetadata-5.26.0-odfextractor-segfault.patch66
-rw-r--r--kde-frameworks/kfilemetadata/kfilemetadata-5.26.0-r1.ebuild55
4 files changed, 0 insertions, 271 deletions
diff --git a/kde-frameworks/kfilemetadata/Manifest b/kde-frameworks/kfilemetadata/Manifest
index b4ce9b9ea95..452a48954c9 100644
--- a/kde-frameworks/kfilemetadata/Manifest
+++ b/kde-frameworks/kfilemetadata/Manifest
@@ -1,4 +1,3 @@
DIST kfilemetadata-4.14.3.tar.xz 35908 SHA256 3115e6ebd8b52ae9eb1016a3391b019c34fa443d6a5d9351550c5e0baf0d5371 SHA512 d7321b7e1ad755c0dc267b236a33a011377ba309d94c1497c081edad82171452595ce113428048e455b8b71f3ea480e4e76e797e31a74edd24bcf42617c59acb WHIRLPOOL 7e940864c4d9529bc3d5f8337bb9f22f09e00b653ce51b089b026ba3364c57f3f94df89f011f69e9d5500894f5f953fce29acfc7ee25b884876ada7f5f54fe86
-DIST kfilemetadata-5.26.0.tar.xz 131636 SHA256 345c02a2e6e808cda7e278848722ece2050bf8f9577fdfec3ece18fb15a500f9 SHA512 1737f8fe3d46d91af7f29aadcb6d06fc638b12741902bb011dce56395d7fd8dc24fd0745d4e7ef326d2cd78119fa4be175c0281d81a09b82d9a6bda705e88286 WHIRLPOOL 6f5d93cf934da0a80d109744eb527c90642cb8ad88098ff526aa29552749a301c4613b6575a4a666f87bedac603474389579f8ea4bf5742d8b3dc85e53a1d782
DIST kfilemetadata-5.29.0.tar.xz 135184 SHA256 821df076d1fce4ac7dac067703e3c2ab885676a68e34f36140b10e58ec7b91c2 SHA512 14937b56647f5dc1f924c8d05110c787d5aacbe07fed84936d7fe32d0ebc7c7d3de46f79521e5fcb5c1eef8cb07dbf759579605ef6cfee94ab0373def1281f58 WHIRLPOOL bbcb6613ece829af0a102e99cb83af710129044bea9b1113d34a88e9a3b533c3aa72103da78f64a9f611f1593a14c4d5b5cc949c5333be98545faf655d7cc1e8
DIST kfilemetadata-5.30.0.tar.xz 133484 SHA256 90c69432d8a85d112ce3dc98f3caeff80b3485330342ea55e6012d6b8b8407d4 SHA512 e0292c51e0c0e441c77c8216d699e8e8ec5950d059882b7df55f917d53b42bee190388438c0e8aa297adb374d49c18b7e72294e911fac53c4eac953d820629a2 WHIRLPOOL 0736d93be1b813d300f4b78feab641b0b38adcaac76c79e7c11c8c1fb6e0728fcc4e286ff49a576c1571226e00defad56a8858d84ca65cd888334698a91e1dfa
diff --git a/kde-frameworks/kfilemetadata/files/kfilemetadata-5.26.0-epubextractor-segfault.patch b/kde-frameworks/kfilemetadata/files/kfilemetadata-5.26.0-epubextractor-segfault.patch
deleted file mode 100644
index b738d1ae09a..00000000000
--- a/kde-frameworks/kfilemetadata/files/kfilemetadata-5.26.0-epubextractor-segfault.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-From: Christoph Cullmann <cullmann@kde.org>
-Date: Sun, 11 Sep 2016 17:14:51 +0000
-Subject: Improve epub extractor, less segfaults
-X-Git-Url: http://quickgit.kde.org/?p=kfilemetadata.git&a=commitdiff&h=47f6e57b2fa3768feb4f1f4a2cd3ce46660d90f2
----
-Improve epub extractor, less segfaults
-
-Improve epub extractor:
-
-1) check for more nullpointers (e.g. data can be null for some fields, iterators, ...)
-2) actually close the epub file again at all
-3) iterator seems to handle clink as stated in docs, fix double free
-
-e.g. see bug 361727
-could be the double freed clink in the last iterator
-
-BUG: 361727
-REVIEW: 128888
----
-
-
---- a/src/extractors/epubextractor.cpp
-+++ b/src/extractors/epubextractor.cpp
-@@ -1,5 +1,6 @@
- /*
- Copyright (C) 2013 Vishesh Handa <me@vhanda.in>
-+ Copyright (C) 2016 Christoph Cullmann <cullmann@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
-@@ -46,11 +47,14 @@
- QString fetchMetadata(struct epub* e, const epub_metadata& type)
- {
- int size = 0;
--
- unsigned char** data = epub_get_metadata(e, type, &size);
- if (data) {
- QStringList strList;
- for (int i = 0; i < size; i++) {
-+ // skip nullptr entries, can happen for broken xml files
-+ if (!data[i])
-+ continue;
-+
- strList << QString::fromUtf8((char*)data[i]);
- free(data[i]);
- }
-@@ -65,7 +69,8 @@
-
- void EPubExtractor::extract(ExtractionResult* result)
- {
-- struct epub* ePubDoc = epub_open(result->inputUrl().toUtf8().constData(), 1);
-+ // open epub, return on exit, file will be closed again at end of function
-+ auto ePubDoc = epub_open(result->inputUrl().toUtf8().constData(), 1);
- if (!ePubDoc) {
- qWarning() << "Invalid document";
- return;
-@@ -138,49 +143,49 @@
- //
- // Plain Text
- //
-- if (!(result->inputFlags() & ExtractionResult::ExtractPlainText)) {
-- return;
-+ if (result->inputFlags() & ExtractionResult::ExtractPlainText) {
-+ if (auto iter = epub_get_iterator(ePubDoc, EITERATOR_SPINE, 0)) {
-+ do {
-+ char* curr = epub_it_get_curr(iter);
-+ if (!curr)
-+ continue;
-+
-+ QString html = QString::fromUtf8(curr);
-+ html.remove(QRegularExpression(QStringLiteral("<[^>]*>")));
-+ result->append(html);
-+ } while (epub_it_get_next(iter));
-+
-+ epub_free_iterator(iter);
-+ }
-+
-+ auto tit = epub_get_titerator(ePubDoc, TITERATOR_NAVMAP, 0);
-+ if (!tit) {
-+ tit = epub_get_titerator(ePubDoc, TITERATOR_GUIDE, 0);
-+ }
-+ if (tit) {
-+ if (epub_tit_curr_valid(tit)) {
-+ do {
-+ // get link, iterator handles freeing of it
-+ char* clink = epub_tit_get_curr_link(tit);
-+
-+ // epub_get_data returns -1 on failure
-+ char* data = nullptr;
-+ const int size = epub_get_data(ePubDoc, clink, &data);
-+ if (size >= 0 && data) {
-+ QString html = QString::fromUtf8(data, size);
-+ // strip html tags
-+ html.remove(QRegularExpression(QStringLiteral("<[^>]*>")));
-+
-+ result->append(html);
-+ free(data);
-+ }
-+ } while (epub_tit_next(tit));
-+ }
-+ epub_free_titerator(tit);
-+ }
- }
-
-- struct eiterator* iter = epub_get_iterator(ePubDoc, EITERATOR_SPINE, 0);
-- do {
-- char* curr = epub_it_get_curr(iter);
-- if (!curr)
-- continue;
-- QString html = QString::fromUtf8(curr);
-- html.remove(QRegularExpression(QStringLiteral("<[^>]*>")));
--
-- result->append(html);
-- } while (epub_it_get_next(iter));
--
-- epub_free_iterator(iter);
--
-- struct titerator* tit;
--
-- tit = epub_get_titerator(ePubDoc, TITERATOR_NAVMAP, 0);
-- if (!tit) {
-- tit = epub_get_titerator(ePubDoc, TITERATOR_GUIDE, 0);
-- }
--
-- if (epub_tit_curr_valid(tit)) {
-- do {
-- char* clink = epub_tit_get_curr_link(tit);
--
-- char* data;
-- int size = epub_get_data(ePubDoc, clink, &data);
-- free(clink);
--
-- // epub_get_data returns -1 on failure
-- if (size > 0 && data) {
-- QString html = QString::fromUtf8(data, size);
-- // strip html tags
-- html.remove(QRegularExpression(QStringLiteral("<[^>]*>")));
--
-- result->append(html);
-- free(data);
-- }
-- } while (epub_tit_next(tit));
-- }
-- epub_free_titerator(tit);
-+ // close epub file again
-+ epub_close(ePubDoc);
- }
-
-
diff --git a/kde-frameworks/kfilemetadata/files/kfilemetadata-5.26.0-odfextractor-segfault.patch b/kde-frameworks/kfilemetadata/files/kfilemetadata-5.26.0-odfextractor-segfault.patch
deleted file mode 100644
index 9f3029bdbb8..00000000000
--- a/kde-frameworks/kfilemetadata/files/kfilemetadata-5.26.0-odfextractor-segfault.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From: Christoph Cullmann <cullmann@kde.org>
-Date: Sun, 11 Sep 2016 13:07:47 +0000
-Subject: Make odf indexer more error prove, check if the files are there (and are files at all) (meta.xml + content.xml)
-X-Git-Url: http://quickgit.kde.org/?p=kfilemetadata.git&a=commitdiff&h=40730d75397aefb92145f86fc6abc9b303c56cfe
----
-Make odf indexer more error prove, check if the files are there (and are files at all) (meta.xml + content.xml)
-
-REVIEW: 128886
-BUG 364748
-
-=> if you download this odt's to indexed directories your baloo will die on each index, be careful
----
-
-
---- a/src/extractors/odfextractor.cpp
-+++ b/src/extractors/odfextractor.cpp
-@@ -2,6 +2,7 @@
- <one line to give the library's name and an idea of what it does.>
- Copyright (C) 2013 Vishesh Handa <me@vhanda.in>
- Copyright (C) 2012 Jörg Ehrichs <joerg.ehrichs@gmx.de>
-+ Copyright (C) 2016 Christoph Cullmann <cullmann@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
-@@ -59,19 +60,18 @@
- return;
- }
-
-- const QStringList entries = directory->entries();
-- if (!entries.contains(QStringLiteral("meta.xml"))) {
-+ // we need a meta xml file in the archive!
-+ const auto metaXml = directory->entry(QStringLiteral("meta.xml"));
-+ if (!metaXml || !metaXml->isFile()) {
- qWarning() << "Invalid document structure (meta.xml is missing)";
- return;
- }
-
- QDomDocument metaData(QStringLiteral("metaData"));
-- const KArchiveFile* file = static_cast<const KArchiveFile*>(directory->entry(QStringLiteral("meta.xml")));
-- metaData.setContent(file->data());
-+ metaData.setContent(static_cast<const KArchiveFile*>(metaXml)->data());
-
- // parse metadata ...
- QDomElement docElem = metaData.documentElement();
--
- QDomNode n = docElem.firstChild().firstChild(); // <office:document-meta> ... <office:meta> ... content
- while (!n.isNull()) {
- QDomElement e = n.toElement();
-@@ -129,9 +129,14 @@
- return;
- }
-
-- const KArchiveFile* contentsFile = static_cast<const KArchiveFile*>(directory->entry(QStringLiteral("content.xml")));
-- QXmlStreamReader xml(contentsFile->createDevice());
-+ // for content indexing, we need content xml file
-+ const auto contentXml = directory->entry(QStringLiteral("content.xml"));
-+ if (!contentXml || !contentXml->isFile()) {
-+ qWarning() << "Invalid document structure (content.xml is missing)";
-+ return;
-+ }
-
-+ QXmlStreamReader xml(static_cast<const KArchiveFile*>(contentXml)->createDevice());
- while (!xml.atEnd()) {
- xml.readNext();
- if (xml.isCharacters()) {
-
diff --git a/kde-frameworks/kfilemetadata/kfilemetadata-5.26.0-r1.ebuild b/kde-frameworks/kfilemetadata/kfilemetadata-5.26.0-r1.ebuild
deleted file mode 100644
index 8acefb08496..00000000000
--- a/kde-frameworks/kfilemetadata/kfilemetadata-5.26.0-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit eutils kde5
-
-DESCRIPTION="Library for extracting file metadata"
-KEYWORDS="amd64 ~arm x86"
-IUSE="epub exif ffmpeg libav pdf taglib"
-
-RDEPEND="
- $(add_frameworks_dep karchive)
- $(add_frameworks_dep ki18n)
- $(add_qt_dep qtxml)
- epub? ( app-text/ebook-tools )
- exif? ( media-gfx/exiv2:= )
- ffmpeg? (
- libav? ( media-video/libav:= )
- !libav? ( media-video/ffmpeg:0= )
- )
- pdf? ( app-text/poppler[qt5] )
- taglib? ( media-libs/taglib )
-"
-DEPEND="${RDEPEND}
- kernel_linux? ( sys-apps/attr )
-"
-
-PATCHES=(
- "${FILESDIR}/${P}-odfextractor-segfault.patch"
- "${FILESDIR}/${P}-epubextractor-segfault.patch"
-)
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_find_package epub EPub)
- $(cmake-utils_use_find_package exif Exiv2)
- $(cmake-utils_use_find_package ffmpeg FFmpeg)
- $(cmake-utils_use_find_package pdf PopplerQt5)
- $(cmake-utils_use_find_package taglib Taglib)
- )
-
- kde5_src_configure
-}
-
-pkg_postinst() {
- kde5_pkg_postinst
-
- if ! has_version app-text/catdoc || ! has_version dev-libs/libxls; then
- elog "To get additional features, optional runtime dependencies may be installed:"
- optfeature "indexing of Microsoft Word or Powerpoint files" app-text/catdoc
- optfeature "indexing of Microsoft Excel files" dev-libs/libxls
- fi
-}