Hello community,
here is the log from the commit of package kdebase4-workspace
checked in at Fri Jul 18 22:56:58 CEST 2008.
--------
--- KDE/kdebase4-workspace/kdebase4-wallpapers.changes 2008-07-09 21:10:06.000000000 +0200
+++ 4.0.99/STABLE/kdebase4-workspace/kdebase4-wallpapers.changes 2008-07-18 22:54:29.670549000 +0200
@@ -1,0 +2,20 @@
+Fri Jul 18 13:12:33 CEST 2008 - dmueller@suse.de
+
+- update to 4.0.99
+
+-------------------------------------------------------------------
+Tue Jul 15 15:45:45 CEST 2008 - stbinner@suse.de
+
+- port more SUSE-specific changes/features from 4.0 to 4.1 Plasma
+
+-------------------------------------------------------------------
+Tue Jul 15 14:54:00 CEST 2008 - dmueller@suse.de
+
+- do not link ksysguardd against kdefakes to reduce dependencies (bnc#406895)
+
+-------------------------------------------------------------------
+Fri Jul 11 13:43:11 CEST 2008 - stbinner@suse.de
+
+- update to 4.0.98
+
+-------------------------------------------------------------------
kdebase4-workspace.changes: same change
Old:
----
kdebase-workspace-4.0.85.tar.bz2
r829672.diff
select-wm-gui.diff
New:
----
kdebase-workspace-4.0.99.tar.bz2
no-kdefakes-link.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebase4-wallpapers.spec ++++++
--- /var/tmp/diff_new_pack.xd9948/_old 2008-07-18 22:54:52.000000000 +0200
+++ /var/tmp/diff_new_pack.xd9948/_new 2008-07-18 22:54:52.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kdebase4-wallpapers (Version 4.0.85)
+# spec file for package kdebase4-wallpapers (Version 4.0.99)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -21,7 +21,7 @@
Group: System/GUI/KDE
Summary: KDE 4 Wallpapers
Url: http://www.kde.org/
-Version: 4.0.85
+Version: 4.0.99
Release: 1
Source0: kdebase-workspace-%version.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -47,7 +47,7 @@
%install
cd build/wallpapers
%makeinstall
- rm -r $RPM_BUILD_ROOT/usr/share/wallpapers/EOS
+ rm -r $RPM_BUILD_ROOT/usr/share/wallpapers/Blue_Curl
%kde_post_install
%clean
@@ -59,6 +59,14 @@
/usr/share/wallpapers
%changelog
+* Fri Jul 18 2008 dmueller@suse.de
+- update to 4.0.99
+* Tue Jul 15 2008 stbinner@suse.de
+- port more SUSE-specific changes/features from 4.0 to 4.1 Plasma
+* Tue Jul 15 2008 dmueller@suse.de
+- do not link ksysguardd against kdefakes to reduce dependencies (bnc#406895)
+* Fri Jul 11 2008 stbinner@suse.de
+- update to 4.0.98
* Mon Jul 07 2008 dmueller@suse.de
- update to 4.0.85
* Wed Jul 02 2008 schwab@suse.de
++++++ kdebase4-workspace.spec ++++++
--- /var/tmp/diff_new_pack.xd9948/_old 2008-07-18 22:54:52.000000000 +0200
+++ /var/tmp/diff_new_pack.xd9948/_new 2008-07-18 22:54:52.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kdebase4-workspace (Version 4.0.85)
+# spec file for package kdebase4-workspace (Version 4.0.99)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -26,7 +26,7 @@
Group: System/GUI/KDE
Summary: The KDE Workspace Components
Url: http://www.kde.org/
-Version: 4.0.85
+Version: 4.0.99
Release: 1
Source0: kdebase-workspace-%version.tar.bz2
Source2: titlebar_decor.png
@@ -48,7 +48,6 @@
Patch67: kdm-remove-duplicated-sessions.diff
Patch68: kdm-make_it_cool.diff
Patch69: kdm-all-users-nopass.diff
-Patch72: select-wm-gui.diff
Patch74: lowdiskspace.patch
Patch75: ksmserver-leave-countdown.diff
Patch77: systemsettings-desktop.diff
@@ -57,7 +56,7 @@
Patch85: windeco-color.diff
Patch87: klipperrc.diff
Patch88: kde4-migrate.diff
-Patch89: r829672.diff
+Patch89: no-kdefakes-link.diff
%kde4_runtime_requires
Conflicts: yast2-theme-NLD
%if %suse_version > 1030
@@ -103,9 +102,8 @@
%patch67
%patch68
%patch69
-#%patch72
%patch74
-#%patch75
+%patch75
%patch77
%patch82
#%patch83
@@ -134,7 +132,6 @@
rm -f $RPM_BUILD_ROOT/%{_kde_config_dir}/kdm/README
sed -ri "s,.*%{_kde_share_dir}/apps/kdm/themes/oxygen.*,," filelists/kdm
sed -ri "s,.*%{_kde_share_dir}/apps/kdm/pics.*,," filelists/kdm
- mv $RPM_BUILD_ROOT/usr/share/wallpapers/EOS $RPM_BUILD_ROOT/usr/share/
rm -r $RPM_BUILD_ROOT/usr/share/wallpapers/Code_Poets_Dream
rm -r $RPM_BUILD_ROOT/usr/share/wallpapers/Colorado_Farm
rm -r $RPM_BUILD_ROOT/usr/share/wallpapers/Curls_on_Green
@@ -149,7 +146,9 @@
rm -r $RPM_BUILD_ROOT/usr/share/wallpapers/Red_Leaf
rm -r $RPM_BUILD_ROOT/usr/share/wallpapers/Skeeter_Hawk
rm -r $RPM_BUILD_ROOT/usr/share/wallpapers/There_is_Rain_on_the_Table
- mv $RPM_BUILD_ROOT/usr/share/EOS $RPM_BUILD_ROOT/usr/share/wallpapers/
+ rm -r $RPM_BUILD_ROOT/usr/share/wallpapers/Flower_drops
+ rm -r $RPM_BUILD_ROOT/usr/share/wallpapers/Vector_Sunset
+ rm -r $RPM_BUILD_ROOT/usr/share/wallpapers/EOS
mkdir -p $RPM_BUILD_ROOT/etc
mv $RPM_BUILD_ROOT/usr/etc/ksysguarddrc $RPM_BUILD_ROOT/etc/
mv $RPM_BUILD_ROOT/usr/etc/systemsettingsrc $RPM_BUILD_ROOT/etc/
@@ -714,8 +713,18 @@
/usr/share/icons/Oxygen_Yellow_Big
/usr/share/icons/Oxygen_Zion
/usr/share/icons/Oxygen_Zion_Big
+/usr/%_lib/kconf_update_bin/plasma-add-shortcut-to-menu
+/usr/share/kde4/apps/kconf_update/plasma-add-shortcut-to-menu.upd
%changelog
+* Fri Jul 18 2008 dmueller@suse.de
+- update to 4.0.99
+* Tue Jul 15 2008 stbinner@suse.de
+- port more SUSE-specific changes/features from 4.0 to 4.1 Plasma
+* Tue Jul 15 2008 dmueller@suse.de
+- do not link ksysguardd against kdefakes to reduce dependencies (bnc#406895)
+* Fri Jul 11 2008 stbinner@suse.de
+- update to 4.0.98
* Mon Jul 07 2008 dmueller@suse.de
- update to 4.0.85
* Wed Jul 02 2008 schwab@suse.de
++++++ kdebase-workspace-4.0.85.tar.bz2 -> kdebase-workspace-4.0.99.tar.bz2 ++++++
KDE/kdebase4-workspace/kdebase-workspace-4.0.85.tar.bz2 4.0.99/STABLE/kdebase4-workspace/kdebase-workspace-4.0.99.tar.bz2 differ: byte 11, line 1
++++++ kdm-make_it_cool.diff ++++++
--- /var/tmp/diff_new_pack.xd9948/_old 2008-07-18 22:54:52.000000000 +0200
+++ /var/tmp/diff_new_pack.xd9948/_new 2008-07-18 22:54:52.000000000 +0200
@@ -1,61 +1,6 @@
---- kdm/kfrontend/themer/kdmlist.cpp
-+++ kdm/kfrontend/themer/kdmlist.cpp
-@@ -29,8 +29,6 @@
- : KdmItem( parent, node )
- {
- itemType = "list";
-- if (!isVisible())
-- return;
-
- // Read RECT TAGS
- QDomNodeList childList = node.childNodes();
---- kdm/kfrontend/themer/kdmthemer.cpp
-+++ kdm/kfrontend/themer/kdmthemer.cpp
-@@ -228,11 +228,7 @@
- else if (type == "svg")
- newItem = new KdmPixmap( parent, subnode );
- else
-- continue;
-- if (!newItem->isVisible()) {
-- delete newItem;
-- continue;
-- }
-+ continue;
- connect( newItem, SIGNAL(needUpdate( int, int, int, int )),
- SLOT(update( int, int, int, int )) );
- connect( newItem, SIGNAL(needPlacement()),
---- kdm/kfrontend/themer/kdmitem.cpp
-+++ kdm/kfrontend/themer/kdmitem.cpp
-@@ -65,7 +65,6 @@
- !modes.split( ",", QString::SkipEmptyParts ).contains( "console" ))))
- {
- m_visible = false;
-- return;
- }
-
- m_showType = sel.attribute( "type" );
-@@ -78,7 +77,6 @@
- themer()->typeVisible( m_showType ) == m_showTypeInvert)
- {
- m_visible = false;
-- return;
- }
- }
-
---- kdm/kfrontend/kgreeter.h
-+++ kdm/kfrontend/kgreeter.h
-@@ -70,7 +70,7 @@
- protected:
- void installUserList();
- void insertUser( const QImage &, const QString &, struct passwd * );
-- void insertUsers();
-+ void insertUsers(int limit_users = -1);
- void putSession( const QString &, const QString &, bool, const char * );
- void insertSessions();
- virtual void pluginSetup();
--- kdm/kfrontend/kgreeter.cpp
+++ kdm/kfrontend/kgreeter.cpp
-@@ -63,20 +63,20 @@
+@@ -64,20 +64,20 @@
class UserListView : public QListWidget {
public:
@@ -79,25 +24,24 @@
virtual QSize sizeHint() const
{
if (!cachedSizeHint.isValid()) {
-@@ -116,6 +116,8 @@
- break;
- }
- }
-+
-+ bool themed;
+@@ -145,6 +145,7 @@
+
+ private:
+ bool m_suppressClick;
++ bool themed;
};
class UserListViewItem : public QListWidgetItem {
-@@ -153,7 +155,7 @@
+@@ -181,7 +182,7 @@
"PrevUser" );
if (_userList) {
- userView = new UserListView( this );
+ userView = new UserListView( framed, this );
- connect( userView, SIGNAL(itemPressed( QListWidgetItem * )),
+ connect( userView, SIGNAL(itemClicked( QListWidgetItem * )),
SLOT(slotUserClicked( QListWidgetItem * )) );
- connect( userView, SIGNAL(itemActivated( QListWidgetItem * )),
-@@ -161,8 +163,6 @@
+ connect( userView, SIGNAL(itemDoubleClicked( QListWidgetItem * )),
+@@ -189,8 +190,6 @@
}
if (_userCompletion)
userList = new QStringList;
@@ -106,7 +50,7 @@
sessMenu = new QMenu( this );
connect( sessMenu, SIGNAL(triggered( QAction * )),
-@@ -301,8 +301,11 @@
+@@ -331,8 +330,11 @@
users.insert( *in );
}
@@ -119,7 +63,7 @@
{
struct passwd *ps;
-@@ -328,6 +331,9 @@
+@@ -358,6 +360,9 @@
if (_showUsers == SHOW_ALL) {
UserList noUsers( _noUsers );
QSet<QString> dupes;
@@ -129,7 +73,7 @@
for (setpwent(); (ps = getpwent()) != 0;) {
if (*ps->pw_dir && *ps->pw_shell &&
(ps->pw_uid >= (unsigned)_lowUserId ||
-@@ -339,10 +345,53 @@
+@@ -369,10 +374,53 @@
QString username( QFile::decodeName( ps->pw_name ) );
if (!dupes.contains( username )) {
dupes.insert( username );
@@ -184,7 +128,7 @@
} else {
UserList users( _users );
if (users.hasGroups()) {
-@@ -724,6 +773,9 @@
+@@ -747,6 +795,9 @@
break;
}
@@ -194,7 +138,7 @@
if (userView) {
if (clock)
inner_box->addWidget( clock, 0, Qt::AlignCenter );
-@@ -839,6 +891,9 @@
+@@ -860,6 +911,9 @@
adjustGeometry();
@@ -204,7 +148,7 @@
themer->setWidget( this );
connect( themer, SIGNAL(activated( const QString & )),
-@@ -922,6 +977,13 @@
+@@ -943,6 +997,13 @@
completeMenu();
#endif
@@ -218,7 +162,7 @@
if ((system_button = themer->findNode( "system_button" ))) {
if (optMenu)
addAction( optMenu->menuAction() );
-@@ -952,7 +1014,10 @@
+@@ -973,7 +1034,10 @@
{
inherited::pluginSetup();
@@ -230,3 +174,58 @@
userlist_node->setWidget( userView );
userlist_rect->setVisible( true );
} else {
+--- kdm/kfrontend/kgreeter.h
++++ kdm/kfrontend/kgreeter.h
+@@ -71,7 +71,7 @@
+ protected:
+ void installUserList();
+ void insertUser( const QImage &, const QString &, struct passwd * );
+- void insertUsers();
++ void insertUsers(int limit_users = -1);
+ void putSession( const QString &, const QString &, bool, const char * );
+ void insertSessions();
+ virtual void pluginSetup();
+--- kdm/kfrontend/themer/kdmitem.cpp
++++ kdm/kfrontend/themer/kdmitem.cpp
+@@ -65,7 +65,6 @@
+ !modes.split( ",", QString::SkipEmptyParts ).contains( "console" ))))
+ {
+ m_visible = false;
+- return;
+ }
+
+ m_showType = sel.attribute( "type" );
+@@ -78,7 +77,6 @@
+ themer()->typeVisible( m_showType ) == m_showTypeInvert)
+ {
+ m_visible = false;
+- return;
+ }
+ }
+
+--- kdm/kfrontend/themer/kdmlist.cpp
++++ kdm/kfrontend/themer/kdmlist.cpp
+@@ -29,8 +29,6 @@
+ : KdmItem( parent, node )
+ {
+ itemType = "list";
+- if (!isVisible())
+- return;
+
+ // Read RECT TAGS
+ QDomNodeList childList = node.childNodes();
+--- kdm/kfrontend/themer/kdmthemer.cpp
++++ kdm/kfrontend/themer/kdmthemer.cpp
+@@ -228,11 +228,7 @@
+ else if (type == "svg")
+ newItem = new KdmPixmap( parent, subnode );
+ else
+- continue;
+- if (!newItem->isVisible()) {
+- delete newItem;
+- continue;
+- }
++ continue;
+ connect( newItem, SIGNAL(needUpdate( int, int, int, int )),
+ SLOT(update( int, int, int, int )) );
+ connect( newItem, SIGNAL(needPlacement()),
++++++ ksmserver-leave-countdown.diff ++++++
--- /var/tmp/diff_new_pack.xd9948/_old 2008-07-18 22:54:53.000000000 +0200
+++ /var/tmp/diff_new_pack.xd9948/_new 2008-07-18 22:54:53.000000000 +0200
@@ -1,6 +1,6 @@
Index: libs/kworkspace/kworkspace.h
===================================================================
---- libs/kworkspace/kworkspace.h (revision 796708)
+--- libs/kworkspace/kworkspace.h (revision 832330)
+++ libs/kworkspace/kworkspace.h (working copy)
@@ -52,7 +52,7 @@
*/
@@ -24,260 +24,46 @@
};
/**
-Index: ksmserver/server.cpp
-===================================================================
---- ksmserver/server.cpp (revision 796708)
-+++ ksmserver/server.cpp (working copy)
-@@ -29,6 +29,10 @@
-
- ******************************************************************/
-
-+#include "server.h"
-+#include "global.h"
-+#include "client.h"
-+#include "ksmserverinterfaceadaptor.h"
-
- #include