Date: Wednesday, January 2, 2013 @ 05:59:35 Author: andrea Revision: 174033
KDE 4.9.5 Modified: kdelibs/trunk/PKGBUILD Deleted: kdelibs/trunk/0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch kdelibs/trunk/fix-crash-on-open-with.patch -----------------------------------------------------------------+ 0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch | 53 ---------- PKGBUILD | 18 --- fix-crash-on-open-with.patch | 19 --- 3 files changed, 5 insertions(+), 85 deletions(-) Deleted: 0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch =================================================================== --- 0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch 2013-01-02 09:54:00 UTC (rev 174032) +++ 0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch 2013-01-02 10:59:35 UTC (rev 174033) @@ -1,53 +0,0 @@ -From 73283f1332e90fbb6fe0caa39a038cb16b83a54c Mon Sep 17 00:00:00 2001 -From: David Faure <[email protected]> -Date: Wed, 5 Dec 2012 22:42:25 +0100 -Subject: [PATCH] Revert "Also check parent mimetypes in - protocolForArchiveMimetype()." - -This reverts commit 4f296cfbced2c4ad54beec8f500ed2d3fc04ee05. -It breaks opening odt and other zip-based files in external apps. -That's what I get for delegating the testing :-) -BUG: 311214 ---- - kio/kio/kprotocolmanager.cpp | 19 +------------------ - 1 files changed, 1 insertions(+), 18 deletions(-) - -diff --git a/kio/kio/kprotocolmanager.cpp b/kio/kio/kprotocolmanager.cpp -index 3f1cadd..502a3e6 100644 ---- a/kio/kio/kprotocolmanager.cpp -+++ b/kio/kio/kprotocolmanager.cpp -@@ -47,7 +47,6 @@ - #include <ksharedconfig.h> - #include <kstandarddirs.h> - #include <kurl.h> --#include <kmimetype.h> - #include <kmimetypetrader.h> - #include <kprotocolinfofactory.h> - -@@ -1190,23 +1189,7 @@ QString KProtocolManager::protocolForArchiveMimetype( const QString& mimeType ) - } - } - } -- const QString prot = d->protocolForArchiveMimetypes.value(mimeType); -- if (!prot.isEmpty()) -- return prot; -- -- // Check parent mimetypes -- KMimeType::Ptr mime = KMimeType::mimeType(mimeType); -- if (mime) { -- const QStringList parentMimeTypes = mime->allParentMimeTypes(); -- Q_FOREACH(const QString& parentMimeType, parentMimeTypes) { -- const QString res = d->protocolForArchiveMimetypes.value(parentMimeType); -- if (!res.isEmpty()) { -- return res; -- } -- } -- } -- -- return QString(); -+ return d->protocolForArchiveMimetypes.value(mimeType); - } - - #undef PRIVATE_DATA --- -1.7.7 Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-01-02 09:54:00 UTC (rev 174032) +++ PKGBUILD 2013-01-02 10:59:35 UTC (rev 174033) @@ -3,8 +3,8 @@ # Contributor: Pierre Schmitz <[email protected]> pkgname=kdelibs -pkgver=4.9.4 -pkgrel=4 +pkgver=4.9.5 +pkgrel=1 pkgdesc="KDE Core Libraries" arch=('i686' 'x86_64') url='https://projects.kde.org/projects/kde/kdelibs' @@ -17,14 +17,10 @@ makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell' 'mesa') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz"; - 'kde-applications-menu.patch' 'archlinux-menu.patch' - '0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch' - 'fix-crash-on-open-with.patch') -sha1sums=('b2fe70261207a96a26b5d8789379f134e3e070be' + 'kde-applications-menu.patch' 'archlinux-menu.patch') +sha1sums=('899a58c5cf2115a1a18fb1690c99b2b3815975c6' '86ee8c8660f19de8141ac99cd6943964d97a1ed7' - '63a850ab4196b9d06934f2b4a13acd9f7739bc67' - 'f5d203932f67ab6d87c794e9cb78a3b1a22ef747' - '8faa5984ba37e9c6da04bc64f1fe21cd24f1cf07') + '63a850ab4196b9d06934f2b4a13acd9f7739bc67') build() { cd "${srcdir}"/${pkgname}-${pkgver} @@ -34,10 +30,6 @@ # add Archlinux menu entry patch -p1 -i "${srcdir}"/archlinux-menu.patch - # Fixed upstream - patch -p1 -i "${srcdir}"/0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch - patch -p1 -i "${srcdir}"/fix-crash-on-open-with.patch - cd "${srcdir}" mkdir build cd build Deleted: fix-crash-on-open-with.patch =================================================================== --- fix-crash-on-open-with.patch 2013-01-02 09:54:00 UTC (rev 174032) +++ fix-crash-on-open-with.patch 2013-01-02 10:59:35 UTC (rev 174033) @@ -1,19 +0,0 @@ -commit 0820b3173aff4f0f3c803a9e75e726024da38ee5 -Author: David Faure <[email protected]> -Date: Thu Dec 6 11:55:05 2012 +0100 - - Fix crash when no service was selected (user clicked on "Open With...") - -diff --git a/kparts/browserrun.cpp b/kparts/browserrun.cpp -index 6d84800..6de0380 100644 ---- a/kparts/browserrun.cpp -+++ b/kparts/browserrun.cpp -@@ -304,7 +304,7 @@ BrowserRun::NonEmbeddableResult BrowserRun::handleNonEmbeddable(const QString& _ - this, SLOT(slotCopyToTempFileResult(KJob*)) ); - return Delayed; // We'll continue after the job has finished - } -- if (selectedService) { -+ if (selectedService && question.selectedService()) { - *selectedService = question.selectedService(); - // KRun will use this when starting an app - KRun::setPreferredService(question.selectedService()->desktopEntryName());
