Hello community,
here is the log from the commit of package kdelibs4 for openSUSE:12.3 checked
in at 2013-02-09 10:12:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.3/kdelibs4 (Old)
and /work/SRC/openSUSE:12.3/.kdelibs4.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdelibs4", Maintainer is "kde-maintain...@suse.de"
Changes:
--------
--- /work/SRC/openSUSE:12.3/kdelibs4/kdelibs4.changes 2013-02-04
20:31:39.000000000 +0100
+++ /work/SRC/openSUSE:12.3/.kdelibs4.new/kdelibs4.changes 2013-02-09
10:12:42.000000000 +0100
@@ -1,0 +2,7 @@
+Thu Feb 7 18:56:22 UTC 2013 - wba...@tmo.at
+
+- changed clever-menu.patch:
+ * added method KServiceGroup::addSortOrderEntry(), needed to fix
+ bnc#356553
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
kdelibs4.spec: same change
++++++ clever-menu.diff ++++++
--- /var/tmp/diff_new_pack.0i7EwG/_old 2013-02-09 10:12:44.000000000 +0100
+++ /var/tmp/diff_new_pack.0i7EwG/_new 2013-02-09 10:12:44.000000000 +0100
@@ -117,10 +117,18 @@
}
QList<KServiceGroup::Ptr> KServiceGroup::groupEntries(EntriesOptions options)
-@@ -359,6 +388,13 @@ KServiceGroup::entries(bool sort, bool e
+@@ -359,6 +388,21 @@ KServiceGroup::entries(bool sort, bool e
return d->entries(this, sort, excludeNoDisplay, allowSeparators,
sortByGenericName);
}
++void KServiceGroup::addSortOrderEntry( const char *entry )
++{
++ Q_D(KServiceGroup);
++ const QString s = QString::fromLatin1(entry);
++ if (!d->sortOrder.contains(s))
++ d->sortOrder << s;
++}
++
+KServiceGroup::List
+KServiceGroup::SuSEsortEntries( KSortableList<KServiceGroup::SPtr,QByteArray>
slist, KSortableList<KServiceGroup::SPtr,QByteArray> glist, bool
excludeNoDisplay, bool allowSeparators )
+{
@@ -131,7 +139,7 @@
static void addItem(KServiceGroup::List &sorted, const KSycocaEntry::Ptr &p,
bool &addSeparator)
{
if (addSeparator && !sorted.isEmpty())
-@@ -370,6 +406,12 @@ static void addItem(KServiceGroup::List
+@@ -370,6 +414,12 @@ static void addItem(KServiceGroup::List
KServiceGroup::List
KServiceGroupPrivate::entries(KServiceGroup *group, bool sort, bool
excludeNoDisplay, bool allowSeparators, bool sortByGenericName)
{
@@ -144,7 +152,7 @@
KServiceGroup::Ptr grp;
// If the entries haven't been loaded yet, we have to reload ourselves
-@@ -395,11 +437,20 @@ KServiceGroupPrivate::entries(KServiceGr
+@@ -395,11 +445,20 @@ KServiceGroupPrivate::entries(KServiceGr
KSortableList<KServiceGroup::SPtr,QByteArray> glist;
Q_FOREACH (KSycocaEntry::Ptr p, group->d_func()->m_serviceList)
{
@@ -165,7 +173,7 @@
// Choose the right list
KSortableList<KServiceGroup::SPtr,QByteArray> & list =
p->isType(KST_KServiceGroup) ? glist : slist;
QString name;
-@@ -435,6 +486,12 @@ KServiceGroupPrivate::entries(KServiceGr
+@@ -435,6 +494,12 @@ KServiceGroupPrivate::entries(KServiceGr
}
list.insert(key,KServiceGroup::SPtr(p));
}
@@ -178,7 +186,7 @@
// Now sort
slist.sort();
glist.sort();
-@@ -475,6 +532,8 @@ KServiceGroupPrivate::entries(KServiceGr
+@@ -475,6 +540,8 @@ KServiceGroupPrivate::entries(KServiceGr
// TODO: This prevents duplicates
for(KSortableList<KServiceGroup::SPtr,QByteArray>::Iterator it2 =
slist.begin(); it2 != slist.end(); ++it2)
{
@@ -212,12 +220,13 @@
* @internal
* Returns information related to the layout of services in this group.
*/
-@@ -200,6 +207,12 @@ public:
+@@ -200,6 +207,13 @@ public:
List entries(bool sorted = false);
/**
+ * UNOFFICIAL SuSE special
+ */
++ void addSortOrderEntry( const char *entry );
+ KServiceGroup::List SuSEsortEntries(
KSortableList<KServiceGroup::SPtr,QByteArray> slist,
KSortableList<KServiceGroup::SPtr,QByteArray> glist, bool excludeNoDisplay,
bool allowSeparators );
+
+
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
