Hello community,
here is the log from the commit of package kdelibs4 for openSUSE:Factory
checked in at Mon Jan 12 18:00:55 CET 2009.
--------
--- KDE/kdelibs4/kdelibs4.changes 2008-12-12 16:49:25.000000000 +0100
+++ /mounts/work_src_done/STABLE/kdelibs4/kdelibs4.changes 2009-01-09 13:26:33.000000000 +0100
@@ -1,0 +2,16 @@
+Fri Jan 9 13:23:19 CET 2009 - dmueller@suse.de
+
+- update to 4.1.87 (KDE 4.2 Januar snapshot)
+
+-------------------------------------------------------------------
+Mon Jan 5 11:43:37 CET 2009 - dmueller@suse.de
+
+- build with acl support
+
+-------------------------------------------------------------------
+Fri Jan 2 01:43:36 CET 2009 - cgoncalves@opensuse.org
+
+- get a missing Flash plugin not from Adobe but non-oss
+ (original idea from bnc#304999)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
4_1_BRANCH.diff
kdelibs-4.1.3.tar.bz2
kfile-select.diff
r895893-fix-autocomplete.diff
solid-interfaces.diff
New:
----
4_2_BRANCH.diff
flash-player-non-oss.diff
kdelibs-4.1.87.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdelibs4.spec ++++++
--- /var/tmp/diff_new_pack.K21378/_old 2009-01-12 18:00:06.000000000 +0100
+++ /var/tmp/diff_new_pack.K21378/_new 2009-01-12 18:00:06.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kdelibs4 (Version 4.1.3)
+# spec file for package kdelibs4 (Version 4.1.87)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,10 +19,10 @@
Name: kdelibs4
BuildRequires: alsa-devel aspell-devel cmake cups-devel giflib-devel hicolor-icon-theme
-BuildRequires: libattr-devel libpng-devel libqt4-devel libtiff-devel libxslt-devel unzip
+BuildRequires: libQtWebKit-devel libattr-devel libpng-devel libqt4-devel libtiff-devel libxslt-devel unzip
BuildRequires: libsoprano-devel pcre-devel phonon-devel shared-mime-info
BuildRequires: kde4-filesystem strigi strigi-devel update-desktop-files
-BuildRequires: OpenEXR-devel automoc4 enchant-devel fam-devel
+BuildRequires: OpenEXR-devel automoc4 enchant-devel fam-devel libacl-devel
%if %suse_version > 1020
BuildRequires: avahi-compat-mDNSResponder-devel fdupes libjasper-devel
%else
@@ -32,8 +32,8 @@
Group: System/GUI/KDE
Summary: KDE Base Libraries
Url: http://www.kde.org
-Version: 4.1.3
-Release: 5
+Version: 4.1.87
+Release: 1
%if %suse_version > 1010
Requires: libqt4-x11 >= %( echo `rpm -q --queryformat '%{VERSION}' libqt4-x11`)
%else
@@ -50,7 +50,7 @@
Source2: hidden.desktop
Source3: ycp.xml
Source4: kde4rc
-Patch0: 4_1_BRANCH.diff
+Patch0: 4_2_BRANCH.diff
Patch1: kde3-applications.diff
Patch2: default-useragent.diff
Patch3: add-suse-translations.diff
@@ -63,9 +63,7 @@
Patch11: display-key-support.diff
Patch12: desktop-translations.diff
Patch13: kjs-mark-register-stack.diff
-Patch14: solid-interfaces.diff
-Patch15: kfile-select.diff
-Patch16: r895893-fix-autocomplete.diff
+Patch17: flash-player-non-oss.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?opensuse_bs}
%define debug_package_requires %name = %version-%release libqt4-debuginfo
@@ -99,9 +97,7 @@
%patch11
%patch12
%patch13
-%patch14
-%patch15
-%patch16
+%patch17
#
# define KDE version exactly
#
@@ -177,6 +173,7 @@
%defattr(-,root,root)
/usr/bin/meinproc4
%_kde_share_dir/apps/ksgmltools2
+%doc %lang(en) /usr/share/doc/kde/HTML/en/kioslave
%package -n libkdecore4
License: LGPL v2.1 or later
@@ -289,6 +286,8 @@
%_libdir/libkdesu.so.*
%_libdir/libkdeui.so.*
%_libdir/libkdnssd.so.*
+%_libdir/libkfile.so.*
+%_libdir/libkformula.so.*
%_libdir/libkhtml.so.*
%_libdir/libkimproxy.so.*
%_libdir/libkio.so.*
@@ -303,13 +302,14 @@
%_libdir/libktexteditor.so.*
%_libdir/libkunittest.so.*
%_libdir/libkutils.so.*
-%_libdir/libkwalletbackend.so.*
%_libdir/libkrossui.so.*
%_libdir/libsolid.so.*
+%_libdir/libplasma.so.*
%_libdir/libthreadweaver.so.*
%_libdir/libkfile.so.*
%_libdir/libknewstuff2.so.*
%_libdir/libnepomuk.so.*
+/usr/share/locale/all_languages
%package -n libkde4-devel
License: LGPL v2.1 or later
@@ -319,6 +319,7 @@
Requires: kdelibs4-doc = %version
Requires: libkde4 = %version libkdecore4-devel = %version
Requires: libxslt-devel libattr-devel aspell-devel libtiff-devel pcre-devel
+Requires: libQtWebKit-devel
%if %suse_version > 1010
Requires: libqt4-devel
%else
@@ -331,7 +332,7 @@
Requires: libjpeg-devel libidn-devel libbz2-devel
Requires: libxml2-devel update-desktop-files strigi-devel
Requires: fam-devel enchant-devel OpenEXR-devel enchant-devel
-Requires: phonon-devel
+Requires: phonon-devel libacl-devel
%description -n libkde4-devel
This package contains all necessary include files and libraries needed
@@ -378,6 +379,29 @@
/usr/share/autostart/panel.desktop
/usr/share/autostart/ktip.desktop
/usr/share/dbus-1/interfaces/*
+/usr/share/icons/hicolor/*/actions/abs.*
+/usr/share/icons/hicolor/*/actions/brackets.*
+/usr/share/icons/hicolor/*/actions/frac.*
+/usr/share/icons/hicolor/*/actions/gsub.*
+/usr/share/icons/hicolor/*/actions/gsup.*
+/usr/share/icons/hicolor/*/actions/inscol.*
+/usr/share/icons/hicolor/*/actions/insrow.*
+/usr/share/icons/hicolor/*/actions/int.*
+/usr/share/icons/hicolor/*/actions/lsub.*
+/usr/share/icons/hicolor/*/actions/lsup.*
+/usr/share/icons/hicolor/*/actions/matrix.*
+/usr/share/icons/hicolor/*/actions/multiline.*
+/usr/share/icons/hicolor/*/actions/onetwomatrix.*
+/usr/share/icons/hicolor/*/actions/over.*
+/usr/share/icons/hicolor/*/actions/paren.*
+/usr/share/icons/hicolor/*/actions/prod.*
+/usr/share/icons/hicolor/*/actions/remcol.*
+/usr/share/icons/hicolor/*/actions/remrow.*
+/usr/share/icons/hicolor/*/actions/rsub.*
+/usr/share/icons/hicolor/*/actions/rsup.*
+/usr/share/icons/hicolor/*/actions/sqrt.*
+/usr/share/icons/hicolor/*/actions/sum.*
+/usr/share/icons/hicolor/*/actions/under.*
/usr/share/icons/hicolor/*/actions/presence_away.*
/usr/share/icons/hicolor/*/actions/presence_offline.*
/usr/share/icons/hicolor/*/actions/presence_online.*
@@ -386,6 +410,13 @@
/usr/share/mime/packages/kde.xml
%changelog
+* Fri Jan 09 2009 dmueller@suse.de
+- update to 4.1.87 (KDE 4.2 Januar snapshot)
+* Mon Jan 05 2009 dmueller@suse.de
+- build with acl support
+* Fri Jan 02 2009 cgoncalves@opensuse.org
+- get a missing Flash plugin not from Adobe but non-oss
+ (original idea from bnc#304999)
* Fri Dec 12 2008 wstephenson@suse.de
- Fix display of autocomplete widget (bnc#448621, kde#176058)
* Thu Dec 11 2008 dmueller@suse.de
++++++ 4_1_BRANCH.diff -> 4_2_BRANCH.diff ++++++
++++ 2394 lines (skipped)
++++ between KDE/kdelibs4/4_1_BRANCH.diff
++++ and /mounts/work_src_done/STABLE/kdelibs4/4_2_BRANCH.diff
++++++ clever-menu.diff ++++++
--- /var/tmp/diff_new_pack.K21378/_old 2009-01-12 18:00:08.000000000 +0100
+++ /var/tmp/diff_new_pack.K21378/_new 2009-01-12 18:00:08.000000000 +0100
@@ -1,92 +1,6 @@
---- kdecore/services/kservicegroup_p.h
-+++ kdecore/services/kservicegroup_p.h
-@@ -31,7 +31,8 @@ public:
-
- KServiceGroupPrivate(const QString &path)
- : KSycocaEntryPrivate(path),
-- m_bNoDisplay(false), m_bShowEmptyMenu(false), m_bShowInlineHeader(false), m_bInlineAlias(false),
-+ m_bNoDisplay(false), m_bShortMenu(false), m_bGeneralDescription(false),
-+ m_bShowEmptyMenu(false), m_bShowInlineHeader(false), m_bInlineAlias(false),
- m_bAllowInline(false), m_inlineValue(4), m_bDeep(false), m_childCount(-1)
- {
- }
-@@ -58,6 +59,13 @@ public:
-
- KServiceGroup::List
- entries(KServiceGroup *group, bool sort, bool excludeNoDisplay, bool allowSeparators, bool sortByGenericName);
-+
-+ /**
-+ * UNOFFICIAL SuSE special
-+ */
-+ KServiceGroup::List SuSEentries(KServiceGroup *group, bool sort, bool excludeNoDisplay, bool allowSeparators, bool sortByGenericName, bool excludeSuSEunimportant = true);
-+ KServiceGroup::List SuSEsortEntries( KServiceGroup *group, KSortableListKServiceGroup::SPtr,QByteArray slist, KSortableListKServiceGroup::SPtr,QByteArray glist, bool excludeNoDisplay, bool allowSeparators );
-+
- /**
- * This function parse attributes into menu
- */
-@@ -65,6 +73,8 @@ public:
-
-
- bool m_bNoDisplay : 1;
-+ bool m_bShortMenu : 1;
-+ bool m_bGeneralDescription : 1;
- bool m_bShowEmptyMenu : 1;
- bool m_bShowInlineHeader : 1;
- bool m_bInlineAlias : 1;
---- kdecore/services/kservice.h
-+++ kdecore/services/kservice.h
-@@ -331,6 +331,12 @@ public:
- bool noDisplay() const;
-
- /**
-+ * check if the application entry is important
-+ * SuSE special, not part of KDE API
-+ */
-+ bool SuSEunimportant() const;
-+
-+ /**
- * Name of the application this service belongs to.
- * (Useful for e.g. plugins)
- * @return the parent application, or QString() if not set
---- kdecore/services/kservicegroup.h
-+++ kdecore/services/kservicegroup.h
-@@ -22,6 +22,7 @@
- #include
- #include
- #include
-+#include
-
- class KBuildServiceGroupFactory;
-
-@@ -173,6 +174,12 @@ public:
- void setLayoutInfo(const QStringList &layout);
-
- /**
-+ * SuSE special, not part of KDE API
-+ */
-+ bool SuSEshortMenu() const;
-+ bool SuSEgeneralDescription() const;
-+
-+ /**
- * @internal
- * Returns information related to the layout of services in this group.
- */
-@@ -199,6 +206,12 @@ public:
- List entries(bool sorted = false);
-
- /**
-+ * UNOFFICIAL SuSE special
-+ */
-+ KServiceGroup::List SuSEsortEntries( KSortableListKServiceGroup::SPtr,QByteArray slist, KSortableListKServiceGroup::SPtr,QByteArray glist, bool excludeNoDisplay, bool allowSeparators );
-+
-+
-+ /**
- * options for groupEntries and serviceEntries
- */
- enum EntriesOption
--- kdecore/services/kservice.cpp
+++ kdecore/services/kservice.cpp
-@@ -675,6 +675,12 @@ QString KService::untranslatedGenericNam
+@@ -672,6 +672,12 @@
return v.isValid() ? v.toString() : QString();
}
@@ -99,6 +13,7 @@
QString KService::parentApp() const {
Q_D(const KService);
QMap::ConstIterator it = d->m_mapProps.find( "X-KDE-ParentApp" );
+Nur in b/kdelibs-4.1.87/kdecore/services: kservice.cpp.orig.
--- kdecore/services/kservicegroup.cpp
+++ kdecore/services/kservicegroup.cpp
@@ -30,7 +30,7 @@
@@ -110,7 +25,7 @@
KServiceGroup::KServiceGroup( const QString & name )
: KSycocaEntry(*new KServiceGroupPrivate(name))
-@@ -62,6 +62,11 @@ void KServiceGroupPrivate::load(const QS
+@@ -62,6 +62,11 @@
m_strComment = config.readEntry( "Comment" );
deleted = config.readEntry("Hidden", false );
m_bNoDisplay = desktopFile.noDisplay();
@@ -122,7 +37,7 @@
m_strBaseGroupName = config.readEntry( "X-KDE-BaseGroup" );
suppressGenericNames = config.readEntry( "X-KDE-SuppressGenericNames", QStringList() );
// d->sortOrder = config.readEntry("SortOrder", QStringList());
-@@ -125,6 +130,10 @@ int KServiceGroupPrivate::childCount() c
+@@ -125,6 +130,10 @@
{
if (m_childCount == -1)
{
@@ -133,7 +48,7 @@
m_childCount = 0;
for( KServiceGroup::List::ConstIterator it = m_serviceList.begin();
-@@ -135,7 +144,8 @@ int KServiceGroupPrivate::childCount() c
+@@ -135,7 +144,8 @@
{
KService::Ptr service = KService::Ptr::staticCast( p );
if (!service->noDisplay())
@@ -143,7 +58,7 @@
}
else if (p->isType(KST_KServiceGroup))
{
-@@ -220,6 +230,18 @@ QStringList KServiceGroup::suppressGener
+@@ -220,6 +230,18 @@
return d->suppressGenericNames;
}
@@ -162,7 +77,7 @@
void KServiceGroupPrivate::load( QDataStream& s )
{
QStringList groupList;
-@@ -228,16 +250,21 @@ void KServiceGroupPrivate::load( QDataSt
+@@ -228,16 +250,21 @@
qint8 inlineHeader;
qint8 _inlineAlias;
qint8 _allowInline;
@@ -185,7 +100,7 @@
if (m_bDeep)
{
-@@ -301,10 +328,12 @@ void KServiceGroupPrivate::save( QDataSt
+@@ -297,10 +324,12 @@
qint8 inlineHeader = m_bShowInlineHeader ? 1 : 0;
qint8 _inlineAlias = m_bInlineAlias ? 1 : 0;
qint8 _allowInline = m_bAllowInline ? 1 : 0;
@@ -199,7 +114,7 @@
}
QListKServiceGroup::Ptr KServiceGroup::groupEntries(EntriesOptions options)
-@@ -364,6 +393,13 @@ KServiceGroup::entries(bool sort, bool e
+@@ -360,6 +389,13 @@
return d->entries(this, sort, excludeNoDisplay, allowSeparators, sortByGenericName);
}
@@ -213,7 +128,7 @@
static void addItem(KServiceGroup::List &sorted, const KSycocaEntry::Ptr &p, bool &addSeparator)
{
if (addSeparator && !sorted.isEmpty())
-@@ -375,6 +411,12 @@ static void addItem(KServiceGroup::List
+@@ -371,6 +407,12 @@
KServiceGroup::List
KServiceGroupPrivate::entries(KServiceGroup *group, bool sort, bool excludeNoDisplay, bool allowSeparators, bool sortByGenericName)
{
@@ -226,28 +141,30 @@
KServiceGroup::Ptr grp;
// If the entries haven't been loaded yet, we have to reload ourselves
-@@ -401,11 +443,18 @@ KServiceGroupPrivate::entries(KServiceGr
- for (KServiceGroup::List::ConstIterator it(group->d_func()->m_serviceList.begin()); it != group->d_func()->m_serviceList.end(); ++it)
+@@ -396,11 +438,20 @@
+ KSortableListKServiceGroup::SPtr,QByteArray glist;
+ Q_FOREACH (KSycocaEntry::Ptr p, group->d_func()->m_serviceList)
{
- KSycocaEntry::Ptr p = (*it);
-+ if( !p->isType(KST_KServiceGroup) && !p->isType(KST_KService))
++ if ( !p->isType(KST_KServiceGroup) && !p->isType(KST_KService))
+ continue;
++
bool noDisplay = p->isType(KST_KServiceGroup) ?
static_cast(p.data())->noDisplay() :
static_cast(p.data())->noDisplay();
if (excludeNoDisplay && noDisplay)
continue;
-+ bool SuSEunimportant = p->isType(KST_KService) &&
-+ static_cast(p.data())->SuSEunimportant();
++
++ bool SuSEunimportant = p->isType(KST_KService) &&
++ static_cast(p.data())->SuSEunimportant();
+ if (excludeSuSEunimportant && SuSEunimportant)
-+ continue;
++ continue;
+
// Choose the right list
KSortableListKServiceGroup::SPtr,QByteArray & list = p->isType(KST_KServiceGroup) ? glist : slist;
QString name;
-@@ -438,6 +487,12 @@ KServiceGroupPrivate::entries(KServiceGr
+@@ -433,6 +484,12 @@
}
- list.insert(key,KServiceGroup::SPtr(*it));
+ list.insert(key,KServiceGroup::SPtr(p));
}
+ return SuSEsortEntries( group, slist, glist, excludeNoDisplay, allowSeparators );
+}
@@ -258,7 +175,7 @@
// Now sort
slist.sort();
glist.sort();
-@@ -479,6 +534,8 @@ KServiceGroupPrivate::entries(KServiceGr
+@@ -473,6 +530,8 @@
// TODO: This prevents duplicates
for(KSortableListKServiceGroup::SPtr,QByteArray::Iterator it2 = slist.begin(); it2 != slist.end(); ++it2)
{
@@ -267,3 +184,90 @@
const KService::Ptr service = KService::Ptr::staticCast( (*it2).value() );
if (service->menuId() == item)
{
+Nur in b/kdelibs-4.1.87/kdecore/services: kservicegroup.cpp.orig.
+--- kdecore/services/kservicegroup.h
++++ kdecore/services/kservicegroup.h
+@@ -22,6 +22,7 @@
+ #include
+ #include
+ #include
++#include
+
+ class KBuildServiceGroupFactory;
+
+@@ -173,6 +174,12 @@
+ void setLayoutInfo(const QStringList &layout);
+
+ /**
++ * SuSE special, not part of KDE API
++ */
++ bool SuSEshortMenu() const;
++ bool SuSEgeneralDescription() const;
++
++ /**
+ * @internal
+ * Returns information related to the layout of services in this group.
+ */
+@@ -199,6 +206,12 @@
+ List entries(bool sorted = false);
+
+ /**
++ * UNOFFICIAL SuSE special
++ */
++ KServiceGroup::List SuSEsortEntries( KSortableListKServiceGroup::SPtr,QByteArray slist, KSortableListKServiceGroup::SPtr,QByteArray glist, bool excludeNoDisplay, bool allowSeparators );
++
++
++ /**
+ * options for groupEntries and serviceEntries
+ */
+ enum EntriesOption
+--- kdecore/services/kservicegroup_p.h
++++ kdecore/services/kservicegroup_p.h
+@@ -31,7 +31,8 @@
+
+ KServiceGroupPrivate(const QString &path)
+ : KSycocaEntryPrivate(path),
+- m_bNoDisplay(false), m_bShowEmptyMenu(false), m_bShowInlineHeader(false), m_bInlineAlias(false),
++ m_bNoDisplay(false), m_bShortMenu(false), m_bGeneralDescription(false),
++ m_bShowEmptyMenu(false), m_bShowInlineHeader(false), m_bInlineAlias(false),
+ m_bAllowInline(false), m_inlineValue(4), m_bDeep(false), m_childCount(-1)
+ {
+ }
+@@ -58,6 +59,13 @@
+
+ KServiceGroup::List
+ entries(KServiceGroup *group, bool sort, bool excludeNoDisplay, bool allowSeparators, bool sortByGenericName);
++
++ /**
++ * UNOFFICIAL SuSE special
++ */
++ KServiceGroup::List SuSEentries(KServiceGroup *group, bool sort, bool excludeNoDisplay, bool allowSeparators, bool sortByGenericName, bool excludeSuSEunimportant = true);
++ KServiceGroup::List SuSEsortEntries( KServiceGroup *group, KSortableListKServiceGroup::SPtr,QByteArray slist, KSortableListKServiceGroup::SPtr,QByteArray glist, bool excludeNoDisplay, bool allowSeparators );
++
+ /**
+ * This function parse attributes into menu
+ */
+@@ -65,6 +73,8 @@
+
+
+ bool m_bNoDisplay : 1;
++ bool m_bShortMenu : 1;
++ bool m_bGeneralDescription : 1;
+ bool m_bShowEmptyMenu : 1;
+ bool m_bShowInlineHeader : 1;
+ bool m_bInlineAlias : 1;
+--- kdecore/services/kservice.h
++++ kdecore/services/kservice.h
+@@ -331,6 +331,12 @@
+ bool noDisplay() const;
+
+ /**
++ * check if the application entry is important
++ * SuSE special, not part of KDE API
++ */
++ bool SuSEunimportant() const;
++
++ /**
+ * Name of the application this service belongs to.
+ * (Useful for e.g. plugins)
+ * @return the parent application, or QString() if not set
++++++ flash-player-non-oss.diff ++++++
--- khtml/html/html_objectimpl.cpp.orig 2009-01-01 23:50:23.000000000 +0000
+++ khtml/html/html_objectimpl.cpp 2009-01-02 00:16:50.000000000 +0000
@@ -573,14 +573,32 @@
// Prepare the URL to show in the question (host only if http, to make it short)
KUrl pluginPageURL(embed->pluginPage);
QString shortURL = pluginPageURL.protocol() == "http" ? pluginPageURL.host() : pluginPageURL.prettyUrl();
- int res = KMessageBox::questionYesNo( part->view(),
- i18n("No plugin found for '%1'.\nDo you want to download one from %2?", mimeName, shortURL),
+
+ int res;
+ if (mimeName.startsWith("Shockwave Flash", Qt::CaseInsensitive))
+ {
+ res = KMessageBox::questionYesNo( part->view(),
+ i18n("No plugin found for '%1'.\nDo you want to download one from %2?", mimeName, "openSUSE"),
i18n("Missing Plugin"), KGuiItem(i18n("Download")), KGuiItem(i18n("Do Not Download")), QString("plugin-")+serviceType);
- if (res == KMessageBox::Yes)
+ if (res == KMessageBox::Yes)
+ {
+ // Open YMP file
+ KUrl ymp_flash("http://download.opensuse.org/YaST/flash-player.ymp");
+ ext->openUrlRequest(ymp_flash);
+ return;
+ }
+ }
+ else
{
- // Display vendor download page
- ext->createNewWindow(pluginPageURL);
- return;
+ res = KMessageBox::questionYesNo( part->view(),
+ i18n("No plugin found for '%1'.\nDo you want to download one from %2?", mimeName, "openSUSE"),
+ i18n("Missing Plugin"), KGuiItem(i18n("Download")), KGuiItem(i18n("Do Not Download")), QString("plugin-")+serviceType);
+ if (res == KMessageBox::Yes)
+ {
+ // Display vendor download page
+ ext->createNewWindow(pluginPageURL);
+ return;
+ }
}
}
}
++++++ kde3-applications.diff ++++++
--- /var/tmp/diff_new_pack.K21378/_old 2009-01-12 18:00:11.000000000 +0100
+++ /var/tmp/diff_new_pack.K21378/_new 2009-01-12 18:00:11.000000000 +0100
@@ -1,6 +1,6 @@
--- kdecore/services/kservice.cpp
+++ kdecore/services/kservice.cpp
-@@ -57,6 +57,8 @@ void KServicePrivate::init( const KDeskt
+@@ -57,6 +57,8 @@
{
const QString entryPath = q->entryPath();
bool absPath = !QDir::isRelativePath(entryPath);
@@ -9,7 +9,7 @@
// TODO: it makes sense to have a KConstConfigGroup I guess
const KConfigGroup desktopGroup = const_cast(config)->desktopGroup();
-@@ -84,6 +86,8 @@ void KServicePrivate::init( const KDeskt
+@@ -84,6 +86,8 @@
if (i != -1)
m_strName = m_strName.left(i);
}
@@ -18,7 +18,7 @@
m_strType = config->readType();
entryMap.remove("Type");
-@@ -107,6 +111,18 @@ void KServicePrivate::init( const KDeskt
+@@ -107,6 +111,18 @@
// NOT readPathEntry, it is not XDG-compliant. Path entries written by
// KDE4 will be still treated as such, though.
m_strExec = desktopGroup.readEntry( "Exec", QString() );
@@ -37,7 +37,17 @@
entryMap.remove("Exec");
if ( m_strType == "Application" ) {
-@@ -242,6 +259,8 @@ void KServicePrivate::init( const KDeskt
+@@ -203,6 +219,9 @@
+ m_initialPreference = desktopGroup.readEntry( "InitialPreference", 1 );
+ entryMap.remove("InitialPreference");
+
++ if (kde3application)
++ m_initialPreference = 1;
++
+ // Assign the "initial preference" to each mimetype/servicetype
+ // (and to set such preferences in memory from kbuildsycoca)
+ m_serviceTypes.reserve(lstServiceTypes.size());
+@@ -243,6 +262,8 @@
m_DBUSStartusType = KService::DBusNone;
m_strDesktopEntryName = _name.toLower();
@@ -46,26 +56,14 @@
m_bAllowAsDefault = desktopGroup.readEntry("AllowDefault", true);
entryMap.remove("AllowDefault");
-@@ -252,7 +271,9 @@ void KServicePrivate::init( const KDeskt
+@@ -262,7 +283,9 @@
// qDebug("Path = %s", entryPath.toLatin1().constData());
- QMap::ConstIterator it = entryMap.begin();
- for( ; it != entryMap.end();++it) {
+ QMap::ConstIterator it = entryMap.constBegin();
+ for( ; it != entryMap.constEnd();++it) {
- const QString key = it.key();
+ QString key = it.key();
+ if (kde3application && key=="OnlyShowIn" && QVariant(*it)=="KDE;")
-+ key = "NotShowIn";
++ key = "NotShowIn";
// do not store other translations like Name[fr]; kbuildsycoca will rerun if we change languages anyway
if (!key.contains('[')) {
//kDebug(7012) << " Key =" << key << " Data =" << *it;
---- kdecore/services/kservice.cpp 2008/04/10 14:25:49 1.11
-+++ kdecore/services/kservice.cpp 2008/04/10 14:26:54
-@@ -216,6 +216,9 @@
- m_initialPreference = desktopGroup.readEntry( "InitialPreference", 1 );
- entryMap.remove("InitialPreference");
-
-+ if (kde3application)
-+ m_initialPreference = 1;
-+
- // Assign the "initial preference" to each mimetype/servicetype
- // (and to set such preferences in memory from kbuildsycoca)
- m_serviceTypes.reserve(lstServiceTypes.size());
++++++ kde3-autostart.diff ++++++
--- /var/tmp/diff_new_pack.K21378/_old 2009-01-12 18:00:11.000000000 +0100
+++ /var/tmp/diff_new_pack.K21378/_new 2009-01-12 18:00:11.000000000 +0100
@@ -1,5 +1,5 @@
---- kinit/autostart.cpp.sav 2008-02-04 15:34:25.000000000 +0100
-+++ kinit/autostart.cpp 2008-02-04 17:18:18.000000000 +0100
+--- kinit/autostart.cpp
++++ kinit/autostart.cpp
@@ -23,7 +23,10 @@
#include
#include
@@ -11,7 +11,7 @@
class AutoStartItem
{
-@@ -76,7 +79,7 @@ static QString extractName(QString path)
+@@ -76,7 +79,7 @@
return path;
}
@@ -20,7 +20,7 @@
{
if (condition.isEmpty())
return true;
-@@ -87,6 +90,13 @@ static bool startCondition(const QString
+@@ -87,6 +90,13 @@
if (list[0].isEmpty() || list[2].isEmpty())
return true;
@@ -34,16 +34,17 @@
KConfig config(list[0], KConfig::NoGlobals);
KConfigGroup cg(&config, list[1]);
-@@ -99,6 +109,8 @@ void
+@@ -98,7 +108,8 @@
+ void
AutoStart::loadAutoStartList()
{
- QStringList files = KGlobal::dirs()->findAllResources("autostart", "*.desktop", KStandardDirs::NoDuplicates);
-+
+- const QStringList files = KGlobal::dirs()->findAllResources("autostart", "*.desktop", KStandardDirs::NoDuplicates);
++ QStringList files = KGlobal::dirs()->findAllResources("autostart", "*.desktop", KStandardDirs::NoDuplicates);
+ files = mergeKDE3Autostart( files );
for(QStringList::ConstIterator it = files.begin();
it != files.end();
-@@ -106,7 +118,7 @@ AutoStart::loadAutoStartList()
+@@ -106,7 +117,7 @@
{
KDesktopFile config(*it);
const KConfigGroup grp = config.desktopGroup();
@@ -52,7 +53,7 @@
continue;
if (!config.tryExec())
continue;
-@@ -135,6 +147,30 @@ AutoStart::loadAutoStartList()
+@@ -126,6 +137,30 @@
}
}
@@ -83,9 +84,11 @@
QString
AutoStart::startService()
{
---- kinit/autostart.h.sav 2007-02-28 17:19:10.000000000 +0100
-+++ kinit/autostart.h 2008-02-04 16:23:17.000000000 +0100
-@@ -39,6 +39,7 @@ public:
+Nur in b/kdelibs-4.1.87/kinit: autostart.cpp.orig.
+Nur in b/kdelibs-4.1.87/kinit: autostart.cpp.rej.
+--- kinit/autostart.h
++++ kinit/autostart.h
+@@ -39,6 +39,7 @@
bool phaseDone() const { return m_phasedone; }
private:
++++++ kdelibs-4.1.3.tar.bz2 -> kdelibs-4.1.87.tar.bz2 ++++++
KDE/kdelibs4/kdelibs-4.1.3.tar.bz2 /mounts/work_src_done/STABLE/kdelibs4/kdelibs-4.1.87.tar.bz2 differ: byte 11, line 1
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org