Hello community, here is the log from the commit of package kdebase4-workspace for openSUSE:11.4 checked in at Mon Feb 21 00:27:20 CET 2011.
-------- --- old-versions/11.4/all/kdebase4-workspace/kdebase4-wallpapers.changes 2011-02-11 21:52:04.000000000 +0100 +++ /mounts/work_src_done/11.4/kdebase4-workspace/kdebase4-wallpapers.changes 2011-02-21 00:26:51.422814000 +0100 @@ -1,0 +2,23 @@ +Fri Feb 18 08:03:47 UTC 2011 - [email protected] + +- Blacklist Intel 945GM from KWin Blur effect + +------------------------------------------------------------------- +Thu Feb 17 12:05:39 UTC 2011 - [email protected] + +- Reenable some patches: + * Add some default launchers to new panels + * Enable fingerprint support in KDM + +------------------------------------------------------------------- +Tue Feb 15 17:30:00 CET 2011 - [email protected] + +- remove blacklisting of unauthorized rpmlintrc errors + +------------------------------------------------------------------- +Mon Feb 14 23:13:20 UTC 2011 - [email protected] + +- added powerdevil branchupdate to fix various bugs + bko264534, bko264730, bko257948, bko257948, bnc670851 + +------------------------------------------------------------------- kdebase4-workspace.changes: same change python-kdebase4.changes: same change calling whatdependson for 11.4-i586 Old: ---- bko264730-powerdevil-dpms-for-4.6.0.diff New: ---- kwin-update-blacklist-11.4.diff powerdevil_46branchupdate.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-wallpapers.spec ++++++ --- /var/tmp/diff_new_pack.k9scdp/_old 2011-02-21 00:27:03.000000000 +0100 +++ /var/tmp/diff_new_pack.k9scdp/_new 2011-02-21 00:27:03.000000000 +0100 @@ -23,7 +23,7 @@ Summary: KDE 4 Wallpapers Url: http://www.kde.org/ Version: 4.6.0 -Release: 4 +Release: 5.<RELEASE2> BuildRequires: libdbusmenu-qt-devel BuildRequires: libkdepimlibs4-devel >= %version BuildRequires: libqimageblitz-devel ++++++ kdebase4-workspace.spec ++++++ --- /var/tmp/diff_new_pack.k9scdp/_old 2011-02-21 00:27:03.000000000 +0100 +++ /var/tmp/diff_new_pack.k9scdp/_new 2011-02-21 00:27:03.000000000 +0100 @@ -23,7 +23,7 @@ Summary: The KDE Workspace Components Url: http://www.kde.org/ Version: 4.6.0 -Release: 4 +Release: 10.<RELEASE2> BuildRequires: audit-devel BuildRequires: bluez-devel BuildRequires: ConsoleKit-devel @@ -108,8 +108,8 @@ Patch212: build-final.diff Patch213: bko265206-plasma-notification-crashfix.diff Patch214: bnc661844-akonadi-launched-by-calendarwidget.diff -#Patch215 to be removed when building for 4.6.1 -Patch215: bko264730-powerdevil-dpms-for-4.6.0.diff +Patch215: powerdevil_46branchupdate.diff +Patch216: kwin-update-blacklist-11.4.diff Requires: kde4-kgreeter-plugins = %version Requires: kdebase4-workspace-liboxygenstyle = %version %kde4_runtime_requires @@ -161,7 +161,7 @@ %prep %setup -q -n kdebase-workspace-%version %patch0 -###KDE44: rediff! +###KDE46: rewrite! #%patch8 %patch18 #%patch60 @@ -173,38 +173,36 @@ %patch67 %patch68 %patch69 -###KDE45: rediff! -#%patch70 -p1 +%patch70 -p0 %patch71 %patch77 %patch82 %patch88 -###KDE45: rediff! +### Remove when KDM KCM configuration bugs are fixed #%patch94 %patch98 %patch99 -###KDE45: rediff! -#%patch103 +%patch103 %patch104 %patch106 %patch107 %patch108 %patch109 -###KDE45: rediff! -#%patch123 -p1 -#%patch124 -p1 +%patch123 -p1 +%patch124 -p1 %patch125 %if %suse_version <= 1110 %patch130 %endif %patch201 -p1 -###KDE45: rediff! +###KDE45: rediff! - kdm code may have added similar functionality #%patch208 %patch211 %patch212 %patch213 -p1 %patch214 -p1 %patch215 -p1 +%patch216 -p1 cp %{SOURCE3} kwin/effects/cube/data/cubecap.png %build @@ -528,6 +526,11 @@ -------- The KDE Team <[email protected]> +%post liboxygenstyle +/sbin/ldconfig + +%postun liboxygenstyle +/sbin/ldconfig %files branding-upstream %defattr(-,root,root) ++++++ python-kdebase4.spec ++++++ --- /var/tmp/diff_new_pack.k9scdp/_old 2011-02-21 00:27:04.000000000 +0100 +++ /var/tmp/diff_new_pack.k9scdp/_new 2011-02-21 00:27:04.000000000 +0100 @@ -27,7 +27,7 @@ Summary: Python bindings for KDE 4 desktop shell Url: http://www.kde.org/ Version: 4.6.0 -Release: 4 +Release: 5.<RELEASE2> BuildRequires: NetworkManager-devel bluez-devel libQtWebKit-devel libdbusmenu-qt-devel libkdepimlibs4-devel >= %version libqimageblitz-devel BuildRequires: libknotificationitem-devel libsmbclient-devel libxklavier-devel python-kde4-devel >= %version Source0: kdebase-workspace-%version.tar.bz2 ++++++ kdebase4-workspace-rpmlintrc ++++++ --- /var/tmp/diff_new_pack.k9scdp/_old 2011-02-21 00:27:04.000000000 +0100 +++ /var/tmp/diff_new_pack.k9scdp/_new 2011-02-21 00:27:04.000000000 +0100 @@ -1,3 +1 @@ addFilter("untranslated-desktop-file .*/usr/share/wallpapers/.*") -addFilter("suse-dbus-unauthorized-service") -addFilter("polkit-unauthorized-privilege") ++++++ kdm-fix-generic-greeter.diff ++++++ --- /var/tmp/diff_new_pack.k9scdp/_old 2011-02-21 00:27:04.000000000 +0100 +++ /var/tmp/diff_new_pack.k9scdp/_new 2011-02-21 00:27:04.000000000 +0100 @@ -4,19 +4,23 @@ Bug: bnc#533189 Relates: kdm-fix-labelcolors.diff, same-pam-generic-classic.diff ---- workspace/kdm/kfrontend/kgreeter.cpp.sav 2010-03-11 13:59:41.000000000 +0100 -+++ workspace/kdm/kfrontend/kgreeter.cpp 2010-03-15 15:45:39.000000000 +0100 -@@ -915,8 +915,6 @@ KThemedGreeter::KThemedGreeter( KdmTheme - timed_label = themer->findNode( "timed-label" ); - - KdmItem *itm; -- if ((itm = themer->findNode( "pam-message" ))) // done via msgboxes -- itm->setVisible( false ); - if ((itm = themer->findNode( "language_button" ))) // not implemented yet - itm->setVisible( false ); - ---- workspace/kdm/kfrontend/themes/greeter.dtd.sav 2010-03-11 13:59:41.000000000 +0100 -+++ workspace/kdm/kfrontend/themes/greeter.dtd 2010-03-15 15:57:51.000000000 +0100 +Index: kdebase-workspace-4.6.0/kdm/kfrontend/kgreeter.cpp +=================================================================== +--- kdebase-workspace-4.6.0.orig/kdm/kfrontend/kgreeter.cpp ++++ kdebase-workspace-4.6.0/kdm/kfrontend/kgreeter.cpp +@@ -976,8 +976,6 @@ KThemedGreeter::KThemedGreeter(KdmThemer + timed_label = themer->findNode("timed-label"); + + KdmItem *itm; +- if ((itm = themer->findNode("pam-message"))) // done via msgboxes +- itm->setVisible(false); + if ((itm = themer->findNode("language_button"))) // not implemented yet + itm->setVisible(false); + +Index: kdebase-workspace-4.6.0/kdm/kfrontend/themes/greeter.dtd +=================================================================== +--- kdebase-workspace-4.6.0.orig/kdm/kfrontend/themes/greeter.dtd ++++ kdebase-workspace-4.6.0/kdm/kfrontend/themes/greeter.dtd @@ -19,9 +19,9 @@ Items with these IDs get special treatme caps-lock-warning | xauth-warning | pam-error | timed-label | login_button | session_button | system_button @@ -29,206 +33,212 @@ --> <!ATTLIST item ---- workspace/libs/kdm/kgreet_generic.cpp.sav 2010-03-11 13:59:40.000000000 +0100 -+++ workspace/libs/kdm/kgreet_generic.cpp 2010-03-15 16:20:56.000000000 +0100 +Index: kdebase-workspace-4.6.0/libs/kdm/kgreet_generic.cpp +=================================================================== +--- kdebase-workspace-4.6.0.orig/libs/kdm/kgreet_generic.cpp ++++ kdebase-workspace-4.6.0/libs/kdm/kgreet_generic.cpp @@ -41,24 +41,14 @@ extern KDE_EXPORT KGreeterPluginInfo kgr static int echoMode; -class KDMPasswordEdit : public KLineEdit { -public: -- KDMPasswordEdit( QWidget *parent = 0 ) : KLineEdit( parent ) -- { -- if (::echoMode == -1) -- setPasswordMode( true ); -- else -- setEchoMode( ::echoMode ? Password : NoEcho ); -- setContextMenuPolicy( Qt::NoContextMenu ); -- } +- KDMPasswordEdit(QWidget *parent = 0) : KLineEdit(parent) +- { +- if (::echoMode == -1) +- setPasswordMode(true); +- else +- setEchoMode(::echoMode ? Password : NoEcho); +- setContextMenuPolicy(Qt::NoContextMenu); +- } -}; - - KGenericGreeter::KGenericGreeter( KGreeterPluginHandler *_handler, - QWidget *parent, - const QString &_fixedEntity, - Function _func, Context _ctx ) : - QObject(), - KGreeterPlugin( _handler ), -+ m_label( 0 ), -+ m_messageLabel( 0 ), - m_lineEdit( 0 ), - fixedUser( _fixedEntity ), - func( _func ), -@@ -66,22 +56,55 @@ KGenericGreeter::KGenericGreeter( KGreet - exp( -1 ), - running( false ) + KGenericGreeter::KGenericGreeter(KGreeterPluginHandler *_handler, + QWidget *parent, + const QString &_fixedEntity, + Function _func, Context _ctx) : + QObject(), + KGreeterPlugin(_handler), ++ m_label( 0 ), ++ m_messageLabel( 0 ), + m_lineEdit(0), + fixedUser(_fixedEntity), + func(_func), +@@ -66,22 +56,56 @@ KGenericGreeter::KGenericGreeter(KGreete + exp(-1), + running(false) { -- m_parentWidget = new QWidget( parent ); -- m_parentWidget->setObjectName( "talker" ); -- // XXX set some minimal size -- widgetList << m_parentWidget; -- m_grid = new QGridLayout( m_parentWidget ); -- m_grid->setMargin( 0 ); -+ QGridLayout *grid = 0; -+ if (!_handler->gplugHasNode( "pam-prompt" ) || -+ !_handler->gplugHasNode( "user-pw-entry" ) || -+ !_handler->gplugHasNode( "pam-message" )) { -+ parent = new QWidget( parent ); -+ parent->setObjectName( "talker" ); -+ widgetList << parent; -+ grid = new QGridLayout( parent ); -+ grid->setMargin( 0 ); -+ } +- m_parentWidget = new QWidget(parent); +- m_parentWidget->setObjectName("talker"); +- // XXX set some minimal size +- widgetList << m_parentWidget; +- m_grid = new QGridLayout(m_parentWidget); +- m_grid->setMargin(0); ++ QGridLayout *grid = 0; ++ if (!_handler->gplugHasNode( "pam-prompt" ) || ++ !_handler->gplugHasNode( "user-pw-entry" ) || ++ !_handler->gplugHasNode( "pam-message" )) { ++ parent = new QWidget( parent ); ++ parent->setObjectName( "talker" ); ++ widgetList << parent; ++ grid = new QGridLayout( parent ); ++ grid->setMargin( 0 ); ++ } - if (ctx == ExUnlock || ctx == ExChangeTok) - fixedUser = KUser().loginName(); + if (ctx == ExUnlock || ctx == ExChangeTok) + fixedUser = KUser().loginName(); ++ ++ m_label = new QLabel( parent ); ++ if( grid ) { ++ m_label->setMinimumWidth( ++ m_label->fontMetrics().width( "A username" ) ); ++ grid->addWidget( m_label, 0, 0 ); ++ } else { ++ m_label->setObjectName( "pam-prompt" ); ++ widgetList << m_label; + -+ m_label = new QLabel( parent ); -+ if( grid ) { -+ m_label->setMinimumWidth( -+ m_label->fontMetrics().width( "A username" ) ); -+ grid->addWidget( m_label, 0, 0 ); ++ m_lineEdit = new KLineEdit( parent ); ++ m_label->setBuddy( m_lineEdit ); ++ if( grid ) { ++ m_lineEdit->setMinimumWidth( ++ m_lineEdit->fontMetrics().width( "This is a long password" ) ); ++ grid->addWidget( m_lineEdit, 0, 1 ); + } else { -+ m_label->setObjectName( "pam-prompt" ); -+ widgetList << m_label; -+ } -+ m_lineEdit = new KLineEdit( parent ); -+ m_label->setBuddy( m_lineEdit ); -+ if( grid ) { -+ m_lineEdit->setMinimumWidth( -+ m_lineEdit->fontMetrics().width( "This is a long password" ) ); -+ grid->addWidget( m_lineEdit, 0, 1 ); -+ } else { -+ m_lineEdit->setObjectName( "user-pw-entry" ); -+ widgetList << m_lineEdit; -+ } -+ m_messageLabel = new QLabel( parent ); -+ if( grid ) { -+ m_messageLabel->setMinimumWidth( -+ m_messageLabel->fontMetrics().width( "Information text" ) ); -+ grid->addWidget( m_messageLabel, 1, 0 ); ++ m_lineEdit->setObjectName( "user-pw-entry" ); ++ widgetList << m_lineEdit; ++ } ++ m_messageLabel = new QLabel( parent ); ++ if( grid ) { ++ m_messageLabel->setMinimumWidth( ++ m_messageLabel->fontMetrics().width( "Information text" ) ); ++ grid->addWidget( m_messageLabel, 1, 0 ); + } else { -+ m_messageLabel->setObjectName( "pam-message" ); -+ widgetList << m_messageLabel; -+ } ++ m_messageLabel->setObjectName( "pam-message" ); ++ widgetList << m_messageLabel; ++ } ++ } } // virtual KGenericGreeter::~KGenericGreeter() { - abort(); -- delete m_parentWidget; -+ qDeleteAll( widgetList ); + abort(); +- delete m_parentWidget; ++ qDeleteAll( widgetList ); } void // virtual -@@ -127,8 +150,7 @@ KGenericGreeter::setEnabled( bool enable +@@ -127,8 +151,7 @@ KGenericGreeter::setEnabled(bool enable) { - // assert( func == Authenticate && ctx == Shutdown ); - // XXX this is likely to bear some bogosity -- foreach (QWidget *w, m_children) -- w->setEnabled( enable ); -+ m_lineEdit->setEnabled( enable ); - if (enable && m_lineEdit) - m_lineEdit->setFocus(); + // assert(func == Authenticate && ctx == Shutdown); + // XXX this is likely to bear some bogosity +- foreach (QWidget *w, m_children) +- w->setEnabled(enable); ++ m_lineEdit->setEnabled( enable ); + if (enable && m_lineEdit) + m_lineEdit->setFocus(); } -@@ -143,9 +165,7 @@ KGenericGreeter::textMessage( const char - revive(); - QString qtext = QString::fromUtf8( text ); - m_infoMsgs.append( qtext ); -- QLabel *label = new QLabel( qtext, m_parentWidget ); -- m_grid->addWidget( label, m_line++, 0, 1, 2 ); -- m_children.append( label ); -+ m_messageLabel->setText( m_infoMsgs.join( "\n" )); +@@ -143,9 +166,7 @@ KGenericGreeter::textMessage(const char + revive(); + QString qtext = QString::fromUtf8(text); + m_infoMsgs.append(qtext); +- QLabel *label = new QLabel(qtext, m_parentWidget); +- m_grid->addWidget(label, m_line++, 0, 1, 2); +- m_children.append(label); ++ m_messageLabel->setText( m_infoMsgs.join( "\n" )); - return true; + return true; } -@@ -168,15 +188,19 @@ KGenericGreeter::textPrompt( const char - revive(); - else - m_infoMsgs.clear(); +@@ -169,15 +190,20 @@ KGenericGreeter::textPrompt(const char * + revive(); + else + m_infoMsgs.clear(); - -- QLabel *label = new QLabel( QString::fromUtf8( prompt ).trimmed() ); -- m_grid->addWidget( label, m_line, 0 ); -- m_children.append( label ); - m_echo = echo; +- QLabel *label = new QLabel(QString::fromUtf8(prompt).trimmed()); +- m_grid->addWidget(label, m_line, 0); +- m_children.append(label); ++ m_children.append(m_label); + m_echo = echo; + -+ m_label->setText( QString::fromUtf8( prompt ).trimmed()); -+ m_lineEdit->setContextMenuPolicy( Qt::NoContextMenu ); -+ m_lineEdit->setCompletionObject( 0 ); -+ m_lineEdit->disconnect( this ); -+ m_lineEdit->clear(); -+ m_lineEdit->setPasswordMode( false ); -+ m_lineEdit->setEchoMode( QLineEdit::Normal ); - if (echo) { -- m_lineEdit = new KLineEdit; -- m_lineEdit->setContextMenuPolicy( Qt::NoContextMenu ); - if (!exp) { -+ if (m_label->text().isEmpty()) -+ m_label->setText( i18n("&Username:")); - if (!m_users.isEmpty()) { - KCompletion *userNamesCompletion = new KCompletion; - userNamesCompletion->setItems( m_users ); -@@ -187,20 +211,18 @@ KGenericGreeter::textPrompt( const char - if (!curUser.isEmpty()) { - m_lineEdit->setText( curUser ); - m_lineEdit->selectAll(); -- connect( m_lineEdit, SIGNAL(selectionChanged()), SLOT(slotChanged()) ); - } - connect( m_lineEdit, SIGNAL(editingFinished()), SLOT(slotLoginLostFocus()) ); - } - connect( m_lineEdit, SIGNAL(editingFinished()), SLOT(slotChanged()) ); - connect( m_lineEdit, SIGNAL(textChanged( const QString & )), SLOT(slotChanged()) ); - } else { -- m_lineEdit = new KDMPasswordEdit; -+ if (::echoMode == -1) -+ m_lineEdit->setPasswordMode( true ); -+ else -+ m_lineEdit->setEchoMode( ::echoMode ? QLineEdit::Password : QLineEdit::NoEcho ); -+ connect( m_lineEdit, SIGNAL(editingFinished()), SLOT(slotChanged()) ); - } -- m_lineEdit->setMinimumWidth( -- m_lineEdit->fontMetrics().width( "This is a long password" ) ); -- m_grid->addWidget( m_lineEdit, m_line, 1 ); -- m_children.append( m_lineEdit ); -- m_lineEdit->show(); - m_lineEdit->setFocus(); ++ m_label->setText( QString::fromUtf8( prompt ).trimmed()); ++ m_lineEdit->setContextMenuPolicy( Qt::NoContextMenu ); ++ m_lineEdit->setCompletionObject( 0 ); ++ m_lineEdit->disconnect( this ); ++ m_lineEdit->clear(); ++ m_lineEdit->setPasswordMode( false ); ++ m_lineEdit->setEchoMode( QLineEdit::Normal ); + if (echo) { +- m_lineEdit = new KLineEdit; +- m_lineEdit->setContextMenuPolicy(Qt::NoContextMenu); + if (!exp) { ++ if (m_label->text().isEmpty()) ++ m_label->setText( i18n("&Username:")); + if (!m_users.isEmpty()) { + KCompletion *userNamesCompletion = new KCompletion; + userNamesCompletion->setItems(m_users); +@@ -188,20 +214,18 @@ KGenericGreeter::textPrompt(const char * + if (!curUser.isEmpty()) { + m_lineEdit->setText(curUser); + m_lineEdit->selectAll(); +- connect(m_lineEdit, SIGNAL(selectionChanged()), SLOT(slotChanged())); + } + connect(m_lineEdit, SIGNAL(editingFinished()), SLOT(slotLoginLostFocus())); + } + connect(m_lineEdit, SIGNAL(editingFinished()), SLOT(slotChanged())); + connect(m_lineEdit, SIGNAL(textChanged(const QString &)), SLOT(slotChanged())); + } else { +- m_lineEdit = new KDMPasswordEdit; ++ if (::echoMode == -1) ++ m_lineEdit->setPasswordMode( true ); ++ else ++ m_lineEdit->setEchoMode( ::echoMode ? QLineEdit::Password : QLineEdit::NoEcho ); ++ connect( m_lineEdit, SIGNAL(editingFinished()), SLOT(slotChanged()) ); + } +- m_lineEdit->setMinimumWidth( +- m_lineEdit->fontMetrics().width("This is a long password")); +- m_grid->addWidget(m_lineEdit, m_line, 1); +- m_children.append(m_lineEdit); +- m_lineEdit->show(); + m_lineEdit->setFocus(); } -@@ -235,7 +257,6 @@ KGenericGreeter::next() - if (m_lineEdit) { - m_lineEdit->setEnabled( false ); - QString text = m_lineEdit->text(); -- m_lineEdit = 0; - handler->gplugReturnText( text.toLocal8Bit(), - !m_echo ? - KGreeterPluginHandler::IsSecret : -@@ -272,8 +293,7 @@ KGenericGreeter::failed() - revive(); - handler->gplugMsgBox( QMessageBox::Information, text ); - } else { -- foreach (QWidget *w, m_children) -- w->setEnabled( false ); -+ m_lineEdit->setEnabled( false ); - } - exp = -1; - running = false; -@@ -283,12 +303,9 @@ void // virtual +@@ -236,7 +260,6 @@ KGenericGreeter::next() + if (m_lineEdit) { + m_lineEdit->setEnabled(false); + QString text = m_lineEdit->text(); +- m_lineEdit = 0; + handler->gplugReturnText(text.toLocal8Bit(), + !m_echo ? + KGreeterPluginHandler::IsSecret : +@@ -273,8 +296,7 @@ KGenericGreeter::failed() + revive(); + handler->gplugMsgBox(QMessageBox::Information, text); + } else { +- foreach (QWidget *w, m_children) +- w->setEnabled(false); ++ m_lineEdit->setEnabled( false ); + } + exp = -1; + running = false; +@@ -284,12 +306,9 @@ void // virtual KGenericGreeter::revive() { - // assert( !running ); -- foreach (QWidget *w, m_children) -- w->deleteLater(); -- m_children.clear(); - m_infoMsgs.clear(); -- m_lineEdit = 0; -- m_line = 0; -+ m_lineEdit->clear(); -+ m_lineEdit->setEnabled( true ); + // assert(!running); +- foreach (QWidget *w, m_children) +- w->deleteLater(); +- m_children.clear(); + m_infoMsgs.clear(); +- m_lineEdit = 0; +- m_line = 0; ++ m_lineEdit->clear(); ++ m_lineEdit->setEnabled( true ); } void // virtual ---- workspace/libs/kdm/kgreet_generic.h.sav 2010-03-11 13:59:40.000000000 +0100 -+++ workspace/libs/kdm/kgreet_generic.h 2010-03-15 16:02:30.000000000 +0100 +Index: kdebase-workspace-4.6.0/libs/kdm/kgreet_generic.h +=================================================================== +--- kdebase-workspace-4.6.0.orig/libs/kdm/kgreet_generic.h ++++ kdebase-workspace-4.6.0/libs/kdm/kgreet_generic.h @@ -33,7 +33,6 @@ Foundation, Inc., 51 Franklin Street, Fi #include <QObject> @@ -238,23 +248,25 @@ class KLineEdit; @@ -68,11 +67,11 @@ class KGenericGreeter : public QObject, - void slotChanged(); + void slotChanged(); private: -- QGridLayout *m_grid; - QList<QWidget *> m_children; -+ QLabel *m_label; -+ QLabel *m_messageLabel; - KLineEdit *m_lineEdit; -- QWidget *m_parentWidget; -- QList<QString> m_infoMsgs; -+ QStringList m_infoMsgs; - QString fixedUser, curUser; - QStringList m_users; - Function func; ---- workspace/kdm/kfrontend/themes/oxygen-air/oxygen-air.xml.sav 2010-03-09 11:52:01.000000000 +0100 -+++ workspace/kdm/kfrontend/themes/oxygen-air/oxygen-air.xml 2010-03-15 15:57:08.000000000 +0100 -@@ -27,11 +27,12 @@ +- QGridLayout *m_grid; + QList<QWidget *> m_children; ++ QLabel *m_label; ++ QLabel *m_messageLabel; + KLineEdit *m_lineEdit; +- QWidget *m_parentWidget; +- QList<QString> m_infoMsgs; ++ QStringList m_infoMsgs; + QString fixedUser, curUser; + QStringList m_users; + Function func; +Index: kdebase-workspace-4.6.0/kdm/kfrontend/themes/oxygen-air/oxygen-air.xml +=================================================================== +--- kdebase-workspace-4.6.0.orig/kdm/kfrontend/themes/oxygen-air/oxygen-air.xml ++++ kdebase-workspace-4.6.0/kdm/kfrontend/themes/oxygen-air/oxygen-air.xml +@@ -26,7 +26,7 @@ <stock type="welcome-label"/> </item> @@ -262,49 +274,44 @@ + <item type="rect" id="talker"> <pos anchor="c" x="50%" y="43%" width="400" height="144"/> <box orientation="vertical" spacing="0" homogeneous="true"> - -- <item type="pixmap" butoon="true"> -+ <item type="pixmap" button="true"> -+ <show type="!plugin-specific-generic"/> - <normal file="user-entry.png"/> - <prelight file="user-entry-li.png"/> - <active file="user-entry-li.png"/> -@@ -39,18 +40,38 @@ - </item> - - <item type="entry" id="user-entry"> -+ <show type="!plugin-specific-generic"/> - <pos anchor="c" x="52%" y="0%" width="110" height="22"/> - </item> - <item type="pixmap"> -+ <show type="!plugin-specific-generic"/> - <normal file="pw-entry.png"/> - <prelight file="pw-entry-li.png"/> - <pos anchor="c" x="50%" y="100%"/> - </item> - - <item type="entry" id="pw-entry"> -+ <show type="!plugin-specific-generic"/> - <pos anchor="c" x="52%" y="0%" width="110" height="22"/> - </item> -+ -+ <item type="label" id="pam-message"> -+ <show type="plugin-specific-generic"/> -+ <pos anchor="n" x="50%" y="60%" width="90%" height="30%"/> -+ <text> </text> -+ </item> +@@ -34,6 +34,7 @@ + <pos anchor="c" x="50%" y="60%" height="box" width="box"/> + <box orientation="horizontal" spacing="10"> + <item type="pixmap"> ++ <show type="!plugin-specific-generic"/> + <normal file="user-entry.png"/> + </item> + <item type="entry" id="user-entry"> +@@ -47,12 +48,31 @@ + <pos anchor="c" x="50%" y="40%" height="box" width="box"/> + <box orientation="horizontal" spacing="10"> + <item type="pixmap"> ++ <show type="!plugin-specific-generic"/> + <normal file="pw-entry.png"/> + </item> + <item type="entry" id="pw-entry"> ++ <show type="!plugin-specific-generic"/> + <pos width="157" height="30"/> + <style frame="true"/> + </item> ++ <!-- these need repositioning for KDE 4.6 --> ++ <item type="label" id="pam-message"> ++ <show type="plugin-specific-generic"/> ++ <pos anchor="n" x="50%" y="60%" width="90%" height="30%"/> ++ <text> </text> ++ </item> + -+ <item type="label" id="pam-prompt"> -+ <show type="plugin-specific-generic"/> -+ <pos anchor="n" x="50%" y="30%" width="90%" height="22"/> -+ <text> </text> -+ </item> ++ <item type="label" id="pam-prompt"> ++ <show type="plugin-specific-generic"/> ++ <pos anchor="n" x="50%" y="30%" width="90%" height="22"/> ++ <text> </text> ++ </item> + -+ <item type="entry" id="user-pw-entry"> -+ <show type="plugin-specific-generic"/> -+ <pos anchor="c" x="50%" y="30%" width="90%" height="22"/> -+ </item> - - </box> - </item> ++ <item type="entry" id="user-pw-entry"> ++ <show type="plugin-specific-generic"/> ++ <pos anchor="c" x="50%" y="30%" width="90%" height="22"/> ++ </item> + </box> + </item> + ++++++ kdm-fix-labelcolors.diff ++++++ --- /var/tmp/diff_new_pack.k9scdp/_old 2011-02-21 00:27:04.000000000 +0100 +++ /var/tmp/diff_new_pack.k9scdp/_new 2011-02-21 00:27:04.000000000 +0100 @@ -4,54 +4,47 @@ Bug: bnc#533189 Relates: kdm-fix-generic-greeter.diff, same-pam-generic-classic.diff ---- workspace/kdm/kfrontend/themer/kdmlabel.h.sav 2009-12-17 19:55:47.000000000 +0100 -+++ workspace/kdm/kfrontend/themer/kdmlabel.h 2010-02-23 14:08:46.493126179 +0100 +Index: kdebase-workspace-4.6.0/kdm/kfrontend/themer/kdmlabel.h +=================================================================== +--- kdebase-workspace-4.6.0.orig/kdm/kfrontend/themer/kdmlabel.h ++++ kdebase-workspace-4.6.0/kdm/kfrontend/themer/kdmlabel.h @@ -61,6 +61,8 @@ protected: - virtual void doPlugActions( bool plug ); + virtual void doPlugActions(bool plug); -+ virtual void updatePalette( QWidget *w ); ++ virtual void updatePalette( QWidget *w ); + - struct LabelStruct { - QString text; - bool isTimer; ---- workspace/kdm/kfrontend/themer/kdmitem.cpp.sav 2009-12-17 19:55:47.000000000 +0100 -+++ workspace/kdm/kfrontend/themer/kdmitem.cpp 2010-02-23 14:54:51.423875416 +0100 -@@ -240,9 +240,9 @@ void - KdmItem::setWidgetAttribs( QWidget *widget ) - { - widget->setPalette( style.palette ); -+ ::setWidgetAttribs( widget, style, style.frame ); - widget->installEventFilter( this ); - updatePalette( myWidget ); -- ::setWidgetAttribs( widget, style, style.frame ); - } + virtual void setWidget(QWidget *widget); - void ---- workspace/kdm/kfrontend/themer/kdmitem.h.sav 2009-12-17 19:55:47.000000000 +0100 -+++ workspace/kdm/kfrontend/themer/kdmitem.h 2010-02-23 14:08:00.428124930 +0100 + struct LabelStruct { +Index: kdebase-workspace-4.6.0/kdm/kfrontend/themer/kdmitem.h +=================================================================== +--- kdebase-workspace-4.6.0.orig/kdm/kfrontend/themer/kdmitem.h ++++ kdebase-workspace-4.6.0/kdm/kfrontend/themer/kdmitem.h @@ -199,7 +199,7 @@ protected: - bool eventFilter( QObject *o, QEvent *e ); - void setWidgetAttribs( QWidget * ); -- void updatePalette( QWidget *w ); -+ virtual void updatePalette( QWidget *w ); - - void updateThisVisible(); - ---- workspace/kdm/kfrontend/themer/kdmlabel.cpp.sav 2010-02-23 13:58:17.000000000 +0100 -+++ workspace/kdm/kfrontend/themer/kdmlabel.cpp 2010-02-23 15:57:27.457125094 +0100 -@@ -219,6 +219,8 @@ KdmLabel::statusChanged( bool descend ) - if ((state == Sprelight && !label.prelight.present) || - (state == Sactive && !label.active.present)) - return; -+ if( myWidget ) -+ updatePalette( myWidget ); - needUpdate(); + bool eventFilter(QObject *o, QEvent *e); + void setWidgetAttribs(QWidget *); +- void updatePalette(QWidget *w); ++ virtual void updatePalette(QWidget *w); + + void updateThisVisible(); + +Index: kdebase-workspace-4.6.0/kdm/kfrontend/themer/kdmlabel.cpp +=================================================================== +--- kdebase-workspace-4.6.0.orig/kdm/kfrontend/themer/kdmlabel.cpp ++++ kdebase-workspace-4.6.0/kdm/kfrontend/themer/kdmlabel.cpp +@@ -221,6 +221,8 @@ KdmLabel::statusChanged(bool descend) + if ((state == Sprelight && !label.prelight.present) || + (state == Sactive && !label.active.present)) + return; ++ if( myWidget ) ++ updatePalette( myWidget ); + updateWidgetAttribs(); + needUpdate(); } - -@@ -336,4 +338,19 @@ KdmLabel::lookupText( const QString &t ) - return text; +@@ -362,4 +364,19 @@ KdmLabel::updateWidgetAttribs() + myWidget->setPalette(p); } +void ++++++ kwin-suse.diff ++++++ --- /var/tmp/diff_new_pack.k9scdp/_old 2011-02-21 00:27:04.000000000 +0100 +++ /var/tmp/diff_new_pack.k9scdp/_new 2011-02-21 00:27:04.000000000 +0100 @@ -1,3 +1,5 @@ +Subject: put SUSE logo into kwin titlebar +Patch-upstream: no --- kwin/clients/oxygen/oxygenclient.cpp +++ kwin/clients/oxygen/oxygenclient.cpp @@ -59,6 +59,9 @@ ++++++ kwin-update-blacklist-11.4.diff ++++++ Subject: add intel 945GM to blacklist for blur Patch-upstream: no commit 42f4b204607e1e604af8241c2fa7e84b2d4725c6 Author: Will Stephenson <[email protected]> Date: Fri Feb 18 08:55:12 2011 +0100 Add blacklist updater for Blur on Intel 945GM on openSUSE 11.4 diff --git a/kwin/data/CMakeLists.txt b/kwin/data/CMakeLists.txt index ca6ff12..f1f314e 100644 --- a/kwin/data/CMakeLists.txt +++ b/kwin/data/CMakeLists.txt @@ -38,5 +38,5 @@ install( TARGETS kwin_update_tabbox_settings DESTINATION ${LIB_INSTALL_DIR}/kcon install( FILES fsp_workarounds_1.kwinrules DESTINATION ${DATA_INSTALL_DIR}/kwin/default_rules ) install( FILES pop.wav DESTINATION ${SOUND_INSTALL_DIR} ) install( FILES kwin.upd kwinsticky.upd kwiniconify.upd kwin3_plugin.upd kwin_focus1.upd kwinupdatewindowsettings.upd kwin_focus2.upd kwin_fsp_workarounds_1.upd kwin_on_off.upd kwin_window_shortcuts.upd kwin_update_tabbox_settings.upd kwin_blacklist.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} ) -install( PROGRAMS pluginlibFix.pl kwin3_plugin.pl kwin_focus1.sh kwin_focus2.sh on-off_to_true-false.sh kwin_window_shortcuts.sh kwin_blacklist.sh DESTINATION ${KCONF_UPDATE_INSTALL_DIR} ) +install( PROGRAMS pluginlibFix.pl kwin3_plugin.pl kwin_focus1.sh kwin_focus2.sh on-off_to_true-false.sh kwin_window_shortcuts.sh kwin_blacklist.sh kwin_blacklist-opensuse-11.4.pl DESTINATION ${KCONF_UPDATE_INSTALL_DIR} ) diff --git a/kwin/data/kwin_blacklist-opensuse-11.4.pl b/kwin/data/kwin_blacklist-opensuse-11.4.pl new file mode 100755 index 0000000..28a6e63 --- /dev/null +++ b/kwin/data/kwin_blacklist-opensuse-11.4.pl @@ -0,0 +1,32 @@ +#! /usr/bin/perl + +use strict; + +my $currentGroup = ""; +my $key; +my $value; +my $i; +my $out; +my @blacklist; +my $found = 0; +my $toblacklist = "Mesa DRI Intel(R) 945GM GEM 20100330 DEVELOPMENT x86/MMX/SSE2:-:1.4 Mesa 7.10"; +while (<>) +{ + chomp; + ($key, $value) = ($_ =~ /([^=]+)=[ \t]*([^\n]+)/); + if ($_ =~ /Intel/) + { + @blacklist = split(/,/, $value); + push(@blacklist, $toblacklist); + $value = join(',', @blacklist); + $found = 1; + } + if (not $found) { + $value = $toblacklist; + } + +} + +print("[Blacklist][Blur]\n"); +print("Intel=$value\n"); + diff --git a/kwin/data/kwin_blacklist.upd b/kwin/data/kwin_blacklist.upd index 59bfda6..160ff9e 100644 --- a/kwin/data/kwin_blacklist.upd +++ b/kwin/data/kwin_blacklist.upd @@ -1,3 +1,9 @@ Id=Blacklist-4.5 File=kwinrc Script=kwin_blacklist.sh,sh +Id=Blacklist-openSUSE-11.4 +Group=[Blacklist][Blur] +Options=overwrite +File=kwinrc +Script=kwin_blacklist-opensuse-11.4.pl + ++++++ pam-translate.diff ++++++ --- /var/tmp/diff_new_pack.k9scdp/_old 2011-02-21 00:27:04.000000000 +0100 +++ /var/tmp/diff_new_pack.k9scdp/_new 2011-02-21 00:27:04.000000000 +0100 @@ -1,8 +1,8 @@ Index: libs/kdm/kgreet_generic.cpp =================================================================== ---- libs/kdm/kgreet_generic.cpp.orig 2010-07-06 08:54:28.000000000 +0200 -+++ libs/kdm/kgreet_generic.cpp 2010-11-21 20:47:03.809718230 +0100 -@@ -141,7 +141,9 @@ KGenericGreeter::textMessage(const char +--- libs/kdm/kgreet_generic.cpp.orig ++++ libs/kdm/kgreet_generic.cpp +@@ -164,7 +164,9 @@ KGenericGreeter::textMessage(const char if (m_infoMsgs.isEmpty()) revive(); @@ -11,17 +11,18 @@ + //(void) I18N_NOOP(""); + QString qtext = i18n( text ); m_infoMsgs.append(qtext); - QLabel *label = new QLabel(qtext, m_parentWidget); - m_grid->addWidget(label, m_line++, 0, 1, 2); -@@ -169,7 +171,10 @@ KGenericGreeter::textPrompt(const char * - else - m_infoMsgs.clear(); + m_messageLabel->setText( m_infoMsgs.join( "\n" )); -- QLabel *label = new QLabel(QString::fromUtf8(prompt).trimmed()); +@@ -193,7 +195,11 @@ KGenericGreeter::textPrompt(const char * + m_children.append(m_label); + m_echo = echo; + +- m_label->setText( QString::fromUtf8( prompt ).trimmed()); + // PAM does not translate these + ( void ) I18N_NOOP( "Password: " ); + ( void ) I18N_NOOP( "Password or swipe finger: " ); -+ QLabel *label = new QLabel(i18n( prompt ).trimmed()); - m_grid->addWidget(label, m_line, 0); - m_children.append(label); - m_echo = echo; ++ m_label->setText( i18n( prompt ).trimmed()); ++ + m_lineEdit->setContextMenuPolicy( Qt::NoContextMenu ); + m_lineEdit->setCompletionObject( 0 ); + m_lineEdit->disconnect( this ); ++++++ plasma-branding-defaults-corona.diff ++++++ --- /var/tmp/diff_new_pack.k9scdp/_old 2011-02-21 00:27:04.000000000 +0100 +++ /var/tmp/diff_new_pack.k9scdp/_new 2011-02-21 00:27:04.000000000 +0100 @@ -1,62 +1,18 @@ -Index: plasma/desktop/shell/desktopcorona.cpp +Index: plasma/desktop/shell/data/layouts/org.kde.plasma-desktop.defaultPanel/contents/layout.js =================================================================== ---- 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())); +--- plasma/desktop/shell/data/layouts/org.kde.plasma-desktop.defaultPanel/contents/layout.js.orig ++++ plasma/desktop/shell/data/layouts/org.kde.plasma-desktop.defaultPanel/contents/layout.js +@@ -6,6 +6,13 @@ if (panelIds.length == 1) { + + panel.height = 27 + panel.addWidget("launcher") ++// begin SUSE branding ++panel.addWidget("showdesktop"); ++var firefox = panel.addWidget("icon"); ++firefox.writeConfig("Url", "firefox.desktop"); ++var dolphin = panel.addWidget("icon"); ++dolphin.writeConfig("Url", "dolphin.desktop"); ++// end SUSE branding + panel.addWidget("pager") + panel.addWidget("tasks") + panel.addWidget("systemtray") ++++++ powerdevil_46branchupdate.diff ++++++ ++++ 932 lines (skipped) ++++++ same-pam-generic-classic.diff ++++++ --- /var/tmp/diff_new_pack.k9scdp/_old 2011-02-21 00:27:04.000000000 +0100 +++ /var/tmp/diff_new_pack.k9scdp/_new 2011-02-21 00:27:04.000000000 +0100 @@ -1,6 +1,11 @@ ---- kcheckpass/checkpass_pam.c +Subject: Use same pam config with generic plugin, to be used with fingerprint auth +From: [email protected] +Patch-upstream: no +Index: kcheckpass/checkpass_pam.c +=================================================================== +--- kcheckpass/checkpass_pam.c.orig +++ kcheckpass/checkpass_pam.c -@@ -140,12 +140,14 @@ +@@ -140,12 +140,14 @@ AuthReturn Authenticate(const char *call openlog("kcheckpass", LOG_PID, LOG_AUTH); PAM_data.conv = conv; @@ -19,9 +24,11 @@ } pam_error = pam_start(pam_service, user, &PAM_conversation, &pamh); if (pam_error != PAM_SUCCESS) ---- kdm/backend/client.c +Index: kdm/backend/client.c +=================================================================== +--- kdm/backend/client.c.orig +++ kdm/backend/client.c -@@ -537,7 +537,8 @@ +@@ -540,7 +540,8 @@ verify(GConvFunc gconv, int rootok) #ifdef USE_PAM pnopass = False; @@ -31,7 +38,7 @@ if (!gconv(GCONV_USER, 0)) return False; if (isNoPassAllowed(curuser)) { -@@ -552,11 +553,11 @@ +@@ -555,11 +556,11 @@ verify(GConvFunc gconv, int rootok) } else { psrv = PAMService; } @@ -45,9 +52,11 @@ } pdata.gconv = gconv; if (!doPAMAuth(psrv, &pdata)) ---- libs/kdm/kgreet_generic.cpp +Index: libs/kdm/kgreet_generic.cpp +=================================================================== +--- libs/kdm/kgreet_generic.cpp.orig +++ libs/kdm/kgreet_generic.cpp -@@ -156,6 +156,7 @@ +@@ -156,6 +156,7 @@ KGenericGreeter::textPrompt(const char * exp = exp >= 0 || func != Authenticate || @@ -55,7 +64,7 @@ !(kgreeterplugin_info.flags & KGreeterPluginInfo::Presettable); if (!exp && !fixedUser.isEmpty()) { -@@ -325,8 +326,7 @@ +@@ -325,8 +326,7 @@ static bool init(const QString &, echoMode = getConf(ctx, "EchoMode", QVariant(-1)).toInt(); // Fielded entities are not supported per se. // This implies that the first field is the presettable entity, if any. ++++++ systemsettings-root-kcm.diff ++++++ --- /var/tmp/diff_new_pack.k9scdp/_old 2011-02-21 00:27:04.000000000 +0100 +++ /var/tmp/diff_new_pack.k9scdp/_new 2011-02-21 00:27:04.000000000 +0100 @@ -1,3 +1,5 @@ +Subject: run the KCM as root - probably unnecessary now that the KCM is ported to KAuth +Patch-upstream: no Index: systemsettings/core/ModuleView.cpp =================================================================== --- systemsettings/core/ModuleView.cpp.orig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
