Hello community,
here is the log from the commit of package kdelibs4 for openSUSE:Factory
checked in at Mon Dec 21 23:37:37 CET 2009.
--------
--- KDE/kdelibs4/kdelibs4.changes 2009-12-16 13:49:01.000000000 +0100
+++ kdelibs4/kdelibs4.changes 2009-12-18 13:47:45.000000000 +0100
@@ -1,0 +2,6 @@
+Fri Dec 18 13:47:40 CET 2009 - dmueller@suse.de
+
+- update to 4.3.85
+ * see http://www.kde.org/announcements/announce-4.4-beta2.php for details
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
display-key-support.diff
kdelibs-4.3.80.tar.bz2
New:
----
kdelibs-4.3.85.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdelibs4.spec ++++++
--- /var/tmp/diff_new_pack.4Bqrb7/_old 2009-12-21 23:36:05.000000000 +0100
+++ /var/tmp/diff_new_pack.4Bqrb7/_new 2009-12-21 23:36:05.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kdelibs4 (Version 4.3.80)
+# spec file for package kdelibs4 (Version 4.3.85)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -43,8 +43,8 @@
Group: System/GUI/KDE
Summary: KDE Base Libraries
Url: http://www.kde.org
-Version: 4.3.80
-Release: 2
+Version: 4.3.85
+Release: 1
Requires: soprano >= %( echo `rpm -q --queryformat '%{VERSION}' libsoprano-devel`)
Recommends: strigi >= %( echo `rpm -q --queryformat '%{VERSION}' strigi-devel`)
Requires: kdelibs4-core = %version
@@ -66,7 +66,6 @@
Patch8: windeco-color.diff
Patch9: kdesu-settings.diff
Patch10: kdebug-areas-update.diff
-Patch11: display-key-support.diff
Patch12: desktop-translations.diff
Patch13: kjs-mark-register-stack.diff
Patch17: flash-player-non-oss.diff
@@ -126,7 +125,6 @@
%patch8
%patch9
%patch10
-%patch11
%patch12
%patch13
%patch17
@@ -432,7 +430,7 @@
/usr/share/autostart/panel.desktop
/usr/share/autostart/ktip.desktop
/usr/share/dbus-1/interfaces/*
-/etc/dbus-1/system.d/org.kde.kcontrol.kcmremotewidgets.conf
+%_kde4_sysconfdir/dbus-1/system.d/org.kde.kcontrol.kcmremotewidgets.conf
%_kde4_iconsdir/hicolor/*/actions/presence_away.*
%_kde4_iconsdir/hicolor/*/actions/presence_offline.*
%_kde4_iconsdir/hicolor/*/actions/presence_online.*
++++++ add-suse-translations.diff ++++++
--- /var/tmp/diff_new_pack.4Bqrb7/_old 2009-12-21 23:36:05.000000000 +0100
+++ /var/tmp/diff_new_pack.4Bqrb7/_new 2009-12-21 23:36:05.000000000 +0100
@@ -1,21 +1,19 @@
-From: Dirk Mueller
-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
-@@ -344,12 +344,15 @@
+@@ -344,13 +344,16 @@ void KLocalePrivate::initMainCatalogs()
catalogNames.append(KCatalogName(catalogName)); // application catalog
// catalogs from which each application can draw translations
-- numberOfSysCatalogs = 5;
-+ numberOfSysCatalogs = 8;
+- numberOfSysCatalogs = 6;
++ numberOfSysCatalogs = 9;
catalogNames.append(KCatalogName("libphonon"));
catalogNames.append(KCatalogName("kio4"));
catalogNames.append(KCatalogName("kdelibs4"));
catalogNames.append(KCatalogName("kdeqt"));
catalogNames.append(KCatalogName("solid_qt"));
+ catalogNames.append(KCatalogName("kdecalendarsystems"));
+ catalogNames.append(KCatalogName("desktop_translations"));
+ catalogNames.append(KCatalogName("kde4-openSUSE"));
+ catalogNames.append(KCatalogName("kde4-SLE"));
++++++ clever-menu.diff ++++++
--- /var/tmp/diff_new_pack.4Bqrb7/_old 2009-12-21 23:36:05.000000000 +0100
+++ /var/tmp/diff_new_pack.4Bqrb7/_new 2009-12-21 23:36:05.000000000 +0100
@@ -2,7 +2,7 @@
===================================================================
--- kdecore/services/kservice.cpp.orig
+++ kdecore/services/kservice.cpp
-@@ -702,6 +702,12 @@ QString KService::untranslatedGenericNam
+@@ -707,6 +707,12 @@ QString KService::untranslatedGenericNam
return v.isValid() ? v.toString() : QString();
}
++++++ desktop-translations.diff ++++++
--- /var/tmp/diff_new_pack.4Bqrb7/_old 2009-12-21 23:36:05.000000000 +0100
+++ /var/tmp/diff_new_pack.4Bqrb7/_new 2009-12-21 23:36:05.000000000 +0100
@@ -1,6 +1,8 @@
---- kdecore/config/kconfig.cpp
+Index: kdecore/config/kconfig.cpp
+===================================================================
+--- kdecore/config/kconfig.cpp.orig
+++ kdecore/config/kconfig.cpp
-@@ -754,6 +754,17 @@
+@@ -754,6 +754,17 @@ QString KConfigPrivate::lookupData(const
return entryMap.getEntry(group, key, QString(), flags, expand);
}
@@ -18,9 +20,11 @@
void KConfig::virtual_hook(int /*id*/, void* /*data*/)
{
/* nothing */
---- kdecore/config/kconfigdata.h
+Index: kdecore/config/kconfigdata.h
+===================================================================
+--- kdecore/config/kconfigdata.h.orig
+++ kdecore/config/kconfigdata.h
-@@ -175,6 +175,19 @@
+@@ -175,6 +175,19 @@ class KEntryMap : public QMapd_func()->lookupData(d->fullName(), key, flags).isNull();
}
@@ -59,9 +65,11 @@
bool KConfigGroup::hasKey(const QString &key) const
{
return hasKey(key.toUtf8().constData());
---- kdecore/config/kconfiggroup.h
+Index: kdecore/config/kconfiggroup.h
+===================================================================
+--- kdecore/config/kconfiggroup.h.orig
+++ kdecore/config/kconfiggroup.h
-@@ -617,6 +617,11 @@
+@@ -617,6 +617,11 @@ public:
*/
QMap entryMap() const;
@@ -73,9 +81,11 @@
protected:
bool hasGroupImpl(const QByteArray &group) const;
KConfigGroup groupImpl(const QByteArray &b);
---- kdecore/config/kconfig_p.h
+Index: kdecore/config/kconfig_p.h
+===================================================================
+--- kdecore/config/kconfig_p.h.orig
+++ kdecore/config/kconfig_p.h
-@@ -53,6 +53,7 @@
+@@ -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;
@@ -83,7 +93,9 @@
void putData(const QByteArray& group, const char* key, const QByteArray& value,
KConfigBase::WriteConfigFlags flags, bool expand=false);
---- kdecore/config/kdesktopfile.cpp
+Index: kdecore/config/kdesktopfile.cpp
+===================================================================
+--- kdecore/config/kdesktopfile.cpp.orig
+++ kdecore/config/kdesktopfile.cpp
@@ -35,6 +35,8 @@
#include "kstandarddirs.h"
@@ -94,7 +106,7 @@
class KDesktopFilePrivate : public KConfigPrivate
{
-@@ -179,6 +181,34 @@
+@@ -176,6 +178,34 @@ bool KDesktopFile::isAuthorizedDesktopFi
return false;
}
@@ -129,7 +141,7 @@
QString KDesktopFile::readType() const
{
Q_D(const KDesktopFile);
-@@ -193,20 +223,17 @@
+@@ -190,20 +220,17 @@ QString KDesktopFile::readIcon() const
QString KDesktopFile::readName() const
{
@@ -153,9 +165,11 @@
}
QString KDesktopFile::readPath() const
---- kdecore/config/kdesktopfile.h
+Index: kdecore/config/kdesktopfile.h
+===================================================================
+--- kdecore/config/kdesktopfile.h.orig
+++ kdecore/config/kdesktopfile.h
-@@ -243,6 +243,11 @@
+@@ -243,6 +243,11 @@ public:
const char *resource() const;
@@ -167,7 +181,7 @@
protected:
/** Virtual hook, used to add new "virtual" functions while maintaining
binary compatibility. Unused in this class.
-@@ -250,6 +255,8 @@
+@@ -250,6 +255,8 @@ protected:
// virtual void virtual_hook( int id, void* data );
private:
@@ -176,9 +190,11 @@
Q_DISABLE_COPY(KDesktopFile)
Q_DECLARE_PRIVATE(KDesktopFile)
---- kdecore/services/kservice.cpp
+Index: kdecore/services/kservice.cpp
+===================================================================
+--- kdecore/services/kservice.cpp.orig
+++ kdecore/services/kservice.cpp
-@@ -300,7 +300,7 @@
+@@ -330,7 +330,7 @@ void KServicePrivate::parseActions(const
<< "has no Name or no Exec key";
} else {
m_actions.append(KServiceAction(group,
@@ -187,9 +203,11 @@
cg.readEntry("Icon"),
cg.readEntry("Exec"),
cg.readEntry("NoDisplay", false)));
---- kdecore/services/kservicegroup.cpp
+Index: kdecore/services/kservicegroup.cpp
+===================================================================
+--- kdecore/services/kservicegroup.cpp.orig
+++ kdecore/services/kservicegroup.cpp
-@@ -56,9 +56,9 @@
+@@ -56,9 +56,9 @@ void KServiceGroupPrivate::load(const QS
const KConfigGroup config = desktopFile.desktopGroup();
++++++ flash-player-non-oss.diff ++++++
--- /var/tmp/diff_new_pack.4Bqrb7/_old 2009-12-21 23:36:05.000000000 +0100
+++ /var/tmp/diff_new_pack.4Bqrb7/_new 2009-12-21 23:36:05.000000000 +0100
@@ -2,7 +2,7 @@
===================================================================
--- khtml/html/html_objectimpl.cpp.orig
+++ khtml/html/html_objectimpl.cpp
-@@ -590,14 +590,32 @@ void HTMLObjectBaseElementImpl::slotPart
+@@ -587,14 +587,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.4Bqrb7/_old 2009-12-21 23:36:05.000000000 +0100
+++ /var/tmp/diff_new_pack.4Bqrb7/_new 2009-12-21 23:36:05.000000000 +0100
@@ -1,6 +1,8 @@
---- kdecore/services/kservice.cpp
+Index: kdecore/services/kservice.cpp
+===================================================================
+--- kdecore/services/kservice.cpp.orig
+++ kdecore/services/kservice.cpp
-@@ -100,6 +100,8 @@
+@@ -104,6 +104,8 @@ void KServicePrivate::init( const KDeskt
m_bValid = false;
return;*/
m_strType = "Application";
++++++ ignore-inline-menu.diff ++++++
--- /var/tmp/diff_new_pack.4Bqrb7/_old 2009-12-21 23:36:05.000000000 +0100
+++ /var/tmp/diff_new_pack.4Bqrb7/_new 2009-12-21 23:36:05.000000000 +0100
@@ -1,8 +1,8 @@
Index: kded/vfolder_menu.cpp
===================================================================
---- kded/vfolder_menu.cpp (revision 1015540)
-+++ kded/vfolder_menu.cpp (working copy)
-@@ -1451,6 +1451,7 @@
+--- kded/vfolder_menu.cpp.orig
++++ kded/vfolder_menu.cpp
+@@ -1450,6 +1450,7 @@ static QString parseAttribute( const QDo
else
kDebug()<<" Error in parsing show_empty attribute :"< kdelibs-4.3.85.tar.bz2 ++++++
KDE/kdelibs4/kdelibs-4.3.80.tar.bz2 kdelibs4/kdelibs-4.3.85.tar.bz2 differ: char 11, line 1
++++++ kjs-mark-register-stack.diff ++++++
--- /var/tmp/diff_new_pack.4Bqrb7/_old 2009-12-21 23:36:05.000000000 +0100
+++ /var/tmp/diff_new_pack.4Bqrb7/_new 2009-12-21 23:36:05.000000000 +0100
@@ -2,7 +2,7 @@
===================================================================
--- kjs/collector.cpp.orig
+++ kjs/collector.cpp
-@@ -528,6 +528,9 @@ static inline void* currentThreadStackBa
+@@ -532,6 +532,9 @@ static inline void* currentThreadStackBa
return stackBase;
}
@@ -12,7 +12,7 @@
void Collector::markCurrentThreadConservatively()
{
-@@ -547,6 +550,11 @@ void Collector::markCurrentThreadConserv
+@@ -551,6 +554,11 @@ void Collector::markCurrentThreadConserv
void* stackBase = currentThreadStackBase();
markStackObjectsConservatively(stackPointer, stackBase);
++++++ plasma-libs.diff ++++++
--- /var/tmp/diff_new_pack.4Bqrb7/_old 2009-12-21 23:36:05.000000000 +0100
+++ /var/tmp/diff_new_pack.4Bqrb7/_new 2009-12-21 23:36:05.000000000 +0100
@@ -1,6 +1,8 @@
---- plasma/containment.cpp
+Index: plasma/containment.cpp
+===================================================================
+--- plasma/containment.cpp.orig
+++ plasma/containment.cpp
-@@ -134,6 +134,18 @@
+@@ -137,6 +137,18 @@ Containment::Containment(const QString &
setHasConfigurationInterface(false);
}
@@ -19,7 +21,7 @@
Containment::~Containment()
{
delete d;
-@@ -504,7 +516,7 @@
+@@ -502,7 +514,7 @@ void Containment::setContainmentType(Con
return;
}
@@ -28,9 +30,11 @@
d->createToolBox();
}
---- plasma/containment.h
+Index: plasma/containment.h
+===================================================================
+--- plasma/containment.h.orig
+++ plasma/containment.h
-@@ -132,6 +132,8 @@
+@@ -132,6 +132,8 @@ class PLASMA_EXPORT Containment : public
*/
Containment(QObject *parent, const QVariantList &args);
@@ -39,9 +43,11 @@
~Containment();
/**
---- plasma/corona.cpp
+Index: plasma/corona.cpp
+===================================================================
+--- plasma/corona.cpp.orig
+++ plasma/corona.cpp
-@@ -188,7 +188,9 @@
+@@ -188,7 +188,9 @@ public:
if (pluginName.isEmpty()) {
// default to the desktop containment
@@ -52,9 +58,11 @@
}
if (pluginName != "null") {
---- plasma/private/containment_p.h
+Index: plasma/private/containment_p.h
+===================================================================
+--- plasma/private/containment_p.h.orig
+++ plasma/private/containment_p.h
-@@ -53,6 +53,7 @@
+@@ -53,6 +53,7 @@ public:
type(Containment::NoContainmentType),
showDropZoneDelayTimer(0),
drawWallpaper(true),
@@ -62,17 +70,19 @@
dropZoneStarted(false)
{
}
-@@ -164,6 +165,7 @@
+@@ -164,6 +165,7 @@ public:
QHash dropMenus;
QTimer *showDropZoneDelayTimer;
bool drawWallpaper : 1;
+ bool showToolBox : 1;
bool dropZoneStarted : 1;
+ Animation *zoomAnim;
};
-
---- plasma/theme.cpp
+Index: plasma/theme.cpp
+===================================================================
+--- plasma/theme.cpp.orig
+++ plasma/theme.cpp
-@@ -60,7 +60,6 @@
+@@ -60,7 +60,6 @@ public:
colorScheme(QPalette::Active, KColorScheme::Window, KSharedConfigPtr(0)),
buttonColorScheme(QPalette::Active, KColorScheme::Button, KSharedConfigPtr(0)),
viewColorScheme(KColorScheme(QPalette::Active, KColorScheme::View, KSharedConfigPtr(0))),
@@ -80,7 +90,7 @@
defaultWallpaperSuffix(DEFAULT_WALLPAPER_SUFFIX),
defaultWallpaperWidth(DEFAULT_WALLPAPER_WIDTH),
defaultWallpaperHeight(DEFAULT_WALLPAPER_HEIGHT),
-@@ -76,6 +75,10 @@
+@@ -76,6 +75,10 @@ public:
ThemeConfig config;
cacheTheme = config.cacheTheme();
@@ -91,7 +101,7 @@
#ifdef Q_WS_X11
Display *dpy = QX11Info::display();
int screen = DefaultScreen(dpy);
-@@ -397,7 +400,10 @@
+@@ -397,7 +400,10 @@ void ThemePrivate::setThemeName(const QS
cg = config();
}
@@ -103,7 +113,7 @@
defaultWallpaperSuffix = cg.readEntry("defaultFileSuffix", DEFAULT_WALLPAPER_SUFFIX);
defaultWallpaperWidth = cg.readEntry("defaultWidth", DEFAULT_WALLPAPER_WIDTH);
defaultWallpaperHeight = cg.readEntry("defaultHeight", DEFAULT_WALLPAPER_HEIGHT);
-@@ -559,6 +565,10 @@
+@@ -559,6 +565,10 @@ QString Theme::wallpaperPath(const QSize
}
}
++++++ windeco-color.diff ++++++
--- /var/tmp/diff_new_pack.4Bqrb7/_old 2009-12-21 23:36:05.000000000 +0100
+++ /var/tmp/diff_new_pack.4Bqrb7/_new 2009-12-21 23:36:05.000000000 +0100
@@ -2,7 +2,7 @@
===================================================================
--- kdeui/kernel/kglobalsettings.cpp.orig
+++ kdeui/kernel/kglobalsettings.cpp
-@@ -319,7 +319,7 @@ QColor KGlobalSettings::activeTitleColor
+@@ -327,7 +327,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