rpms/kdelibs/devel kdelibs-3.5.4-kde#123915.patch, NONE, 1.1 kdelibs.spec, 1.188, 1.189

[fedora-cvs-commits at redhat.com]

Author: than

Update of /cvs/dist/rpms/kdelibs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29194

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-3.5.4-kde#123915.patch 
Log Message:
- fix #115891/bz#208270, CUPS 1.2.x unix socket support
- apply upstream patches
   fix #123915, Page format display is 'overlaid'



kdelibs-3.5.4-kde#123915.patch:
 render_block.cpp |   14 ++++++++++++++
 render_block.h   |    1 +
 2 files changed, 15 insertions(+)

--- NEW FILE kdelibs-3.5.4-kde#123915.patch ---
Index: khtml/rendering/render_block.h
===================================================================
--- khtml/rendering/render_block.h	(Revision 588482)
+++ khtml/rendering/render_block.h	(Revision 588483)
@@ -330,6 +330,7 @@
     RenderObject* handleRunInChild(RenderObject* child, bool& handled);
     void collapseMargins(RenderObject* child, MarginInfo& marginInfo, int yPosEstimate);
     void clearFloatsIfNeeded(RenderObject* child, MarginInfo& marginInfo, int oldTopPosMargin, int oldTopNegMargin);
+    void adjustSizeForCompactIfNeeded(RenderObject* child, CompactInfo& compactInfo);
     void insertCompactIfNeeded(RenderObject* child, CompactInfo& compactInfo);
     int estimateVerticalPosition(RenderObject* child, const MarginInfo& info);
     void determineHorizontalPosition(RenderObject* child);
Index: khtml/rendering/render_block.cpp
===================================================================
--- khtml/rendering/render_block.cpp	(Revision 588482)
+++ khtml/rendering/render_block.cpp	(Revision 588483)
@@ -916,6 +916,18 @@
     return 0;
 }
 
+void RenderBlock::adjustSizeForCompactIfNeeded(RenderObject* child, CompactInfo& compactInfo)
+{
+    // if the compact is bigger than the block it was run into
+    // then "this" block should take the height of the compact
+    if (compactInfo.matches(child)) {
+        // We have a compact child to squeeze in.
+        RenderObject* compactChild = compactInfo.compact();
+        if (compactChild->height() > child->height())
+            m_height += compactChild->height() - child->height();
+    } 
+}
+
 void RenderBlock::insertCompactIfNeeded(RenderObject* child, CompactInfo& compactInfo)
 {
     if (compactInfo.matches(child)) {
@@ -949,6 +961,7 @@
         child->style()->setLineHeight( newLineHeight );
         child->setNeedsLayout( true, false );
         child->layout();
+
         compactChild->setPos(compactXPos, compactYPos); // Set the x position.
         compactInfo.clear();
     }
@@ -1417,6 +1430,7 @@
         // Now place the child in the correct horizontal position
         determineHorizontalPosition(child);
 
+        adjustSizeForCompactIfNeeded(child, compactInfo);
         // Update our height now that the child has been placed in the correct position.
         m_height += child->height();
 


Index: kdelibs.spec
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -r1.188 -r1.189
--- kdelibs.spec	26 Sep 2006 15:28:11 -0000	1.188
+++ kdelibs.spec	27 Sep 2006 15:15:45 -0000	1.189
@@ -64,6 +64,7 @@
 Patch114: kdelibs-3.5.4-kde#133401.patch
 Patch115: kdelibs-3.5.4-kde#131979.patch
 Patch116: kdelibs-3.5.4-kde#115891.patch
+Patch117: kdelibs-3.5.4-kde#123915.patch
 
 %if %{arts}
 Requires: arts >= %{arts_epoch}:%{arts_version}
@@ -211,6 +212,7 @@
 %patch114 -p0 -b .kde#133401
 %patch115 -p0 -b .kde#131979
 %patch116 -p0 -b .kde#115891
+%patch117 -p0 -b .kde#123915
 
 perl -pi -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h
 
@@ -440,7 +442,9 @@
 
 %changelog
 * Tue Sep 26 2006 <than at redhat.com> 6:3.5.4-8
-- fix #115891/bz#193098, CUPS 1.2.x unix socket support
+- fix #115891/bz#208270, CUPS 1.2.x unix socket support
+- apply upstream patches
+   fix #123915, Page format display is 'overlaid'
 
 * Thu Sep 14 2006 Than Ngo <than at redhat.com> 6:3.5.4-7
 - apply upstream patches