Hello community, here is the log from the commit of package kdelibs4 for openSUSE:Factory checked in at Tue May 19 23:55:45 CEST 2009. -------- --- KDE/kdelibs4/kdelibs4.changes 2009-04-30 21:04:55.000000000 +0200 +++ kdelibs4/kdelibs4.changes 2009-05-14 19:31:37.000000000 +0200 @@ -1,0 +2,10 @@ +Thu May 14 19:31:22 CEST 2009 - dmueller@suse.de + +- update to 4.2.85 (KDE 4.3 Beta1) + +------------------------------------------------------------------- +Tue May 12 19:25:52 CEST 2009 - beineri@opensuse.org + +- bump to 4.2.3.1 to help solver with libqt4 update (bnc#502984) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- 4_2_BRANCH.diff kdelibs-4.2.3.tar.bz2 runtime_initialise_qt45_locale.diff _upstream New: ---- 4_3_BRANCH.diff kdelibs-4.2.85.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdelibs4.spec ++++++ --- /var/tmp/diff_new_pack.E16564/_old 2009-05-19 23:54:11.000000000 +0200 +++ /var/tmp/diff_new_pack.E16564/_new 2009-05-19 23:54:11.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdelibs4 (Version 4.2.3) +# spec file for package kdelibs4 (Version 4.2.85) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,6 +23,12 @@ 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 libacl-devel utempter +%if %suse_version > 1110 +BuildRequires: xz-devel +%endif +%if %suse_version > 1030 +BuildRequires: libgssglue-devel +%endif %if %suse_version > 1020 BuildRequires: avahi-compat-mDNSResponder-devel fdupes libjasper-devel %else @@ -32,7 +38,7 @@ Group: System/GUI/KDE Summary: KDE Base Libraries Url: http://www.kde.org -Version: 4.2.3 +Version: 4.2.85 Release: 1 %if %suse_version > 1010 Requires: libqt4-x11 >= %( echo `rpm -q --queryformat '%{VERSION}' libqt4-x11`) @@ -46,11 +52,10 @@ Requires: libkde4 = %version Requires: shared-mime-info >= %( echo `rpm -q --queryformat '%{VERSION}' shared-mime-info`) Source0: kdelibs-%version.tar.bz2 -Source1: _upstream Source2: hidden.desktop Source3: ycp.xml Source4: kde4rc -Patch0: 4_2_BRANCH.diff +Patch0: 4_3_BRANCH.diff Patch1: kde3-applications.diff Patch2: default-useragent.diff Patch3: add-suse-translations.diff @@ -65,7 +70,6 @@ Patch13: kjs-mark-register-stack.diff Patch17: flash-player-non-oss.diff Patch18: plasma-libs.diff -Patch19: runtime_initialise_qt45_locale.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?opensuse_bs} %define debug_package_requires %name = %version-%release libqt4-debuginfo @@ -101,7 +105,6 @@ %patch13 %patch17 %patch18 -%patch19 # # define KDE version exactly # @@ -211,6 +214,7 @@ Group: System/GUI/KDE Summary: KDE Base Libraries Requires: kde4-filesystem >= %_kde_platform_version +%requires_ge libqt4 Requires: libkdecore4 = %version %description -n kdelibs4-core @@ -416,6 +420,10 @@ /usr/share/mime/packages/kde.xml %changelog +* Thu May 14 2009 dmueller@suse.de +- update to 4.2.85 (KDE 4.3 Beta1) +* Tue May 12 2009 beineri@opensuse.org +- bump to 4.2.3.1 to help solver with libqt4 update (bnc#502984) * Thu Apr 30 2009 dmueller@suse.de - update to 4.2.3 * see http://kde.org/announcements/changelogs/changelog4_2_2to4_2_3.php ++++++ 4_2_BRANCH.diff -> 4_3_BRANCH.diff ++++++ ++++ 8839 lines (skipped) ++++ between KDE/kdelibs4/4_2_BRANCH.diff ++++ and kdelibs4/4_3_BRANCH.diff ++++++ add-suse-translations.diff ++++++ --- /var/tmp/diff_new_pack.E16564/_old 2009-05-19 23:54:11.000000000 +0200 +++ /var/tmp/diff_new_pack.E16564/_new 2009-05-19 23:54:11.000000000 +0200 @@ -2,9 +2,11 @@ Summary: add suse provided translations Patch-Upstream: never ---- kdecore/localization/klocale.cpp +Index: kdecore/localization/klocale.cpp +=================================================================== +--- kdecore/localization/klocale.cpp.orig +++ kdecore/localization/klocale.cpp -@@ -265,11 +265,14 @@ void KLocalePrivate::initMainCatalogs(const QString & catalog) +@@ -325,11 +325,14 @@ void KLocalePrivate::initMainCatalogs(co catalogNames.append(KCatalogName(mainCatalog)); // application catalog // catalogs from which each application can draw translations @@ -17,6 +19,6 @@ + catalogNames.append(KCatalogName("desktop_translations")); + catalogNames.append(KCatalogName("kde4-openSUSE")); + catalogNames.append(KCatalogName("kde4-SLE")); - + updateCatalogs(); // evaluate this for all languages } ++++++ clever-menu.diff ++++++ --- /var/tmp/diff_new_pack.E16564/_old 2009-05-19 23:54:12.000000000 +0200 +++ /var/tmp/diff_new_pack.E16564/_new 2009-05-19 23:54:12.000000000 +0200 @@ -1,6 +1,8 @@ ---- kdecore/services/kservice.cpp +Index: kdecore/services/kservice.cpp +=================================================================== +--- kdecore/services/kservice.cpp.orig +++ kdecore/services/kservice.cpp -@@ -672,6 +672,12 @@ +@@ -702,6 +702,12 @@ QString KService::untranslatedGenericNam return v.isValid() ? v.toString() : QString(); } @@ -13,10 +15,11 @@ QString KService::parentApp() const { Q_D(const KService); QMap<QString,QVariant>::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 +Index: kdecore/services/kservicegroup.cpp +=================================================================== +--- kdecore/services/kservicegroup.cpp.orig +++ kdecore/services/kservicegroup.cpp -@@ -30,7 +30,7 @@ +@@ -29,7 +29,7 @@ #include <ksortablelist.h> #include <kdesktopfile.h> #include <kconfiggroup.h> @@ -25,7 +28,7 @@ KServiceGroup::KServiceGroup( const QString & name ) : KSycocaEntry(*new KServiceGroupPrivate(name)) -@@ -62,6 +62,11 @@ +@@ -61,6 +61,11 @@ void KServiceGroupPrivate::load(const QS m_strComment = config.readEntry( "Comment" ); deleted = config.readEntry("Hidden", false ); m_bNoDisplay = desktopFile.noDisplay(); @@ -37,7 +40,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 @@ +@@ -124,6 +129,10 @@ int KServiceGroupPrivate::childCount() c { if (m_childCount == -1) { @@ -48,7 +51,7 @@ m_childCount = 0; for( KServiceGroup::List::ConstIterator it = m_serviceList.begin(); -@@ -135,7 +144,8 @@ +@@ -134,7 +143,8 @@ int KServiceGroupPrivate::childCount() c { KService::Ptr service = KService::Ptr::staticCast( p ); if (!service->noDisplay()) @@ -58,7 +61,7 @@ } else if (p->isType(KST_KServiceGroup)) { -@@ -220,6 +230,18 @@ +@@ -219,6 +229,18 @@ QStringList KServiceGroup::suppressGener return d->suppressGenericNames; } @@ -77,7 +80,7 @@ void KServiceGroupPrivate::load( QDataStream& s ) { QStringList groupList; -@@ -228,16 +250,21 @@ +@@ -227,16 +249,21 @@ void KServiceGroupPrivate::load( QDataSt qint8 inlineHeader; qint8 _inlineAlias; qint8 _allowInline; @@ -100,7 +103,7 @@ if (m_bDeep) { -@@ -297,10 +324,12 @@ +@@ -296,10 +323,12 @@ void KServiceGroupPrivate::save( QDataSt qint8 inlineHeader = m_bShowInlineHeader ? 1 : 0; qint8 _inlineAlias = m_bInlineAlias ? 1 : 0; qint8 _allowInline = m_bAllowInline ? 1 : 0; @@ -114,7 +117,7 @@ } QList<KServiceGroup::Ptr> KServiceGroup::groupEntries(EntriesOptions options) -@@ -360,6 +389,13 @@ +@@ -359,6 +388,13 @@ KServiceGroup::entries(bool sort, bool e return d->entries(this, sort, excludeNoDisplay, allowSeparators, sortByGenericName); } @@ -128,7 +131,7 @@ static void addItem(KServiceGroup::List &sorted, const KSycocaEntry::Ptr &p, bool &addSeparator) { if (addSeparator && !sorted.isEmpty()) -@@ -371,6 +407,12 @@ +@@ -370,6 +406,12 @@ static void addItem(KServiceGroup::List KServiceGroup::List KServiceGroupPrivate::entries(KServiceGroup *group, bool sort, bool excludeNoDisplay, bool allowSeparators, bool sortByGenericName) { @@ -141,7 +144,7 @@ KServiceGroup::Ptr grp; // If the entries haven't been loaded yet, we have to reload ourselves -@@ -396,11 +438,20 @@ +@@ -395,11 +437,20 @@ KServiceGroupPrivate::entries(KServiceGr KSortableList<KServiceGroup::SPtr,QByteArray> glist; Q_FOREACH (KSycocaEntry::Ptr p, group->d_func()->m_serviceList) { @@ -162,7 +165,7 @@ // Choose the right list KSortableList<KServiceGroup::SPtr,QByteArray> & list = p->isType(KST_KServiceGroup) ? glist : slist; QString name; -@@ -433,6 +484,12 @@ +@@ -435,6 +486,12 @@ KServiceGroupPrivate::entries(KServiceGr } list.insert(key,KServiceGroup::SPtr(p)); } @@ -175,7 +178,7 @@ // Now sort slist.sort(); glist.sort(); -@@ -473,6 +530,8 @@ +@@ -475,6 +532,8 @@ KServiceGroupPrivate::entries(KServiceGr // TODO: This prevents duplicates for(KSortableList<KServiceGroup::SPtr,QByteArray>::Iterator it2 = slist.begin(); it2 != slist.end(); ++it2) { @@ -184,8 +187,9 @@ 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 +Index: kdecore/services/kservicegroup.h +=================================================================== +--- kdecore/services/kservicegroup.h.orig +++ kdecore/services/kservicegroup.h @@ -22,6 +22,7 @@ #include <kdecore_export.h> @@ -195,7 +199,7 @@ class KBuildServiceGroupFactory; -@@ -173,6 +174,12 @@ +@@ -174,6 +175,12 @@ public: void setLayoutInfo(const QStringList &layout); /** @@ -208,7 +212,7 @@ * @internal * Returns information related to the layout of services in this group. */ -@@ -199,6 +206,12 @@ +@@ -200,6 +207,12 @@ public: List entries(bool sorted = false); /** @@ -221,9 +225,11 @@ * options for groupEntries and serviceEntries */ enum EntriesOption ---- kdecore/services/kservicegroup_p.h +Index: kdecore/services/kservicegroup_p.h +=================================================================== +--- kdecore/services/kservicegroup_p.h.orig +++ kdecore/services/kservicegroup_p.h -@@ -31,7 +31,8 @@ +@@ -31,7 +31,8 @@ public: KServiceGroupPrivate(const QString &path) : KSycocaEntryPrivate(path), @@ -233,7 +239,7 @@ m_bAllowInline(false), m_inlineValue(4), m_bDeep(false), m_childCount(-1) { } -@@ -58,6 +59,13 @@ +@@ -58,6 +59,13 @@ public: KServiceGroup::List entries(KServiceGroup *group, bool sort, bool excludeNoDisplay, bool allowSeparators, bool sortByGenericName); @@ -247,7 +253,7 @@ /** * This function parse attributes into menu */ -@@ -65,6 +73,8 @@ +@@ -65,6 +73,8 @@ public: bool m_bNoDisplay : 1; @@ -256,9 +262,11 @@ bool m_bShowEmptyMenu : 1; bool m_bShowInlineHeader : 1; bool m_bInlineAlias : 1; ---- kdecore/services/kservice.h +Index: kdecore/services/kservice.h +=================================================================== +--- kdecore/services/kservice.h.orig +++ kdecore/services/kservice.h -@@ -331,6 +331,12 @@ +@@ -330,6 +330,12 @@ public: bool noDisplay() const; /** ++++++ default-useragent.diff ++++++ --- /var/tmp/diff_new_pack.E16564/_old 2009-05-19 23:54:12.000000000 +0200 +++ /var/tmp/diff_new_pack.E16564/_new 2009-05-19 23:54:12.000000000 +0200 @@ -1,6 +1,8 @@ ---- kio/kio/kprotocolmanager.cpp 2007/12/16 19:19:43 1.1 -+++ kio/kio/kprotocolmanager.cpp 2007/12/16 19:20:14 -@@ -73,7 +73,7 @@ +Index: kio/kio/kprotocolmanager.cpp +=================================================================== +--- kio/kio/kprotocolmanager.cpp.orig ++++ kio/kio/kprotocolmanager.cpp +@@ -77,7 +77,7 @@ KProtocolManagerPrivate::~KProtocolManag // DEFAULT USERAGENT STRING #define CFG_DEFAULT_UAGENT(X) \ ++++++ desktop-translations.diff ++++++ --- /var/tmp/diff_new_pack.E16564/_old 2009-05-19 23:54:12.000000000 +0200 +++ /var/tmp/diff_new_pack.E16564/_new 2009-05-19 23:54:12.000000000 +0200 @@ -4,9 +4,11 @@ Patch-upstream: no Relates: kdelibs3/desktop-translations.diff ---- kdecore/services/kservicegroup.cpp.sav 2008-09-15 14:43:32.000000000 +0200 -+++ kdecore/services/kservicegroup.cpp 2008-09-15 15:03:12.000000000 +0200 -@@ -57,9 +57,9 @@ void KServiceGroupPrivate::load(const QS +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(); @@ -18,10 +20,12 @@ + m_strComment = desktopFile.readComment(); deleted = config.readEntry("Hidden", false ); m_bNoDisplay = desktopFile.noDisplay(); - m_strBaseGroupName = config.readEntry( "X-KDE-BaseGroup" ); ---- kdecore/config/kconfigdata.h.sav 2008-09-15 14:43:32.000000000 +0200 -+++ kdecore/config/kconfigdata.h 2008-09-15 15:03:12.000000000 +0200 -@@ -174,6 +174,19 @@ class KEntryMap : public QMap<KEntryKey, + 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 QMap<KEntryKey, return find(theKey); } @@ -41,9 +45,11 @@ Iterator findEntry(const QByteArray& group, const QByteArray& key = QByteArray(), SearchFlags flags = SearchFlags()) { ---- kdecore/config/kdesktopfile.cpp.sav 2008-09-15 14:43:32.000000000 +0200 -+++ kdecore/config/kdesktopfile.cpp 2008-09-15 15:03:12.000000000 +0200 -@@ -34,6 +34,8 @@ +Index: kdecore/config/kdesktopfile.cpp +=================================================================== +--- kdecore/config/kdesktopfile.cpp.orig ++++ kdecore/config/kdesktopfile.cpp +@@ -35,6 +35,8 @@ #include "kstandarddirs.h" #include "kconfigini_p.h" #include "kde_file.h" @@ -52,7 +58,7 @@ class KDesktopFilePrivate : public KConfigPrivate { -@@ -162,6 +164,29 @@ bool KDesktopFile::isAuthorizedDesktopFi +@@ -179,6 +181,29 @@ bool KDesktopFile::isAuthorizedDesktopFi return false; } @@ -82,7 +88,7 @@ QString KDesktopFile::readType() const { Q_D(const KDesktopFile); -@@ -176,20 +201,17 @@ QString KDesktopFile::readIcon() const +@@ -193,20 +218,17 @@ QString KDesktopFile::readIcon() const QString KDesktopFile::readName() const { @@ -106,9 +112,11 @@ } QString KDesktopFile::readPath() const ---- kdecore/config/kdesktopfile.h.sav 2008-09-15 14:43:32.000000000 +0200 -+++ kdecore/config/kdesktopfile.h 2008-09-15 15:03:12.000000000 +0200 -@@ -243,6 +243,8 @@ protected: +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: @@ -117,9 +125,11 @@ Q_DISABLE_COPY(KDesktopFile) Q_DECLARE_PRIVATE(KDesktopFile) ---- kdecore/config/kconfiggroup.h.sav 2008-09-15 14:43:32.000000000 +0200 -+++ kdecore/config/kconfiggroup.h 2008-09-15 15:05:54.000000000 +0200 -@@ -558,6 +558,11 @@ public: +Index: kdecore/config/kconfiggroup.h +=================================================================== +--- kdecore/config/kconfiggroup.h.orig ++++ kdecore/config/kconfiggroup.h +@@ -617,6 +617,11 @@ public: */ QMap<QString, QString> entryMap() const; @@ -131,9 +141,11 @@ protected: bool hasGroupImpl(const QByteArray &group) const; KConfigGroup groupImpl(const QByteArray &b); ---- kdecore/config/kconfig.cpp.sav 2008-09-15 14:43:32.000000000 +0200 -+++ kdecore/config/kconfig.cpp 2008-09-15 15:03:12.000000000 +0200 -@@ -732,6 +732,17 @@ QString KConfigPrivate::lookupData(const +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); } @@ -151,8 +163,10 @@ void KConfig::virtual_hook(int /*id*/, void* /*data*/) { /* nothing */ ---- kdecore/config/kconfig_p.h.sav 2008-09-15 14:43:32.000000000 +0200 -+++ kdecore/config/kconfig_p.h 2008-09-15 15:03:12.000000000 +0200 +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; @@ -161,9 +175,11 @@ void putData(const QByteArray& group, const char* key, const QByteArray& value, KConfigBase::WriteConfigFlags flags, bool expand=false); ---- kdecore/config/kconfiggroup.cpp.sav 2008-09-15 14:43:32.000000000 +0200 -+++ kdecore/config/kconfiggroup.cpp 2008-09-15 15:03:12.000000000 +0200 -@@ -1236,6 +1236,16 @@ bool KConfigGroup::hasKey(const char *ke +Index: kdecore/config/kconfiggroup.cpp +=================================================================== +--- kdecore/config/kconfiggroup.cpp.orig ++++ kdecore/config/kconfiggroup.cpp +@@ -1239,6 +1239,16 @@ bool KConfigGroup::hasKey(const char *ke return !config()->d_func()->lookupData(d->fullName(), key, flags).isNull(); } ++++++ display-key-support.diff ++++++ --- /var/tmp/diff_new_pack.E16564/_old 2009-05-19 23:54:12.000000000 +0200 +++ /var/tmp/diff_new_pack.E16564/_new 2009-05-19 23:54:12.000000000 +0200 @@ -4,20 +4,22 @@ Patch-upstream: no (maybe todo) Relates: libqt4/display-key-support.diff, kdebase4/randr12.diff ---- kdeui/util/kkeyserver_x11.cpp.sav 2007-10-30 11:11:39.000000000 +0100 -+++ kdeui/util/kkeyserver_x11.cpp 2008-09-12 14:33:03.000000000 +0200 -@@ -245,6 +245,7 @@ static const TransKey g_rgQtToSymX[] = - #define XF86XK_LaunchD 0x1008FF4D - #define XF86XK_LaunchE 0x1008FF4E - #define XF86XK_LaunchF 0x1008FF4F +Index: kdeui/util/kkeyserver_x11.cpp +=================================================================== +--- kdeui/util/kkeyserver_x11.cpp.orig ++++ kdeui/util/kkeyserver_x11.cpp +@@ -240,6 +240,7 @@ static const TransKey g_rgQtToSymX[] = + #define XF86XK_LaunchD 0x1008FF4D + #define XF86XK_LaunchE 0x1008FF4E + #define XF86XK_LaunchF 0x1008FF4F +#define XF86XK_Display 0x1008FF59 /* Output switch key */ // end of XF86keysyms.h , - { Qt::Key_Standby, XF86XK_Standby }, -@@ -282,6 +283,7 @@ static const TransKey g_rgQtToSymX[] = - { Qt::Key_LaunchD, XF86XK_LaunchB }, - { Qt::Key_LaunchE, XF86XK_LaunchC }, - { Qt::Key_LaunchF, XF86XK_LaunchD }, + { Qt::Key_Standby, XF86XK_Standby }, +@@ -277,6 +278,7 @@ static const TransKey g_rgQtToSymX[] = + { Qt::Key_LaunchD, XF86XK_LaunchB }, + { Qt::Key_LaunchE, XF86XK_LaunchC }, + { Qt::Key_LaunchF, XF86XK_LaunchD }, + { Qt::Key_Display, XF86XK_Display }, }; ++++++ flash-player-non-oss.diff ++++++ --- /var/tmp/diff_new_pack.E16564/_old 2009-05-19 23:54:12.000000000 +0200 +++ /var/tmp/diff_new_pack.E16564/_new 2009-05-19 23:54:12.000000000 +0200 @@ -1,6 +1,8 @@ ---- 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 @@ +Index: khtml/html/html_objectimpl.cpp +=================================================================== +--- khtml/html/html_objectimpl.cpp.orig ++++ khtml/html/html_objectimpl.cpp +@@ -590,14 +590,32 @@ void HTMLObjectBaseElementImpl::slotPart // 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(); ++++++ hotplug-kde3.diff ++++++ --- /var/tmp/diff_new_pack.E16564/_old 2009-05-19 23:54:12.000000000 +0200 +++ /var/tmp/diff_new_pack.E16564/_new 2009-05-19 23:54:12.000000000 +0200 @@ -4,9 +4,11 @@ Patch-upstream: never Relates: kdebase4-runtime/hotplug-kde3.diff, kdebase4-workspace/hotplug-kde3.diff ---- ./kdecore/services/kservice.cpp.sav 2008-05-13 13:49:58.000000000 +0200 -+++ ./kdecore/services/kservice.cpp 2008-05-14 11:44:14.000000000 +0200 -@@ -95,6 +95,8 @@ void KServicePrivate::init( const KDeskt +Index: kdecore/services/kservice.cpp +=================================================================== +--- kdecore/services/kservice.cpp.orig ++++ kdecore/services/kservice.cpp +@@ -99,6 +99,8 @@ void KServicePrivate::init( const KDeskt m_bValid = false; return;*/ m_strType = "Application"; ++++++ kde3-applications.diff ++++++ --- /var/tmp/diff_new_pack.E16564/_old 2009-05-19 23:54:12.000000000 +0200 +++ /var/tmp/diff_new_pack.E16564/_new 2009-05-19 23:54:12.000000000 +0200 @@ -1,6 +1,8 @@ ---- kdecore/services/kservice.cpp +Index: kdecore/services/kservice.cpp +=================================================================== +--- kdecore/services/kservice.cpp.orig +++ kdecore/services/kservice.cpp -@@ -57,6 +57,8 @@ +@@ -57,6 +57,8 @@ void KServicePrivate::init( const KDeskt { const QString entryPath = q->entryPath(); bool absPath = !QDir::isRelativePath(entryPath); @@ -9,7 +11,7 @@ // TODO: it makes sense to have a KConstConfigGroup I guess const KConfigGroup desktopGroup = const_cast<KDesktopFile*>(config)->desktopGroup(); -@@ -84,6 +86,8 @@ +@@ -84,6 +86,8 @@ void KServicePrivate::init( const KDeskt if (i != -1) m_strName = m_strName.left(i); } @@ -18,7 +20,7 @@ m_strType = config->readType(); entryMap.remove("Type"); -@@ -107,6 +111,18 @@ +@@ -107,6 +111,18 @@ void KServicePrivate::init( const KDeskt // 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 +39,7 @@ entryMap.remove("Exec"); if ( m_strType == "Application" ) { -@@ -203,6 +219,9 @@ +@@ -210,6 +226,9 @@ void KServicePrivate::init( const KDeskt m_initialPreference = desktopGroup.readEntry( "InitialPreference", 1 ); entryMap.remove("InitialPreference"); @@ -47,7 +49,7 @@ // 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 @@ +@@ -250,6 +269,8 @@ void KServicePrivate::init( const KDeskt m_DBUSStartusType = KService::DBusNone; m_strDesktopEntryName = _name.toLower(); @@ -56,7 +58,7 @@ m_bAllowAsDefault = desktopGroup.readEntry("AllowDefault", true); entryMap.remove("AllowDefault"); -@@ -262,7 +283,9 @@ +@@ -269,7 +290,9 @@ void KServicePrivate::init( const KDeskt // qDebug("Path = %s", entryPath.toLatin1().constData()); QMap<QString,QString>::ConstIterator it = entryMap.constBegin(); for( ; it != entryMap.constEnd();++it) { ++++++ kde3-autostart.diff ++++++ --- /var/tmp/diff_new_pack.E16564/_old 2009-05-19 23:54:12.000000000 +0200 +++ /var/tmp/diff_new_pack.E16564/_new 2009-05-19 23:54:12.000000000 +0200 @@ -1,8 +1,46 @@ ---- kinit/autostart.cpp +Index: kdecore/kernel/kautostart.cpp +=================================================================== +--- kdecore/kernel/kautostart.cpp.orig ++++ kdecore/kernel/kautostart.cpp +@@ -22,6 +22,7 @@ + + #include "kaboutdata.h" + #include "kglobal.h" ++#include "kshell.h" + #include "kcomponentdata.h" + #include "kdesktopfile.h" + #include "kstandarddirs.h" +@@ -30,6 +31,8 @@ + #include <QtCore/QFile> + #include <QStringList> + ++#include <stdlib.h> ++ + class KAutostart::Private + { + public: +@@ -117,6 +120,14 @@ bool KAutostart::checkStartCondition() c + if (list[0].isEmpty() || list[2].isEmpty()) + return true; + ++ if( d->name.startsWith( "/etc/opt/kde3/" ) || d->name.startsWith( "/opt/kde3/" )) ++ { ++ QString cmd = QString( "/opt/kde3/bin/kreadconfig --file %1 --group %2 --key %3 --default %4 --type bool" ) ++ .arg( KShell::quoteArg( list[0] ), KShell::quoteArg( list[1] ), KShell::quoteArg( list[2] ), ++ KShell::quoteArg( list[3] )); ++ return system( cmd.toLocal8Bit()) == 0; ++ } ++ + KConfig config(list[0], KConfig::NoGlobals); + KConfigGroup cg(&config, list[1]); + +Index: kinit/autostart.cpp +=================================================================== +--- kinit/autostart.cpp.orig +++ kinit/autostart.cpp -@@ -23,7 +23,10 @@ - #include <kconfiggroup.h> - #include <kdesktopfile.h> +@@ -22,7 +22,10 @@ + + #include <kautostart.h> #include <kglobal.h> +#include <kshell.h> #include <kstandarddirs.h> @@ -11,49 +49,19 @@ class AutoStartItem { -@@ -76,7 +79,7 @@ - return path; - } - --static bool startCondition(const QString &condition) -+static bool startCondition(const QString &condition, const QString& file) - { - if (condition.isEmpty()) - return true; -@@ -87,6 +90,13 @@ - if (list[0].isEmpty() || list[2].isEmpty()) - return true; - -+ if( file.startsWith( "/etc/opt/kde3/" ) || file.startsWith( "/opt/kde3/" )) -+ { -+ QString cmd = QString( "/opt/kde3/bin/kreadconfig --file %1 --group %2 --key %3 --default %4 --type bool" ) -+ .arg( KShell::quoteArg( list[0] ), KShell::quoteArg( list[1] ), KShell::quoteArg( list[2] ), -+ KShell::quoteArg( list[3] )); -+ return system( cmd.toLocal8Bit()) == 0; -+ } - KConfig config(list[0], KConfig::NoGlobals); - KConfigGroup cg(&config, list[1]); - -@@ -98,7 +108,8 @@ +@@ -78,9 +81,10 @@ static QString extractName(QString path) void AutoStart::loadAutoStartList() { -- const QStringList files = KGlobal::dirs()->findAllResources("autostart", "*.desktop", KStandardDirs::NoDuplicates); -+ QStringList files = KGlobal::dirs()->findAllResources("autostart", "*.desktop", KStandardDirs::NoDuplicates); +- const QStringList files = KGlobal::dirs()->findAllResources("autostart", ++ QStringList files = KGlobal::dirs()->findAllResources("autostart", + QString::fromLatin1("*.desktop"), + KStandardDirs::NoDuplicates); + files = mergeKDE3Autostart( files ); for(QStringList::ConstIterator it = files.begin(); it != files.end(); -@@ -106,7 +117,7 @@ - { - KDesktopFile config(*it); - const KConfigGroup grp = config.desktopGroup(); -- if (!startCondition(grp.readEntry("X-KDE-autostart-condition"))) -+ if (!startCondition(grp.readEntry("X-KDE-autostart-condition"), *it)) - continue; - if (!config.tryExec()) - continue; -@@ -126,6 +137,30 @@ +@@ -101,6 +105,30 @@ AutoStart::loadAutoStartList() } } @@ -67,14 +75,14 @@ +{ + QStringList dupecheck; + foreach( QString file, autostart ) -+ dupecheck.append( QString( file ).mid( file.lastIndexOf( '/' ) + 1 )); -+ foreach( QString prefix, QStringList() << "/etc/opt/kde3/" << "/opt/kde3" ) ++ dupecheck.append( QString( file ).mid( file.lastIndexOf( QLatin1Char('/') ) + 1 )); ++ foreach( QString prefix, QStringList() << QString::fromLatin1("/etc/opt/kde3/") << QString::fromLatin1("/opt/kde3") ) + { -+ foreach( QString name, QDir( prefix + "/share/autostart/" ).entryList( QStringList() << "*.desktop", QDir::Files )) ++ foreach( QString name, QDir( prefix + QString::fromLatin1("/share/autostart/") ).entryList( QStringList() << QString::fromLatin1("*.desktop"), QDir::Files )) + { + if( dupecheck.contains( name )) + continue; -+ autostart.append( prefix + "/share/autostart/" + name ); // add it to the list ++ autostart.append( prefix + QString::fromLatin1("/share/autostart/") + name ); // add it to the list + dupecheck.append( name ); + } + } @@ -84,11 +92,11 @@ QString AutoStart::startService() { -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 +Index: kinit/autostart.h +=================================================================== +--- kinit/autostart.h.orig +++ kinit/autostart.h -@@ -39,6 +39,7 @@ +@@ -39,6 +39,7 @@ public: bool phaseDone() const { return m_phasedone; } private: ++++++ kdebug-areas-update.diff ++++++ --- /var/tmp/diff_new_pack.E16564/_old 2009-05-19 23:54:12.000000000 +0200 +++ /var/tmp/diff_new_pack.E16564/_new 2009-05-19 23:54:12.000000000 +0200 @@ -1,6 +1,8 @@ ---- kdecore/kdebug.areas +Index: kdecore/kdebug.areas +=================================================================== +--- kdecore/kdebug.areas.orig +++ kdecore/kdebug.areas -@@ -687,6 +687,8 @@ +@@ -723,6 +723,8 @@ 100200 kfs ++++++ kdelibs-4.2.3.tar.bz2 -> kdelibs-4.2.85.tar.bz2 ++++++ KDE/kdelibs4/kdelibs-4.2.3.tar.bz2 kdelibs4/kdelibs-4.2.85.tar.bz2 differ: byte 11, line 1 ++++++ kdesu-settings.diff ++++++ --- /var/tmp/diff_new_pack.E16564/_old 2009-05-19 23:54:12.000000000 +0200 +++ /var/tmp/diff_new_pack.E16564/_new 2009-05-19 23:54:12.000000000 +0200 @@ -9,14 +9,13 @@ Update: Change the timeout back to 2 hours (bnc#404521). ---- kdesu/defaults.h +Index: kdesu/defaults.h +=================================================================== +--- kdesu/defaults.h.orig +++ kdesu/defaults.h -@@ -13,9 +13,9 @@ +@@ -15,7 +15,7 @@ namespace KDESu { - namespace KDESu { - --const int defTimeout = 120*60; -+const int defTimeout = 120*60; + const int defTimeout = 120*60; const int defEchoMode = 0; -const bool defKeep = false; +const bool defKeep = true; ++++++ kjs-mark-register-stack.diff ++++++ --- /var/tmp/diff_new_pack.E16564/_old 2009-05-19 23:54:12.000000000 +0200 +++ /var/tmp/diff_new_pack.E16564/_new 2009-05-19 23:54:12.000000000 +0200 @@ -1,4 +1,6 @@ ---- kjs/collector.cpp +Index: kjs/collector.cpp +=================================================================== +--- kjs/collector.cpp.orig +++ kjs/collector.cpp @@ -528,6 +528,9 @@ static inline void* currentThreadStackBa return stackBase; ++++++ plasma-libs.diff ++++++ --- /var/tmp/diff_new_pack.E16564/_old 2009-05-19 23:54:12.000000000 +0200 +++ /var/tmp/diff_new_pack.E16564/_new 2009-05-19 23:54:12.000000000 +0200 @@ -1,13 +1,13 @@ Index: plasma/corona.cpp =================================================================== ---- plasma/corona.cpp (revision 920623) -+++ plasma/corona.cpp (working copy) -@@ -127,7 +127,9 @@ +--- plasma/corona.cpp.orig ++++ plasma/corona.cpp +@@ -185,7 +185,9 @@ public: if (pluginName.isEmpty()) { // default to the desktop containment - pluginName = "desktop"; -+ KSharedConfigPtr defaultconfig = KSharedConfig::openConfig("plasmarc"); ++ KSharedConfigPtr defaultconfig = KSharedConfig::openConfig("plasma-desktoprc"); + KConfigGroup group = KConfigGroup(defaultconfig, "Defaults"); + pluginName = group.readEntry("containment", "desktop"); } @@ -15,9 +15,9 @@ if (pluginName != "null") { Index: plasma/private/containment_p.h =================================================================== ---- plasma/private/containment_p.h (revision 920623) -+++ plasma/private/containment_p.h (working copy) -@@ -48,7 +48,8 @@ +--- plasma/private/containment_p.h.orig ++++ plasma/private/containment_p.h +@@ -48,7 +48,8 @@ public: toolBox(0), con(0), type(Containment::NoContainmentType), @@ -27,7 +27,7 @@ { } -@@ -121,6 +122,7 @@ +@@ -126,6 +127,7 @@ public: Containment::Type type; static bool s_positioning; bool drawWallpaper; @@ -37,9 +37,9 @@ } // Plasma namespace Index: plasma/containment.h =================================================================== ---- plasma/containment.h (revision 920623) -+++ plasma/containment.h (working copy) -@@ -123,6 +123,8 @@ +--- plasma/containment.h.orig ++++ plasma/containment.h +@@ -123,6 +123,8 @@ class PLASMA_EXPORT Containment : public */ Containment(QObject *parent, const QVariantList &args); @@ -50,10 +50,10 @@ /** Index: plasma/containment.cpp =================================================================== ---- plasma/containment.cpp (revision 920623) -+++ plasma/containment.cpp (working copy) -@@ -109,6 +109,17 @@ - setBackgroundHints(NoBackground); +--- plasma/containment.cpp.orig ++++ plasma/containment.cpp +@@ -113,6 +113,18 @@ Containment::Containment(QObject *parent + setHasConfigurationInterface(false); } +Containment::Containment(QObject *parent, const QVariantList &args, bool showToolBox) @@ -64,26 +64,27 @@ + // that requires a scene, which is not available at this point + setPos(0, 0); + setBackgroundHints(NoBackground); ++ setHasConfigurationInterface(false); + d->showToolBox=showToolBox; +} + Containment::~Containment() { - if (Applet::d->transient) { -@@ -392,7 +403,7 @@ + delete d; +@@ -409,7 +421,7 @@ void Containment::setContainmentType(Con return; } -- if ((type == DesktopContainment || type == PanelContainment)) { +- if (type == DesktopContainment || type == PanelContainment) { + if ((type == DesktopContainment || type == PanelContainment) && d->showToolBox) { d->createToolBox(); } Index: plasma/theme.cpp =================================================================== ---- plasma/theme.cpp (revision 946103) -+++ plasma/theme.cpp (working copy) -@@ -55,7 +55,6 @@ +--- plasma/theme.cpp.orig ++++ plasma/theme.cpp +@@ -56,7 +56,6 @@ public: : q(theme), colorScheme(QPalette::Active, KColorScheme::Window, KSharedConfigPtr(0)), buttonColorScheme(QPalette::Active, KColorScheme::Button, KSharedConfigPtr(0)), @@ -91,30 +92,30 @@ defaultWallpaperSuffix(DEFAULT_WALLPAPER_SUFFIX), defaultWallpaperWidth(DEFAULT_WALLPAPER_WIDTH), defaultWallpaperHeight(DEFAULT_WALLPAPER_HEIGHT), -@@ -69,6 +68,10 @@ +@@ -70,6 +69,10 @@ public: + { generalFont = QApplication::font(); - KConfigGroup cg(KGlobal::config(), "CachePolicies"); - cacheTheme = cg.readEntry("CacheTheme", true); + cacheTheme = cacheConfig().readEntry("CacheTheme", true); + -+ KSharedConfigPtr defaultconfig = KSharedConfig::openConfig("plasmarc"); ++ KSharedConfigPtr defaultconfig = KSharedConfig::openConfig("plasma-desktoprc"); + KConfigGroup group = KConfigGroup(defaultconfig, "Defaults"); + defaultWallpaperTheme = group.readEntry("wallpaper", DEFAULT_WALLPAPER_THEME); } ~ThemePrivate() -@@ -332,7 +335,10 @@ - cg = d->config(); +@@ -360,7 +363,10 @@ void ThemePrivate::setThemeName(const QS + cg = config(); } -- d->defaultWallpaperTheme = cg.readEntry("defaultWallpaperTheme", DEFAULT_WALLPAPER_THEME); -+ KSharedConfigPtr defaultconfig = KSharedConfig::openConfig("plasmarc"); +- defaultWallpaperTheme = cg.readEntry("defaultWallpaperTheme", DEFAULT_WALLPAPER_THEME); ++ KSharedConfigPtr defaultconfig = KSharedConfig::openConfig("plasma-desktoprc"); + KConfigGroup group = KConfigGroup(defaultconfig, "Defaults"); -+ d->defaultWallpaperTheme = cg.readEntry("defaultWallpaperTheme", group.readEntry("wallpaper", DEFAULT_WALLPAPER_THEME)); ++ defaultWallpaperTheme = cg.readEntry("defaultWallpaperTheme", group.readEntry("wallpaper", DEFAULT_WALLPAPER_THEME)); + - d->defaultWallpaperSuffix = cg.readEntry("defaultFileSuffix", DEFAULT_WALLPAPER_SUFFIX); - d->defaultWallpaperWidth = cg.readEntry("defaultWidth", DEFAULT_WALLPAPER_WIDTH); - d->defaultWallpaperHeight = cg.readEntry("defaultHeight", DEFAULT_WALLPAPER_HEIGHT); -@@ -463,6 +469,10 @@ + defaultWallpaperSuffix = cg.readEntry("defaultFileSuffix", DEFAULT_WALLPAPER_SUFFIX); + defaultWallpaperWidth = cg.readEntry("defaultWidth", DEFAULT_WALLPAPER_WIDTH); + defaultWallpaperHeight = cg.readEntry("defaultHeight", DEFAULT_WALLPAPER_HEIGHT); +@@ -494,6 +500,10 @@ QString Theme::wallpaperPath(const QSize } } ++++++ windeco-color.diff ++++++ --- /var/tmp/diff_new_pack.E16564/_old 2009-05-19 23:54:12.000000000 +0200 +++ /var/tmp/diff_new_pack.E16564/_new 2009-05-19 23:54:12.000000000 +0200 @@ -1,8 +1,8 @@ Index: kdeui/kernel/kglobalsettings.cpp =================================================================== ---- kdeui/kernel/kglobalsettings.cpp (revision 808006) -+++ kdeui/kernel/kglobalsettings.cpp (working copy) -@@ -273,7 +273,7 @@ +--- kdeui/kernel/kglobalsettings.cpp.orig ++++ kdeui/kernel/kglobalsettings.cpp +@@ -319,7 +319,7 @@ QColor KGlobalSettings::activeTitleColor return qt_colorref2qrgb(GetSysColor(COLOR_ACTIVECAPTION)); #else KConfigGroup g( KGlobal::config(), "WM" ); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org