rpms/kdebase/F-10 kdebase-4.2.1-konsole-layout-regression.patch, NONE, 1.1 kdebase.spec, 1.360, 1.361

[Than Ngo]

Author: than

Update of /cvs/extras/rpms/kdebase/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4348

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-4.2.1-konsole-layout-regression.patch 
Log Message:
- apply patch to fix regression in konsole, layout regression affecting apps
  using the KPart


kdebase-4.2.1-konsole-layout-regression.patch:

--- NEW FILE kdebase-4.2.1-konsole-layout-regression.patch ---
--- kdebase/apps/konsole/src/ViewContainer.cpp	2009/01/08 09:44:16	907499
+++ kdebase/apps/konsole/src/ViewContainer.cpp	2009/03/09 15:51:15	937339
@@ -784,6 +784,7 @@
     searchBar()->setParent(_containerWidget);
     layout->addWidget(searchBar());
     layout->addWidget(_stackWidget);
+    layout->setMargin(0);
 }
 StackedViewContainer::~StackedViewContainer()
 {
@@ -829,6 +830,7 @@
     searchBar()->setParent(contentArea);
     layout->addWidget(_stackWidget);
     layout->addWidget(searchBar());
+    layout->setMargin(0);
 
     // elide left is used because the most informative part of the session name is often
     // the rightmost part


Index: kdebase.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase/F-10/kdebase.spec,v
retrieving revision 1.360
retrieving revision 1.361
diff -u -r1.360 -r1.361
--- kdebase.spec	4 Mar 2009 20:59:56 -0000	1.360
+++ kdebase.spec	9 Mar 2009 22:21:16 -0000	1.361
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Core Files
 Version: 4.2.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdebase
@@ -28,8 +28,9 @@
 Patch1:   kdebase-4.1.70-konsole-session.patch
 Patch2:   kdebase-4.2.1-home-icon.patch
 
-## upstream patches
+# upstream patches
 Patch100:   kdebase-4.2.1-konsole-selection.patch
+Patch101:   kdebase-4.2.1-konsole-layout-regression.patch
 
 %ifnarch s390 s390x
 Requires: eject
@@ -127,6 +128,7 @@
 %patch2 -p1 -b .home-icon
 
 %patch100 -p1 -b .konsole
+%patch101 -p1 -b .layout-regression
 
 # fix incorrect assumption that we're building in a combined kdebase tree
 sed -i -e 's/EXISTS "${kdebase_SOURCE_DIR}"/0/g' apps/CMakeLists.txt
@@ -308,6 +310,10 @@
 
 
 %changelog
+* Mon Mar 09 2009 Than Ngo <than at redhat.com> - 4.2.1-3
+- apply patch to fix regression in konsole, layout regression affecting apps
+  using the KPart
+
 * Wed Mar 04 2009 Than Ngo <than at redhat.com> - 4.2.1-2
 - apply patch to fix regression in konsole, double-click selection works again