Hello community,
here is the log from the commit of package kdelibs4 for openSUSE:Factory
checked in at Mon Nov 16 13:15:02 CET 2009.
--------
--- KDE/kdelibs4/kdelibs4.changes 2009-11-02 22:02:28.000000000 +0100
+++ /mounts/work_src_done/STABLE/kdelibs4/kdelibs4.changes 2009-11-15 19:36:41.000000000 +0100
@@ -1,0 +2,5 @@
+Sun Nov 15 19:36:22 CET 2009 - dmueller@suse.de
+
+- refresh patches
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdelibs4.spec ++++++
--- /var/tmp/diff_new_pack.UnqqSh/_old 2009-11-16 13:12:00.000000000 +0100
+++ /var/tmp/diff_new_pack.UnqqSh/_new 2009-11-16 13:12:00.000000000 +0100
@@ -43,7 +43,7 @@
Summary: KDE Base Libraries
Url: http://www.kde.org
Version: 4.3.3
-Release: 1
+Release: 2
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`)
++++++ add-suse-translations.diff ++++++
--- /var/tmp/diff_new_pack.UnqqSh/_old 2009-11-16 13:12:00.000000000 +0100
+++ /var/tmp/diff_new_pack.UnqqSh/_new 2009-11-16 13:12:00.000000000 +0100
@@ -1,13 +1,7 @@
-From: Dirk Mueller
-Summary: add suse provided translations
-Patch-Upstream: never
-
-Index: kdecore/localization/klocale.cpp
-===================================================================
---- kdecore/localization/klocale.cpp.orig
+--- kdecore/localization/klocale.cpp
+++ kdecore/localization/klocale.cpp
-@@ -325,11 +325,14 @@ void KLocalePrivate::initMainCatalogs(co
- catalogNames.append(KCatalogName(mainCatalog)); // application catalog
+@@ -327,11 +327,14 @@
+ catalogNames.append(KCatalogName(catalogName)); // application catalog
// catalogs from which each application can draw translations
- numberOfSysCatalogs = 4;
++++++ desktop-translations.diff ++++++
--- /var/tmp/diff_new_pack.UnqqSh/_old 2009-11-16 13:12:00.000000000 +0100
+++ /var/tmp/diff_new_pack.UnqqSh/_new 2009-11-16 13:12:00.000000000 +0100
@@ -1,12 +1,67 @@
-Subject: Read .desktop file translations from .mo files if not present
-From: Lubos Lunak
-Fate: #300461
-Patch-upstream: no
-Relates: kdebase4/desktop-translations.diff
-
---- 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:
+--- kdecore/config/kconfig.cpp
++++ kdecore/config/kconfig.cpp
+@@ -754,6 +754,17 @@
+ 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 */
+--- kdecore/config/kconfigdata.h
++++ kdecore/config/kconfigdata.h
+@@ -175,6 +175,19 @@
+ return find(theKey);
+ }
+
++ ConstIterator findExactEntry(const QByteArray& group, const QByteArray& key = QByteArray(),
++ SearchFlags flags = SearchFlags()) const
++ {
++ KEntryKey theKey(group, key, false, bool(flags&SearchDefaults));
++
++ // try the localized key first
++ if (flags&SearchLocalized) {
++ theKey.bLocal = true;
++ return find(theKey);
++ }
++ return find(theKey);
++ }
++
+ Iterator findEntry(const QByteArray& group, const QByteArray& key = QByteArray(),
+ SearchFlags flags = SearchFlags())
+ {
+--- kdecore/config/kconfiggroup.cpp
++++ kdecore/config/kconfiggroup.cpp
+@@ -1239,6 +1239,16 @@
+ return !config()->d_func()->lookupData(d->fullName(), key, flags).isNull();
+ }
+
++bool KConfigGroup::hasTranslatedKey(const char* key) const
++{
++ Q_ASSERT_X(isValid(), "KConfigGroup::hasTranslatedKey", "accessing an invalid group");
++
++ KEntryMap::SearchFlags flags = KEntryMap::SearchLocalized;
++ if ( config()->readDefaults() )
++ flags |= KEntryMap::SearchDefaults;
++ return !config()->d_func()->lookupExactData(d->fullName(), key, flags).isNull();
++}
++
+ bool KConfigGroup::hasKey(const QString &key) const
+ {
+ return hasKey(key.toUtf8().constData());
+--- kdecore/config/kconfiggroup.h
++++ kdecore/config/kconfiggroup.h
+@@ -617,6 +617,11 @@
*/
QMap entryMap() const;
@@ -18,32 +73,9 @@
protected:
bool hasGroupImpl(const QByteArray &group) const;
KConfigGroup groupImpl(const QByteArray &b);
---- kdecore/config/kdesktopfile.h.sav 2009-07-20 17:48:26.000000000 +0200
-+++ kdecore/config/kdesktopfile.h 2009-10-08 17:47:00.000000000 +0200
-@@ -243,6 +243,11 @@ public:
-
- const char *resource() const;
-
-+ /**
-+ * @internal SUSE addition
-+ */
-+ QString translatedEntry(const KConfigGroup& group, const char*) const;
-+
- protected:
- /** Virtual hook, used to add new "virtual" functions while maintaining
- binary compatibility. Unused in this class.
-@@ -250,6 +255,8 @@ protected:
- // virtual void virtual_hook( int id, void* data );
- private:
-
-+ QString translatedEntry(const char*) const;
-+
- Q_DISABLE_COPY(KDesktopFile)
-
- Q_DECLARE_PRIVATE(KDesktopFile)
---- kdecore/config/kconfig_p.h.sav 2009-07-20 17:48:26.000000000 +0200
-+++ kdecore/config/kconfig_p.h 2009-10-08 17:42:41.000000000 +0200
-@@ -53,6 +53,7 @@ public:
+--- kdecore/config/kconfig_p.h
++++ kdecore/config/kconfig_p.h
+@@ -53,6 +53,7 @@
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;
@@ -51,28 +83,8 @@
void putData(const QByteArray& group, const char* key, const QByteArray& value,
KConfigBase::WriteConfigFlags flags, bool expand=false);
---- kdecore/config/kconfig.cpp.sav 2009-07-20 17:48:26.000000000 +0200
-+++ kdecore/config/kconfig.cpp 2009-10-08 17:42:41.000000000 +0200
-@@ -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 */
---- 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
+--- kdecore/config/kdesktopfile.cpp
++++ kdecore/config/kdesktopfile.cpp
@@ -35,6 +35,8 @@
#include "kstandarddirs.h"
#include "kconfigini_p.h"
@@ -82,7 +94,7 @@
class KDesktopFilePrivate : public KConfigPrivate
{
-@@ -179,6 +181,34 @@ bool KDesktopFile::isAuthorizedDesktopFi
+@@ -179,6 +181,34 @@
return false;
}
@@ -117,7 +129,7 @@
QString KDesktopFile::readType() const
{
Q_D(const KDesktopFile);
-@@ -193,20 +223,17 @@ QString KDesktopFile::readIcon() const
+@@ -193,20 +223,17 @@
QString KDesktopFile::readName() const
{
@@ -141,50 +153,32 @@
}
QString KDesktopFile::readPath() const
---- 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();
- }
+--- kdecore/config/kdesktopfile.h
++++ kdecore/config/kdesktopfile.h
+@@ -243,6 +243,11 @@
-+bool KConfigGroup::hasTranslatedKey(const char* key) const
-+{
-+ Q_ASSERT_X(isValid(), "KConfigGroup::hasTranslatedKey", "accessing an invalid group");
-+
-+ KEntryMap::SearchFlags flags = KEntryMap::SearchLocalized;
-+ if ( config()->readDefaults() )
-+ flags |= KEntryMap::SearchDefaults;
-+ return !config()->d_func()->lookupExactData(d->fullName(), key, flags).isNull();
-+}
-+
- 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 QMap