Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kio version bump and check

Browse Source
This commit is contained in:
groni
2015-06-27 16:35:14 +02:00
parent a0bce2989b
commit 4304436034
4 changed files with 254 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/kde/framework/kio/actions.py
+26
View File
@@ -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")
desktop/kde/framework/kio/files/0001-Fix-thumbnails-for-mimetype-groups.patch
+52
View File
@@ -0,0 +1,52 @@
From ae87a7d6999fc6ad90ab300dd8ea0c9c68c02bd4 Mon Sep 17 00:00:00 2001
From: Maarten De Meyer <de.meyer.maarten@gmail.com>
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
desktop/kde/framework/kio/files/0002-Fix-relative-paths-being-turned-into-http-urls-by-fr.patch
+77
View File
@@ -0,0 +1,77 @@
From 5a5aa4b1786e793f457ad5a88a4e49d7469a92fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Tinkl?= <lukas@kde.org>
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<QUrl> KFileWidgetPrivate::tokenize(const QString &line) const
urls.append(u);
}
} else {
- urls << QUrl::fromUserInput(line);
+ urls << QUrl::fromLocalFile(line);
}
return urls;
--
2.1.0
desktop/kde/framework/kio/pspec.xml
+99
View File
@@ -0,0 +1,99 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>kio</Name>
<Homepage>http://www.kde.org</Homepage>
<Packager>
<Name>Pisi Linux Admins</Name>
<Email>admins@pisilinux.org</Email>
</Packager>
<License>LGPLv2</License>
<IsA>library</IsA>
<IsA>app:console</IsA>
<Summary>Resource and network access abstraction</Summary>
<Description>Network transparent access to files and data</Description>
<Archive sha1sum="8a20f17d613b5ddfca363d71797bf64ffca4a264" type="tarxz">http://download.kde.org/stable/frameworks/5.11/kio-5.11.0.tar.xz</Archive>
<BuildDependencies>
<Dependency>qt5-base-devel</Dependency>
<Dependency>kdoctools-devel</Dependency>
<Dependency>extra-cmake-modules</Dependency>
</BuildDependencies>
</Source>
<Package>
<Name>kio</Name>
<RuntimeDependencies>
<Dependency>qt5-base</Dependency>
<Dependency>acl</Dependency>
<Dependency>attr</Dependency>
<Dependency>libgcc</Dependency>
<Dependency>libxml2</Dependency>
<Dependency>mit-kerberos</Dependency>
<Dependency>knotifications</Dependency>
<Dependency>libxslt</Dependency>
<Dependency>qt5-script</Dependency>
<Dependency>qt5-x11extras</Dependency>
<Dependency>karchive</Dependency>
<Dependency>kconfig</Dependency>
<Dependency>kcodecs</Dependency>
<Dependency>kbookmarks</Dependency>
<Dependency>kcompletion</Dependency>
<Dependency>kconfigwidgets</Dependency>
<Dependency>kcoreaddons</Dependency>
<Dependency>kdbusaddons</Dependency>
<Dependency>ki18n</Dependency>
<Dependency>kiconthemes</Dependency>
<Dependency>kitemviews</Dependency>
<Dependency>kjobwidgets</Dependency>
<Dependency>kservice</Dependency>
<Dependency>ktextwidgets</Dependency>
<Dependency>kwallet</Dependency>
<Dependency>kwidgetsaddons</Dependency>
<Dependency>kwindowsystem</Dependency>
<Dependency>kxmlgui</Dependency>
<Dependency>solid</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="config">/etc/</Path>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="data">/usr/share</Path>
<Path fileType="localedata">/usr/share/locale</Path>
<Path fileType="library">/usr/lib/qt5</Path>
<Path fileType="library">/usr/lib</Path>
<Path fileType="doc">/usr/share/doc</Path>
<Path fileType="man">/usr/share/man</Path>
</Files>
</Package>
<Package>
<Name>kio-devel</Name>
<Summary>Development files for kio</Summary>
<RuntimeDependencies>
<Dependency>qt5-base-devel</Dependency>
<Dependency release="current">kio</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include</Path>
<Path fileType="data">/usr/lib/cmake</Path>
<Path fileType="config">/usr/lib/pkgconfig</Path>
</Files>
</Package>
<History>
<Update release="2">
<Date>2015-06-27</Date>
<Version>5.11.0</Version>
<Comment>Version bump.</Comment>
<Name>Stefan Gronewold(groni)</Name>
<Email>groni@pisilinux.org</Email>
</Update>
<Update release="1">
<Date>2015-05-31</Date>
<Version>5.10.0</Version>
<Comment>First Release.</Comment>
<Name>Stefan Gronewold(groni)</Name>
<Email>groni@pisilinux.org</Email>
</Update>
</History>
</PISI>