diff options
author | Michael Palimaka <kensington@gentoo.org> | 2016-09-15 04:04:32 +1000 |
---|---|---|
committer | Michael Palimaka <kensington@gentoo.org> | 2016-09-15 04:12:16 +1000 |
commit | 1f9700ed2ec8463a6b7d80a06f83c7b50c973b54 (patch) | |
tree | 4a5042f5e2915e29ee83096ce0306f8e0e8208ee /kde-frameworks/kparts | |
parent | dev-python/simplecv: remove unused patch (diff) | |
download | gentoo-1f9700ed2ec8463a6b7d80a06f83c7b50c973b54.tar.gz gentoo-1f9700ed2ec8463a6b7d80a06f83c7b50c973b54.tar.bz2 gentoo-1f9700ed2ec8463a6b7d80a06f83c7b50c973b54.zip |
kde-frameworks: version bump 5.26.0
Package-Manager: portage-2.3.0
Diffstat (limited to 'kde-frameworks/kparts')
-rw-r--r-- | kde-frameworks/kparts/Manifest | 1 | ||||
-rw-r--r-- | kde-frameworks/kparts/files/kparts-5.26.0-misdetected-dirs.patch | 62 | ||||
-rw-r--r-- | kde-frameworks/kparts/kparts-5.26.0-r1.ebuild | 33 |
3 files changed, 96 insertions, 0 deletions
diff --git a/kde-frameworks/kparts/Manifest b/kde-frameworks/kparts/Manifest index 59b55a94b470..75cc797741a9 100644 --- a/kde-frameworks/kparts/Manifest +++ b/kde-frameworks/kparts/Manifest @@ -1,2 +1,3 @@ DIST kparts-5.23.0.tar.xz 153940 SHA256 2e584c9904aaef4cffeedeb686ca9addfca25a3a118779d6a31ab02c62f4d705 SHA512 ef3f6ef39ed40947b60d861a37ed773e9dd52677066076b2d52052958c38ff13acdaaad2e8111ff2a463f51d16c065b4d0986f640f663c23c90fa630047f4475 WHIRLPOOL 0e8d4368b92679b5d7f4a0bab57b1f951084db54a34b9c3d4d2ea72f3db946758e582bc63defc489ba5460625a9cbd6f3f24164e83c949b29843b115c5e8fa2c DIST kparts-5.25.0.tar.xz 154396 SHA256 ea187dc45376b53818bf76ed794c988b7793ae21f2683ce010cba995a31b92e3 SHA512 44584c38ac45baa083360955c21fa9023a218509b7f865da016a8bb0a487eff6e481e381d68f03e8a196c803e8a9d6d5c0e9ffe6effcbc713d30296c3a89739b WHIRLPOOL 8c630017e9ed6f93911da04c9ee2554effd15306c809bed94953f05a648c976716cf71737aaf31818becc28c9453f25d11601650b22c6714e5b1def8defcd53e +DIST kparts-5.26.0.tar.xz 154344 SHA256 ca6f79885d4d788d3cf20f663ba1727a5dfecfe9d418d3e7ee4a9420c03c21da SHA512 c7370d50b6129d6e106641a837308dfc38b92f89aec17f861cd1be73adcfcddd769ac01c750eaecfaf0fbab97d48f27acc412cfc43c7951c8053e4bb147ba272 WHIRLPOOL a51c860d4301a93e08039bd357f003e963be541ce0b0734bd941e416e547e48be3219681a7dec74ef1c5a6b25ed13bf51f8b0daa20ef42f20b224e3cd491215f diff --git a/kde-frameworks/kparts/files/kparts-5.26.0-misdetected-dirs.patch b/kde-frameworks/kparts/files/kparts-5.26.0-misdetected-dirs.patch new file mode 100644 index 000000000000..269f6dbe722e --- /dev/null +++ b/kde-frameworks/kparts/files/kparts-5.26.0-misdetected-dirs.patch @@ -0,0 +1,62 @@ +From: David Faure <faure@kde.org> +Date: Tue, 06 Sep 2016 15:53:48 +0000 +Subject: Fix URLs with a trailing slash being always assumed to be directories. +X-Git-Url: http://quickgit.kde.org/?p=kparts.git&a=commitdiff&h=7d99562257cc44f63fff32a160810d9c0d7dda4c +--- +Fix URLs with a trailing slash being always assumed to be directories. + +Testcase: `konqueror gopher://gopher.quux.org/1/` + +QMimeDatabase can't differenciate between KIO protocols, so we do it here. +--- + + +--- a/src/browserrun.cpp ++++ b/src/browserrun.cpp +@@ -113,21 +113,23 @@ + + void BrowserRun::scanFile() + { +- // qDebug() << KRun::url(); ++ const QUrl url = KRun::url(); ++ // qDebug() << url; + + // Let's check for well-known extensions + // Not when there is a query in the URL, in any case. + // Optimization for http/https, findByURL doesn't trust extensions over http. +- QString protocol = KRun::url().scheme(); ++ QString protocol = url.scheme(); + + if (!KProtocolInfo::proxiedBy(protocol).isEmpty()) { + QString dummy; +- protocol = KProtocolManager::slaveProtocol(KRun::url(), dummy); +- } +- +- if (!KRun::url().hasQuery() && !protocol.startsWith(QLatin1String("http"))) { ++ protocol = KProtocolManager::slaveProtocol(url, dummy); ++ } ++ ++ if (!url.hasQuery() && !protocol.startsWith(QLatin1String("http")) && ++ (!url.path().endsWith(QLatin1Char('/')) || KProtocolManager::supportsListing(url))) { + QMimeDatabase db; +- QMimeType mime = db.mimeTypeForUrl(KRun::url()); ++ QMimeType mime = db.mimeTypeForUrl(url); + if (!mime.isDefault() || isLocalFile()) { + // qDebug() << "MIME TYPE is" << mime.name(); + mimeTypeDetermined(mime.name()); +@@ -155,11 +157,11 @@ + } + + KIO::TransferJob *job; +- if (d->m_browserArgs.doPost() && KRun::url().scheme().startsWith(QLatin1String("http"))) { +- job = KIO::http_post(KRun::url(), d->m_browserArgs.postData, KIO::HideProgressInfo); ++ if (d->m_browserArgs.doPost() && url.scheme().startsWith(QLatin1String("http"))) { ++ job = KIO::http_post(url, d->m_browserArgs.postData, KIO::HideProgressInfo); + job->addMetaData(QStringLiteral("content-type"), d->m_browserArgs.contentType()); + } else { +- job = KIO::get(KRun::url(), ++ job = KIO::get(url, + d->m_args.reload() ? KIO::Reload : KIO::NoReload, + KIO::HideProgressInfo); + } + diff --git a/kde-frameworks/kparts/kparts-5.26.0-r1.ebuild b/kde-frameworks/kparts/kparts-5.26.0-r1.ebuild new file mode 100644 index 000000000000..31e442098e5d --- /dev/null +++ b/kde-frameworks/kparts/kparts-5.26.0-r1.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +VIRTUALX_REQUIRED="test" +inherit kde5 + +DESCRIPTION="Framework providing elaborate user-interface components" +LICENSE="LGPL-2+" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +RDEPEND=" + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep kio) + $(add_frameworks_dep kjobwidgets) + $(add_frameworks_dep kservice) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kxmlgui) + $(add_qt_dep qtgui) + $(add_qt_dep qtwidgets) + $(add_qt_dep qtxml) +" +DEPEND="${RDEPEND} + $(add_frameworks_dep ktextwidgets) +" + +PATCHES=( "${FILESDIR}/${P}-misdetected-dirs.patch" ) |