rpms/kdelibs4/F-8 kdelibs-4.0.1-dcop-servicetype.patch, NONE, 1.1 kdelibs4.spec, 1.10, 1.11
Kevin Kofler (kkofler)
fedora-extras-commits at redhat.com
Tue Feb 19 22:30:42 UTC 2008
Author: kkofler
Update of /cvs/pkgs/rpms/kdelibs4/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20068/F-8
Modified Files:
kdelibs4.spec
Added Files:
kdelibs-4.0.1-dcop-servicetype.patch
Log Message:
Sync from devel:
* Tue Feb 19 2008 Kevin Kofler <Kevin at 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 at fedoraprojectorg> 4.0.1-5
- -devel: include %%_kde4_appsdir/cmake here (#341751)
kdelibs-4.0.1-dcop-servicetype.patch:
--- NEW FILE kdelibs-4.0.1-dcop-servicetype.patch ---
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");
Index: kdelibs4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs4/F-8/kdelibs4.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- kdelibs4.spec 7 Feb 2008 03:52:17 -0000 1.10
+++ kdelibs4.spec 19 Feb 2008 22:30:08 -0000 1.11
@@ -4,7 +4,7 @@
Summary: K Desktop Environment 4 - Libraries
Version: 4.0.1
-Release: 4%{?dist}
+Release: 6%{?dist}
%if 0%{?fedora} > 8
Name: kdelibs
@@ -60,6 +60,9 @@
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 @@
# 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
@@ -235,6 +239,7 @@
%exclude %{_kde4_bindir}/makekdewidgets4
%exclude %{_kde4_appsdir}/kdewidgets/
%exclude %{_kde4_libdir}/kde4/plugins/designer/kdewidgets.*
+%exclude %{_kde4_appsdir}/cmake/
# ksgmltools2
%exclude %{_kde4_appsdir}/ksgmltools2/
%{_kde4_configdir}/*
@@ -272,6 +277,7 @@
%doc KDE4PORTING.html
%{_kde4_bindir}/kconfig_compiler4
%{_kde4_bindir}/makekdewidgets4
+%{_kde4_appsdir}/cmake/
%{_kde4_appsdir}/kdewidgets/
%dir %{_kde4_libdir}/kde4/plugins/designer
%{_kde4_libdir}/kde4/plugins/designer/kdewidgets.*
@@ -281,6 +287,12 @@
%changelog
+* Tue Feb 19 2008 Kevin Kofler <Kevin at 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 at fedoraprojectorg> 4.0.1-5
+- -devel: include %%_kde4_appsdir/cmake here (#341751)
+
* Wed Feb 06 2008 Than Ngo <than at redhat.com> 4.0.1-4
- upstream patch to make sure that static widget is always at position 0,0
More information about the fedora-extras-commits
mailing list