diff options
author | André Fabian Silva Delgado <emulatorman@lavabit.com> | 2012-12-06 15:46:08 -0200 |
---|---|---|
committer | André Fabian Silva Delgado <emulatorman@lavabit.com> | 2012-12-06 15:46:08 -0200 |
commit | 276bd5a0c0f719faac74cca3c44c30b8f593b098 (patch) | |
tree | cc6da9a0bf02e0963d9bb5d46c3738e7d8527f81 | |
parent | 498fa3c696035f6dc30f3cf7de3d36d99e524e3c (diff) | |
download | abslibre-276bd5a0c0f719faac74cca3c44c30b8f593b098.tar.gz abslibre-276bd5a0c0f719faac74cca3c44c30b8f593b098.tar.bz2 abslibre-276bd5a0c0f719faac74cca3c44c30b8f593b098.zip |
kdelibs-libre-4.9.4-3: updating version
-rw-r--r-- | libre/kdelibs-libre/0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch | 53 | ||||
-rwxr-xr-x | libre/kdelibs-libre/PKGBUILD | 18 | ||||
-rw-r--r-- | libre/kdelibs-libre/fix-crash-on-open-with.patch | 19 |
3 files changed, 81 insertions, 9 deletions
diff --git a/libre/kdelibs-libre/0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch b/libre/kdelibs-libre/0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch new file mode 100644 index 000000000..5aadeb883 --- /dev/null +++ b/libre/kdelibs-libre/0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch @@ -0,0 +1,53 @@ +From 73283f1332e90fbb6fe0caa39a038cb16b83a54c Mon Sep 17 00:00:00 2001 +From: David Faure <faure@kde.org> +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 diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD index 326eae2aa..1f88f6557 100755 --- a/libre/kdelibs-libre/PKGBUILD +++ b/libre/kdelibs-libre/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 170700 2012-11-09 21:01:24Z andrea $ +# $Id: PKGBUILD 172900 2012-12-06 14:03:01Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org # Contributor: Pierre Schmitz <pierre@archlinux.de> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> _pkgname=kdelibs pkgname=kdelibs-libre -pkgver=4.9.3 -pkgrel=2 +pkgver=4.9.4 +pkgrel=3 pkgdesc="KDE Core Libraries" arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kde/kdelibs' @@ -23,13 +23,13 @@ conflicts=('kdelibs') install=${_pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz" 'kde-applications-menu.patch' - 'use-pythondontwritebytecode.patch' - 'fix-save-path.patch' + '0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch' + 'fix-crash-on-open-with.patch' 'khtml-fsdg.diff') sha1sums=('d5d60c431159b17a753ee7427d9ca129d550e3f8' '86ee8c8660f19de8141ac99cd6943964d97a1ed7' - '1138e78f15faa7221669ea81e313c595000cc953' - 'e3d2621bd1451fe7f45a454af970fae108614ddd' + 'f5d203932f67ab6d87c794e9cb78a3b1a22ef747' + '8faa5984ba37e9c6da04bc64f1fe21cd24f1cf07' 'a1502a964081ad583a00cf90c56e74bf60121830') build() { @@ -39,8 +39,8 @@ build() { patch -p1 -i "${srcdir}"/kde-applications-menu.patch # Fixed upstream - patch -p1 -i "${srcdir}"/use-pythondontwritebytecode.patch - patch -p1 -i "${srcdir}"/fix-save-path.patch + patch -p1 -i "${srcdir}"/0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch + patch -p1 -i "${srcdir}"/fix-crash-on-open-with.patch # Don't ask the user to download a plugin, it's probably nonfree. patch -p1 -i "${srcdir}"/khtml-fsdg.diff diff --git a/libre/kdelibs-libre/fix-crash-on-open-with.patch b/libre/kdelibs-libre/fix-crash-on-open-with.patch new file mode 100644 index 000000000..60556386d --- /dev/null +++ b/libre/kdelibs-libre/fix-crash-on-open-with.patch @@ -0,0 +1,19 @@ +commit 0820b3173aff4f0f3c803a9e75e726024da38ee5 +Author: David Faure <faure@kde.org> +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()); |