Hello community,
here is the log from the commit of package kdebase4-workspace for openSUSE:Factory checked in at 2012-01-31 10:20:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kdebase4-workspace (Old)
and /work/SRC/openSUSE:Factory/.kdebase4-workspace.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdebase4-workspace", Maintainer is "kde-maintainers@suse.de"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kdebase4-workspace/kdebase4-workspace.changes 2012-01-11 15:38:02.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.kdebase4-workspace.new/kdebase4-workspace.changes 2012-01-31 10:21:00.000000000 +0100
@@ -1,0 +2,16 @@
+Wed Jan 18 20:57:57 CET 2012 - dmueller@suse.de
+
+- update to 4.8.0
+ * first stable release of KDE 4.8 (only critical fixes over 4.7.98)
+ * see http://kde.org/announcements/4.8/ for details
+
+
+-------------------------------------------------------------------
+Tue Jan 10 16:32:48 CET 2012 - dmueller@suse.de
+
+- update to 4.7.98
+ * RC2+ milestone release of KDE 4.8
+ * see http://kde.org/announcements/4.8/ for details
+
+
+-------------------------------------------------------------------
--- /work/SRC/openSUSE:Factory/kdebase4-workspace/python-kdebase4.changes 2011-12-08 11:51:07.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.kdebase4-workspace.new/python-kdebase4.changes 2012-01-31 10:21:01.000000000 +0100
@@ -1,0 +2,31 @@
+Wed Jan 18 20:57:57 CET 2012 - dmueller@suse.de
+
+- update to 4.8.0
+ * first stable release of KDE 4.8 (only critical fixes over 4.7.98)
+ * see http://kde.org/announcements/4.8/ for details
+
+
+-------------------------------------------------------------------
+Tue Jan 10 16:32:48 CET 2012 - dmueller@suse.de
+
+- update to 4.7.98
+ * RC2+ milestone release of KDE 4.8
+ * see http://kde.org/announcements/4.8/ for details
+
+
+-------------------------------------------------------------------
+Mon Dec 12 09:59:29 UTC 2011 - saschpe@suse.de
+
+- Use supplements packageand instead of recommends
+- Added split provides
+
+-------------------------------------------------------------------
+Wed Dec 7 14:18:37 UTC 2011 - saschpe@suse.de
+
+
+- New subpackages plasma-engine-akonadi and plasma-calendar:
+ * Removed %kde4_akonadi_requires from base package, otherwise
+ half of KDE depends on akonadi-runtime.
+ * Both are recommended by base package
+
+-------------------------------------------------------------------
@@ -12,0 +44,5 @@
+Sat Nov 26 18:44:48 UTC 2011 - ctrippe@opensuse.org
+
+- show window size in characters if resizing terminal (bnc#703594)
+
+-------------------------------------------------------------------
@@ -17,0 +54,6 @@
+Tue Nov 22 20:41:08 UTC 2011 - wstephenson@sue.com
+
+- Fix slow KDE logout/shutdown dialog apearance
+ (bnc#729823,kde#265405)
+
+-------------------------------------------------------------------
@@ -44,0 +87,5 @@
+Thu Nov 17 13:13:35 UTC 2011 - idonmez@suse.com
+
+- Unbreak signalling remaining time on the battery
+
+-------------------------------------------------------------------
Old:
----
94b134f9-kworkspace-async-shutdown-dialog.diff
bnc703594_geometry_size_chars_terminal.diff
kde-workspace-4.7.4.tar.bz2
New:
----
kde-workspace-4.8.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebase4-workspace.spec ++++++
--- /var/tmp/diff_new_pack.jjiYX8/_old 2012-01-31 10:21:02.000000000 +0100
+++ /var/tmp/diff_new_pack.jjiYX8/_new 2012-01-31 10:21:02.000000000 +0100
@@ -15,9 +15,8 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-
Name: kdebase4-workspace
-Version: 4.7.4
+Version: 4.8.0
Release: 0
Summary: The KDE Workspace Components
License: GPL-2.0+
@@ -33,8 +32,8 @@
BuildRequires: bluez-devel
BuildRequires: fdupes
BuildRequires: gpsd-devel
-BuildRequires: libQtWebKit-devel
BuildRequires: libdbusmenu-qt-devel
+BuildRequires: libkactivities-devel
BuildRequires: libkde4-devel >= %{version}
BuildRequires: libkdepimlibs4-devel
BuildRequires: liblazy-devel
@@ -42,6 +41,7 @@
BuildRequires: libprison-devel
BuildRequires: libqalculate-devel
BuildRequires: libqimageblitz-devel
+BuildRequires: libQtWebKit-devel
BuildRequires: libraw1394-devel
BuildRequires: libsmbclient-devel
BuildRequires: libusb-devel
@@ -96,8 +96,6 @@
Patch201: plasma-notifications-kill-timer.diff
Patch202: plasma-disable-networkmanager.diff
Patch211: disable-python-support.diff
-Patch212: 94b134f9-kworkspace-async-shutdown-dialog.diff
-Patch213: bnc703594_geometry_size_chars_terminal.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if %suse_version > 1200
@@ -273,7 +271,7 @@
Summary: The Akonadi Plasma engine
Group: System/GUI/KDE
Supplements: packageand(akonadi-runtime:kdebase4-workspace)
-Provides: kdebase4-workspace:%{_libdir}/kde4/plasma_engine_akonadi.so
+Provides: kdebase4-workspace:%_libdir/kde4/plasma_engine_akonadi.so
Requires: %{name} = %{version}
%kde4_akonadi_requires
%kde4_pimlibs_requires
@@ -285,7 +283,7 @@
Summary: The calendar Plasma engine and applet
Group: System/GUI/KDE
Supplements: packageand(akonadi-runtime:kdebase4-workspace)
-Provides: kdebase4-workspace:%{_libdir}/kde4/plasma_engine_calendar.so
+Provides: kdebase4-workspace:%_libdir/kde4/plasma_engine_calendar.so
Requires: %{name} = %{version}
%kde4_akonadi_requires
@@ -319,17 +317,15 @@
%patch99
%patch104
%patch106
-%patch107 -p1
+%patch107
%patch108
-%patch123 -p1
+%patch123
%patch124 -p1
###KDE47: rediff
#%%patch125
%patch201 -p1
%patch202 -p1
%patch211
-%patch212 -p1
-%patch213 -p1
cp %{SOURCE3} kwin/effects/cube/data/cubecap.png
%build
@@ -541,6 +537,7 @@
%{_kde4_libdir}/libkscreensaver.so
%{_kde4_libdir}/libprocesscore.so
%{_kde4_libdir}/libprocessui.so
+%{_kde4_libdir}/libksgrd.so
%{_kde4_libdir}/libtaskmanager.so
%{_kde4_libdir}/libksignalplotter.so
%{_kde4_libdir}/libweather_ion.so
@@ -617,7 +614,7 @@
%exclude %{_kde4_libdir}/libkfontinstui.so
%exclude %{_kde4_libdir}/libkscreensaver.so
%exclude %{_kde4_libdir}/libksignalplotter.so
-%exclude %{_kde4_libdir}/libksgrd.so*
+%exclude %{_kde4_libdir}/libksgrd.so
%exclude %{_kde4_libdir}/libkworkspace.so
%exclude %{_kde4_libdir}/liblsofui.so
%exclude %{_kde4_libdir}/liboxygenstyle.*
++++++ python-kdebase4.spec ++++++
--- /var/tmp/diff_new_pack.jjiYX8/_old 2012-01-31 10:21:02.000000000 +0100
+++ /var/tmp/diff_new_pack.jjiYX8/_new 2012-01-31 10:21:02.000000000 +0100
@@ -15,8 +15,9 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
Name: python-kdebase4
-Version: 4.7.4
+Version: 4.8.0
Release: 0
Summary: Python bindings for KDE 4 desktop shell
License: GPL-2.0+
@@ -27,6 +28,7 @@
BuildRequires: NetworkManager-devel
BuildRequires: bluez-devel
BuildRequires: libdbusmenu-qt-devel
+BuildRequires: libkactivities-devel
BuildRequires: libkde4-devel >= %{version}
BuildRequires: libkdepimlibs4-devel
BuildRequires: libknotificationitem-devel
++++++ kde-workspace-4.7.4.tar.bz2 -> kde-workspace-4.8.0.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/kdebase4-workspace/kde-workspace-4.7.4.tar.bz2 /work/SRC/openSUSE:Factory/.kdebase4-workspace.new/kde-workspace-4.8.0.tar.bz2 differ: char 11, line 1
++++++ kdm-cope-with-new-grub.diff ++++++
--- /var/tmp/diff_new_pack.jjiYX8/_old 2012-01-31 10:21:02.000000000 +0100
+++ /var/tmp/diff_new_pack.jjiYX8/_new 2012-01-31 10:21:02.000000000 +0100
@@ -1,25 +1,16 @@
Index: kdm/backend/bootman.c
===================================================================
---- kdm/backend/bootman.c.orig 2011-05-20 22:32:06.000000000 +0200
-+++ kdm/backend/bootman.c 2011-10-21 12:13:29.790475621 +0200
-@@ -81,8 +81,7 @@ getGrub(char ***opts, int *def, int *cur
- int len;
- char line[1000];
-
-- if (!grubSetDefault && !grub &&
-- !(grubSetDefault = locate("grub-set-default")) &&
-+ if (!grub &&
- !(grub = locate("grub")))
- return BO_NOMAN;
-
-@@ -133,31 +132,10 @@ setGrub(const char *opt, SdRec *sdr)
+--- kdm/backend/bootman.c.orig
++++ kdm/backend/bootman.c
+@@ -133,31 +133,10 @@ setGrub(const char *opt, SdRec *sdr)
static void
commitGrub(void)
{
- if (sdRec.bmstamp != mTime(GRUB_MENU) &&
- setGrub(sdRec.osname, &sdRec) != BO_OK)
- return;
--
++ char buffer[PATH_MAX];
+
- if (grubSetDefault) {
- /* The grub-set-default command must be used, which is
- * not so good because there is no way of setting an
@@ -41,10 +32,8 @@
- pClose(f, &pid);
- }
- }
-+ char buffer[PATH_MAX];
-+
+ snprintf(buffer, PATH_MAX, "/usr/sbin/grubonce %d", sdRec.osindex);
+ system(buffer);
}
- #define GRUB2_MENU "/boot/grub/grub.cfg"
+ static char *grubReboot;
++++++ kdm-fix-generic-greeter.diff ++++++
--- /var/tmp/diff_new_pack.jjiYX8/_old 2012-01-31 10:21:02.000000000 +0100
+++ /var/tmp/diff_new_pack.jjiYX8/_new 2012-01-31 10:21:02.000000000 +0100
@@ -1,14 +1,6 @@
-Subject: Fix broken KDM layout with fingerprint support
-From: Lubos Lunak
-Patch-upstream: not yet
-Bug: bnc#533189
-Relates: kdm-fix-labelcolors.diff, same-pam-generic-classic.diff
-
-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
+--- kdm/kfrontend/kgreeter.cpp
++++ kdm/kfrontend/kgreeter.cpp
+@@ -922,8 +922,6 @@
timed_label = themer->findNode("timed-label");
KdmItem *itm;
@@ -17,11 +9,9 @@
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
+--- kdm/kfrontend/themes/greeter.dtd
++++ kdm/kfrontend/themes/greeter.dtd
+@@ -19,9 +19,9 @@
caps-lock-warning | xauth-warning | pam-error | timed-label |
login_button | session_button | system_button
Items with these IDs might get special treatment by conversation plugins:
@@ -33,11 +23,60 @@
-->
<!ATTLIST item
-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
+--- kdm/kfrontend/themes/oxygen-air/oxygen-air.xml
++++ kdm/kfrontend/themes/oxygen-air/oxygen-air.xml
+@@ -26,7 +26,7 @@
+ <stock type="welcome-label"/>
+ </item>
+
+- <item type="rect" id="user-field">
++ <item type="rect" id="talker">
+ <pos anchor="c" x="50%" y="43%" width="400" height="144"/>
+ <box orientation="vertical" spacing="0" homogeneous="true">
+
+@@ -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="entry" id="user-pw-entry">
++ <show type="plugin-specific-generic"/>
++ <pos anchor="c" x="50%" y="30%" width="90%" height="22"/>
++ </item>
+ </box>
+ </item>
+
+--- libs/kdm/kgreet_generic.cpp
++++ libs/kdm/kgreet_generic.cpp
+@@ -41,24 +41,14 @@
static int echoMode;
@@ -64,7 +103,7 @@
m_lineEdit(0),
fixedUser(_fixedEntity),
func(_func),
-@@ -66,22 +56,56 @@ KGenericGreeter::KGenericGreeter(KGreete
+@@ -66,22 +56,56 @@
exp(-1),
running(false)
{
@@ -128,7 +167,7 @@
}
void // virtual
-@@ -127,8 +151,7 @@ KGenericGreeter::setEnabled(bool enable)
+@@ -127,8 +151,7 @@
{
// assert(func == Authenticate && ctx == Shutdown);
// XXX this is likely to bear some bogosity
@@ -138,7 +177,7 @@
if (enable && m_lineEdit)
m_lineEdit->setFocus();
}
-@@ -143,9 +166,7 @@ KGenericGreeter::textMessage(const char
+@@ -143,9 +166,7 @@
revive();
QString qtext = QString::fromUtf8(text);
m_infoMsgs.append(qtext);
@@ -149,7 +188,7 @@
return true;
}
-@@ -169,15 +190,20 @@ KGenericGreeter::textPrompt(const char *
+@@ -168,15 +189,20 @@
revive();
else
m_infoMsgs.clear();
@@ -176,7 +215,7 @@
if (!m_users.isEmpty()) {
KCompletion *userNamesCompletion = new KCompletion;
userNamesCompletion->setItems(m_users);
-@@ -188,20 +214,18 @@ KGenericGreeter::textPrompt(const char *
+@@ -187,20 +213,18 @@
if (!curUser.isEmpty()) {
m_lineEdit->setText(curUser);
m_lineEdit->selectAll();
@@ -185,7 +224,7 @@
connect(m_lineEdit, SIGNAL(editingFinished()), SLOT(slotLoginLostFocus()));
}
connect(m_lineEdit, SIGNAL(editingFinished()), SLOT(slotChanged()));
- connect(m_lineEdit, SIGNAL(textChanged(const QString &)), SLOT(slotChanged()));
+ connect(m_lineEdit, SIGNAL(textChanged(QString)), SLOT(slotChanged()));
} else {
- m_lineEdit = new KDMPasswordEdit;
+ if (::echoMode == -1)
@@ -202,7 +241,7 @@
m_lineEdit->setFocus();
}
-@@ -236,7 +260,6 @@ KGenericGreeter::next()
+@@ -235,7 +259,6 @@
if (m_lineEdit) {
m_lineEdit->setEnabled(false);
QString text = m_lineEdit->text();
@@ -210,7 +249,7 @@
handler->gplugReturnText(text.toLocal8Bit(),
!m_echo ?
KGreeterPluginHandler::IsSecret :
-@@ -273,8 +296,7 @@ KGenericGreeter::failed()
+@@ -272,8 +295,7 @@
revive();
handler->gplugMsgBox(QMessageBox::Information, text);
} else {
@@ -220,7 +259,7 @@
}
exp = -1;
running = false;
-@@ -284,12 +306,9 @@ void // virtual
+@@ -283,12 +305,9 @@
KGenericGreeter::revive()
{
// assert(!running);
@@ -235,11 +274,9 @@
}
void // virtual
-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
+--- libs/kdm/kgreet_generic.h
++++ libs/kdm/kgreet_generic.h
+@@ -33,7 +33,6 @@
#include <QObject>
@@ -247,7 +284,7 @@
class QWidget;
class KLineEdit;
-@@ -68,11 +67,11 @@ class KGenericGreeter : public QObject,
+@@ -68,11 +67,11 @@
void slotChanged();
private:
@@ -262,56 +299,3 @@
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>
-
-- <item type="rect" id="user-field">
-+ <item type="rect" id="talker">
- <pos anchor="c" x="50%" y="43%" width="400" height="144"/>
- <box orientation="vertical" spacing="0" homogeneous="true">
-
-@@ -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="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-make_it_cool.diff ++++++
--- /var/tmp/diff_new_pack.jjiYX8/_old 2012-01-31 10:21:02.000000000 +0100
+++ /var/tmp/diff_new_pack.jjiYX8/_new 2012-01-31 10:21:02.000000000 +0100
@@ -1,8 +1,6 @@
-Index: kdm/kfrontend/kgreeter.cpp
-===================================================================
---- kdm/kfrontend/kgreeter.cpp.orig
-+++ kdm/kfrontend/kgreeter.cpp
-@@ -68,20 +68,20 @@ Foundation, Inc., 51 Franklin Street, Fi
+--- kdm/kfrontend/kgreeter.cpp 2011-08-18 18:54:29.000000000 +0200
++++ kdm/kfrontend/kgreeter.cpp 2011-08-19 09:37:02.384127904 +0200
+@@ -68,20 +68,20 @@
class UserListView : public QListWidget {
public:
@@ -26,7 +24,7 @@
virtual QSize sizeHint() const
{
if (!cachedSizeHint.isValid()) {
-@@ -149,6 +149,7 @@ class UserListView : public QListWidget
+@@ -149,6 +149,7 @@
private:
bool m_suppressClick;
@@ -34,16 +32,16 @@
};
class UserListViewItem : public QListWidgetItem {
-@@ -185,7 +186,7 @@ KGreeter::KGreeter(bool framed)
+@@ -185,7 +186,7 @@
"PrevUser");
if (_userList) {
- userView = new UserListView(this);
+ userView = new UserListView(framed, this);
- connect(userView, SIGNAL(itemClicked(QListWidgetItem *)),
- SLOT(slotUserClicked(QListWidgetItem *)));
- connect(userView, SIGNAL(itemDoubleClicked(QListWidgetItem *)),
-@@ -193,8 +194,6 @@ KGreeter::KGreeter(bool framed)
+ connect(userView, SIGNAL(itemClicked(QListWidgetItem*)),
+ SLOT(slotUserClicked(QListWidgetItem*)));
+ connect(userView, SIGNAL(itemDoubleClicked(QListWidgetItem*)),
+@@ -193,8 +194,6 @@
}
if (_userCompletion)
userList = new QStringList;
@@ -51,8 +49,8 @@
- insertUsers();
sessMenu = new QMenu(this);
- connect(sessMenu, SIGNAL(triggered(QAction *)),
-@@ -365,8 +364,11 @@ UserList::UserList(char **in)
+ connect(sessMenu, SIGNAL(triggered(QAction*)),
+@@ -365,8 +364,11 @@
}
}
@@ -65,7 +63,7 @@
{
struct passwd *ps;
-@@ -392,6 +394,9 @@ KGreeter::insertUsers()
+@@ -392,6 +394,9 @@
if (_showUsers == SHOW_ALL) {
UserList noUsers(_noUsers);
QSet<QString> dupes;
@@ -75,7 +73,7 @@
for (setpwent(); (ps = getpwent()) != 0;) {
if (*ps->pw_dir && *ps->pw_shell &&
(ps->pw_uid >= (unsigned)_lowUserId ||
-@@ -403,10 +408,55 @@ KGreeter::insertUsers()
+@@ -403,10 +408,55 @@
QString username(QFile::decodeName(ps->pw_name));
if (!dupes.contains(username)) {
dupes.insert(username);
@@ -132,7 +130,7 @@
} else {
UserList users(_users);
if (users.hasGroups()) {
-@@ -783,6 +833,9 @@ KStdGreeter::KStdGreeter()
+@@ -783,6 +833,9 @@
break; }
}
@@ -142,7 +140,7 @@
if (userView) {
if (clock)
inner_box->addWidget(clock, 0, Qt::AlignCenter);
-@@ -895,6 +948,7 @@ KThemedGreeter::KThemedGreeter(KdmThemer
+@@ -895,6 +948,7 @@
setMouseTracking(true);
adjustGeometry();
@@ -150,7 +148,7 @@
themer->setWidget(this);
-@@ -983,6 +1037,13 @@ KThemedGreeter::KThemedGreeter(KdmThemer
+@@ -983,6 +1037,13 @@
completeMenu();
#endif
@@ -164,7 +162,7 @@
if ((system_button = themer->findNode("system_button"))) {
if (optMenu)
addAction(optMenu->menuAction());
-@@ -1021,6 +1082,8 @@ KThemedGreeter::pluginSetup()
+@@ -1021,6 +1082,8 @@
inherited::pluginSetup();
if (userView && verify->entitiesLocal() && verify->entityPresettable() && userlist_node) {
@@ -173,11 +171,9 @@
userlist_node->setWidget(userView);
userlist_rect->setVisible(true);
} else {
-Index: kdm/kfrontend/kgreeter.h
-===================================================================
---- kdm/kfrontend/kgreeter.h.orig
-+++ kdm/kfrontend/kgreeter.h
-@@ -70,7 +70,7 @@ class KGreeter : public KGDialog, public
+--- kdm/kfrontend/kgreeter.h 2011-08-18 18:54:29.000000000 +0200
++++ kdm/kfrontend/kgreeter.h 2011-08-19 09:36:00.097124913 +0200
+@@ -70,7 +70,7 @@
protected:
void insertUser(const QImage &, const QString &, struct passwd *);
@@ -186,11 +182,9 @@
void putSession(const QString &, const QString &, bool, const char *);
void insertSessions();
virtual void pluginSetup();
-Index: kdm/kfrontend/themer/kdmitem.cpp
-===================================================================
---- kdm/kfrontend/themer/kdmitem.cpp.orig
-+++ kdm/kfrontend/themer/kdmitem.cpp
-@@ -65,7 +65,6 @@ KdmItem::KdmItem(QObject *parent, const
+--- kdm/kfrontend/themer/kdmitem.cpp 2011-08-18 18:54:29.000000000 +0200
++++ kdm/kfrontend/themer/kdmitem.cpp 2011-08-19 09:36:00.098124907 +0200
+@@ -65,7 +65,6 @@
!modes.split(",", QString::SkipEmptyParts).contains("console"))))
{
m_visible = false;
@@ -198,7 +192,7 @@
}
m_showType = sel.attribute("type");
-@@ -78,7 +77,6 @@ KdmItem::KdmItem(QObject *parent, const
+@@ -78,7 +77,6 @@
themer()->typeVisible(m_showType) == m_showTypeInvert)
{
m_visible = false;
@@ -206,11 +200,9 @@
}
}
-Index: kdm/kfrontend/themer/kdmlist.cpp
-===================================================================
---- kdm/kfrontend/themer/kdmlist.cpp.orig
-+++ kdm/kfrontend/themer/kdmlist.cpp
-@@ -29,8 +29,6 @@ KdmList::KdmList(QObject *parent, const
+--- kdm/kfrontend/themer/kdmlist.cpp 2011-08-18 18:54:29.000000000 +0200
++++ kdm/kfrontend/themer/kdmlist.cpp 2011-08-19 09:36:00.098124907 +0200
+@@ -29,8 +29,6 @@
: KdmItem(parent, node)
{
itemType = "list";
@@ -219,11 +211,9 @@
// Read RECT TAGS
QDomNodeList childList = node.childNodes();
-Index: kdm/kfrontend/themer/kdmthemer.cpp
-===================================================================
---- kdm/kfrontend/themer/kdmthemer.cpp.orig
-+++ kdm/kfrontend/themer/kdmthemer.cpp
-@@ -223,10 +223,6 @@ KdmThemer::generateItems(KdmItem *parent
+--- kdm/kfrontend/themer/kdmthemer.cpp 2011-08-18 18:54:29.000000000 +0200
++++ kdm/kfrontend/themer/kdmthemer.cpp 2011-08-19 09:38:00.360130704 +0200
+@@ -223,10 +223,6 @@
} else {
continue;
}
@@ -231,6 +221,6 @@
- delete newItem;
- continue;
- }
- connect(newItem, SIGNAL(needUpdate(int, int, int, int)),
- SLOT(update(int, int, int, int)));
+ connect(newItem, SIGNAL(needUpdate(int,int,int,int)),
+ SLOT(update(int,int,int,int)));
connect(newItem, SIGNAL(needPlacement()),
++++++ kdm-sysconfig-values.diff ++++++
--- /var/tmp/diff_new_pack.jjiYX8/_old 2012-01-31 10:21:02.000000000 +0100
+++ /var/tmp/diff_new_pack.jjiYX8/_new 2012-01-31 10:21:02.000000000 +0100
@@ -123,16 +123,16 @@
Comment:
The program which is invoked to dynamically generate replies to &XDMCP;
DirectQuery or BroadcastQuery requests.
-@@ -1258,7 +1274,7 @@ Type: enum
- Grub/BO_GRUB: Grub boot manager
+@@ -1259,7 +1275,7 @@ Type: enum
Grub2/BO_GRUB2: Grub2 boot manager
+ Burg/BO_BURG: Burg boot manager
Lilo/BO_LILO: Lilo boot manager (Linux on i386 & x86-64 only)
-Default: None
+Default: Grub
User: core
User: greeter
Instance: #Grub
-@@ -1360,7 +1376,7 @@ Type: string
+@@ -1361,7 +1377,7 @@ Type: string
Default: DEF_SERVER_CMD
DDefault: -
User: core
@@ -141,7 +141,7 @@
Update: upd_servercmd
Comment:
The command line to start the &X-Server;, without display number and VT spec.
-@@ -1373,13 +1389,13 @@ Description:
+@@ -1374,13 +1390,13 @@ Description:
This string is subject to word splitting.
</para><para>
The default is something reasonable for the system on which &kdm; was built,
@@ -157,7 +157,7 @@
Comment: &
Description:
Additional arguments for the &X-Server;s for local sessions.
-@@ -1478,6 +1494,8 @@ Type: bool
+@@ -1479,6 +1495,8 @@ Type: bool
Default: false
User: core
Instance: #:*/!
@@ -166,7 +166,7 @@
Merge: xdm
Comment:
Restart instead of resetting the local &X-Server; after session exit.
-@@ -1552,11 +1570,10 @@ Description:
+@@ -1553,11 +1571,10 @@ Description:
Key: Resources
# XXX strictly speaking this is supposed to be a string list, i think.
Type: string
@@ -180,7 +180,7 @@
Comment:
Specify a file with X-resources for the greeter, chooser and background.
The KDE frontend does not use this file, so you do not need it unless you
-@@ -1584,12 +1601,11 @@ Description:
+@@ -1585,12 +1602,11 @@ Description:
Key: Setup
Type: string
@@ -195,7 +195,7 @@
Comment:
A program to run before the greeter is shown. Can be used to start an
xconsole or an alternative background generator. Subject to word splitting.
-@@ -1605,12 +1621,11 @@ Description:
+@@ -1606,12 +1622,11 @@ Description:
Key: Startup
Type: string
@@ -210,7 +210,7 @@
Comment:
A program to run before a user session starts. Subject to word splitting.
Description:
-@@ -1623,12 +1638,11 @@ Description:
+@@ -1624,12 +1639,11 @@ Description:
Key: Reset
Type: string
@@ -225,7 +225,7 @@
Comment:
A program to run after a user session exits. Subject to word splitting.
Description:
-@@ -1641,12 +1655,12 @@ Description:
+@@ -1642,12 +1656,12 @@ Description:
Key: Session
Type: string
@@ -240,7 +240,7 @@
Comment:
The program which is run as the user which logs in. It is supposed to
interpret the session argument (see SessionsDirs) and start an appropriate
-@@ -1758,10 +1772,11 @@ Description:
+@@ -1759,10 +1773,11 @@ Description:
Key: AllowRootLogin
Type: bool
@@ -254,7 +254,7 @@
Merge: xdm
Comment:
Allow root logins?
-@@ -1776,6 +1791,7 @@ User: core
+@@ -1777,6 +1792,7 @@ User: core
# sensible?
Instance: */false
Instance: :*/true
@@ -262,7 +262,7 @@
Merge: xdm
Comment:
Allow to log in, when user has set an empty password?
-@@ -1787,12 +1803,13 @@ Type: enum
+@@ -1788,12 +1804,13 @@ Type: enum
None/SHUT_NONE: no <guilabel>Shutdown...</guilabel> menu entry is shown at all
Root/SHUT_ROOT: the <systemitem class="username">root</systemitem> password must be entered to shut down
All/SHUT_ALL: everybody can shut down the machine
@@ -279,7 +279,7 @@
Comment: &
Description:
Who is allowed to shut down the system. This applies both to the
-@@ -1882,6 +1899,7 @@ Type: bool
+@@ -1883,6 +1900,7 @@ Type: bool
Default: false
User: dep
Instance: #:0/true
@@ -287,7 +287,7 @@
Comment: &
Description:
Enable automatic login. <emphasis>Use with extreme care!</emphasis>
-@@ -1915,7 +1933,7 @@ Default: ""
+@@ -1916,7 +1934,7 @@ Default: ""
PostProc: PautoLoginX
User: core(autoUser)
User: greeter
@@ -296,7 +296,7 @@
Merge: xdm:autoUser(P_autoUser)
Comment: &
Description:
-@@ -1946,10 +1964,10 @@ Description:
+@@ -1947,10 +1965,10 @@ Description:
Key: SessionsDirs
Type: list
@@ -309,7 +309,7 @@
Update: upd_sessionsdirs
Comment:
The directories containing session type definitions in .desktop format,
-@@ -2018,7 +2036,7 @@ Description:
+@@ -2019,7 +2037,7 @@ Description:
Key: UseSessReg
Type: bool
@@ -318,7 +318,7 @@
User: core
Instance: #*/!
Comment:
-@@ -2064,7 +2082,8 @@ Type: enum
+@@ -2065,7 +2083,8 @@ Type: enum
Clock/LOGO_CLOCK: a neat analog clock
Default: Clock
User: greeter
@@ -328,7 +328,7 @@
Comment:
What should be shown in the greeter's logo are:
Description:
-@@ -2280,7 +2299,7 @@ Description:
+@@ -2281,7 +2300,7 @@ Description:
Key: HiddenUsers
Type: list
@@ -337,7 +337,7 @@
User: greeter-c(noUsers)
Instance: #*/"root"
# depends on {Min,Max}ShowUID
-@@ -2426,7 +2445,7 @@ Description:
+@@ -2427,7 +2446,7 @@ Description:
Key: UseBackground
Type: bool
@@ -346,7 +346,7 @@
User: greeter
Instance: #*/!
Comment:
-@@ -2586,6 +2605,7 @@ Type: bool
+@@ -2587,6 +2606,7 @@ Type: bool
Default: false
User: greeter
Instance: :0/true
@@ -354,7 +354,7 @@
Comment:
Enable &kdm;'s built-in xconsole. Note that this can be enabled for only
one display at a time.
-@@ -2674,9 +2694,9 @@ Description:
+@@ -2675,9 +2695,9 @@ Description:
Key: Preloader
Type: string
@@ -366,7 +366,7 @@
Update: upd_preloader
Comment: &
Description:
-@@ -2686,7 +2706,7 @@ Description:
+@@ -2687,7 +2707,7 @@ Description:
Key: UseTheme
Type: bool
@@ -374,15 +374,15 @@
+Default: true
User: greeter
Instance: */true
- Comment: &
-@@ -2695,9 +2715,10 @@ Description:
+ Comment:
+@@ -2700,9 +2720,10 @@ Description:
Key: Theme
Type: string
-Default: ""
+Default: KDMDATA "/themes/SUSE"
User: greeter
--Instance: */KDMDATA "/themes/horos"
+-Instance: */KDMDATA "/themes/ariya"
+Instance: */""
+Update: reset_sec_0_1
Comment: &
++++++ plasma-branding-defaults-applets.diff ++++++
--- /var/tmp/diff_new_pack.jjiYX8/_old 2012-01-31 10:21:02.000000000 +0100
+++ /var/tmp/diff_new_pack.jjiYX8/_new 2012-01-31 10:21:02.000000000 +0100
@@ -1,7 +1,7 @@
Index: plasma/desktop/applets/kickoff/applet/applet.cpp
===================================================================
---- plasma/desktop/applets/kickoff/applet/applet.cpp.orig
-+++ plasma/desktop/applets/kickoff/applet/applet.cpp
+--- plasma/desktop/applets/kickoff/applet/applet.cpp.orig 2010-11-05 11:47:50.000000000 +0100
++++ plasma/desktop/applets/kickoff/applet/applet.cpp 2010-11-21 20:47:03.734717865 +0100
@@ -27,6 +27,7 @@
#include