Hello community,
here is the log from the commit of package kdebase4-workspace for openSUSE:Factory
checked in at Tue Aug 10 12:15:52 CEST 2010.
--------
--- KDE/kdebase4-workspace/kdebase4-wallpapers.changes 2010-08-01 17:16:18.000000000 +0200
+++ kdebase4-workspace/kdebase4-wallpapers.changes 2010-08-10 12:13:41.865776000 +0200
@@ -1,0 +2,12 @@
+Sun Aug 8 14:59:13 UTC 2010 - beineri@opensuse.org
+
+- port applets part of plasma-branding-defaults.diff
+
+-------------------------------------------------------------------
+Thu Jul 29 13:51:15 CEST 2010 - dmueller@suse.de
+
+- update to 4.5.0
+ * KDE 4.5.0 final (version bump over RC3)
+
+
+-------------------------------------------------------------------
kdebase4-workspace.changes: same change
python-kdebase4.changes: same change
calling whatdependson for head-i586
Old:
----
kdebase-workspace-4.4.95.tar.bz2
plasma-branding-defaults.diff
New:
----
kdebase-workspace-4.5.0.tar.bz2
plasma-branding-defaults-applets.diff
plasma-branding-defaults-corona.diff
r1159603-plasma-safe-applet-drag.diff
r1159643-panel-applet-drag-behaviour.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebase4-wallpapers.spec ++++++
--- /var/tmp/diff_new_pack.KmXTQv/_old 2010-08-10 12:14:07.000000000 +0200
+++ /var/tmp/diff_new_pack.KmXTQv/_new 2010-08-10 12:14:07.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kdebase4-wallpapers (Version 4.4.95)
+# spec file for package kdebase4-wallpapers (Version 4.5.0)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -30,7 +30,7 @@
Group: System/GUI/KDE
Summary: KDE 4 Wallpapers
Url: http://www.kde.org/
-Version: 4.4.95
+Version: 4.5.0
Release: 1
Source0: kdebase-workspace-%version.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ kdebase4-workspace.spec ++++++
--- /var/tmp/diff_new_pack.KmXTQv/_old 2010-08-10 12:14:07.000000000 +0200
+++ /var/tmp/diff_new_pack.KmXTQv/_new 2010-08-10 12:14:07.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kdebase4-workspace (Version 4.4.95)
+# spec file for package kdebase4-workspace (Version 4.5.0)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -39,7 +39,7 @@
Group: System/GUI/KDE
Summary: The KDE Workspace Components
Url: http://www.kde.org/
-Version: 4.4.95
+Version: 4.5.0
Release: 1
Source0: kdebase-workspace-%version.tar.bz2
Source1: rcksysguardd
@@ -73,7 +73,8 @@
#Patch-upstream: no
#Bug: bnc#462478
Patch99: kdm-long-xserver-timeout.diff
-Patch103: plasma-branding-defaults.diff
+Patch103: plasma-branding-defaults-corona.diff
+Patch104: plasma-branding-defaults-applets.diff
# slightly modified copy of standard desktop containment
Patch105: plasma-plaindesktop.diff
Patch106: plasma-dashboard-leave.diff
@@ -87,6 +88,8 @@
Patch201: plasma-notifications-kill-timer.diff
Patch203: kdebase-workspace-4.3.95-ck-shutdown.patch
Patch208: kdm-themer-wallpaper-sizes.diff
+Patch209: r1159603-plasma-safe-applet-drag.diff
+Patch210: r1159643-panel-applet-drag-behaviour.diff
Patch211: disable-python-support.diff
Patch212: build-final.diff
Requires: kde4-kgreeter-plugins = %version
@@ -172,6 +175,7 @@
%patch99
###KDE45: rediff!
#%patch103
+%patch104
%patch105
%patch106
###KDE45: rediff!
@@ -186,6 +190,8 @@
%patch203 -p1
###KDE45: rediff!
#%patch208
+%patch209
+%patch210
%patch211
%patch212
cp %{SOURCE3} kwin/effects/cube/data/cubecap.png
++++++ python-kdebase4.spec ++++++
--- /var/tmp/diff_new_pack.KmXTQv/_old 2010-08-10 12:14:07.000000000 +0200
+++ /var/tmp/diff_new_pack.KmXTQv/_new 2010-08-10 12:14:07.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package python-kdebase4 (Version 4.4.95)
+# spec file for package python-kdebase4 (Version 4.5.0)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -28,7 +28,7 @@
Group: System/GUI/KDE
Summary: Python bindings for KDE 4 desktop shell
Url: http://www.kde.org/
-Version: 4.4.95
+Version: 4.5.0
Release: 1
Source0: kdebase-workspace-%version.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ 4_5_BRANCH.diff ++++++
--- /var/tmp/diff_new_pack.KmXTQv/_old 2010-08-10 12:14:07.000000000 +0200
+++ /var/tmp/diff_new_pack.KmXTQv/_new 2010-08-10 12:14:07.000000000 +0200
@@ -1,7 +1,82 @@
-package: kdebase-workspace-4.4.4.tar.bz2
+package: kdebase-workspace-4.5.0.tar.bz2
kdemod: kdebase/workspace
--- BRANCH_STATUS
+++ BRANCH_STATUS
@@ -0,0 +1,2 @@
-+current HEAD: 1145643
-+svn di between //tags/KDE/4.4.4/kdebase/workspace and //branches/KDE/4.4/kdebase/workspace
++current HEAD: 1159322
++svn di between //tags/KDE/4.5.0/kdebase/workspace and //branches/KDE/4.5/kdebase/workspace
+--- kcontrol/keyboard/kcm_view_models.cpp
++++ kcontrol/keyboard/kcm_view_models.cpp
+@@ -307,8 +307,8 @@
+ else {
+ int groupRow = index.row();
+ const OptionGroupInfo* xkbGroup = rules->optionGroupInfos[groupRow];
+- foreach(const QString& option, keyboardConfig->xkbOptions) {
+- if( option.startsWith(xkbGroup->name + Rules::XKB_OPTION_GROUP_SEPARATOR) )
++ foreach(const OptionInfo* optionInfo, xkbGroup->optionInfos) {
++ if( keyboardConfig->xkbOptions.indexOf(optionInfo->name) != -1 )
+ return Qt::PartiallyChecked;
+ }
+ return Qt::Unchecked;
+--- kcontrol/keyboard/CMakeLists.txt
++++ kcontrol/keyboard/CMakeLists.txt
+@@ -3,14 +3,11 @@
+
+ if( X11_Xinput_FOUND AND XiGetDevicePresenceNotifyEvent_EXISTS )
+ set(XiGetDevicePresence_FOUND 1)
++ ADD_DEFINITIONS(-DHAVE_XINPUT_AND_DEVICE_NOTIFY=1)
+ else( X11_Xinput_FOUND AND XiGetDevicePresenceNotifyEvent_EXISTS )
+ MESSAGE(STATUS "_XiGetDevicePresenceNotifyEvent is not found, libXi version 1.2.0 or later is required to keep layouts with keyboard hotplugging")
+ endif( X11_Xinput_FOUND AND XiGetDevicePresenceNotifyEvent_EXISTS )
+
+-macro_bool_to_01(XiGetDevicePresence_FOUND HAVE_XINPUT)
+-ADD_DEFINITIONS(-DHAVE_XINPUT=${HAVE_XINPUT})
+-
+-
+
+ ### kded daemon ###
+
+--- kcontrol/keyboard/layout_widget.cpp
++++ kcontrol/keyboard/layout_widget.cpp
+@@ -190,7 +190,7 @@
+
+ m_notifierItem->setToolTipSubTitle(longText);
+
+- const QIcon icon(flags->getIcon(layoutUnit.layout));
++ const QIcon icon(getFlag(layoutUnit.layout));
+ m_notifierItem->setToolTipIconByPixmap(icon);
+
+ QIcon textOrIcon = flags->getIconWithText(layoutUnit, *keyboardConfig);
+--- kcontrol/keyboard/xinput_helper.cpp
++++ kcontrol/keyboard/xinput_helper.cpp
+@@ -27,7 +27,7 @@
+ #include
+ #include
+
+-#if HAVE_XINPUT==1
++#ifdef HAVE_XINPUT_AND_DEVICE_NOTIFY
+ #include
+ #endif
+
+@@ -75,7 +75,7 @@
+ }
+
+
+-#if HAVE_XINPUT==1
++#ifdef HAVE_XINPUT_AND_DEVICE_NOTIFY
+
+ extern "C" {
+ extern int _XiGetDevicePresenceNotifyEvent(Display *);
+--- krunner/interfaces/default/interface.cpp
++++ krunner/interfaces/default/interface.cpp
+@@ -172,9 +172,9 @@
+
+ KrunnerTabFilter *krunnerTabFilter = new KrunnerTabFilter(m_resultsScene, lineEdit, this);
+ m_searchTerm->installEventFilter(krunnerTabFilter);
+- m_singleRunnerSearchTerm->installEventFilter(krunnerTabFilter);
+ connect(krunnerTabFilter, SIGNAL(historyRotated(QString)), this, SLOT(queryTextEdited(QString)));
+ lineEdit->installEventFilter(this);
++ m_singleRunnerSearchTerm->installEventFilter(this);
+
+ themeUpdated();
+ connect(Plasma::Theme::defaultTheme(), SIGNAL(themeChanged()), this, SLOT(themeUpdated()));
++++++ kdebase-workspace-4.4.95.tar.bz2 -> kdebase-workspace-4.5.0.tar.bz2 ++++++
KDE/kdebase4-workspace/kdebase-workspace-4.4.95.tar.bz2 kdebase4-workspace/kdebase-workspace-4.5.0.tar.bz2 differ: char 11, line 1
++++++ plasma-branding-defaults-applets.diff ++++++
--- plasma/desktop/applets/kickoff/applet/applet.cpp 2010/08/08 14:42:18 1.1
+++ plasma/desktop/applets/kickoff/applet/applet.cpp 2010/08/08 14:46:44
@@ -27,6 +27,7 @@
#include
#include
#include
+#include <QFile>
// KDE
#include <KIcon>
@@ -187,7 +188,10 @@
void LauncherApplet::configChanged()
{
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"));
constraintsEvent(Plasma::ImmutableConstraint);
}
@@ -202,7 +206,12 @@
d->createLauncher();
KConfigGroup cg = config();
- const QString oldIcon = cg.readEntry("icon", "start-here-kde");
+ QString oldIcon;
+ if (QFile::exists("/usr/share/icons/oxygen/scalable/places/start-here-branding.svg"))
+ oldIcon = cg.readEntry("icon", "start-here-branding");
+ else
+ oldIcon = cg.readEntry("icon", "start-here-kde");
+
if (!iconname.isEmpty() && iconname != oldIcon) {
cg.writeEntry("icon", iconname);
--- plasma/desktop/applets/kickoff/core/favoritesmodel.cpp 2010/08/08 14:42:18 1.1
+++ plasma/desktop/applets/kickoff/core/favoritesmodel.cpp 2010/08/08 14:42:42
@@ -167,6 +167,11 @@
void FavoritesModel::add(const QString& url)
{
+ KService::Ptr service = KService::serviceByStorageId(url);
+ if (!service) {
+ return;
+ }
+
Private::globalFavoriteList << url;
Private::globalFavoriteSet << url;
--- plasma/desktop/applets/kickoff/core/models.cpp 2010/08/08 14:42:18 1.1
+++ plasma/desktop/applets/kickoff/core/models.cpp 2010/08/08 14:42:42
@@ -177,7 +177,19 @@
{
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/package-manager.desktop"))
+ apps << "package-manager.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";
+
apps = appsGroup.readEntry("DesktopFiles", apps);
return apps;
}
--- plasma/desktop/applets/kickoff/core/systemmodel.cpp 2010/08/08 14:42:18 1.1
+++ plasma/desktop/applets/kickoff/core/systemmodel.cpp 2010/08/08 14:42:42
@@ -81,7 +81,7 @@
connect(placesModel, SIGNAL(rowsRemoved(QModelIndex, int, int)),
q, SLOT(sourceRowsRemoved(QModelIndex, int, int)));
- topLevelSections << i18n("Applications")
+ topLevelSections << i18n("Administration")
<< i18n("Places")
<< i18n("Removable Storage")
<< i18n("Storage");
@@ -225,19 +225,33 @@
}
KService::Ptr service = d->appsList[index.row()];
-
- 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/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp 2010/08/08 14:42:18 1.1
+++ plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp 2010/08/08 14:49:52
@@ -36,6 +36,7 @@
#include
#include
#include
+#include <QFile>
// KDE Libs
#include <KActionCollection>
@@ -305,7 +306,10 @@
d->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";
}
}
d->formattype = NameDescription;
--- plasma/desktop/applets/kickoff/ui/brandingbutton.cpp 2010/08/08 14:42:18 1.1
+++ plasma/desktop/applets/kickoff/ui/brandingbutton.cpp 2010/08/08 14:42:42
@@ -69,7 +69,10 @@
void BrandingButton::openHomepage()
{
//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/"));
+
QString themePath = KStandardDirs::locate("data", "desktoptheme/" +
Plasma::Theme::defaultTheme()->themeName() +
"/metadata.desktop");
++++++ plasma-branding-defaults-corona.diff ++++++
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>
@@ -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
- c = addContainment("desktop");
+ KSharedConfigPtr defaultconfig = KSharedConfig::openConfig("plasma-desktoprc");
+ KConfigGroup group = KConfigGroup(defaultconfig, "Defaults");
+ c = addContainment(group.readEntry("containment", "desktop"));
if (!c) {
KPluginInfo::List desktopPlugins = Plasma::Containment::listContainmentsOfType("desktop");
@@ -436,6 +439,25 @@ void DesktopCorona::loadDefaultLayout()
applet->setGlobalShortcut(KShortcut("Alt+F1"));
}
+ if (QFile::exists("/usr/share/kde4/services/plasma-applet-showdashboard.desktop"))
+ loadDefaultApplet("showdashboard", panel);
+
+ QVariantList args;
+ if (QFile::exists("/usr/share/applications/MozillaFirefox.desktop")) {
+ args << "/usr/share/applications/MozillaFirefox.desktop";
+ panel->addApplet("icon", args);
+ }
+ else if (QFile::exists("/usr/share/applications/kde4/konqbrowser.desktop")) {
+ args << "/usr/share/applications/kde4/konqbrowser.desktop";
+ panel->addApplet("icon", args);
+ }
+
+ args.clear();
+ if (QFile::exists("/usr/share/applications/kde4/dolphin.desktop")) {
+ args << "/usr/share/applications/kde4/dolphin.desktop";
+ panel->addApplet("icon", args);
+ }
+
loadDefaultApplet("pager", panel);
loadDefaultApplet("tasks", panel);
Plasma::Applet *sysTray = loadDefaultApplet("systemtray", panel);
@@ -447,7 +469,12 @@ void DesktopCorona::loadDefaultLayout()
}
}
+ if (QFile::exists("/usr/share/kde4/services/plasma-applet-networkmanagement.desktop")) {
+ loadDefaultApplet("networkmanagement", panel);
+ }
+
loadDefaultApplet("digital-clock", panel);
+ loadDefaultApplet("lockout", panel);
emit containmentAdded(panel);
QTimer::singleShot(1000, this, SLOT(saveDefaultSetup()));
++++++ r1159603-plasma-safe-applet-drag.diff ++++++
Subject: Don't allow the user to accidentally drop applets from the panel onto the desktop while moving them along the panel.
From: wstephenson@suse.de
Patch-upstream: r1159603
Index: plasma/desktop/shell/panelappletoverlay.cpp
===================================================================
--- plasma/desktop/shell/panelappletoverlay.cpp (revision 1159602)
+++ plasma/desktop/shell/panelappletoverlay.cpp (revision 1159603)
@@ -294,7 +294,7 @@
}
QPointF pos = view->mapFromGlobal(event->globalPos());
- if (view != m_applet->view()) {
+ if (view != m_applet->view() && (event->buttons() & Qt::LeftButton)) {
Plasma::Containment *c = view->containment();
if (!c) {
return;
++++++ r1159643-panel-applet-drag-behaviour.diff ++++++
Subject: allow dragging based on mouse position, makes dragging large applets on the panel possible
From: wstephenson@suse.de
Patch-upstream: yes
Index: plasma/desktop/shell/panelappletoverlay.cpp
===================================================================
--- plasma/desktop/shell/panelappletoverlay.cpp (revision 1159641)
+++ plasma/desktop/shell/panelappletoverlay.cpp (revision 1159642)
@@ -359,7 +359,7 @@
if (m_layout) {
m_layout->removeItem(m_applet);
m_layout->insertItem(m_index, m_spacer);
- }
+ }
}
QPoint p = mapToParent(event->pos());
@@ -375,29 +375,31 @@
m_applet->setGeometry(g);
//FIXME: assumption on how panel containment works, presence of a non applet spacer in last position (if they were swapped would be impossible to save and restore)
- if (m_index > 0 && m_layout->itemAt(m_index - 1)) {
+ if ((m_index > 0 && m_layout->itemAt(m_index - 1)) || m_index == 0) {
const bool prevIsApplet = dynamic_castPlasma::Applet*(m_layout->itemAt(m_index - 1)) != 0;
const bool nextIsApplet = dynamic_castPlasma::Applet*(m_layout->itemAt(m_index + 1)) != 0;
+ QPointF mousePos = event->pos() + g.topLeft();
// swap items if we pass completely over the next/previous item or cross
// more than halfway across it, whichever comes first
if (m_orientation == Qt::Horizontal) {
//kDebug() << prevIsApplet << m_prevGeom << g << nextIsApplet << m_nextGeom;
if (QApplication::layoutDirection() == Qt::RightToLeft) {
- if (prevIsApplet && m_prevGeom.isValid() && g.right() >= m_prevGeom.right()) {
+ if (prevIsApplet && m_prevGeom.isValid() && mousePos.x() >= m_prevGeom.right()) {
swapWithPrevious();
- } else if (nextIsApplet && m_nextGeom.isValid() && g.left() <= m_nextGeom.left()) {
+ } else if (nextIsApplet && m_nextGeom.isValid() && mousePos.x() <= m_nextGeom.left()) {
swapWithNext();
}
- } else if (prevIsApplet && m_prevGeom.isValid() && g.left() <= m_prevGeom.left()) {
+ } else if (prevIsApplet && m_prevGeom.isValid() && mousePos.x() <= m_prevGeom.left()) {
swapWithPrevious();
- } else if (nextIsApplet && m_nextGeom.isValid() && g.right() >= m_nextGeom.right()) {
+ } else if (nextIsApplet && m_nextGeom.isValid() && mousePos.x() >= m_nextGeom.right()) {
swapWithNext();
}
- } else if (prevIsApplet && m_prevGeom.isValid() && g.top() <= m_prevGeom.top()) {
+
+ } else if (prevIsApplet && m_prevGeom.isValid() && mousePos.y() <= m_prevGeom.top()) {
swapWithPrevious();
- } else if (nextIsApplet && m_nextGeom.isValid() && g.bottom() >= m_nextGeom.bottom()) {
+ } else if (nextIsApplet && m_nextGeom.isValid() && mousePos.y() >= m_nextGeom.bottom()) {
swapWithNext();
}
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org