Hello community,
here is the log from the commit of package kdebase4-workspace for
openSUSE:Factory checked in at 2011-11-14 11:55:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kdebase4-workspace (Old)
and /work/SRC/openSUSE:Factory/.kdebase4-workspace.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdebase4-workspace", Maintainer is "kde-maintain...@suse.de"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kdebase4-workspace/kdebase4-workspace.changes
2011-11-05 08:35:17.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.kdebase4-workspace.new/kdebase4-workspace.changes
2011-11-14 11:55:31.000000000 +0100
@@ -1,0 +2,18 @@
+Wed Nov 9 19:38:02 UTC 2011 - jav...@opensuse.org
+
+- Add plasma-crash-on-logout.diff to fix bko#275286
+
+-------------------------------------------------------------------
+Thu Nov 3 15:46:31 UTC 2011 - m...@suse.com
+
+- Add plasma-detect-gpsd-correctly.diff
+ * used return value of gps_open() as condition instead of checking
+ m_gpsdata, that fix plasmoid crash when gpsd not running. (bnc#722133)
+
+-------------------------------------------------------------------
+Wed Nov 2 20:25:11 CET 2011 - dmuel...@suse.de
+
+- update to 4.7.3
+ * see http://kde.org/announcements/changelogs/changelog4_7_2to4_7_3.php for
details
+
+-------------------------------------------------------------------
@@ -4,0 +23,5 @@
+
+-------------------------------------------------------------------
+Wed Nov 2 19:59:05 CET 2011 - dmuel...@suse.de
+
+- rediff 4.7 branch diff to include fix for regression kde#285347
python-kdebase4.changes: same change
Old:
----
kde-workspace-4.7.2.tar.bz2
kdebase4-workspace-powerdevil-kconfig-cbce41f0.diff
kwin-performance.diff
New:
----
kde-workspace-4.7.3.tar.bz2
plasma-crash-on-logout.diff
plasma-detect-gpsd-correctly.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebase4-workspace.spec ++++++
--- /var/tmp/diff_new_pack.OfPSY5/_old 2011-11-14 11:55:35.000000000 +0100
+++ /var/tmp/diff_new_pack.OfPSY5/_new 2011-11-14 11:55:35.000000000 +0100
@@ -23,7 +23,7 @@
Group: System/GUI/KDE
Summary: The KDE Workspace Components
Url: http://www.kde.org/
-Version: 4.7.2
+Version: 4.7.3
Release: 1
BuildRequires: ConsoleKit-devel
%if %suse_version > 1140
@@ -98,13 +98,14 @@
Patch106: plasma-dashboard-leave.diff
Patch107: plasma-kickoff-newly-collapsing.diff
Patch108: plasma-panel-resize-hint.diff
+Patch109: plasma-crash-on-logout.diff
Patch123: kdm-fix-generic-greeter.diff
Patch124: kdm-fix-labelcolors.diff
Patch125: pam-translate.diff
Patch201: plasma-notifications-kill-timer.diff
Patch202: plasma-disable-networkmanager.diff
Patch211: disable-python-support.diff
-Patch212: kdebase4-workspace-powerdevil-kconfig-cbce41f0.diff
+Patch212: plasma-detect-gpsd-correctly.diff
Requires: kde4-kgreeter-plugins = %version
Requires: kdebase4-workspace-liboxygenstyle = %version
%kde4_runtime_requires
@@ -173,6 +174,7 @@
%patch106
%patch107 -p1
%patch108
+%patch109 -p1
%patch123 -p1
%patch124 -p1
###KDE47: rediff
++++++ python-kdebase4.spec ++++++
--- /var/tmp/diff_new_pack.OfPSY5/_old 2011-11-14 11:55:35.000000000 +0100
+++ /var/tmp/diff_new_pack.OfPSY5/_new 2011-11-14 11:55:35.000000000 +0100
@@ -18,7 +18,7 @@
Name: python-kdebase4
-Version: 4.7.2
+Version: 4.7.3
Release: 1
License: GPLv2+
Summary: Python bindings for KDE 4 desktop shell
++++++ 4_7_BRANCH.diff ++++++
++++ 1873 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/kdebase4-workspace/4_7_BRANCH.diff
++++ and /work/SRC/openSUSE:Factory/.kdebase4-workspace.new/4_7_BRANCH.diff
++++++ kde-workspace-4.7.2.tar.bz2 -> kde-workspace-4.7.3.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/kdebase4-workspace/kde-workspace-4.7.2.tar.bz2
/work/SRC/openSUSE:Factory/.kdebase4-workspace.new/kde-workspace-4.7.3.tar.bz2
differ: char 11, line 1
++++++ plasma-crash-on-logout.diff ++++++
commit 77b1374b99ee91d23d8802dd1dec9a5f630e919a
Author: Aaron Seigo <ase...@kde.org>
Date: Wed Nov 9 20:15:50 2011 +0100
only delete the layout when it isn't assigned to another layout
based on the patch by Raul Fernandes
BUG:275286
diff --git a/plasma/desktop/applets/tasks/taskgroupitem.cpp
b/plasma/desktop/applets/tasks/taskgroupitem.cpp
index 6b23b71..d7816d3 100644
--- a/plasma/desktop/applets/tasks/taskgroupitem.cpp
+++ b/plasma/desktop/applets/tasks/taskgroupitem.cpp
@@ -79,8 +79,11 @@ TaskGroupItem::TaskGroupItem(QGraphicsWidget *parent, Tasks
*applet)
TaskGroupItem::~TaskGroupItem()
{
- delete m_tasksLayout;
- m_tasksLayout = 0;
+ if (!m_offscreenLayout && !m_mainLayout) {
+ // only delete this if we have neither an offscreen layout or a
mainlayout
+ // if we do, then they will delete the layout for us.
+ delete m_tasksLayout;
+ }
}
bool TaskGroupItem::isSplit()
++++++ plasma-detect-gpsd-correctly.diff ++++++
>From 60d13c58234086816b8c241cb5a0b29539e23303 Mon Sep 17 00:00:00 2001
From: Max Lin <max7...@gmail.com>
Date: Thu, 3 Nov 2011 16:00:08 +0800
Subject: [PATCH] Used the gps_open() return value as condition instead of
checking m_gpsdata
Checking the return value of gps_open() as condition instead of checking
m_gpsdata for GPSD_API_MAJOR_VERSION >=5, there should be prevent crash
occurred when no gpsd running.
BUG: 277036
REVIEW: 103035
Index:
kde-workspace-4.7.2/plasma/generic/dataengines/geolocation/location_gps.cpp
===================================================================
---
kde-workspace-4.7.2.orig/plasma/generic/dataengines/geolocation/location_gps.cpp
+++ kde-workspace-4.7.2/plasma/generic/dataengines/geolocation/location_gps.cpp
@@ -83,11 +83,11 @@ Gps::Gps(QObject* parent, const QVariant
{
#if GPSD_API_MAJOR_VERSION >= 5
m_gpsdata = new gps_data_t;
- gps_open("localhost", DEFAULT_GPSD_PORT, m_gpsdata);
+ if (gps_open("localhost", DEFAULT_GPSD_PORT, m_gpsdata) != -1) {
#else
gps_data_t* m_gpsdata = gps_open("localhost", DEFAULT_GPSD_PORT);
-#endif
if (m_gpsdata) {
+#endif
kDebug() << "gpsd found.";
m_gpsd = new Gpsd(m_gpsdata);
connect(m_gpsd, SIGNAL(dataReady(const Plasma::DataEngine::Data&)),
++++++ plasma-kickoff-newly-collapsing.diff ++++++
--- /var/tmp/diff_new_pack.OfPSY5/_old 2011-11-14 11:55:35.000000000 +0100
+++ /var/tmp/diff_new_pack.OfPSY5/_new 2011-11-14 11:55:35.000000000 +0100
@@ -1,7 +1,8 @@
-diff -urN
kde-workspace-4.7.0.orig/plasma/desktop/applets/kickoff/applet/applet.cpp
kde-workspace-4.7.0/plasma/desktop/applets/kickoff/applet/applet.cpp
---- kde-workspace-4.7.0.orig/plasma/desktop/applets/kickoff/applet/applet.cpp
2011-08-02 15:20:44.912157708 +0200
-+++ kde-workspace-4.7.0/plasma/desktop/applets/kickoff/applet/applet.cpp
2011-08-02 15:20:55.501158687 +0200
-@@ -165,6 +165,8 @@
+Index: kde-workspace-4.7.3/plasma/desktop/applets/kickoff/applet/applet.cpp
+===================================================================
+--- kde-workspace-4.7.3.orig/plasma/desktop/applets/kickoff/applet/applet.cpp
++++ kde-workspace-4.7.3/plasma/desktop/applets/kickoff/applet/applet.cpp
+@@ -165,6 +165,8 @@ void LauncherApplet::createConfiguration
d->ui.iconButton->setIcon(popupIcon());
d->ui.switchOnHoverCheckBox->setChecked(d->launcher->switchTabsOnHover());
d->ui.appsByNameCheckBox->setChecked(d->launcher->showAppsByName());
@@ -10,7 +11,7 @@
connect(d->ui.iconButton, SIGNAL(iconChanged(QString)), parent,
SLOT(settingsModified()));
connect(d->ui.switchOnHoverCheckBox, SIGNAL(toggled(bool)), parent,
SLOT(settingsModified()));
connect(d->ui.appsByNameCheckBox, SIGNAL(toggled(bool)), parent,
SLOT(settingsModified()));
-@@ -204,6 +206,9 @@
+@@ -204,6 +206,9 @@ void LauncherApplet::configAccepted()
bool switchTabsOnHover = d->ui.switchOnHoverCheckBox->isChecked();
bool showAppsByName = d->ui.appsByNameCheckBox->isChecked();
@@ -20,7 +21,7 @@
const QString iconname = d->ui.iconButton->icon();
// TODO: should this be moved into Launcher as well? perhaps even the
config itself?
-@@ -223,6 +228,9 @@
+@@ -223,6 +228,9 @@ void LauncherApplet::configAccepted()
d->launcher->setSwitchTabsOnHover(switchTabsOnHover);
d->launcher->setShowAppsByName(showAppsByName);
@@ -30,9 +31,10 @@
}
QList<QAction*> LauncherApplet::contextualActions()
-diff -urN
kde-workspace-4.7.0.orig/plasma/desktop/applets/kickoff/applet/kickoffConfig.ui
kde-workspace-4.7.0/plasma/desktop/applets/kickoff/applet/kickoffConfig.ui
----
kde-workspace-4.7.0.orig/plasma/desktop/applets/kickoff/applet/kickoffConfig.ui
2011-08-02 15:20:44.912157708 +0200
-+++ kde-workspace-4.7.0/plasma/desktop/applets/kickoff/applet/kickoffConfig.ui
2011-08-02 15:20:55.502158687 +0200
+Index:
kde-workspace-4.7.3/plasma/desktop/applets/kickoff/applet/kickoffConfig.ui
+===================================================================
+---
kde-workspace-4.7.3.orig/plasma/desktop/applets/kickoff/applet/kickoffConfig.ui
++++ kde-workspace-4.7.3/plasma/desktop/applets/kickoff/applet/kickoffConfig.ui
@@ -54,7 +54,7 @@
</property>
</spacer>
@@ -89,10 +91,11 @@
</layout>
</widget>
<customwidgets>
-diff -urN
kde-workspace-4.7.0.orig/plasma/desktop/applets/kickoff/core/applicationmodel.cpp
kde-workspace-4.7.0/plasma/desktop/applets/kickoff/core/applicationmodel.cpp
----
kde-workspace-4.7.0.orig/plasma/desktop/applets/kickoff/core/applicationmodel.cpp
2011-08-02 15:20:44.913157708 +0200
-+++
kde-workspace-4.7.0/plasma/desktop/applets/kickoff/core/applicationmodel.cpp
2011-08-02 15:20:55.501158687 +0200
-@@ -109,7 +109,10 @@
+Index:
kde-workspace-4.7.3/plasma/desktop/applets/kickoff/core/applicationmodel.cpp
+===================================================================
+---
kde-workspace-4.7.3.orig/plasma/desktop/applets/kickoff/core/applicationmodel.cpp
++++
kde-workspace-4.7.3/plasma/desktop/applets/kickoff/core/applicationmodel.cpp
+@@ -109,7 +109,10 @@ public:
systemApplicationPolicy(ApplicationModel::ShowSystemOnlyPolicy),
primaryNamePolicy(ApplicationModel::GenericNamePrimary),
displayOrder(NameAfterDescription),
@@ -104,7 +107,7 @@
{
systemApplications = Kickoff::systemApplicationList();
reloadTimer = new QTimer(qq);
-@@ -123,6 +126,8 @@
+@@ -123,6 +126,8 @@ public:
}
void fillNode(const QString &relPath, AppNode *node);
@@ -113,7 +116,7 @@
static QHash<QString, QString> iconNameMap();
ApplicationModel *q;
-@@ -133,78 +138,117 @@
+@@ -133,78 +138,117 @@ public:
QStringList systemApplications;
DisplayOrder displayOrder;
bool allowSeparators;
@@ -277,7 +280,7 @@
}
if (systemApplicationPolicy ==
ApplicationModel::ShowSystemOnlyPolicy &&
-@@ -214,9 +258,40 @@
+@@ -214,9 +258,40 @@ void ApplicationModelPrivate::fillNode(c
continue;
}
@@ -320,7 +323,7 @@
if (serviceGroup->noDisplay() || serviceGroup->childCount() == 0)
{
continue;
-@@ -225,41 +300,42 @@
+@@ -225,41 +300,42 @@ void ApplicationModelPrivate::fillNode(c
kDebug(250) << "Service group" << serviceGroup->entryPath() <<
serviceGroup->icon()
<< serviceGroup->relPath() << serviceGroup->directoryEntryPath();
@@ -378,7 +381,7 @@
}
// set the subTitleMandatory field for nodes that do not provide a unique
generic
-@@ -274,6 +350,20 @@
+@@ -274,6 +350,20 @@ void ApplicationModelPrivate::fillNode(c
}
}
@@ -399,7 +402,7 @@
ApplicationModel::ApplicationModel(QObject *parent, bool allowSeparators)
: KickoffAbstractModel(parent),
d(new ApplicationModelPrivate(this, allowSeparators))
-@@ -283,6 +373,7 @@
+@@ -283,6 +373,7 @@ ApplicationModel::ApplicationModel(QObje
QDBusConnection::sessionBus().registerObject("/kickoff", this);
dbus.connect(QString(), "/kickoff", "org.kde.plasma", "reloadMenu", this,
SLOT(reloadMenu()));
connect(KSycoca::self(), SIGNAL(databaseChanged(QStringList)), this,
SLOT(checkSycocaChange(QStringList)));
@@ -407,7 +410,7 @@
}
ApplicationModel::~ApplicationModel()
-@@ -309,6 +400,32 @@
+@@ -309,6 +400,32 @@ DisplayOrder ApplicationModel::nameDispl
return d->displayOrder;
}
@@ -440,7 +443,7 @@
int ApplicationModel::columnCount(const QModelIndex &parent) const
{
Q_UNUSED(parent)
-@@ -516,8 +633,9 @@
+@@ -516,8 +633,9 @@ void ApplicationModel::reloadMenu()
{
delete d->root;
d->root = new AppNode();
@@ -451,7 +454,7 @@
}
void ApplicationModel::checkSycocaChange(const QStringList &changes)
-@@ -537,6 +655,104 @@
+@@ -537,6 +655,104 @@ ApplicationModel::SystemApplicationPolic
return d->systemApplicationPolicy;
}
@@ -556,10 +559,11 @@
/**
* FIXME This is a temporary workaround to map the icon names found
* in the desktop directory files (from /usr/share/desktop-directories)
-diff -urN
kde-workspace-4.7.0.orig/plasma/desktop/applets/kickoff/core/applicationmodel.h
kde-workspace-4.7.0/plasma/desktop/applets/kickoff/core/applicationmodel.h
----
kde-workspace-4.7.0.orig/plasma/desktop/applets/kickoff/core/applicationmodel.h
2011-08-02 15:20:44.913157708 +0200
-+++ kde-workspace-4.7.0/plasma/desktop/applets/kickoff/core/applicationmodel.h
2011-08-02 15:20:55.501158687 +0200
-@@ -114,10 +114,19 @@
+Index:
kde-workspace-4.7.3/plasma/desktop/applets/kickoff/core/applicationmodel.h
+===================================================================
+---
kde-workspace-4.7.3.orig/plasma/desktop/applets/kickoff/core/applicationmodel.h
++++ kde-workspace-4.7.3/plasma/desktop/applets/kickoff/core/applicationmodel.h
+@@ -114,10 +114,19 @@ public:
virtual QModelIndex parent(const QModelIndex &index) const;
virtual int rowCount(const QModelIndex &parent = QModelIndex()) const;
@@ -579,7 +583,7 @@
private:
bool nameAfterDescription(const QModelIndex &index) const;
-@@ -125,6 +134,8 @@
+@@ -125,6 +134,8 @@ private:
friend class ApplicationModelPrivate;
ApplicationModelPrivate *const d;
@@ -588,10 +592,11 @@
Q_DISABLE_COPY(ApplicationModel)
};
-diff -urN
kde-workspace-4.7.0.orig/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp
kde-workspace-4.7.0/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp
----
kde-workspace-4.7.0.orig/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp
2011-08-02 15:20:44.913157708 +0200
-+++
kde-workspace-4.7.0/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp
2011-08-02 15:20:55.502158687 +0200
-@@ -114,12 +114,17 @@
+Index:
kde-workspace-4.7.3/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp
+===================================================================
+---
kde-workspace-4.7.3.orig/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp
++++
kde-workspace-4.7.3/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp
+@@ -114,12 +114,17 @@ public:
MenuLauncherApplet::FormatType formattype;
int maxRecentApps;
bool showMenuTitles;
@@ -609,7 +614,7 @@
QList<QAction*> actions;
QAction* switcher;
-@@ -137,6 +142,8 @@
+@@ -137,6 +142,8 @@ public:
iconButton(0),
formatComboBox(0),
showMenuTitlesCheckBox(0),
@@ -618,7 +623,7 @@
switcher(0),
contextMenuFactory(0)
{}
-@@ -485,7 +492,19 @@
+@@ -485,7 +492,19 @@ void MenuLauncherApplet::createConfigura
d->showMenuTitlesCheckBox->setChecked(d->showMenuTitles);
grid->addWidget(d->showMenuTitlesCheckBox, 3, 1);
@@ -639,7 +644,7 @@
parent->addPage(p, i18n("Options"), "configure");
connect(parent, SIGNAL(applyClicked()), this, SLOT(configAccepted()));
-@@ -551,6 +570,19 @@
+@@ -551,6 +570,19 @@ void MenuLauncherApplet::configAccepted(
d->showMenuTitles = showMenuTitles;
cg.writeEntry("showMenuTitles", showMenuTitles);
}
@@ -659,8 +664,8 @@
if (needssaving) {
d->updateTooltip();
-@@ -618,6 +650,9 @@
-
appModel->setPrimaryNamePolicy(Kickoff::ApplicationModel::AppNamePrimary);
+@@ -618,6 +650,9 @@ void MenuLauncherApplet::showMenu(bool p
+ }
appModel->setSystemApplicationPolicy(Kickoff::ApplicationModel::ShowApplicationAndSystemPolicy);
+ appModel->setShowRecentlyInstalled(d->showRecentlyInstalled);
@@ -669,7 +674,7 @@
menuview->addModel(appModel, Kickoff::MenuView::None,
d->relativePath);
if (d->relativePath.isEmpty()) {
-@@ -862,6 +897,8 @@
+@@ -873,6 +908,8 @@ void MenuLauncherApplet::configChanged()
d->setMaxRecentApps(cg.readEntry("maxRecentApps", qMin(5,
Kickoff::RecentApplications::self()->maximum())));
d->showMenuTitles = cg.readEntry("showMenuTitles", false);
@@ -678,10 +683,11 @@
d->icon->setIcon(KIcon(cg.readEntry("icon", d->iconname)));
-diff -urN
kde-workspace-4.7.0.orig/plasma/desktop/applets/kickoff/ui/launcher.cpp
kde-workspace-4.7.0/plasma/desktop/applets/kickoff/ui/launcher.cpp
---- kde-workspace-4.7.0.orig/plasma/desktop/applets/kickoff/ui/launcher.cpp
2011-08-02 15:20:44.912157708 +0200
-+++ kde-workspace-4.7.0/plasma/desktop/applets/kickoff/ui/launcher.cpp
2011-08-02 15:20:55.502158687 +0200
-@@ -680,6 +680,30 @@
+Index: kde-workspace-4.7.3/plasma/desktop/applets/kickoff/ui/launcher.cpp
+===================================================================
+--- kde-workspace-4.7.3.orig/plasma/desktop/applets/kickoff/ui/launcher.cpp
++++ kde-workspace-4.7.3/plasma/desktop/applets/kickoff/ui/launcher.cpp
+@@ -680,6 +680,30 @@ void Launcher::setShowAppsByName(bool sh
}
}
@@ -712,7 +718,7 @@
bool Launcher::switchTabsOnHover() const
{
return d->contentSwitcher->switchTabsOnHover();
-@@ -690,6 +714,16 @@
+@@ -690,6 +714,16 @@ bool Launcher::showAppsByName() const
return d->applicationModel->nameDisplayOrder() ==
Kickoff::NameBeforeDescription;
}
@@ -729,7 +735,7 @@
void Launcher::setVisibleItemCount(int count)
{
d->visibleItemCount = count;
-@@ -708,6 +742,9 @@
+@@ -708,6 +742,9 @@ void Launcher::setApplet(Plasma::Applet
cg = applet->config();
setShowAppsByName(cg.readEntry("ShowAppsByName", showAppsByName()));
setVisibleItemCount(cg.readEntry("VisibleItemsCount",
visibleItemCount()));
@@ -739,10 +745,11 @@
d->applet = applet;
d->contextMenuFactory->setApplet(applet);
-diff -urN
kde-workspace-4.7.0.orig/plasma/desktop/applets/kickoff/ui/launcher.h
kde-workspace-4.7.0/plasma/desktop/applets/kickoff/ui/launcher.h
---- kde-workspace-4.7.0.orig/plasma/desktop/applets/kickoff/ui/launcher.h
2011-08-02 15:20:44.912157708 +0200
-+++ kde-workspace-4.7.0/plasma/desktop/applets/kickoff/ui/launcher.h
2011-08-02 15:20:55.502158687 +0200
-@@ -78,6 +78,14 @@
+Index: kde-workspace-4.7.3/plasma/desktop/applets/kickoff/ui/launcher.h
+===================================================================
+--- kde-workspace-4.7.3.orig/plasma/desktop/applets/kickoff/ui/launcher.h
++++ kde-workspace-4.7.3/plasma/desktop/applets/kickoff/ui/launcher.h
+@@ -78,6 +78,14 @@ public:
we don't display old searches and switch back to the favorite-view. */
void reset();
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
