Hello community,
here is the log from the commit of package kdelibs4 for openSUSE:Factory
checked in at Mon Oct 12 11:50:39 CEST 2009.
--------
--- KDE/kdelibs4/kdelibs4.changes 2009-10-04 13:40:49.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdelibs4/kdelibs4.changes 2009-10-09 15:29:19.000000000 +0200
@@ -1,0 +2,20 @@
+Fri Oct 9 15:17:05 CEST 2009 - llunak@novell.com
+
+- fix Ctrl+W KHTML crash (kde#207173)
+
+-------------------------------------------------------------------
+Thu Oct 8 22:37:45 CEST 2009 - llunak@novell.com
+
+- use xdg-user-dir locations (bnc#540574)
+
+-------------------------------------------------------------------
+Thu Oct 8 17:58:59 CEST 2009 - llunak@novell.com
+
+- do not miss some translations from .desktop files (bnc#442800)
+
+-------------------------------------------------------------------
+Mon Oct 5 19:01:45 CEST 2009 - llunak@novell.com
+
+- make disabling initial ksycoca check work (bnc#536545)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
kded-checksycocaoption.diff
khtml-closetab-crash-kde207173.diff
xdg-user-dir-bnc540574.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdelibs4.spec ++++++
--- /var/tmp/diff_new_pack.7Mq7W1/_old 2009-10-12 11:44:13.000000000 +0200
+++ /var/tmp/diff_new_pack.7Mq7W1/_new 2009-10-12 11:44:13.000000000 +0200
@@ -43,7 +43,7 @@
Summary: KDE Base Libraries
Url: http://www.kde.org
Version: 4.3.1
-Release: 4
+Release: 5
Requires: libstrigi0 >= %( echo `rpm -q --queryformat '%{VERSION}' strigi-devel`)
Requires: soprano >= %( echo `rpm -q --queryformat '%{VERSION}' libsoprano-devel`)
Recommends: strigi >= %( echo `rpm -q --queryformat '%{VERSION}' strigi-devel`)
@@ -73,6 +73,9 @@
Patch20: ignore-inline-menu.diff
Patch21: policykit-workaround.patch
Patch22: khtml-4.3.2.diff
+Patch23: kded-checksycocaoption.diff
+Patch24: xdg-user-dir-bnc540574.diff
+Patch25: khtml-closetab-crash-kde207173.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if %suse_version > 1010
%requires_ge libqt4-x11
@@ -136,6 +139,9 @@
%patch20
%patch21 -p1
%patch22
+%patch23
+%patch24
+%patch25
#
# define KDE version exactly
#
++++++ desktop-translations.diff ++++++
--- /var/tmp/diff_new_pack.7Mq7W1/_old 2009-10-12 11:44:13.000000000 +0200
+++ /var/tmp/diff_new_pack.7Mq7W1/_new 2009-10-12 11:44:13.000000000 +0200
@@ -2,53 +2,77 @@
From: Lubos Lunak
Fate: #300461
Patch-upstream: no
-Relates: kdelibs3/desktop-translations.diff
+Relates: kdebase4/desktop-translations.diff
-Index: kdecore/services/kservicegroup.cpp
-===================================================================
---- kdecore/services/kservicegroup.cpp.orig
-+++ kdecore/services/kservicegroup.cpp
-@@ -56,9 +56,9 @@ void KServiceGroupPrivate::load(const QS
-
- const KConfigGroup config = desktopFile.desktopGroup();
+--- kdecore/config/kconfiggroup.h.sav 2009-07-20 17:48:26.000000000 +0200
++++ kdecore/config/kconfiggroup.h 2009-10-08 17:42:41.000000000 +0200
+@@ -617,6 +617,11 @@ public:
+ */
+ QMap entryMap() const;
-- m_strCaption = config.readEntry( "Name" );
-- m_strIcon = config.readEntry( "Icon" );
-- m_strComment = config.readEntry( "Comment" );
-+ m_strCaption = desktopFile.readName();
-+ m_strIcon = desktopFile.readIcon();
-+ m_strComment = desktopFile.readComment();
- deleted = config.readEntry("Hidden", false );
- m_bNoDisplay = desktopFile.noDisplay();
- if (directoryEntryPath.startsWith(QDir::homePath()))
-Index: kdecore/config/kconfigdata.h
-===================================================================
---- kdecore/config/kconfigdata.h.orig
-+++ kdecore/config/kconfigdata.h
-@@ -175,6 +175,19 @@ class KEntryMap : public QMapmValue;
++}
+
- Iterator findEntry(const QByteArray& group, const QByteArray& key = QByteArray(),
- SearchFlags flags = SearchFlags())
- {
-Index: kdecore/config/kdesktopfile.cpp
-===================================================================
---- kdecore/config/kdesktopfile.cpp.orig
-+++ kdecore/config/kdesktopfile.cpp
+ void KConfig::virtual_hook(int /*id*/, void* /*data*/)
+ {
+ /* nothing */
+--- kdecore/config/kdesktopfile.cpp.sav 2009-07-20 17:49:14.000000000 +0200
++++ kdecore/config/kdesktopfile.cpp 2009-10-08 17:51:04.000000000 +0200
@@ -35,6 +35,8 @@
#include "kstandarddirs.h"
#include "kconfigini_p.h"
@@ -58,18 +82,23 @@
class KDesktopFilePrivate : public KConfigPrivate
{
-@@ -179,6 +181,29 @@ bool KDesktopFile::isAuthorizedDesktopFi
+@@ -179,6 +181,34 @@ bool KDesktopFile::isAuthorizedDesktopFi
return false;
}
+QString KDesktopFile::translatedEntry(const char* key) const
+{
+ Q_D(const KDesktopFile);
-+ if (d->desktopGroup.hasTranslatedKey(key))
-+ return d->desktopGroup.readEntry(key);
++ return translatedEntry( d->desktopGroup, key );
++}
+
-+ if (d->desktopGroup.hasKey(key)) {
-+ QString value = d->desktopGroup.readEntryUntranslated(key);
++QString KDesktopFile::translatedEntry(const KConfigGroup& group, const char* key) const
++{
++ if (group.hasTranslatedKey(key))
++ return group.readEntry(key);
++
++ if (group.hasKey(key)) {
++ QString value = group.readEntryUntranslated(key);
+ QString fName = fileName();
+ fName = fName.mid(fName.lastIndexOf('/')+1);
+ QString po_lookup_key = QString::fromLatin1(key) + "(" + fName + "): " + value;
@@ -88,7 +117,7 @@
QString KDesktopFile::readType() const
{
Q_D(const KDesktopFile);
-@@ -193,20 +218,17 @@ QString KDesktopFile::readIcon() const
+@@ -193,20 +223,17 @@ QString KDesktopFile::readIcon() const
QString KDesktopFile::readName() const
{
@@ -112,73 +141,8 @@
}
QString KDesktopFile::readPath() const
-Index: kdecore/config/kdesktopfile.h
-===================================================================
---- kdecore/config/kdesktopfile.h.orig
-+++ kdecore/config/kdesktopfile.h
-@@ -250,6 +250,8 @@ protected:
- // virtual void virtual_hook( int id, void* data );
- private:
-
-+ QString translatedEntry(const char*) const;
-+
- Q_DISABLE_COPY(KDesktopFile)
-
- Q_DECLARE_PRIVATE(KDesktopFile)
-Index: kdecore/config/kconfiggroup.h
-===================================================================
---- kdecore/config/kconfiggroup.h.orig
-+++ kdecore/config/kconfiggroup.h
-@@ -617,6 +617,11 @@ public:
- */
- QMap entryMap() const;
-
-+ /**
-+ * @internal
-+ */
-+ bool hasTranslatedKey( const char *pKey ) const;
-+
- protected:
- bool hasGroupImpl(const QByteArray &group) const;
- KConfigGroup groupImpl(const QByteArray &b);
-Index: kdecore/config/kconfig.cpp
-===================================================================
---- kdecore/config/kconfig.cpp.orig
-+++ kdecore/config/kconfig.cpp
-@@ -749,6 +749,17 @@ QString KConfigPrivate::lookupData(const
- return entryMap.getEntry(group, key, QString(), flags, expand);
- }
-
-+QByteArray KConfigPrivate::lookupExactData(const QByteArray& group, const char* key,
-+ KEntryMap::SearchFlags flags) const
-+{
-+ if (bReadDefaults)
-+ flags |= KEntryMap::SearchDefaults;
-+ const KEntryMapConstIterator it = entryMap.findExactEntry(group, key, flags);
-+ if (it == entryMap.constEnd())
-+ return QByteArray();
-+ return it->mValue;
-+}
-+
- void KConfig::virtual_hook(int /*id*/, void* /*data*/)
- {
- /* nothing */
-Index: kdecore/config/kconfig_p.h
-===================================================================
---- kdecore/config/kconfig_p.h.orig
-+++ kdecore/config/kconfig_p.h
-@@ -53,6 +53,7 @@ public:
- QString lookupData(const QByteArray& group, const char* key, KEntryMap::SearchFlags flags,
- bool* expand) const;
- QByteArray lookupData(const QByteArray& group, const char* key, KEntryMap::SearchFlags flags) const;
-+ QByteArray lookupExactData(const QByteArray& group, const char* key, KEntryMap::SearchFlags flags) const;
-
- void putData(const QByteArray& group, const char* key, const QByteArray& value,
- KConfigBase::WriteConfigFlags flags, bool expand=false);
-Index: kdecore/config/kconfiggroup.cpp
-===================================================================
---- kdecore/config/kconfiggroup.cpp.orig
-+++ kdecore/config/kconfiggroup.cpp
+--- kdecore/config/kconfiggroup.cpp.sav 2009-07-20 17:48:26.000000000 +0200
++++ kdecore/config/kconfiggroup.cpp 2009-10-08 17:42:41.000000000 +0200
@@ -1239,6 +1239,16 @@ bool KConfigGroup::hasKey(const char *ke
return !config()->d_func()->lookupData(d->fullName(), key, flags).isNull();
}
@@ -196,3 +160,51 @@
bool KConfigGroup::hasKey(const QString &key) const
{
return hasKey(key.toUtf8().constData());
+--- kdecore/config/kconfigdata.h.sav 2009-07-20 17:48:26.000000000 +0200
++++ kdecore/config/kconfigdata.h 2009-10-08 17:42:41.000000000 +0200
+@@ -175,6 +175,19 @@ class KEntryMap : public QMaptranslatedEntry(cg,"Name"),
+ cg.readEntry("Icon"),
+ cg.readEntry("Exec"),
+ cg.readEntry("NoDisplay", false)));
+--- kdecore/services/kservicegroup.cpp.sav 2009-07-20 17:49:11.000000000 +0200
++++ kdecore/services/kservicegroup.cpp 2009-10-08 17:42:41.000000000 +0200
+@@ -56,9 +56,9 @@ void KServiceGroupPrivate::load(const QS
+
+ const KConfigGroup config = desktopFile.desktopGroup();
+
+- m_strCaption = config.readEntry( "Name" );
+- m_strIcon = config.readEntry( "Icon" );
+- m_strComment = config.readEntry( "Comment" );
++ m_strCaption = desktopFile.readName();
++ m_strIcon = desktopFile.readIcon();
++ m_strComment = desktopFile.readComment();
+ deleted = config.readEntry("Hidden", false );
+ m_bNoDisplay = desktopFile.noDisplay();
+ m_strBaseGroupName = config.readEntry( "X-KDE-BaseGroup" );
++++++ kded-checksycocaoption.diff ++++++
Index: kded.cpp
===================================================================
--- kded/kded.cpp (revision 1030322)
+++ kded/kded.cpp (working copy)
@@ -516,7 +516,8 @@
{
if(!delayedCheck)
updateDirWatch(); // this would search all the directories
- runBuildSycoca();
+ if (bCheckSycoca)
+ runBuildSycoca();
recreateDone();
if(delayedCheck)
{
@@ -810,9 +811,6 @@
Kded *kded = Kded::self();
- if (bCheckSycoca)
- runBuildSycoca();
-
kded->recreate(true); // initial
if (bCheckUpdates)
++++++ khtml-closetab-crash-kde207173.diff ++++++
------------------------------------------------------------------------
r1032787 | dfaure | 2009-10-08 14:04:22 +0000 (Thu, 08 Oct 2009) | 6 lines
Changed paths:
M /branches/KDE/4.3/kdelibs/khtml/khtml_part.cpp
Backport fix for 207173/209876: Hide the whole widget, not just the view and the
viewport. Otherwise the findbar stays around, receives focus, and this makes the
partmanager activate the part that we're currently deleting...
Forgot to do this before 4.3.2, so the fix will be in 4.3.3 :(
CCBUG: 207173
------------------------------------------------------------------------
Index: khtml_part.cpp
===================================================================
--- khtml/khtml_part.cpp (revision 1032786)
+++ khtml/khtml_part.cpp (revision 1032787)
@@ -609,8 +609,7 @@
if ( d->m_view )
{
- d->m_view->hide();
- d->m_view->viewport()->hide();
+ widget()->hide();
d->m_view->m_part = 0;
}
++++++ xdg-user-dir-bnc540574.diff ++++++
------------------------------------------------------------------------
r1032892 | lunakl | 2009-10-08 20:22:56 +0000 (Thu, 08 Oct 2009) | 4 lines
Changed paths:
M /trunk/KDE/kdelibs/kdecore/kde-config.cpp
M /trunk/KDE/kdelibs/kutils/kdeglobals.kcfg
kdeglobals no longer stores Desktop and Document paths,
they are accessed using QDesktopServices/xdg-user-dirs
------------------------------------------------------------------------
Index: kutils/kdeglobals.kcfg
===================================================================
--- kutils/kdeglobals.kcfg (revision 1032891)
+++ kutils/kdeglobals.kcfg (revision 1032892)
@@ -444,16 +444,6 @@
<whatsthis>Path to the directory containing executables to be run on session login</whatsthis>
<default>$KDEHOME/Autostart</default>
</entry>
- <entry key="Desktop" type="Path" >
- <label>Path to the desktop directory</label>
- <whatsthis>Directory where the files on the desktop are stored</whatsthis>
- <default>$HOME/Desktop</default>
- </entry>
- <entry key="Documents" type="Path" >
- <label>Path to documents folder</label>
- <whatsthis></whatsthis>
- <default>$HOME</default>
- </entry>
</group>
<group name="PreviewSettings" >
<entry key="BoostSize" type="Bool" />
Index: kdecore/kde-config.cpp
===================================================================
--- kdecore/kde-config.cpp (revision 1032891)
+++ kdecore/kde-config.cpp (revision 1032892)
@@ -36,6 +36,7 @@
#include <QDir>
#include
#include
+#include <QProcess>
#include
#include
#include
@@ -52,6 +53,15 @@
}
}
+static QString readXdg( const char* type )
+{
+ QProcess proc;
+ proc.start( "xdg-user-dir", QStringList() << type );
+ if (!proc.waitForStarted() || !proc.waitForFinished())
+ return QString();
+ return QString::fromLocal8Bit( proc.readAll()).trimmed();
+}
+
int main(int argc, char **argv)
{
QCoreApplication app(argc, argv);
@@ -193,10 +203,10 @@
{
//code duplicated with KGlobalSettings::initPath()
if ( type == "desktop" )
- {
- KConfigGroup g( KGlobal::config(), "Paths" );
- QString path=QDir::homePath() + "/Desktop/";
- path=g.readPathEntry( "Desktop", path);
+ { // QDesktopServices is QtGui :-/
+ QString path = readXdg( "DESKTOP" );
+ if (path.isEmpty())
+ path = QDir::homePath() + QLatin1String("/Desktop");
path=QDir::cleanPath( path );
if ( !path.endsWith('/') )
path.append(QLatin1Char('/'));
@@ -215,13 +225,9 @@
}
else if ( type == "document" )
{
- KConfigGroup g( KGlobal::config(), "Paths" );
-#ifdef Q_WS_WIN
- QString path=getWin32ShellFoldersPath(QLatin1String("Personal"));
-#else
- QString path=QDir::homePath();
-#endif
- path=g.readPathEntry( "Desktop", path);
+ QString path = readXdg( "DOCUMENTS" );
+ if ( path.isEmpty())
+ path = QDir::homePath() + QLatin1String("/Documents");
path=QDir::cleanPath( path );
if ( !path.endsWith('/') )
path.append(QLatin1Char('/'));
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org