From 43044360341d4c923fd148da989b02dfdafc469e Mon Sep 17 00:00:00 2001 From: groni Date: Sat, 27 Jun 2015 16:35:14 +0200 Subject: [PATCH] kio version bump and check --- desktop/kde/framework/kio/actions.py | 26 +++++ ...1-Fix-thumbnails-for-mimetype-groups.patch | 52 ++++++++++ ...hs-being-turned-into-http-urls-by-fr.patch | 77 +++++++++++++++ desktop/kde/framework/kio/pspec.xml | 99 +++++++++++++++++++ 4 files changed, 254 insertions(+) create mode 100644 desktop/kde/framework/kio/actions.py create mode 100644 desktop/kde/framework/kio/files/0001-Fix-thumbnails-for-mimetype-groups.patch create mode 100644 desktop/kde/framework/kio/files/0002-Fix-relative-paths-being-turned-into-http-urls-by-fr.patch create mode 100644 desktop/kde/framework/kio/pspec.xml diff --git a/desktop/kde/framework/kio/actions.py b/desktop/kde/framework/kio/actions.py new file mode 100644 index 0000000000..863dc8a923 --- /dev/null +++ b/desktop/kde/framework/kio/actions.py @@ -0,0 +1,26 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +# +# Licensed under the GNU General Public License, version 3. +# See the file http://www.gnu.org/licenses/gpl.txt + +from pisi.actionsapi import pisitools +from pisi.actionsapi import cmaketools + +def setup(): + cmaketools.configure("-DCMAKE_BUILD_TYPE=Release \ + -DECM_MKSPECS_INSTALL_DIR=/usr/lib/qt5/mkspecs/modules \ + -DQT_PLUGIN_INSTALL_DIR=lib/qt5/plugins \ + -DLIB_INSTALL_DIR=lib \ + -DSYSCONF_INSTALL_DIR=/etc \ + -DLIBEXEC_INSTALL_DIR=lib \ + -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ + -DBUILD_TESTING=OFF") + +def build(): + cmaketools.make() + +def install(): + cmaketools.install() + + pisitools.dodoc("README.md", "COPYING.LIB") diff --git a/desktop/kde/framework/kio/files/0001-Fix-thumbnails-for-mimetype-groups.patch b/desktop/kde/framework/kio/files/0001-Fix-thumbnails-for-mimetype-groups.patch new file mode 100644 index 0000000000..5dc3083626 --- /dev/null +++ b/desktop/kde/framework/kio/files/0001-Fix-thumbnails-for-mimetype-groups.patch @@ -0,0 +1,52 @@ +From ae87a7d6999fc6ad90ab300dd8ea0c9c68c02bd4 Mon Sep 17 00:00:00 2001 +From: Maarten De Meyer +Date: Mon, 8 Sep 2014 23:58:55 +0200 +Subject: [PATCH 1/2] Fix thumbnails for mimetype groups. + +KService::mimeTypes cannot handle mimetype groups. ex: text/* +Go back to KService::serviceTypes and remove 'ThumbCreator' entries. + +REVIEW: 119958 +--- + src/widgets/previewjob.cpp | 17 +++++++++++------ + 1 file changed, 11 insertions(+), 6 deletions(-) + +diff --git a/src/widgets/previewjob.cpp b/src/widgets/previewjob.cpp +index 55a3fb7..ca47934 100644 +--- a/src/widgets/previewjob.cpp ++++ b/src/widgets/previewjob.cpp +@@ -268,20 +268,25 @@ void PreviewJobPrivate::startPreview() + protocols.append(p); + } + foreach (const QString &protocol, protocols) { +- const QStringList mtypes = (*it)->mimeTypes(); ++ // We cannot use mimeTypes() here, it doesn't support groups such as: text/* ++ const QStringList mtypes = (*it)->serviceTypes(); + // Add supported mimetype for this protocol + QStringList &_ms = m_remoteProtocolPlugins[protocol]; + foreach (const QString &_m, mtypes) { +- protocolMap[protocol].insert(_m, *it); +- if (!_ms.contains(_m)) { +- _ms.append(_m); ++ if (_m != QLatin1String("ThumbCreator")) { ++ protocolMap[protocol].insert(_m, *it); ++ if (!_ms.contains(_m)) { ++ _ms.append(_m); ++ } + } + } + } + if (enabledPlugins.contains((*it)->desktopEntryName())) { +- const QStringList mimeTypes = (*it)->mimeTypes(); ++ const QStringList mimeTypes = (*it)->serviceTypes(); + for (QStringList::ConstIterator mt = mimeTypes.constBegin(); mt != mimeTypes.constEnd(); ++mt) { +- mimeMap.insert(*mt, *it); ++ if (*mt != QLatin1String("ThumbCreator")) { ++ mimeMap.insert(*mt, *it); ++ } + } + } + } +-- +2.1.0 + diff --git a/desktop/kde/framework/kio/files/0002-Fix-relative-paths-being-turned-into-http-urls-by-fr.patch b/desktop/kde/framework/kio/files/0002-Fix-relative-paths-being-turned-into-http-urls-by-fr.patch new file mode 100644 index 0000000000..a959d5d3e8 --- /dev/null +++ b/desktop/kde/framework/kio/files/0002-Fix-relative-paths-being-turned-into-http-urls-by-fr.patch @@ -0,0 +1,77 @@ +From 5a5aa4b1786e793f457ad5a88a4e49d7469a92fa Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Tinkl?= +Date: Tue, 9 Sep 2014 22:49:27 +0200 +Subject: [PATCH 2/2] Fix relative paths being turned into http urls by + fromUserInput. + +Reviewed-By: (well, written by) David Faure. +--- + src/filewidgets/kfilewidget.cpp | 24 ++++++++++++++++++++---- + 1 file changed, 20 insertions(+), 4 deletions(-) + +diff --git a/src/filewidgets/kfilewidget.cpp b/src/filewidgets/kfilewidget.cpp +index 42320e3..58dd92e 100644 +--- a/src/filewidgets/kfilewidget.cpp ++++ b/src/filewidgets/kfilewidget.cpp +@@ -325,6 +325,22 @@ static bool containsProtocolSection(const QString &string) + return false; + } + ++// this string-to-url conversion function handles relative paths, full paths and URLs ++// without the http-prepending that QUrl::fromUserInput does. ++static QUrl urlFromString(const QString& str) ++{ ++ if (QDir::isAbsolutePath(str)) { ++ return QUrl::fromLocalFile(str); ++ } ++ QUrl url(str); ++ if (url.isRelative()) { ++ url.clear(); ++ url.setPath(str); ++ } ++ return url; ++} ++ ++ + KFileWidget::KFileWidget(const QUrl &_startDir, QWidget *parent) + : QWidget(parent), d(new KFileWidgetPrivate(this)) + { +@@ -909,7 +925,7 @@ void KFileWidget::slotOk() + containsProtocolSection(locationEditCurrentText))) { + + QString fileName; +- QUrl url = QUrl::fromUserInput(locationEditCurrentText); ++ QUrl url = urlFromString(locationEditCurrentText); + if (d->operationMode == Opening) { + KIO::StatJob *statJob = KIO::stat(url, KIO::HideProgressInfo); + KJobWidgets::setWindow(statJob, this); +@@ -1447,7 +1463,7 @@ void KFileWidgetPrivate::_k_urlEntered(const QUrl &url) + + bool blocked = locationEdit->blockSignals(true); + if (keepLocation) { +- QUrl currentUrl = QUrl::fromUserInput(filename); ++ QUrl currentUrl = urlFromString(filename); + locationEdit->changeUrl(0, QIcon::fromTheme(KIO::iconNameForUrl(currentUrl)), currentUrl); + locationEdit->lineEdit()->setModified(true); + } +@@ -1494,7 +1510,7 @@ void KFileWidgetPrivate::_k_enterUrl(const QString &url) + { + // qDebug(); + +- _k_enterUrl(QUrl::fromUserInput(KUrlCompletion::replacedPath(url, true, true))); ++ _k_enterUrl(urlFromString(KUrlCompletion::replacedPath(url, true, true))); + } + + bool KFileWidgetPrivate::toOverwrite(const QUrl &url) +@@ -1677,7 +1693,7 @@ QList KFileWidgetPrivate::tokenize(const QString &line) const + urls.append(u); + } + } else { +- urls << QUrl::fromUserInput(line); ++ urls << QUrl::fromLocalFile(line); + } + + return urls; +-- +2.1.0 + diff --git a/desktop/kde/framework/kio/pspec.xml b/desktop/kde/framework/kio/pspec.xml new file mode 100644 index 0000000000..2ae8b984cb --- /dev/null +++ b/desktop/kde/framework/kio/pspec.xml @@ -0,0 +1,99 @@ + + + + + kio + http://www.kde.org + + Pisi Linux Admins + admins@pisilinux.org + + LGPLv2 + library + app:console + Resource and network access abstraction + Network transparent access to files and data + http://download.kde.org/stable/frameworks/5.11/kio-5.11.0.tar.xz + + qt5-base-devel + kdoctools-devel + extra-cmake-modules + + + + + kio + + qt5-base + acl + attr + libgcc + libxml2 + mit-kerberos + knotifications + libxslt + qt5-script + qt5-x11extras + karchive + kconfig + kcodecs + kbookmarks + kcompletion + kconfigwidgets + kcoreaddons + kdbusaddons + ki18n + kiconthemes + kitemviews + kjobwidgets + kservice + ktextwidgets + kwallet + kwidgetsaddons + kwindowsystem + kxmlgui + solid + + + /etc/ + /usr/bin + /usr/share + /usr/share/locale + /usr/lib/qt5 + /usr/lib + /usr/share/doc + /usr/share/man + + + + + kio-devel + Development files for kio + + qt5-base-devel + kio + + + /usr/include + /usr/lib/cmake + /usr/lib/pkgconfig + + + + + + 2015-06-27 + 5.11.0 + Version bump. + Stefan Gronewold(groni) + groni@pisilinux.org + + + 2015-05-31 + 5.10.0 + First Release. + Stefan Gronewold(groni) + groni@pisilinux.org + + +