rpms/kdebase-workspace/F-9 kdebase-workspace-4.1.2-multihead.patch, NONE, 1.1 kdebase-workspace.spec, 1.110, 1.111

[Than Ngo]

Author: than

Update of /cvs/extras/rpms/kdebase-workspace/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3958

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.1.2-multihead.patch 
Log Message:
apply patch to fix multihead issue



kdebase-workspace-4.1.2-multihead.patch:

--- NEW FILE kdebase-workspace-4.1.2-multihead.patch ---
diff -up kdebase-workspace-4.1.2/kdm/kfrontend/kgapp.cpp.orig kdebase-workspace-4.1.2/kdm/kfrontend/kgapp.cpp
--- kdebase-workspace-4.1.2/kdm/kfrontend/kgapp.cpp.orig	2008-10-31 14:23:05.000000000 +0100
+++ kdebase-workspace-4.1.2/kdm/kfrontend/kgapp.cpp	2008-10-31 14:25:23.000000000 +0100
@@ -248,8 +248,9 @@ kg_main( const char *argv0 )
 	gSendInt( G_Ready );
 
 	if (themer) {
-		QPixmap pm( app.desktop()->screen()->size() );
-		themer->paintBackground( &pm );
+		QPixmap pm( app.desktop()->size() );
+		for (int i = 0; i < app.desktop()->numScreens(); ++i)
+			themer->paintBackground( &pm, app.desktop()->screenGeometry(i) );
 		QPalette palette;
 		palette.setBrush( app.desktop()->backgroundRole(), QBrush( pm ) );
 		app.desktop()->setPalette( palette );
diff -up kdebase-workspace-4.1.2/kdm/kfrontend/themer/kdmthemer.cpp.orig kdebase-workspace-4.1.2/kdm/kfrontend/themer/kdmthemer.cpp
--- kdebase-workspace-4.1.2/kdm/kfrontend/themer/kdmthemer.cpp.orig	2008-10-31 14:21:32.000000000 +0100
+++ kdebase-workspace-4.1.2/kdm/kfrontend/themer/kdmthemer.cpp	2008-10-31 14:22:02.000000000 +0100
@@ -186,10 +186,9 @@ KdmThemer::widgetEvent( QEvent *e )
 }
 
 void
-KdmThemer::paintBackground( QPaintDevice *dev )
+KdmThemer::paintBackground( QPaintDevice *dev, const QRect &rect )
 {
 	debug() << "==== setting background geometry ====";
-	QRect rect( 0, 0, dev->width(), dev->height() );
 	QStack<QSize> ps;
 	rootItem->setGeometry( ps, rect, true );
 	QPainter p( dev );
diff -up kdebase-workspace-4.1.2/kdm/kfrontend/themer/kdmthemer.h.orig kdebase-workspace-4.1.2/kdm/kfrontend/themer/kdmthemer.h
--- kdebase-workspace-4.1.2/kdm/kfrontend/themer/kdmthemer.h.orig	2008-10-31 14:22:13.000000000 +0100
+++ kdebase-workspace-4.1.2/kdm/kfrontend/themer/kdmthemer.h	2008-10-31 14:22:50.000000000 +0100
@@ -29,6 +29,7 @@ class KdmItem;
 
 class QDomNode;
 class QPaintDevice;
+class QRect;
 
 /**
 * @author Unai Garro
@@ -69,7 +70,7 @@ public:
 	void setTypeVisible( const QString &t, bool show );
 	bool typeVisible( const QString &t ) { return m_showTypes.value( t, false ); }
 
-	void paintBackground( QPaintDevice *dev );
+	void paintBackground( QPaintDevice *dev, const QRect &rect );
 
 Q_SIGNALS:
 	void activated( const QString &id );


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/F-9/kdebase-workspace.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- kdebase-workspace.spec	18 Oct 2008 22:14:17 -0000	1.110
+++ kdebase-workspace.spec	31 Oct 2008 13:33:12 -0000	1.111
@@ -4,7 +4,7 @@
 Name: kdebase-workspace
 Version: 4.1.2
 
-Release: 6%{?dist}
+Release: 8%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -26,6 +26,7 @@
 Patch10: kdebase-workspace-4.0.72-klipper-url.patch
 # allows to define a default wallpaper via plasmarc:wallpaper
 Patch11: kdebase-workspace-4.0.85-plasma-default-wallpaper.patch
+Patch12: kdebase-workspace-4.1.2-multihead.patch
 
 # upstream patches:
 # backport Plasma tooltip manager from KDE 4.2 (fixes regression from 4.0)
@@ -119,6 +120,13 @@
 Requires: xorg-x11-utils
 Requires: xorg-x11-server-utils
 
+%if 0%{?fedora} == 10
+%define default_face_icon default_solar.png
+Requires: solar-kde-theme
+%else
+%define default_face_icon default1.png
+%endif
+
 %description
 The KDE Workspace consists of what is the desktop of the 
 KDE Desktop Environment.
@@ -194,6 +202,7 @@
 %patch9 -p1 -b .kickoff-suspend
 %patch10 -p1 -b .klipper-url
 %patch11 -p1 -b .plasma-default-wallpaper
+%patch12 -p1 -b .multihead
 
 # upstream patches
 %patch100 -p1 -b .plasma-tooltips
@@ -237,7 +246,7 @@
 # own %{_kde4_appsdir}/kdm/faces and set default user image
 mkdir -p %{buildroot}%{_kde4_appsdir}/kdm/faces
 pushd %{buildroot}%{_kde4_appsdir}/kdm/faces
-ln -sf ../pics/users/default1.png .default.face.icon
+ln -sf ../pics/users/%{default_face_icon} .default.face.icon
 popd
 
 # move devel symlinks
@@ -343,6 +352,12 @@
 
 
 %changelog
+* Fri Oct 31 2008 Than Ngo <than at redhat.com> 4.1.2-8
+- apply patch to fix multihead issue
+
+* Sat Oct 25 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.2-7
+- F10: use KDM default face icon from solar-kde-theme, require it
+
 * Sat Oct 18 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.2-6
 - reenable panel-autohide-fix-flicker patch
 - backport revision 866998 to fix the CPU consumption problem (kde#172549)