Hello community,
here is the log from the commit of package kdebase4-workspace for openSUSE:Factory
checked in at Mon Mar 8 18:13:35 CET 2010.
--------
--- KDE/kdebase4-workspace/kdebase4-wallpapers.changes 2010-02-25 02:29:11.000000000 +0100
+++ /mounts/work_src_done/STABLE/kdebase4-workspace/kdebase4-wallpapers.changes 2010-03-08 18:13:11.842383000 +0100
@@ -1,0 +2,7 @@
+Fri Feb 26 20:50:24 CET 2010 - dmueller@suse.de
+
+- update to 4.4.1
+ * bugfixes over 4.4.0
+ * see http://kde.org/announcements/changelogs/changelog4_4_0to4_4_1.php for details
+
+-------------------------------------------------------------------
kdebase4-workspace.changes: same change
python-kdebase4.changes: same change
calling whatdependson for head-i586
Old:
----
kdebase-workspace-4.4.0.tar.bz2
New:
----
kdebase-workspace-4.4.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebase4-wallpapers.spec ++++++
--- /var/tmp/diff_new_pack.yN32U3/_old 2010-03-08 18:13:26.000000000 +0100
+++ /var/tmp/diff_new_pack.yN32U3/_new 2010-03-08 18:13:26.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kdebase4-wallpapers (Version 4.4.0)
+# spec file for package kdebase4-wallpapers (Version 4.4.1)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -29,8 +29,8 @@
Group: System/GUI/KDE
Summary: KDE 4 Wallpapers
Url: http://www.kde.org/
-Version: 4.4.0
-Release: 2
+Version: 4.4.1
+Release: 1
Source0: kdebase-workspace-%version.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
++++++ kdebase4-workspace.spec ++++++
--- /var/tmp/diff_new_pack.yN32U3/_old 2010-03-08 18:13:26.000000000 +0100
+++ /var/tmp/diff_new_pack.yN32U3/_new 2010-03-08 18:13:26.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kdebase4-workspace (Version 4.4.0)
+# spec file for package kdebase4-workspace (Version 4.4.1)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -39,8 +39,8 @@
Group: System/GUI/KDE
Summary: The KDE Workspace Components
Url: http://www.kde.org/
-Version: 4.4.0
-Release: 2
+Version: 4.4.1
+Release: 1
Source0: kdebase-workspace-%version.tar.bz2
Source1: rcksysguardd
Source2: titlebar_decor.png
@@ -154,21 +154,18 @@
%patch68
%patch69
%patch70
-###KDE44: rediff!
-#%patch71
+%patch71
%patch74
%patch77
%patch82
###KDE44: rediff!
#%patch85
%patch88
-###KDE44: rediff
-#%patch94
+%patch94
%patch97
%patch98
%patch99
-###KDE44: rediff!
-#%patch103
+%patch103
###KDE44: rediff!
#%patch104
###KDE44: rediff!
++++++ python-kdebase4.spec ++++++
--- /var/tmp/diff_new_pack.yN32U3/_old 2010-03-08 18:13:26.000000000 +0100
+++ /var/tmp/diff_new_pack.yN32U3/_new 2010-03-08 18:13:26.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package python-kdebase4 (Version 4.4.0)
+# spec file for package python-kdebase4 (Version 4.4.1)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -28,8 +28,8 @@
Group: System/GUI/KDE
Summary: Python bindings for KDE 4 desktop shell
Url: http://www.kde.org/
-Version: 4.4.0
-Release: 2
+Version: 4.4.1
+Release: 1
Source0: kdebase-workspace-%version.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: python-kde4 = %{version}
++++++ 4_4_BRANCH.diff ++++++
++++ 3540 lines (skipped)
++++ between KDE/kdebase4-workspace/4_4_BRANCH.diff
++++ and /mounts/work_src_done/STABLE/kdebase4-workspace/4_4_BRANCH.diff
++++++ kdebase-workspace-4.4.0.tar.bz2 -> kdebase-workspace-4.4.1.tar.bz2 ++++++
KDE/kdebase4-workspace/kdebase-workspace-4.4.0.tar.bz2 /mounts/work_src_done/STABLE/kdebase4-workspace/kdebase-workspace-4.4.1.tar.bz2 differ: char 11, line 1
++++++ kdm-kdmconf.diff ++++++
--- /var/tmp/diff_new_pack.yN32U3/_old 2010-03-08 18:13:27.000000000 +0100
+++ /var/tmp/diff_new_pack.yN32U3/_new 2010-03-08 18:13:27.000000000 +0100
@@ -1,6 +1,8 @@
---- kdm/kfrontend/genkdmconf.c
+Index: kdm/kfrontend/genkdmconf.c
+===================================================================
+--- kdm/kfrontend/genkdmconf.c.orig
+++ kdm/kfrontend/genkdmconf.c
-@@ -1019,6 +1019,26 @@
+@@ -1058,6 +1058,26 @@ linkFile( Entry *ce )
doLinkFile( ce->value );
}
@@ -27,16 +29,16 @@
/* Create a new file in KDMCONF and fill it */
static void
writeFile( const char *tname, int mode, const char *cont )
-@@ -1027,6 +1047,8 @@
- fputs( cont, f );
- fclose( f );
+@@ -1066,6 +1086,8 @@ writeFile( const char *tname, int mode,
+ fputs_( cont, f );
+ fclose_( f );
addedFile( tname );
+ if (!no_backup)
+ cleanupFile( tname + sizeof(KDMCONF), mode );
}
-@@ -3024,9 +3046,9 @@
+@@ -3070,9 +3092,9 @@ int main( int argc, char **argv )
memcmp( oldkde + olen - sizeof(SHR_CONF) + 1,
SHR_CONF, sizeof(SHR_CONF) ))
{
@@ -49,20 +51,20 @@
oldkdepfx = oldkde;
} else
ASPrintf( (char **)&oldkdepfx,
-@@ -3138,6 +3160,8 @@
+@@ -3184,6 +3206,8 @@ int main( int argc, char **argv )
f = createFile( "kdmrc", kdmrcmode );
writeKdmrc( f );
- fclose( f );
-+ if (!no_backup)
+ fclose_( f );
++ if (!no_backup)
+ cleanupFile( "kdmrc", kdmrcmode );
f = createFile( "README", 0644 );
- fprintf( f,
-@@ -3186,6 +3210,8 @@
+ fprintf_( f,
+@@ -3232,6 +3256,8 @@ int main( int argc, char **argv )
"\nTry 'genkdmconf --help' if you want to generate another configuration.\n"
"\nYou may delete this README.\n" );
- fclose( f );
-+ if (!no_backup)
+ fclose_( f );
++ if (!no_backup)
+ cleanupFile( "README", 0644 );
return 0;
++++++ plasma-branding-defaults.diff ++++++
--- /var/tmp/diff_new_pack.yN32U3/_old 2010-03-08 18:13:27.000000000 +0100
+++ /var/tmp/diff_new_pack.yN32U3/_new 2010-03-08 18:13:27.000000000 +0100
@@ -1,6 +1,8 @@
---- plasma/applets/kickoff/applet/applet.cpp
-+++ plasma/applets/kickoff/applet/applet.cpp
-@@ -28,6 +28,7 @@
+Index: plasma/desktop/applets/kickoff/applet/applet.cpp
+===================================================================
+--- plasma/desktop/applets/kickoff/applet/applet.cpp.orig
++++ plasma/desktop/applets/kickoff/applet/applet.cpp
+@@ -27,6 +27,7 @@
#include
#include
#include
@@ -8,58 +10,64 @@
// KDE
#include <KIcon>
-@@ -106,7 +107,10 @@
+@@ -104,7 +105,10 @@ LauncherApplet::~LauncherApplet()
void LauncherApplet::init()
{
KConfigGroup cg = config();
- setPopupIcon(cg.readEntry("icon", "start-here-kde"));
-+ if (QFile::exists("/usr/share/icons/oxygen/scalable/places/start-here-branding.svg"))
-+ setPopupIcon(cg.readEntry("icon", "start-here-branding"));
-+ else
-+ setPopupIcon(cg.readEntry("icon", "start-here-kde"));
++ if (QFile::exists("/usr/share/icons/oxygen/scalable/places/start-here-branding.svg"))
++ setPopupIcon(cg.readEntry("icon", "start-here-branding"));
++ else
++ setPopupIcon(cg.readEntry("icon", "start-here-kde"));
if (KService::serviceByStorageId("kde4-kmenuedit.desktop")) {
QAction* menueditor = new QAction(i18n("Menu Editor"), this);
---- plasma/applets/kickoff/core/favoritesmodel.cpp
-+++ plasma/applets/kickoff/core/favoritesmodel.cpp
-@@ -167,6 +167,11 @@
+Index: plasma/desktop/applets/kickoff/core/favoritesmodel.cpp
+===================================================================
+--- plasma/desktop/applets/kickoff/core/favoritesmodel.cpp.orig
++++ plasma/desktop/applets/kickoff/core/favoritesmodel.cpp
+@@ -166,6 +166,11 @@ FavoritesModel::~FavoritesModel()
void FavoritesModel::add(const QString& url)
{
-+ KService::Ptr service = KService::serviceByStorageId(url);
-+ if (!service) {
-+ return;
-+ }
++ KService::Ptr service = KService::serviceByStorageId(url);
++ if (!service) {
++ return;
++ }
+
Private::globalFavoriteList << url;
Private::globalFavoriteSet << url;
---- plasma/applets/kickoff/core/models.cpp
-+++ plasma/applets/kickoff/core/models.cpp
-@@ -165,7 +165,19 @@
+Index: plasma/desktop/applets/kickoff/core/models.cpp
+===================================================================
+--- plasma/desktop/applets/kickoff/core/models.cpp.orig
++++ plasma/desktop/applets/kickoff/core/models.cpp
+@@ -177,7 +177,19 @@ QStringList Kickoff::systemApplicationLi
{
KConfigGroup appsGroup = componentData().config()->group("SystemApplications");
QStringList apps;
- apps << "systemsettings";
+
-+ if (QFile::exists("/usr/share/applications/YaST.desktop"))
-+ apps << "YaST.desktop";
++ if (QFile::exists("/usr/share/applications/YaST.desktop"))
++ apps << "YaST.desktop";
+
-+ if (QFile::exists("/usr/share/applications/package-manager.desktop"))
-+ apps << "package-manager.desktop";
++ if (QFile::exists("/usr/share/applications/package-manager.desktop"))
++ apps << "package-manager.desktop";
+
-+ if (KService::serviceByStorageId("YaST2/live-installer.desktop"))
-+ apps << "YaST2/live-installer.desktop";
++ if (KService::serviceByStorageId("YaST2/live-installer.desktop"))
++ apps << "YaST2/live-installer.desktop";
+
-+ if (QFile::exists("/usr/share/kde4/services/sysinfo.protocol"))
-+ apps << "/usr/share/kde4/services/sysinfo.protocol";
++ if (QFile::exists("/usr/share/kde4/services/sysinfo.protocol"))
++ apps << "/usr/share/kde4/services/sysinfo.protocol";
+
apps = appsGroup.readEntry("DesktopFiles", apps);
return apps;
}
---- plasma/applets/kickoff/core/systemmodel.cpp
-+++ plasma/applets/kickoff/core/systemmodel.cpp
-@@ -85,7 +85,7 @@
+Index: plasma/desktop/applets/kickoff/core/systemmodel.cpp
+===================================================================
+--- plasma/desktop/applets/kickoff/core/systemmodel.cpp.orig
++++ plasma/desktop/applets/kickoff/core/systemmodel.cpp
+@@ -81,7 +81,7 @@ public:
connect(placesModel, SIGNAL(rowsRemoved(QModelIndex, int, int)),
q, SLOT(sourceRowsRemoved(QModelIndex, int, int)));
@@ -68,10 +76,11 @@
<< i18n("Places")
<< i18n("Removable Storage")
<< i18n("Storage");
-@@ -259,18 +259,33 @@
+@@ -224,19 +224,33 @@ QVariant SystemModel::data(const QModelI
+ }
KService::Ptr service = d->appsList[index.row()];
-
+-
- switch (role) {
- case Qt::DisplayRole:
- return service->name();
@@ -84,85 +93,89 @@
- default:
- return QVariant();
- }
-+ if (service->name()=="sysinfo") {
-+ switch(role) {
-+ case Qt::DisplayRole:
-+ return i18n("System Information");
-+ case Qt::DecorationRole:
-+ return KIcon("hwinfo");
-+ case SubTitleRole:
-+ return "sysinfo:/";
-+ case UrlRole:
-+ return "sysinfo:/";
-+ default:
-+ return QVariant();
-+ }
-+ } else {
-+ switch(role) {
-+ case Qt::DisplayRole:
-+ return service->name();
-+ case Qt::DecorationRole:
-+ return KIcon(service->icon());
-+ case SubTitleRole:
-+ return service->genericName();
-+ case UrlRole:
-+ return service->entryPath();
-+ default:
-+ return QVariant();
-+ }
-+ }
++ if (service->name()=="sysinfo") {
++ switch(role) {
++ case Qt::DisplayRole:
++ return i18n("System Information");
++ case Qt::DecorationRole:
++ return KIcon("hwinfo");
++ case SubTitleRole:
++ return "sysinfo:/";
++ case UrlRole:
++ return "sysinfo:/";
++ default:
++ return QVariant();
++ }
++ } else {
++ switch (role) {
++ case Qt::DisplayRole:
++ return service->name();
++ case Qt::DecorationRole:
++ return KIcon(service->icon());
++ case SubTitleRole:
++ return service->genericName();
++ case UrlRole:
++ return service->entryPath();
++ default:
++ return QVariant();
++ }
++ }
}
if (role == UrlRole && !d->placesModel->isHidden(mapToSource(index))) {
---- plasma/applets/kickoff/simpleapplet/simpleapplet.cpp
-+++ plasma/applets/kickoff/simpleapplet/simpleapplet.cpp
-@@ -37,6 +37,7 @@
+Index: plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp
+===================================================================
+--- plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp.orig
++++ plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp
+@@ -36,6 +36,7 @@
#include
#include
#include
+#include <QFile>
- // KDE
- #include <KIcon>
-@@ -284,7 +285,11 @@
- void MenuLauncherApplet::init()
- {
- KConfigGroup cg = config();
-- QString iconname = "start-here-kde";
-+ QString iconname;
-+ if (QFile::exists("/usr/share/icons/oxygen/scalable/places/start-here-branding.svg"))
-+ iconname = "start-here-branding";
-+ else
-+ iconname = "start-here-kde";
-
- const QStringList viewtypes = cg.readEntry("views", QStringList());
- if(viewtypes.isEmpty()) { // backward-compatibility to viewtypes << "RunCommand";
+ }
+ d->viewtypes << "Leave";
+- d->iconname = "start-here-kde";
++ if (QFile::exists("/usr/share/icons/oxygen/scalable/places/start-here-branding.svg"))
++ d->iconname = "start-here-branding";
++ else
++ d->iconname = "start-here-kde";
+ } else {
+ d->viewtypes << "Applications";
+ d->relativePath = args.value(0).toString();
+Index: plasma/desktop/applets/kickoff/ui/brandingbutton.cpp
+===================================================================
+--- plasma/desktop/applets/kickoff/ui/brandingbutton.cpp.orig
++++ plasma/desktop/applets/kickoff/ui/brandingbutton.cpp
+@@ -69,7 +69,10 @@ void BrandingButton::checkBranding()
void BrandingButton::openHomepage()
{
-- //FIXME: 4.3 .. add a brandingConfig to Theme
+ //FIXME: 4.3 .. add a brandingConfig to Theme
- KUrl home("http://www.kde.org");
+ KConfig config("kickoffrc");
-+ KConfigGroup group = config.group("Branding");
-+ KUrl home(group.readEntry("Homepage", "http://www.kde.org/"));
++ KConfigGroup group = config.group("Branding");
++ KUrl home(group.readEntry("Homepage", "http://www.kde.org/"));
+
QString themePath = KStandardDirs::locate("data", "desktoptheme/" +
Plasma::Theme::defaultTheme()->themeName() +
"/metadata.desktop");
---- plasma/shells/desktop/desktopcorona.cpp
-+++ plasma/shells/desktop/desktopcorona.cpp
-@@ -23,6 +23,7 @@
- #include <QDir>
- #include <QGraphicsLayout>
+Index: plasma/desktop/shell/desktopcorona.cpp
+===================================================================
+--- plasma/desktop/shell/desktopcorona.cpp.orig
++++ plasma/desktop/shell/desktopcorona.cpp
+@@ -26,6 +26,7 @@
#include <QTimer>
+ #include <QMenu>
+ #include <QSignalMapper>
+#include <QFile>
+
#include <KDebug>
- #include <KDialog>
-@@ -121,7 +122,9 @@
+@@ -166,7 +167,9 @@ void DesktopCorona::addDesktopContainmen
if (!c) {
// first try for "desktop", if it doesn't exist then we try for any
// desktopy containment
@@ -173,7 +186,7 @@
if (!c) {
KPluginInfo::List desktopPlugins = Plasma::Containment::listContainmentsOfType("desktop");
-@@ -254,6 +257,25 @@
+@@ -436,6 +439,25 @@ void DesktopCorona::loadDefaultLayout()
applet->setGlobalShortcut(KShortcut("Alt+F1"));
}
@@ -196,20 +209,19 @@
+ panel->addApplet("icon", args);
+ }
+
- loadDefaultApplet("notifier", panel);
loadDefaultApplet("pager", panel);
loadDefaultApplet("tasks", panel);
-@@ -269,7 +291,13 @@
+ Plasma::Applet *sysTray = loadDefaultApplet("systemtray", panel);
+@@ -447,7 +469,12 @@ void DesktopCorona::loadDefaultLayout()
+ }
}
- engines->unloadEngine("powermanagement");
+ if (QFile::exists("/usr/share/kde4/services/plasma-applet-networkmanagement.desktop")) {
+ loadDefaultApplet("networkmanagement", panel);
+ }
+
loadDefaultApplet("digital-clock", panel);
-+ loadDefaultApplet("lockout", panel);
-+
++ loadDefaultApplet("lockout", panel);
emit containmentAdded(panel);
QTimer::singleShot(1000, this, SLOT(saveDefaultSetup()));
++++++ systemsettings-root-kcm.diff ++++++
--- /var/tmp/diff_new_pack.yN32U3/_old 2010-03-08 18:13:27.000000000 +0100
+++ /var/tmp/diff_new_pack.yN32U3/_new 2010-03-08 18:13:27.000000000 +0100
@@ -1,17 +1,17 @@
Index: systemsettings/core/ModuleView.cpp
===================================================================
---- systemsettings/core/ModuleView.cpp (revision 1004599)
-+++ systemsettings/core/ModuleView.cpp (working copy)
-@@ -39,6 +39,7 @@
- #include <KCModuleProxy>
+--- systemsettings/core/ModuleView.cpp.orig
++++ systemsettings/core/ModuleView.cpp
+@@ -41,6 +41,7 @@
#include <KStandardGuiItem>
#include <KDialogButtonBox>
+ #include
+#include <KStandardDirs>
#include "MenuItem.h"
-@@ -124,6 +125,40 @@
- return;
+@@ -129,6 +130,40 @@ void ModuleView::loadModule( MenuItem *m
+ return;
}
+ if ( menuItem->needsRootPrivs() )
@@ -53,9 +53,9 @@
modules << &menuItem->item();
Index: systemsettings/core/MenuItem.cpp
===================================================================
---- systemsettings/core/MenuItem.cpp (revision 1004599)
-+++ systemsettings/core/MenuItem.cpp (working copy)
-@@ -42,6 +42,7 @@
+--- systemsettings/core/MenuItem.cpp.orig
++++ systemsettings/core/MenuItem.cpp
+@@ -43,6 +43,7 @@ public:
int weight;
KService::Ptr service;
KCModuleInfo item;
@@ -63,7 +63,7 @@
};
MenuItem::MenuItem( bool isMenu, MenuItem * itsParent )
-@@ -49,6 +50,7 @@
+@@ -50,6 +51,7 @@ MenuItem::MenuItem( bool isMenu, MenuIte
{
d->parent = itsParent;
d->menu = isMenu;
@@ -71,29 +71,30 @@
if ( d->parent ) {
d->parent->children().append( this );
-@@ -117,11 +119,17 @@
+@@ -123,12 +125,18 @@ bool MenuItem::menu() const
return d->menu;
}
+bool MenuItem::needsRootPrivs() const
+{
-+ return d->needsRootPrivs;
++ return d->needsRootPrivs;
+}
+
void MenuItem::setService( const KService::Ptr& service )
{
d->service = service;
- d->name = service->property("X-KDE-System-Settings-Category").toString();
- d->item = KCModuleInfo( service->entryPath() );
-+ d->needsRootPrivs = service->property("X-KDE-RootOnly", QVariant::Bool ).toBool();
- const QVariant itemWeight = d->service->property( "X-KDE-Weight", QVariant::Int );
+ d->category = service->property("X-KDE-System-Settings-Category").toString();
+ d->name = service->name();
+ d->item = KCModuleInfo( service );
++ d->needsRootPrivs = service->property("X-KDE-RootOnly", QVariant::Bool ).toBool();
+ const QVariant itemWeight = service->property( "X-KDE-Weight", QVariant::Int );
if( itemWeight.isValid() ) {
d->weight = itemWeight.toInt();
Index: systemsettings/core/MenuItem.h
===================================================================
---- systemsettings/core/MenuItem.h (revision 1004599)
-+++ systemsettings/core/MenuItem.h (working copy)
-@@ -148,6 +148,8 @@
+--- systemsettings/core/MenuItem.h.orig
++++ systemsettings/core/MenuItem.h
+@@ -155,6 +155,8 @@ public:
*/
void setService( const KService::Ptr& service );
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org