rpms
/
kdelibs
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Tue Feb 19 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> 4.0.1-6 

- fix running KDE 3 apps as filetype viewers from KDE 4 Dolphin
This commit is contained in:
Kevin Kofler 2008-02-19 22:12:39 +00:00
parent ed9bd202a0
commit a54ba72ec2
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
kdelibs-4.0.1-dcop-servicetype.patch Normal file
View File

@ -0,0 +1,17 @@
diff -ur kdelibs-4.0.1/kdecore/services/kservice.cpp kdelibs-4.0.1-dcop-servicetype/kdecore/services/kservice.cpp
--- kdelibs-4.0.1/kdecore/services/kservice.cpp 2008-01-05 01:00:34.000000000 +0100
+++ kdelibs-4.0.1-dcop-servicetype/kdecore/services/kservice.cpp 2008-02-19 20:21:57.000000000 +0100
@@ -194,7 +194,12 @@
//Compatibility
if( dbusStartupType.isEmpty() && desktopGroup.hasKey("X-DCOP-ServiceType"))
{
- dbusStartupType = desktopGroup.readEntry("X-DCOP-ServiceType").toLower();
+ QString dcopStartupType = desktopGroup.readEntry("X-DCOP-ServiceType").toLower();
+ // We can't use unique or multi because KLauncher will try to use D-Bus instead of DCOP on it.
+ // Only "wait" is safe (only waits for the process to complete, no DCOP or D-Bus involved).
+ // We use the default "none" otherwise.
+ if (dcopStartupType == "wait")
+ dbusStartupType = dcopStartupType;
entryMap.remove("X-DCOP-ServiceType");
}
entryMap.remove("X-DBUS-StartupType");

9
kdelibs.spec
View File

@ -4,7 +4,7 @@
Summary: K Desktop Environment 4 - Libraries
Version: 4.0.1
Release: 5%{?dist}
Release: 6%{?dist}
%if 0%{?fedora} > 8
Name: kdelibs
@ -60,6 +60,9 @@ Patch4: kdelibs-3.97.0-alsa-default-device.patch
Patch5: kdelibs-4.0.0-k3spell-hunspell.patch
# openssl's SHLIB_VERSION_NUMBER macro can't be used/trusted
Patch6: kdelibs-4.0.0-openssl.patch
# fix running KDE 3 apps as filetype viewers from KDE 4 Dolphin
# (can't talk over D-Bus to an app only supporting DCOP)
Patch7: kdelibs-4.0.1-dcop-servicetype.patch
# upstream patches
Patch100: kdelibs-4.0.1-objectembed-handling.patch
@ -149,6 +152,7 @@ applications for KDE 4.
# shouldn't be needed f9+, we'll see -- Rex
%patch6 -p1 -b .openssl
%endif
%patch7 -p1 -b .dcop-servicetype
# upstream patches
%patch100 -p0 -b .objectembed-handling
@ -283,6 +287,9 @@ rm -rf %{buildroot}
%changelog
* Tue Feb 19 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> 4.0.1-6
- fix running KDE 3 apps as filetype viewers from KDE 4 Dolphin
* Mon Feb 18 2008 Rex Dieter <rdieter@fedoraprojectorg> 4.0.1-5
- -devel: include %%_kde4_appsdir/cmake here (#341751)