Hello community,
here is the log from the commit of package kdebase4-workspace for openSUSE:Factory
checked in at Mon Aug 10 23:50:32 CEST 2009.
--------
--- KDE/kdebase4-workspace/kdebase4-wallpapers.changes 2009-08-04 21:58:08.000000000 +0200
+++ kdebase4-workspace/kdebase4-wallpapers.changes 2009-08-10 23:49:57.208980000 +0200
@@ -1,0 +2,10 @@
+Mon Aug 10 09:52:04 CEST 2009 - beineri@opensuse.org
+
+- add sysconfig.displaymanager-kdm to kdm-branding-upstream package
+
+-------------------------------------------------------------------
+Wed Aug 5 18:24:19 CEST 2009 - llunak@suse.cz
+
+- branch update (no kwin abort because of harmless X errors)
+
+-------------------------------------------------------------------
kdebase4-workspace.changes: same change
python-kdebase4.changes: same change
calling whatdependson for head-i586
New:
----
sysconfig.displaymanager-kdm
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebase4-wallpapers.spec ++++++
--- /var/tmp/diff_new_pack.C4bJeu/_old 2009-08-10 23:50:14.000000000 +0200
+++ /var/tmp/diff_new_pack.C4bJeu/_new 2009-08-10 23:50:14.000000000 +0200
@@ -30,7 +30,7 @@
Summary: KDE 4 Wallpapers
Url: http://www.kde.org/
Version: 4.3.0
-Release: 1
+Release: 2
Source0: kdebase-workspace-%version.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
++++++ kdebase4-workspace.spec ++++++
--- /var/tmp/diff_new_pack.C4bJeu/_old 2009-08-10 23:50:14.000000000 +0200
+++ /var/tmp/diff_new_pack.C4bJeu/_new 2009-08-10 23:50:14.000000000 +0200
@@ -38,11 +38,12 @@
Summary: The KDE Workspace Components
Url: http://www.kde.org/
Version: 4.3.0
-Release: 1
+Release: 2
Source0: kdebase-workspace-%version.tar.bz2
Source1: rcksysguardd
Source2: titlebar_decor.png
Source3: kwin-cubecap.png
+Source4: sysconfig.displaymanager-kdm
Source91: kdebase4-workspace-rpmlintrc
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Patch0: 4_3_BRANCH.diff
@@ -166,6 +167,8 @@
cd build
%makeinstall
install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/usr/share/kde4/apps/kwin/
+ mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates/
+ install -m 644 %{SOURCE4} $RPM_BUILD_ROOT/var/adm/fillup-templates/
%create_subdir_filelist -d kdm -v devel
%create_subdir_filelist -d kwin -v devel
cd ..
@@ -267,6 +270,7 @@
Conflicts: otherproviders(kdm-branding)
Supplements: packageand(kdm:branding-upstream)
%endif
+PreReq: %fillup_prereq
Provides: kde4-kdm-branding-upstream = 4.3.0
Obsoletes: kde4-kdm-branding-upstream < 4.3.0
@@ -280,11 +284,15 @@
--------
The KDE Team
+%post -n kdm-branding-upstream
+%{fillup_only -n displaymanager -s kdm}
+
%files -n kdm-branding-upstream
%defattr(-,root,root)
%doc COPYING
%config(noreplace) %_kde_config_dir/kdm/backgroundrc
%_kde_share_dir/apps/kdm/pics
+/var/adm/fillup-templates/sysconfig.displaymanager-kdm
%package ksysguardd
License: GPL v2 or later
++++++ python-kdebase4.spec ++++++
--- /var/tmp/diff_new_pack.C4bJeu/_old 2009-08-10 23:50:14.000000000 +0200
+++ /var/tmp/diff_new_pack.C4bJeu/_new 2009-08-10 23:50:14.000000000 +0200
@@ -33,7 +33,7 @@
Summary: Python bindings for KDE 4 desktop shell
Url: http://www.kde.org/
Version: 4.3.0
-Release: 1
+Release: 2
Source0: kdebase-workspace-%version.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: python-kde4 = %{version}
++++++ 4_3_BRANCH.diff ++++++
--- /var/tmp/diff_new_pack.C4bJeu/_old 2009-08-10 23:50:14.000000000 +0200
+++ /var/tmp/diff_new_pack.C4bJeu/_new 2009-08-10 23:50:14.000000000 +0200
@@ -1,7 +1,394 @@
-package: kdebase-workspace-4.2.95.tar.bz2
+package: kdebase-workspace-4.3.0.tar.bz2
kdemod: kdebase/workspace
--- BRANCH_STATUS
+++ BRANCH_STATUS
@@ -0,0 +1,2 @@
-+current HEAD: 987508
-+svn di between //tags/KDE/4.2.95/kdebase/workspace and //branches/KDE/4.3/kdebase/workspace
++current HEAD: 1007364
++svn di between //tags/KDE/4.3.0/kdebase/workspace and //branches/KDE/4.3/kdebase/workspace
+--- solid/solid-actions-kcm/device-actions/solid-device-OpticalDrive.desktop
++++ solid/solid-actions-kcm/device-actions/solid-device-OpticalDrive.desktop
+@@ -39,7 +39,7 @@
+ Name[pa]=ਓਪਟੀਕਲ ਡਰਾਇਵ
+ Name[pl]=Dysk optyczny
+ Name[pt]=Unidade Óptica
+-Name[pt_BR]=Drive ótico
++Name[pt_BR]=Unidade óptica
+ Name[ro]=Unitate optică
+ Name[sl]=Optični pogon
+ Name[sr]=оптички уређај
+--- solid/solid-actions-kcm/device-actions/solid-device-OpticalDisc.desktop
++++ solid/solid-actions-kcm/device-actions/solid-device-OpticalDisc.desktop
+@@ -40,7 +40,7 @@
+ Name[pa]=ਓਪਟੀਕਲ ਡਿਸਕ
+ Name[pl]=Dysk optyczny
+ Name[pt]=Disco Óptico
+-Name[pt_BR]=Disco ótico
++Name[pt_BR]=Disco óptico
+ Name[ro]=Disc optic
+ Name[sl]=Optični disk
+ Name[sr]=оптички диск
+--- powerdevil/kcmodule/powerdevilconfig.desktop
++++ powerdevil/kcmodule/powerdevilconfig.desktop
+@@ -120,8 +120,8 @@
+ Comment[ru]=Настройка яркости экрана, режима ожидания и питания
+ Comment[sk]=Nastavenia jasu displeja, uspávania a profilov napájania
+ Comment[sl]=Prikaže nastavitve svetlosti, zaustavljanja in energijskih profilov
+-Comment[sr]=Поставке профила осветљености екрана, суспендовања и напајања
+-Comment[sr@latin]=Postavke profila osvetljenosti ekrana, suspendovanja i napajanja
++Comment[sr]=Поставке профила осветљаја екрана, суспендовања и напајања
++Comment[sr@latin]=Postavke profila osvetljaja ekrana, suspendovanja i napajanja
+ Comment[sv]=Visar ljusstyrka, och inställningar av viloläge och strömsparprofil
+ Comment[te]=ప్రదర్శన కాంతిప్రకాశం, సంస్పెండ్ మరియు పవర్ ప్రొఫైల్ అమర్పులు
+ Comment[th]=ตั้งค่าความสว่างการแสดงผล, การหยุดพักการทำงาน และโพรไฟล์จัดการพลังงาน
+--- kwin/effects/wobblywindows/wobblywindows.cpp
++++ kwin/effects/wobblywindows/wobblywindows.cpp
+@@ -516,6 +516,8 @@
+ {
+ freeWobblyInfo(wwi);
+ windows.remove(w);
++ if( windows.isEmpty() )
++ effects->addRepaintFull();
+ }
+ }
+ else if (m_closeEffectEnabled)
+@@ -1172,6 +1174,8 @@
+ }
+ freeWobblyInfo(wwi);
+ windows.remove(w);
++ if( windows.isEmpty() )
++ effects->addRepaintFull();
+ return false;
+ }
+
+--- kwin/kcmkwin/kwindecoration/kwindecoration.cpp
++++ kwin/kcmkwin/kwindecoration/kwindecoration.cpp
+@@ -158,7 +158,7 @@
+ // preview
+ QVBoxLayout* previewLayout = new QVBoxLayout();
+ layout->addLayout( previewLayout );
+- previewLayout->setMargin( KDialog::marginHint() );
++ previewLayout->setMargin( 0 );
+
+ preview = new KDecorationPreview( this );
+ previewLayout->addWidget(preview);
+--- kwin/kcmkwin/kwindecoration/preview.cpp
++++ kwin/kcmkwin/kwindecoration/preview.cpp
+@@ -23,8 +23,6 @@
+ #include
+ #include
+ #include
+-#include <QDBusMessage>
+-#include <QDBusConnection>
+ #include <QLabel>
+ #include <QStyle>
+ //Added by qt3to4:
+@@ -39,6 +37,7 @@
+ #include
+ #include
+ #include <QX11Info>
++#include
+
+ // FRAME the preview doesn't update to reflect the changes done in the kcm
+
+@@ -145,12 +144,24 @@
+ size = QSize( width() - xoffset, height() - titleBarHeight )
+ .expandedTo( deco[Active]->minimumSize() );
+ geometry = QRect( QPoint( 0, titleBarHeight ), size );
++ if (KDecorationUnstable *unstable = qobject_cast(deco[Active])) {
++ int padLeft, padRight, padTop, padBottom;
++ unstable->padding(padLeft, padRight, padTop, padBottom);
++ geometry.adjust(-padLeft, -padTop, padRight, padBottom);
++ }
++ geometry.adjust(10, 10, -10, -10);
+ deco[Active]->widget()->setGeometry( QStyle::visualRect( this->layoutDirection(), this->rect(), geometry ) );
+
+ // Resize the inactive window
+ size = QSize( width() - xoffset, height() - titleBarHeight )
+ .expandedTo( deco[Inactive]->minimumSize() );
+ geometry = QRect( QPoint( xoffset, 0 ), size );
++ if (KDecorationUnstable *unstable = qobject_cast(deco[Inactive])) {
++ int padLeft, padRight, padTop, padBottom;
++ unstable->padding(padLeft, padRight, padTop, padBottom);
++ geometry.adjust(-padLeft, -padTop, padRight, padBottom);
++ }
++ geometry.adjust(10, 10, -10, -10);
+ deco[Inactive]->widget()->setGeometry( QStyle::visualRect( this->layoutDirection(), this->rect(), geometry ) );
+ }
+
+@@ -442,21 +453,7 @@
+
+ bool KDecorationPreviewBridge::compositingActive() const
+ {
+-
+- QDBusMessage message = QDBusMessage::createMethodCall( "org.kde.kwin", "/KWin", "org.kde.KWin", "compositingActive" );
+- QDBusMessage reply = QDBusConnection::sessionBus().call( message );
+- if( reply.type() != QDBusMessage::ReplyMessage )
+- {
+- return false;
+- }
+-
+- if( reply.arguments().empty() )
+- {
+- return false;
+- }
+-
+- return reply.arguments()[0].toBool();
+-
++ return KWindowSystem::compositingActive();
+ }
+
+ KDecorationPreviewOptions::KDecorationPreviewOptions()
+--- kwin/main.cpp
++++ kwin/main.cpp
+@@ -184,11 +184,6 @@
+ if( kwin_sync )
+ fprintf( stderr, "%s\n", kBacktrace().toLocal8Bit().data() );
+
+- if( initting )
+- {
+- fputs( i18n( "kwin: failure during initialization; aborting").toLocal8Bit(), stderr );
+- exit( 1 );
+- }
+ return 0;
+ }
+
+--- kdm/config.def
++++ kdm/config.def
+@@ -2029,7 +2029,7 @@
+ Comment: &
+ Description:
+ Specify the widget style for the greeter. Empty means to use the
+- built-in default which currently is <literal>Oxygen</literal>.
++ built-in default which currently is <literal>Oxygen-air</literal>.
+
+ Key: ColorScheme
+ Type: string
+@@ -2039,7 +2039,7 @@
+ Comment: &
+ Description:
+ Specify the widget color scheme for the greeter. Empty means to use the
+- built-in default which currently is <literal>Oxygen</literal>.
++ built-in default which currently is <literal>Oxygen-air</literal>.
+
+ Key: LogoArea
+ Type: enum
+@@ -2657,7 +2657,7 @@
+ Type: string
+ Default: ""
+ User: greeter
+-Instance: */KDMDATA "/themes/oxygen"
++Instance: */KDMDATA "/themes/oxygen-air"
+ Comment: &
+ Description:
+ The theme to use for the greeter. Can point to either a directory or an XML
+--- plasma/dataengines/hotplug/plasma-dataengine-hotplug.desktop
++++ plasma/dataengines/hotplug/plasma-dataengine-hotplug.desktop
+@@ -66,7 +66,7 @@
+ Comment[el]=Ανίχνευση συσκευών hotplug καθώς εμφανίζονται και εξαφανίζονται.
+ Comment[es]=Registra los dispositivos extraíbles como aparecen y desaparecen.
+ Comment[et]=Töö ajal ühendatavate seadmete ilmumise ja kadumise jälgimine.
+-Comment[fr]=Surveille l'apparition ou la disparition des périphérique branchable à chaud
++Comment[fr]=Surveille l'apparition ou la disparition des périphériques branchables à chaud.
+ Comment[fy]=Hâld hot-pluggeble aparaten yn de gaten as se ferskine of ferside gean.
+ Comment[gl]=Segue a pista dos dispositivos conectábeis en quente á medida que van aparecendo e desaparecendo.
+ Comment[hu]=Követi a menet közben csatolható (hot-pluggable) eszközöket.
+--- plasma/shells/desktop/dashboardview.cpp
++++ plasma/shells/desktop/dashboardview.cpp
+@@ -280,7 +280,6 @@
+ m_zoomIn = action ? action->isEnabled() : false;
+ newContainment->enableAction("zoom out", false);
+ newContainment->enableAction("zoom in", false);
+- newContainment->openToolBox();
+ }
+
+ if (m_appletBrowser) {
+@@ -318,12 +317,14 @@
+ //kDebug() << "DashboardView::suppressShowTimeout";
+ m_suppressShow = false;
+
+- if (!config().readEntry("DashboardShown", false)) {
++ KConfigGroup cg(KGlobal::config(), "Dashboard");
++ if (!cg.readEntry("DashboardShown", false)) {
+ // the first time we show the user the dashboard, expand
+ // the toolbox; some people don't know how to get out of it at first
+ // so we do this as a hint for them
+ containment()->openToolBox();
+- config().writeEntry("DashboardShown", true);
++ cg.writeEntry("DashboardShown", true);
++ configNeedsSaving();
+ }
+ }
+
+--- plasma/containments/panel/panel.cpp
++++ plasma/containments/panel/panel.cpp
+@@ -242,7 +242,7 @@
+
+ if (formFactor() == Plasma::Vertical) {
+ foreach (Applet *applet, applets()) {
+- if (applet->sizePolicy().verticalPolicy() == QSizePolicy::Expanding || applet->sizePolicy().verticalPolicy() == QSizePolicy::MinimumExpanding) {
++ if (applet->sizePolicy().verticalPolicy() && QSizePolicy::ExpandFlag) {
+ useSpacer = false;
+ break;
+ }
+@@ -544,23 +544,6 @@
+
+ //invalidate the layout and set again
+ if (layout()) {
+- switch (location()) {
+- case LeftEdge:
+- rightWidth = qMin(rightWidth, qMax(qreal(1), size().width() - KIconLoader::SizeMedium));
+- break;
+- case RightEdge:
+- leftWidth = qMin(leftWidth, qMax(qreal(1), size().width() - KIconLoader::SizeMedium));
+- break;
+- case TopEdge:
+- bottomHeight = qMin(bottomHeight, qMax(qreal(1), size().height() - KIconLoader::SizeMedium));
+- break;
+- case BottomEdge:
+- topHeight = qMin(topHeight, qMax(qreal(1), size().height() - KIconLoader::SizeMedium));
+- break;
+- default:
+- break;
+- }
+-
+ qreal oldLeft = leftWidth;
+ qreal oldTop = topHeight;
+ qreal oldRight = rightWidth;
+--- plasma/applets/tasks/taskgroupitem.cpp
++++ plasma/applets/tasks/taskgroupitem.cpp
+@@ -279,7 +279,7 @@
+
+ TaskManager::TaskItem *taskItem = qobject_cast(item);
+
+- if (taskItem) {
++ if (taskItem && taskItem->task()) {
+ windows.append(taskItem->task()->window());
+ }
+ }
+--- plasma/applets/tasks/windowtaskitem.cpp
++++ plasma/applets/tasks/windowtaskitem.cpp
+@@ -23,11 +23,12 @@
+ #include "taskgroupitem.h"
+
+ // Qt
++#include <QApplication>
+ #include <QGraphicsSceneContextMenuEvent>
+-#include <QStyleOptionGraphicsItem>
+ #include <QGraphicsView>
++#include <QStyleOptionGraphicsItem>
++#include <QTextDocument>
+ #include <QTimer>
+-#include <QApplication>
+ #include <QVarLengthArray>
+
+ // KDE
+@@ -80,7 +81,7 @@
+ // in a widget such as a line edit which does accept the focus)
+ // this needs to be implemented for Plasma's own panels.
+ //kDebug();
+- if (m_task) {
++ if (m_task && m_task->task()) {
+ m_task->task()->activateRaiseOrIconify();
+ // emit windowSelected(this);
+ }
+@@ -108,7 +109,7 @@
+
+ void WindowTaskItem::publishIconGeometry() const
+ {
+- if (!m_task) {
++ if (!m_task || !m_task->task()) {
+ return;
+ }
+
+@@ -118,7 +119,7 @@
+
+ void WindowTaskItem::publishIconGeometry(const QRect &rect) const
+ {
+- if (m_task) {
++ if (m_task && m_task->task()) {
+ m_task->task()->publishIconGeometry(rect);
+ }
+ }
+@@ -183,7 +184,7 @@
+
+ void WindowTaskItem::updateToolTip()
+ {
+- if (!m_task) {
++ if (!m_task || !m_task->task()) {
+ return;
+ }
+
+@@ -193,7 +194,7 @@
+ Qt::KeepAspectRatio, Qt::SmoothTransformation);
+ }
+
+- Plasma::ToolTipContent data(m_task->name(),
++ Plasma::ToolTipContent data(Qt::escape(m_task->name()),
+ i18nc("Which virtual desktop a window is currently on", "On %1",
+ KWindowSystem::desktopName(m_task->desktop())), p);
+ data.setWindowToPreview(m_task->task()->window());
+--- plasma/applets/devicenotifier/notifierdialog.cpp
++++ plasma/applets/devicenotifier/notifierdialog.cpp
+@@ -162,7 +162,7 @@
+ m_notifierView->calculateRects();
+ }
+
+-void NotifierDialog::setUnMount(bool unmount, const QString &name)
++void NotifierDialog::setUnMount(bool unmount, const QString &name)
+ {
+ QModelIndex index = indexForUdi(name);
+ if (!index.isValid()) {
+@@ -249,14 +249,18 @@
+ void NotifierDialog::buildDialog()
+ {
+ m_widget = new QWidget();
++ m_widget->setAttribute(Qt::WA_TranslucentBackground);
++ QPalette p = m_widget->palette();
++ p.setColor(QPalette::Window, Qt::transparent);
++ m_widget->setPalette(p);
+
+ QVBoxLayout *l_layout = new QVBoxLayout(m_widget);
+ l_layout->setSpacing(0);
+ l_layout->setMargin(0);
+-
++
+ m_label = new QLabel(m_widget);
+ updateColors();
+-
++
+ QLabel *icon = new QLabel(m_widget);
+ icon->setPixmap(KIcon("emblem-mounted").pixmap(KIconLoader::SizeMedium, KIconLoader::SizeMedium));
+
+@@ -411,9 +415,6 @@
+ KColorScheme colorTheme = KColorScheme(QPalette::Active, KColorScheme::View,Plasma::Theme::defaultTheme()->colorScheme());
+ m_label->setText(i18n("Devices recently plugged in:</font>",colorTheme.foreground(KColorScheme::NormalText).color().name()));
+
+- QPalette p = m_widget->palette();
+- p.setColor(QPalette::Window, Plasma::Theme::defaultTheme()->color(Plasma::Theme::BackgroundColor));
+- m_widget->setPalette(p);
+ }
+
+ #include "notifierdialog.moc"
+--- plasma/applets/devicenotifier/notifierview.cpp
++++ plasma/applets/devicenotifier/notifierview.cpp
+@@ -212,7 +212,7 @@
+ while (it.hasNext()) {
+ it.next();
+ QRect itemRect = it.value();
+- QRect rect(itemRect.x(), itemRect.y() - verticalOffset(), itemRect.width(), itemRect.height());
++ QRect rect(itemRect.x(), itemRect.y() - verticalOffset(), itemRect.width(), itemRect.height());
+ if (event->region().contains(rect)) {
+ QModelIndex index = it.key();
+ if (model()->hasChildren(index)) {
+--- plasma/applets/kickoff/ui/launcher.cpp
++++ plasma/applets/kickoff/ui/launcher.cpp
+@@ -866,7 +866,9 @@
+ break;
+ }
+ }
++
+ d->panelEdge = location;
++ reset();
+ }
+
+ #include "launcher.moc"
++++++ kdm-sysconfig-values.diff ++++++
--- /var/tmp/diff_new_pack.C4bJeu/_old 2009-08-10 23:50:15.000000000 +0200
+++ /var/tmp/diff_new_pack.C4bJeu/_new 2009-08-10 23:50:15.000000000 +0200
@@ -608,7 +608,7 @@
-Default: ""
+Default: KDMDATA "/themes/SUSE"
User: greeter
--Instance: */KDMDATA "/themes/oxygen"
+-Instance: */KDMDATA "/themes/oxygen-air"
+Instance: */""
+Update: reset_sec_0_1
Comment: &
++++++ sysconfig.displaymanager-kdm ++++++
## Path: Desktop/Display manager
## Description: settings to generate a proper displaymanager config
## Config: kdm3
## Type: string
## Default:
#
# space separated list of users for which icons should be shown in KDM
# if empty, then take system defaults
#
KDM_USERS=""
## Type: string
## Default:
#
# Special greeting words in kdm
#
KDM_GREETSTRING=""
## Type: string
## Default:
#
# Defines extra Server Arguments given to the kdm display manager when
# starting a local display. Useful to override e.g. the -dpi setting.
#
DISPLAYMANAGER_KDM_LOCALARGS=""
## Type: string
## Default: SUSE
#
# Define the theme to be used by kdm. If empty, the traditional login
# window is used (which lacks some features)
#
DISPLAYMANAGER_KDM_THEME="oxygen-air"
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org