rpms/kdebase-runtime/F-10 kdebase-runtime-4.3.1-manpath.patch, NONE, 1.1 .cvsignore, 1.30, 1.31 kdebase-runtime.spec, 1.97, 1.98 sources, 1.33, 1.34
Lukas Tinkl
ltinkl at fedoraproject.org
Tue Oct 6 13:01:10 UTC 2009
- Previous message: rpms/dracut/F-12 .cvsignore, 1.22, 1.23 dracut.spec, 1.37, 1.38 sources, 1.23, 1.24
- Next message: rpms/kdebase-runtime/F-11 kdebase-runtime-4.3.1-manpath.patch, NONE, 1.1 .cvsignore, 1.35, 1.36 kdebase-runtime.spec, 1.120, 1.121 sources, 1.35, 1.36
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: ltinkl
Update of /cvs/extras/rpms/kdebase-runtime/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2347/F-10
Modified Files:
.cvsignore kdebase-runtime.spec sources
Added Files:
kdebase-runtime-4.3.1-manpath.patch
Log Message:
KDE 4.3.2
kdebase-runtime-4.3.1-manpath.patch:
kio_man.cpp | 49 ++++++++++++++++++++++++++++++++++++++++++++++++-
kio_man.h | 4 +++-
2 files changed, 51 insertions(+), 2 deletions(-)
--- NEW FILE kdebase-runtime-4.3.1-manpath.patch ---
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 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>
+ Copyright (c) 2009 Red Hat, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
@@ -17,6 +18,13 @@
Boston, MA 02110-1301, USA.
*/
+/*
+ Changes:
+
+ - 2009-09-30: use manpath binary if available to construct the man path (Nils
+ Philippsen <nils at redhat.com>)
+*/
+
#include "kio_man.h"
#include <stdio.h>
@@ -31,6 +39,8 @@
#include <QTextStream>
#include <QDataStream>
#include <QMap>
+#include <QIODevice>
+#include <QProcess>
#include <QRegExp>
#include <QTextCodec>
@@ -817,7 +827,7 @@ void MANProtocol::showMainIndex()
finished();
}
-void MANProtocol::constructPath(QStringList& constr_path, QStringList constr_catmanpath)
+void MANProtocol::constructPathFallback(QStringList& constr_path, QStringList constr_catmanpath)
{
QMap<QString, QString> manpath_map;
QMap<QString, QString> mandb_map;
@@ -984,6 +994,43 @@ void MANProtocol::constructPath(QStringL
}
}
+void MANProtocol::constructPathManpath(QStringList& constr_path, QStringList& constr_catmanpath)
+{
+ QProcess manpath;
+ QStringList args;
+
+ // start the "manpath" command, ...
+ manpath.start( "manpath", args, QIODevice::ReadOnly );
+
+ // ... wait (forever) until it's started, ...
+ if ( ! manpath.waitForStarted( -1 ) )
+ // ... or errors out, ...
+ return;
+
+ // ... 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();
+
+ // ... then process its output.
+ constr_path = manpath_output.split( ":", QString::SkipEmptyParts );
+}
+
+void MANProtocol::constructPath(QStringList& constr_path, QStringList& constr_catmanpath)
+{
+ // Attempt to use the "manpath" command, ...
+ constructPathManpath( constr_path, constr_catmanpath );
+ if ( constr_path.count() == 0 )
+ // ... if that yields nothing, fall back to our own implementation
+ constructPathFallback ( constr_path, constr_catmanpath );
+}
+
void MANProtocol::checkManPaths()
{
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 19:24:18.733936178 +0200
@@ -68,7 +68,9 @@ private:
void addToBuffer(const char *buffer, int buflen);
QString pageName(const QString& page) const;
QStringList buildSectionList(const QStringList& dirs) const;
- void constructPath(QStringList& constr_path, QStringList constr_catmanpath);
+ void constructPathFallback(QStringList& constr_path, QStringList constr_catmanpath);
+ void constructPathManpath(QStringList& constr_path, QStringList& constr_catmanpath);
+ void constructPath(QStringList& constr_path, QStringList& constr_catmanpath);
private:
static MANProtocol *_self;
QByteArray lastdir;
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/F-10/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- .cvsignore 1 Sep 2009 13:01:54 -0000 1.30
+++ .cvsignore 6 Oct 2009 13:01:09 -0000 1.31
@@ -1 +1 @@
-kdebase-runtime-4.3.1.tar.bz2
+kdebase-runtime-4.3.2.tar.bz2
Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/F-10/kdebase-runtime.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -r1.97 -r1.98
--- kdebase-runtime.spec 15 Sep 2009 23:59:40 -0000 1.97
+++ kdebase-runtime.spec 6 Oct 2009 13:01:09 -0000 1.98
@@ -4,8 +4,8 @@
Name: kdebase-runtime
Summary: K Desktop Environment - Runtime
-Version: 4.3.1
-Release: 2%{?dist}
+Version: 4.3.2
+Release: 1%{?dist}
# http://techbase.kde.org/Policies/Licensing_Policy
License: LGPLv2+
@@ -21,6 +21,7 @@ Patch1: kdebase-runtime-4.1.x-sea
Patch2: kdebase-runtime-4.2.85-knetattach.patch
Patch3: kdebase-runtime-4.1.1-iconthemes-inherit.patch
Patch4: kdebase-runtime-4.3.0-nepomuk-autostart.patch
+Patch5: kdebase-runtime-4.3.1-manpath.patch
## Upstream patches
@@ -94,6 +95,7 @@ BuildArch: noarch
%patch2 -p1 -b .knetattach
%patch3 -p1 -b .iconthemes-inherit
%patch4 -p1 -b .nepomuk-autostart
+%patch5 -p1 -b .manpath
%build
mkdir -p %{_target_platform}
@@ -210,6 +212,16 @@ fi
%changelog
+* Sun Oct 04 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
+* 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
+
* Tue Sep 15 2009 Rex Dieter <rdieter at fedorproject.org> - 4.3.1-2
- restore some previously inadvertantly omitted nepomuk ontologies
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/F-10/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- sources 1 Sep 2009 13:01:54 -0000 1.33
+++ sources 6 Oct 2009 13:01:09 -0000 1.34
@@ -1 +1 @@
-e51384cef307280f41fa8f39e2ecab8a kdebase-runtime-4.3.1.tar.bz2
+b0dfe65bc6d18c259c236889f92e2817 kdebase-runtime-4.3.2.tar.bz2
- Previous message: rpms/dracut/F-12 .cvsignore, 1.22, 1.23 dracut.spec, 1.37, 1.38 sources, 1.23, 1.24
- Next message: rpms/kdebase-runtime/F-11 kdebase-runtime-4.3.1-manpath.patch, NONE, 1.1 .cvsignore, 1.35, 1.36 kdebase-runtime.spec, 1.120, 1.121 sources, 1.35, 1.36
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list