rpms/kdebase/F-11 kdebase-4.3.2-dolphin-kde#202176.patch, NONE, 1.1 kdebase.spec, 1.381, 1.382
Lukas Tinkl
ltinkl at fedoraproject.org
Wed Oct 7 11:00:14 UTC 2009
Author: ltinkl
Update of /cvs/extras/rpms/kdebase/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13382/F-11
Modified Files:
kdebase.spec
Added Files:
kdebase-4.3.2-dolphin-kde#202176.patch
Log Message:
sync with devel/
kdebase-4.3.2-dolphin-kde#202176.patch:
terminalpanel.cpp | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
--- NEW FILE kdebase-4.3.2-dolphin-kde#202176.patch ---
diff -up kdebase-4.3.2/apps/dolphin/src/panels/terminal/terminalpanel.cpp.orig kdebase-4.3.2/apps/dolphin/src/panels/terminal/terminalpanel.cpp
--- kdebase-4.3.2/apps/dolphin/src/panels/terminal/terminalpanel.cpp.orig 2009-10-07 12:28:46.000000000 +0200
+++ kdebase-4.3.2/apps/dolphin/src/panels/terminal/terminalpanel.cpp 2009-10-07 12:31:09.000000000 +0200
@@ -23,7 +23,6 @@
#include <kde_terminal_interface_v2.h>
#include <kparts/part.h>
#include <kshell.h>
-#include <kio/netaccess.h>
#include <QBoxLayout>
#include <QShowEvent>
@@ -58,13 +57,12 @@ void TerminalPanel::setUrl(const KUrl& u
}
Panel::setUrl(url);
- KUrl mostLocalUrl = KIO::NetAccess::mostLocalUrl(url, 0);
const bool sendInput = (m_terminal != 0)
&& (m_terminal->foregroundProcessId() == -1)
&& isVisible()
- && mostLocalUrl.isLocalFile();
+ && url.isLocalFile();
if (sendInput) {
- m_terminal->sendInput("cd " + KShell::quoteArg(mostLocalUrl.toLocalFile()) + '\n');
+ m_terminal->sendInput("cd " + KShell::quoteArg(url.toLocalFile()) + '\n');
}
}
Index: kdebase.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase/F-11/kdebase.spec,v
retrieving revision 1.381
retrieving revision 1.382
diff -u -p -r1.381 -r1.382
--- kdebase.spec 6 Oct 2009 12:49:19 -0000 1.381
+++ kdebase.spec 7 Oct 2009 11:00:13 -0000 1.382
@@ -1,7 +1,7 @@
Name: kdebase
Summary: K Desktop Environment 4 - Core Files
Version: 4.3.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 6
License: GPLv2
@@ -15,6 +15,9 @@ Patch0: kdebase-4.1.80-nsplugins-paths
Patch1: kdebase-4.1.70-konsole-session.patch
Patch2: kdebase-4.2.1-home-icon.patch
+# 4.3 upstream patches
+Patch100: kdebase-4.3.2-dolphin-kde#202176.patch
+
%ifnarch s390 s390x
Requires: eject
%endif
@@ -107,6 +110,9 @@ Requires: kdelibs4-devel kdepimlibs4-dev
%patch1 -p1 -b .konsole-session
%patch2 -p1 -b .home-icon
+# 4.3 upstream patches
+%patch100 -p1 -b .dolphin-kde#202176
+
# fix incorrect assumption that we're building in a combined kdebase tree
sed -i -e 's/EXISTS "${kdebase_SOURCE_DIR}"/0/g' apps/CMakeLists.txt
@@ -228,6 +234,9 @@ fi
%changelog
+* Wed Oct 07 2009 Than Ngo <than at redhat.com> - 4.3.2-2
+- fix Dolphin crash (regression)
+
* Sun Oct 04 2009 Than Ngo <than at redhat.com> - 4.3.2-1
- 4.3.2
More information about the fedora-extras-commits
mailing list