[kdelibs] - kio/krun patch so kde services can open urls directly too
Rex Dieter
rdieter at fedoraproject.org
Fri Oct 15 16:10:17 UTC 2010
commit 2a0f06831da301262313032d3eb0d079ab7353e5
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Fri Oct 15 11:16:19 2010 -0500
- kio/krun patch so kde services can open urls directly too
kdelibs-4.5.2-kio_krun_services.patch | 14 ++++++++++++++
kdelibs.spec | 10 ++++++++--
2 files changed, 22 insertions(+), 2 deletions(-)
---
diff --git a/kdelibs-4.5.2-kio_krun_services.patch b/kdelibs-4.5.2-kio_krun_services.patch
new file mode 100644
index 0000000..b5ebe91
--- /dev/null
+++ b/kdelibs-4.5.2-kio_krun_services.patch
@@ -0,0 +1,14 @@
+--- branches/KDE/4.5/kdelibs/kio/kio/krun.cpp 2010/10/15 15:53:49 1186277
++++ branches/KDE/4.5/kdelibs/kio/kio/krun.cpp 2010/10/15 16:00:27 1186278
+@@ -368,9 +368,9 @@
+ }
+ else {
+ if (supportedProtocols.isEmpty()) {
+- // compat mode: assume KIO if not set and it's a KDE app
++ // compat mode: assume KIO if not set and it's a KDE app (or a KDE service)
+ const QStringList categories = _service.property("Categories").toStringList();
+- if (categories.contains("KDE")) {
++ if (categories.contains("KDE") || !_service.isApplication()) {
+ supportedProtocols.append("KIO");
+ }
+ else { // if no KDE app, be a bit over-generic
diff --git a/kdelibs.spec b/kdelibs.spec
index a3d0b04..fe0efbc 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -12,7 +12,7 @@
Summary: KDE Libraries
Version: 4.5.2
-Release: 5%{?dist}
+Release: 6%{?dist}
Name: kdelibs
Epoch: 6
@@ -90,7 +90,9 @@ Patch27: kdelibs-4.4.80-no_rpath.patch
Patch50: kdelibs-4.5.1-knewstuff_gpg2.patch
## 4.5 upstream
-Patch100: kdelibs-4.5.2-comic_applet_kde253387.patch
+Patch100: kdelibs-4.5.2-comic_applet_kde253387.patch
+# http://websvn.kde.org/?view=revision&revision=1186278
+Patch101: kdelibs-4.5.2-kio_krun_services.patch
## trunk upstream
Patch150: kdelibs-4.5.2-krun-kde#253294.patch
@@ -261,6 +263,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
# upstream patches
%patch100 -p4 -b .comic_applet_kde253387
+%patch101 -p4 -b .kio_krun_services
%patch150 -p1 -b .kde#253294
# security fix
@@ -506,6 +509,9 @@ rm -rf %{buildroot}
%changelog
+* Fri Oct 15 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.5.2-6
+- kio/krun patch so kde services can open urls directly too
+
* Fri Oct 08 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.5.2-5
- switching comic in comic applet crashes plasma (kde#253387,rh#640619)
More information about the scm-commits
mailing list