Hello community,
here is the log from the commit of package kdelibs4 for openSUSE:Factory checked in at 2013-07-08 07:34:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kdelibs4 (Old)
and /work/SRC/openSUSE:Factory/.kdelibs4.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdelibs4"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kdelibs4/kdelibs4-apidocs.changes 2013-06-11 09:31:32.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.kdelibs4.new/kdelibs4-apidocs.changes 2013-07-08 07:34:38.000000000 +0200
@@ -1,0 +2,20 @@
+Thu Jun 27 18:07:10 UTC 2013 - tittiatcoke@gmail.com
+
+- Update to 4.10.90
+ * KDE 4.11 Beta 1 release
+ * See http://www.kde.org/announcements/announce-4.11-beta2.php
+
+-------------------------------------------------------------------
+Sun Jun 16 23:59:28 UTC 2013 - jengelh@inai.de
+
+- Explicitly list libattr-devel as BuildRequires
+
+-------------------------------------------------------------------
+Thu Jun 13 19:06:59 UTC 2013 - tittiatcoke@gmail.com
+
+- Update to 4.10.80
+ * KDE 4.11 Beta 1 release
+ * See http://www.kde.org/announcements/announce-4.11-beta1.php
+- Drop kjs-stacklimit.diff, patch is icluded in this release
+
+-------------------------------------------------------------------
--- /work/SRC/openSUSE:Factory/kdelibs4/kdelibs4.changes 2013-06-11 09:31:32.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.kdelibs4.new/kdelibs4.changes 2013-07-08 07:34:38.000000000 +0200
@@ -1,0 +2,26 @@
+Tue Jul 2 12:12:34 UTC 2013 - tittiatcoke@gmail.com
+
+- Utilize the new _kde_branding_version macro to set the correct
+ branding version.
+
+-------------------------------------------------------------------
+Thu Jun 27 18:07:10 UTC 2013 - tittiatcoke@gmail.com
+
+- Update to 4.10.90
+ * KDE 4.11 Beta 1 release
+ * See http://www.kde.org/announcements/announce-4.11-beta2.php
+
+-------------------------------------------------------------------
+Sun Jun 16 23:59:28 UTC 2013 - jengelh@inai.de
+
+- Explicitly list libattr-devel as BuildRequires
+
+-------------------------------------------------------------------
+Thu Jun 13 19:06:59 UTC 2013 - tittiatcoke@gmail.com
+
+- Update to 4.10.80
+ * KDE 4.11 Beta 1 release
+ * See http://www.kde.org/announcements/announce-4.11-beta1.php
+- Drop kjs-stacklimit.diff, patch is icluded in this release
+
+-------------------------------------------------------------------
Old:
----
kdelibs-4.10.4.tar.xz
kjs-stacklimit.diff
New:
----
kdelibs-4.10.90.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdelibs4-apidocs.spec ++++++
--- /var/tmp/diff_new_pack.coHNtR/_old 2013-07-08 07:34:40.000000000 +0200
+++ /var/tmp/diff_new_pack.coHNtR/_new 2013-07-08 07:34:40.000000000 +0200
@@ -17,13 +17,13 @@
Name: kdelibs4-apidocs
-Version: 4.10.4
+Version: 4.10.90
Release: 0
Summary: KDE 4 API documentation
License: LGPL-2.1+
Group: System/GUI/KDE
Url: http://www.kde.org
-Source0: http://download.kde.org/stable/%{version}/src/kdelibs-%{version}.tar.xz
+Source0: http://download.kde.org/unstable/%{version}/src/kdelibs-%{version}.tar.xz
Source1: baselibs.conf
Source2: hidden.desktop
Source3: ycp.xml
++++++ kdelibs4.spec ++++++
--- /var/tmp/diff_new_pack.coHNtR/_old 2013-07-08 07:34:40.000000000 +0200
+++ /var/tmp/diff_new_pack.coHNtR/_new 2013-07-08 07:34:40.000000000 +0200
@@ -24,9 +24,8 @@
%define kderev 0
Name: kdelibs4
-Version: 4.10.4
+Version: 4.10.90
Release: 0
-%define default_branding 4.10
BuildRequires: OpenEXR-devel
BuildRequires: automoc4
BuildRequires: avahi-compat-mDNSResponder-devel
@@ -48,6 +47,7 @@
BuildRequires: libQtWebKit-devel
BuildRequires: libacl-devel
BuildRequires: libattica-devel
+BuildRequires: libattr-devel
BuildRequires: libdbusmenu-qt-devel
BuildRequires: libgssglue-devel
BuildRequires: libjasper-devel
@@ -78,17 +78,11 @@
%else
BuildRequires: libbz2-devel
%endif
-%if %suse_version > 1140
-%define brandingversion %{default_branding}
-%endif
-%if %suse_version == 1140
-%define brandingversion 11.4
-%endif
Summary: KDE Base Libraries
License: LGPL-2.1+
Group: System/GUI/KDE
Url: http://www.kde.org
-Source0: http://download.kde.org/stable/%{version}/src/kdelibs-%{version}.tar.xz
+Source0: http://download.kde.org/unstable/%{version}/src/kdelibs-%{version}.tar.xz
Source1: baselibs.conf
Source2: hidden.desktop
Source3: ycp.xml
@@ -106,8 +100,6 @@
Patch10: kdebug-areas-update.diff
Patch12: desktop-translations.diff
Patch13: kjs-mark-register-stack.diff
-# PATCH-FIX-UPSTREAM kjs-stacklimit.diff -- kjs: Avoid overflow computing availableStackSize in KJS::RegExp::match - b.buschinski@googlemail.com
-Patch14: kjs-stacklimit.diff
Patch17: flash-player-non-oss.diff
Patch18: plasma-libs.diff
Patch20: ignore-inline-menu.diff
@@ -142,7 +134,7 @@
%define debug_package_requires %{name} = %{version}-%{release} libqt4-debuginfo
%endif
-Requires: %{name}-branding = %{brandingversion}
+Requires: %{name}-branding = %{_kde_branding_version}
%description
This package contains the basic packages of the K Desktop Environment.
@@ -155,7 +147,7 @@
Summary: KDE Base Libraries
License: LGPL-2.1+
Group: System/GUI/KDE
-Provides: %{name}-branding = %{brandingversion}
+Provides: %{name}-branding = %{_kde_branding_version}
Supplements: packageand(kdelibs4:branding-upstream)
Conflicts: otherproviders(%{name}-branding)
@@ -173,14 +165,13 @@
%patch1
%patch2
%patch3
-%patch5
+%patch5 -p1
%patch6
%patch8
%patch9
%patch10
-%patch12
+%patch12 -p1
%patch13
-%patch14 -p1
%patch17
%patch18
%patch20
++++++ clever-menu.diff ++++++
--- /var/tmp/diff_new_pack.coHNtR/_old 2013-07-08 07:34:40.000000000 +0200
+++ /var/tmp/diff_new_pack.coHNtR/_new 2013-07-08 07:34:40.000000000 +0200
@@ -1,12 +1,11 @@
-Index: kdecore/services/kservice.cpp
-===================================================================
---- kdecore/services/kservice.cpp.orig
-+++ kdecore/services/kservice.cpp
-@@ -739,6 +739,12 @@ QString KService::untranslatedGenericNam
+diff --git a/kdecore/services/kservice.cpp b/kdecore/services/kservice.cpp
+index eb35a15..097186f 100644
+--- a/kdecore/services/kservice.cpp
++++ b/kdecore/services/kservice.cpp
+@@ -741,6 +741,11 @@ QString KService::untranslatedGenericName() const {
return v.isValid() ? v.toString() : QString();
}
-+
+bool KService::SuSEunimportant() const {
+ QVariant v = property(QString::fromLatin1("X-SuSE-Unimportant"), QVariant::Bool);
+ return v.isValid() && v.toBool();
@@ -15,10 +14,27 @@
QString KService::parentApp() const {
Q_D(const KService);
QMap::ConstIterator it = d->m_mapProps.find(QLatin1String("X-KDE-ParentApp"));
-Index: kdecore/services/kservicegroup.cpp
-===================================================================
---- kdecore/services/kservicegroup.cpp.orig
-+++ kdecore/services/kservicegroup.cpp
+diff --git a/kdecore/services/kservice.h b/kdecore/services/kservice.h
+index 3843bad..022c915 100644
+--- a/kdecore/services/kservice.h
++++ b/kdecore/services/kservice.h
+@@ -358,6 +358,12 @@ public:
+ bool noDisplay() const;
+
+ /**
++ * check if the application entry is important
++ * SuSE special, not part of KDE API
++ */
++ bool SuSEunimportant() const;
++
++ /**
+ * Whether the service should be shown in KDE at all
+ * (including in context menus).
+ * @return true if the service should be shown.
+diff --git a/kdecore/services/kservicegroup.cpp b/kdecore/services/kservicegroup.cpp
+index 08bc587..70f4ab3 100644
+--- a/kdecore/services/kservicegroup.cpp
++++ b/kdecore/services/kservicegroup.cpp
@@ -29,7 +29,7 @@
#include
#include
@@ -28,7 +44,7 @@
KServiceGroup::KServiceGroup( const QString & name )
: KSycocaEntry(*new KServiceGroupPrivate(name))
-@@ -61,6 +61,11 @@ void KServiceGroupPrivate::load(const QS
+@@ -61,6 +61,11 @@ void KServiceGroupPrivate::load(const QString &cfg)
m_strComment = config.readEntry( "Comment" );
deleted = config.readEntry("Hidden", false );
m_bNoDisplay = desktopFile.noDisplay();
@@ -40,7 +56,7 @@
m_strBaseGroupName = config.readEntry( "X-KDE-BaseGroup" );
suppressGenericNames = config.readEntry( "X-KDE-SuppressGenericNames", QStringList() );
// d->sortOrder = config.readEntry("SortOrder", QStringList());
-@@ -124,6 +129,10 @@ int KServiceGroupPrivate::childCount() c
+@@ -124,6 +129,10 @@ int KServiceGroupPrivate::childCount() const
{
if (m_childCount == -1)
{
@@ -51,7 +67,7 @@
m_childCount = 0;
for( KServiceGroup::List::ConstIterator it = m_serviceList.begin();
-@@ -134,7 +143,8 @@ int KServiceGroupPrivate::childCount() c
+@@ -134,7 +143,8 @@ int KServiceGroupPrivate::childCount() const
{
KService::Ptr service = KService::Ptr::staticCast( p );
if (!service->noDisplay())
@@ -61,7 +77,7 @@
}
else if (p->isType(KST_KServiceGroup))
{
-@@ -219,6 +229,18 @@ QStringList KServiceGroup::suppressGener
+@@ -219,6 +229,18 @@ QStringList KServiceGroup::suppressGenericNames() const
return d->suppressGenericNames;
}
@@ -80,7 +96,7 @@
void KServiceGroupPrivate::load( QDataStream& s )
{
QStringList groupList;
-@@ -227,16 +249,21 @@ void KServiceGroupPrivate::load( QDataSt
+@@ -227,16 +249,21 @@ void KServiceGroupPrivate::load( QDataStream& s )
qint8 inlineHeader;
qint8 _inlineAlias;
qint8 _allowInline;
@@ -103,7 +119,7 @@
if (m_bDeep)
{
-@@ -296,10 +323,12 @@ void KServiceGroupPrivate::save( QDataSt
+@@ -296,10 +323,12 @@ void KServiceGroupPrivate::save( QDataStream& s )
qint8 inlineHeader = m_bShowInlineHeader ? 1 : 0;
qint8 _inlineAlias = m_bInlineAlias ? 1 : 0;
qint8 _allowInline = m_bAllowInline ? 1 : 0;
@@ -117,7 +133,7 @@
}
QListKServiceGroup::Ptr KServiceGroup::groupEntries(EntriesOptions options)
-@@ -359,6 +388,21 @@ KServiceGroup::entries(bool sort, bool e
+@@ -359,6 +388,21 @@ KServiceGroup::entries(bool sort, bool excludeNoDisplay, bool allowSeparators, b
return d->entries(this, sort, excludeNoDisplay, allowSeparators, sortByGenericName);
}
@@ -139,7 +155,7 @@
static void addItem(KServiceGroup::List &sorted, const KSycocaEntry::Ptr &p, bool &addSeparator)
{
if (addSeparator && !sorted.isEmpty())
-@@ -370,6 +414,12 @@ static void addItem(KServiceGroup::List
+@@ -370,6 +414,12 @@ static void addItem(KServiceGroup::List &sorted, const KSycocaEntry::Ptr &p, boo
KServiceGroup::List
KServiceGroupPrivate::entries(KServiceGroup *group, bool sort, bool excludeNoDisplay, bool allowSeparators, bool sortByGenericName)
{
@@ -152,7 +168,7 @@
KServiceGroup::Ptr grp;
// If the entries haven't been loaded yet, we have to reload ourselves
-@@ -395,11 +445,20 @@ KServiceGroupPrivate::entries(KServiceGr
+@@ -395,11 +445,20 @@ KServiceGroupPrivate::entries(KServiceGroup *group, bool sort, bool excludeNoDis
KSortableListKServiceGroup::SPtr,QByteArray glist;
Q_FOREACH (KSycocaEntry::Ptr p, group->d_func()->m_serviceList)
{
@@ -173,7 +189,7 @@
// Choose the right list
KSortableListKServiceGroup::SPtr,QByteArray & list = p->isType(KST_KServiceGroup) ? glist : slist;
QString name;
-@@ -435,6 +494,12 @@ KServiceGroupPrivate::entries(KServiceGr
+@@ -435,6 +494,12 @@ KServiceGroupPrivate::entries(KServiceGroup *group, bool sort, bool excludeNoDis
}
list.insert(key,KServiceGroup::SPtr(p));
}
@@ -186,7 +202,7 @@
// Now sort
slist.sort();
glist.sort();
-@@ -475,6 +540,8 @@ KServiceGroupPrivate::entries(KServiceGr
+@@ -475,6 +540,8 @@ KServiceGroupPrivate::entries(KServiceGroup *group, bool sort, bool excludeNoDis
// TODO: This prevents duplicates
for(KSortableListKServiceGroup::SPtr,QByteArray::Iterator it2 = slist.begin(); it2 != slist.end(); ++it2)
{
@@ -195,10 +211,10 @@
const KService::Ptr service = KService::Ptr::staticCast( (*it2).value() );
if (service->menuId() == item)
{
-Index: kdecore/services/kservicegroup.h
-===================================================================
---- kdecore/services/kservicegroup.h.orig
-+++ kdecore/services/kservicegroup.h
+diff --git a/kdecore/services/kservicegroup.h b/kdecore/services/kservicegroup.h
+index 9fdf2b0..ee2da88 100644
+--- a/kdecore/services/kservicegroup.h
++++ b/kdecore/services/kservicegroup.h
@@ -22,6 +22,7 @@
#include
#include
@@ -234,10 +250,10 @@
* options for groupEntries and serviceEntries
*/
enum EntriesOption
-Index: kdecore/services/kservicegroup_p.h
-===================================================================
---- kdecore/services/kservicegroup_p.h.orig
-+++ kdecore/services/kservicegroup_p.h
+diff --git a/kdecore/services/kservicegroup_p.h b/kdecore/services/kservicegroup_p.h
+index 5f21497..c67b984 100644
+--- a/kdecore/services/kservicegroup_p.h
++++ b/kdecore/services/kservicegroup_p.h
@@ -31,7 +31,8 @@ public:
KServiceGroupPrivate(const QString &path)
@@ -271,20 +287,3 @@
bool m_bShowEmptyMenu : 1;
bool m_bShowInlineHeader : 1;
bool m_bInlineAlias : 1;
-Index: kdecore/services/kservice.h
-===================================================================
---- kdecore/services/kservice.h.orig
-+++ kdecore/services/kservice.h
-@@ -350,6 +350,12 @@ public:
- bool noDisplay() const;
-
- /**
-+ * check if the application entry is important
-+ * SuSE special, not part of KDE API
-+ */
-+ bool SuSEunimportant() const;
-+
-+ /**
- * Whether the service should be shown in KDE at all
- * (including in context menus).
- * @return true if the service should be shown.
++++++ desktop-translations.diff ++++++
--- /var/tmp/diff_new_pack.coHNtR/_old 2013-07-08 07:34:40.000000000 +0200
+++ /var/tmp/diff_new_pack.coHNtR/_new 2013-07-08 07:34:40.000000000 +0200
@@ -4,30 +4,59 @@
Patch-upstream: no
Relates: kdelibs3/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();
-
-- 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;
++}
++
+ void KConfig::virtual_hook(int /*id*/, void* /*data*/)
+ {
+ /* nothing */
+diff --git a/kdecore/config/kconfig_p.h b/kdecore/config/kconfig_p.h
+index 7751242..b2c363f 100644
+--- a/kdecore/config/kconfig_p.h
++++ b/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);
+diff --git a/kdecore/config/kconfigdata.h b/kdecore/config/kconfigdata.h
+index e5dd7da..341e40b 100644
+--- a/kdecore/config/kconfigdata.h
++++ b/kdecore/config/kconfigdata.h
+@@ -169,6 +169,19 @@ class KEntryMap : public QMap
+ Iterator findExactEntry(const QByteArray& group, const QByteArray& key = QByteArray(),
+ SearchFlags flags = SearchFlags());
+ ConstIterator findExactEntry(const QByteArray& group, const QByteArray& key = QByteArray(),
+ SearchFlags flags = SearchFlags()) const
@@ -43,25 +72,62 @@
+ }
+
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
-@@ -35,6 +35,8 @@
+ SearchFlags flags = SearchFlags());
+
+diff --git a/kdecore/config/kconfiggroup.cpp b/kdecore/config/kconfiggroup.cpp
+index 9e73eb7..671474f 100644
+--- a/kdecore/config/kconfiggroup.cpp
++++ b/kdecore/config/kconfiggroup.cpp
+@@ -1156,6 +1156,16 @@ bool KConfigGroup::hasKey(const char *key) const
+ 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());
+diff --git a/kdecore/config/kconfiggroup.h b/kdecore/config/kconfiggroup.h
+index 8eddfd5..cae528f 100644
+--- a/kdecore/config/kconfiggroup.h
++++ b/kdecore/config/kconfiggroup.h
+@@ -621,6 +621,11 @@ public:
+ */
+ QMap entryMap() const;
+
++ /**
++ * @internal
++ */
++ bool hasTranslatedKey( const char *pKey ) const;
++
+ protected:
+ bool hasGroupImpl(const QByteArray &group) const;
+ KConfigGroup groupImpl(const QByteArray &b);
+diff --git a/kdecore/config/kdesktopfile.cpp b/kdecore/config/kdesktopfile.cpp
+index 54e5910..ef11b75 100644
+--- a/kdecore/config/kdesktopfile.cpp
++++ b/kdecore/config/kdesktopfile.cpp
+@@ -34,6 +34,8 @@
#include "kstandarddirs.h"
#include "kconfigini_p.h"
#include "kde_file.h"
+#include "kcatalog_p.h"
+#include "klocale.h"
-
+
class KDesktopFilePrivate : public KConfigPrivate
{
-@@ -174,6 +176,29 @@ bool KDesktopFile::isAuthorizedDesktopFi
+@@ -173,6 +175,29 @@ bool KDesktopFile::isAuthorizedDesktopFile(const QString& path)
return false;
}
-
+
+QString KDesktopFile::translatedEntry(const char* key) const
+{
+ Q_D(const KDesktopFile);
@@ -83,116 +149,64 @@
+ }
+
+ return QString::null;
-+}
++}
+
QString KDesktopFile::readType() const
{
Q_D(const KDesktopFile);
-@@ -188,20 +213,17 @@ QString KDesktopFile::readIcon() const
-
+@@ -187,20 +212,17 @@ QString KDesktopFile::readIcon() const
+
QString KDesktopFile::readName() const
{
- Q_D(const KDesktopFile);
- return d->desktopGroup.readEntry("Name", QString());
+ return translatedEntry("Name");
}
-
+
QString KDesktopFile::readComment() const
{
- Q_D(const KDesktopFile);
- return d->desktopGroup.readEntry("Comment", QString());
+ return translatedEntry("Comment");
}
-
+
QString KDesktopFile::readGenericName() const
{
- Q_D(const KDesktopFile);
- return d->desktopGroup.readEntry("GenericName", QString());
+ return translatedEntry("GenericName");
}
-
+
QString KDesktopFile::readPath() const
-Index: kdecore/config/kdesktopfile.h
-===================================================================
---- kdecore/config/kdesktopfile.h.orig
-+++ kdecore/config/kdesktopfile.h
+diff --git a/kdecore/config/kdesktopfile.h b/kdecore/config/kdesktopfile.h
+index 1c4eae6..f8a5d87 100644
+--- a/kdecore/config/kdesktopfile.h
++++ b/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
-@@ -621,6 +621,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
-@@ -881,6 +881,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
-@@ -1159,6 +1159,16 @@ bool KConfigGroup::hasKey(const char *ke
- 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());
+diff --git a/kdecore/services/kservicegroup.cpp b/kdecore/services/kservicegroup.cpp
+index 70f4ab3..f590632 100644
+--- a/kdecore/services/kservicegroup.cpp
++++ b/kdecore/services/kservicegroup.cpp
+@@ -56,9 +56,9 @@ void KServiceGroupPrivate::load(const QString &cfg)
+
+ 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();
+ if (directoryEntryPath.startsWith(QDir::homePath()))
+--
+1.8.2.2
++++++ kdelibs-4.10.4.tar.xz -> kdelibs-4.10.90.tar.xz ++++++
/work/SRC/openSUSE:Factory/kdelibs4/kdelibs-4.10.4.tar.xz /work/SRC/openSUSE:Factory/.kdelibs4.new/kdelibs-4.10.90.tar.xz differ: char 27, line 1
++++++ ksuseinstall.diff ++++++
--- /var/tmp/diff_new_pack.coHNtR/_old 2013-07-08 07:34:40.000000000 +0200
+++ /var/tmp/diff_new_pack.coHNtR/_new 2013-07-08 07:34:40.000000000 +0200
@@ -2,7 +2,7 @@
===================================================================
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -279,6 +279,7 @@ check_library_exists(socket connect "" H
+@@ -311,6 +311,7 @@ check_library_exists(socket connect "" HAVE_SOCKET_LIBRARY)
add_subdirectory( cmake )
add_subdirectory( kdecore )
add_subdirectory( kdeui )
@@ -21,35 +21,35 @@
+ ${CMAKE_SOURCE_DIR}/suseinstall
${KDE4_KDECORE_INCLUDES}/
${ZLIB_INCLUDE_DIR}
-
-@@ -334,6 +335,7 @@ if(NOT KIO_NO_NEPOMUK)
+
+@@ -331,6 +332,7 @@ if(NOT KIO_NO_NEPOMUK)
endif(NOT KIO_NO_NEPOMUK)
target_link_libraries(kio ${KDE4_KDEUI_LIBS} ${ZLIB_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTSVG_LIBRARY} ${X11_LIBRARIES} ${KIO_EXTRA_LIBS})
target_link_libraries(kio LINK_INTERFACE_LIBRARIES kdeui kdecore ${QT_QTNETWORK_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTGUI_LIBRARY} )
+target_link_libraries(kio ksuseinstall)
-
+
if(ACL_FOUND)
target_link_libraries(kio ${ACL_LIBS})
Index: kio/kio/krun.cpp
===================================================================
--- kio/kio/krun.cpp.orig
+++ kio/kio/krun.cpp
-@@ -83,6 +83,8 @@
- #include
+@@ -84,6 +84,8 @@
+ #include <QDesktopServices>
#endif
-
+
+#include
+
KRun::KRunPrivate::KRunPrivate(KRun *parent)
: q(parent),
m_showingDialog(false)
-@@ -171,6 +173,7 @@ bool KRun::runUrl(const KUrl& u, const Q
+@@ -172,6 +174,7 @@ bool KRun::runUrl(const KUrl& u, const QString& _mimetype, QWidget* window, bool
KUrl::List lst;
lst.append(u);
-
+
+ KSUSEInstall::checkMimeTypeInstalled( _mimetype, window );
KService::Ptr offer = KMimeTypeTrader::self()->preferredService(_mimetype);
-
+
if (!offer) {
Index: suseinstall/CMakeLists.txt
===================================================================
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org