rpms/kdebase-runtime/devel kdebase-runtime-4.3.1-manpath.patch, 1.1, 1.2 kdebase-runtime.spec, 1.142, 1.143
Nils Philippsen
nphilipp at fedoraproject.org
Wed Sep 30 17:26:30 UTC 2009
Author: nphilipp
Update of /cvs/pkgs/rpms/kdebase-runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9836
Modified Files:
kdebase-runtime-4.3.1-manpath.patch kdebase-runtime.spec
Log Message:
fix manpath patch (spotted by Kevin Kofler)
kdebase-runtime-4.3.1-manpath.patch:
kio_man.cpp | 49 ++++++++++++++++++++++++++++++++++++++++++++++++-
kio_man.h | 4 +++-
2 files changed, 51 insertions(+), 2 deletions(-)
Index: kdebase-runtime-4.3.1-manpath.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/kdebase-runtime-4.3.1-manpath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- kdebase-runtime-4.3.1-manpath.patch 30 Sep 2009 15:11:28 -0000 1.1
+++ kdebase-runtime-4.3.1-manpath.patch 30 Sep 2009 17:26:30 -0000 1.2
@@ -1,6 +1,6 @@
diff -up kdebase-runtime-4.3.1/kioslave/man/kio_man.cpp.manpath kdebase-runtime-4.3.1/kioslave/man/kio_man.cpp
--- kdebase-runtime-4.3.1/kioslave/man/kio_man.cpp.manpath 2009-06-03 13:54:13.000000000 +0200
-+++ kdebase-runtime-4.3.1/kioslave/man/kio_man.cpp 2009-09-30 16:55:52.068576442 +0200
++++ kdebase-runtime-4.3.1/kioslave/man/kio_man.cpp 2009-09-30 19:25:03.254684269 +0200
@@ -1,5 +1,6 @@
/* This file is part of the KDE libraries
Copyright (c) 2000 Matthias Hoelzer-Kluepfel <mhk at caldera.de>
@@ -57,14 +57,14 @@ diff -up kdebase-runtime-4.3.1/kioslave/
+ // ... or errors out, ...
+ return;
+
-+ // ... grab its output, ...
-+ QString manpath_output = QString( manpath.readAllStandardOutput() );
-+
+ // ... wait (forever) until it's finished, ...
+ if ( ! manpath.waitForFinished( -1 ) )
+ // ... or errors out, ...
+ return;
+
++ // ... grab its output, ...
++ QString manpath_output = QString( manpath.readAllStandardOutput() );
++
+ // ... close the process, ...
+ manpath.close();
+
@@ -86,7 +86,7 @@ diff -up kdebase-runtime-4.3.1/kioslave/
static bool inited = false;
diff -up kdebase-runtime-4.3.1/kioslave/man/kio_man.h.manpath kdebase-runtime-4.3.1/kioslave/man/kio_man.h
--- kdebase-runtime-4.3.1/kioslave/man/kio_man.h.manpath 2008-11-19 11:17:53.000000000 +0100
-+++ kdebase-runtime-4.3.1/kioslave/man/kio_man.h 2009-09-30 14:05:22.254577337 +0200
++++ kdebase-runtime-4.3.1/kioslave/man/kio_man.h 2009-09-30 19:24:18.733936178 +0200
@@ -68,7 +68,9 @@ private:
void addToBuffer(const char *buffer, int buflen);
QString pageName(const QString& page) const;
Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -p -r1.142 -r1.143
--- kdebase-runtime.spec 30 Sep 2009 15:11:28 -0000 1.142
+++ kdebase-runtime.spec 30 Sep 2009 17:26:30 -0000 1.143
@@ -5,7 +5,7 @@
Name: kdebase-runtime
Summary: K Desktop Environment - Runtime
Version: 4.3.1
-Release: 3%{?dist}
+Release: 4%{?dist}
# http://techbase.kde.org/Policies/Licensing_Policy
License: LGPLv2+
@@ -212,6 +212,9 @@ fi
%changelog
+* Wed Sep 30 2009 Nils Philippsen <nils at redhat.com> - 4.3.1-4
+- fix manpath patch (spotted by Kevin Kofler)
+
* Wed Sep 30 2009 Nils Philippsen <nils at redhat.com> - 4.3.1-3
- if available, use the "manpath" command in the man kioslave to determine man
page file locations
More information about the fedora-extras-commits
mailing list