diff options
| author | markd <markd> | 2006-11-20 09:38:15 +0000 |
|---|---|---|
| committer | markd <markd> | 2006-11-20 09:38:15 +0000 |
| commit | 985ed624cbcb8a199780d2c528f9ce2346bc4fea (patch) | |
| tree | 7821501e64cddaccae34f9b51ff486ffe44f07a6 | |
| parent | 7abe79404a6904d1dad8549789392650a1661880 (diff) | |
| download | pkgsrc-985ed624cbcb8a199780d2c528f9ce2346bc4fea.tar.gz | |
Fix a regression in html rendering. From KDE svn. Bump PKGREVISION.
| -rw-r--r-- | x11/kdelibs3/Makefile | 3 | ||||
| -rw-r--r-- | x11/kdelibs3/distinfo | 3 | ||||
| -rw-r--r-- | x11/kdelibs3/patches/patch-ad | 13 |
3 files changed, 17 insertions, 2 deletions
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile index cfc3294a071..932d93d9bdd 100644 --- a/x11/kdelibs3/Makefile +++ b/x11/kdelibs3/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.116 2006/11/20 09:32:02 markd Exp $ +# $NetBSD: Makefile,v 1.117 2006/11/20 09:38:15 markd Exp $ DISTNAME= kdelibs-${_KDE_VERSION} +PKGREVISION= 1 CATEGORIES= x11 COMMENT= Support libraries for the KDE integrated X11 desktop diff --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo index 01e0a6899d5..c7cc44e51d5 100644 --- a/x11/kdelibs3/distinfo +++ b/x11/kdelibs3/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.80 2006/11/20 09:30:26 markd Exp $ +$NetBSD: distinfo,v 1.81 2006/11/20 09:38:15 markd Exp $ SHA1 (kdelibs-3.5.5.tar.bz2) = 7961818e41e22cce7c58219c4eb63ed5fbb94307 RMD160 (kdelibs-3.5.5.tar.bz2) = 8e389869f9a53445754c76a0f7535ef2fffc6d03 @@ -6,6 +6,7 @@ Size (kdelibs-3.5.5.tar.bz2) = 15486690 bytes SHA1 (patch-aa) = be278f29b743c573b71c7804eff26324e78ed779 SHA1 (patch-ab) = 3a79b3e7fadef1a93a5490b716dace60f3de30a1 SHA1 (patch-ac) = f4a8fc2bfcf8a414e690eafd51607250b9f51890 +SHA1 (patch-ad) = 776aa1bc947f28839d9ebbdf6a92b7fba8f8b0e2 SHA1 (patch-ae) = a85911eb156ea53aca02bb2f3d550edbf377981d SHA1 (patch-aj) = 2ec8d33ce6684da7c60759cf395b78fa4ac2eaec SHA1 (patch-an) = a65dd672b26a12a6690d1109ba5ee6f58c69457a diff --git a/x11/kdelibs3/patches/patch-ad b/x11/kdelibs3/patches/patch-ad new file mode 100644 index 00000000000..fae4abe247d --- /dev/null +++ b/x11/kdelibs3/patches/patch-ad @@ -0,0 +1,13 @@ +$NetBSD: patch-ad,v 1.10 2006/11/20 09:38:15 markd Exp $ + +--- khtml/rendering/render_block.cpp.orig 2006-10-02 06:33:39.000000000 +1300 ++++ khtml/rendering/render_block.cpp +@@ -711,7 +711,7 @@ void RenderBlock::layoutBlock(bool relay + int toAdd = borderBottom() + paddingBottom(); + if (m_layer && style()->scrollsOverflow() && style()->height().isVariable()) + toAdd += m_layer->horizontalScrollbarHeight(); +- if ( hasOverhangingFloats() && !style()->scrollsOverflow() && (isFloatingOrPositioned() || flowAroundFloats()) ) ++ if ( hasOverhangingFloats() && (isFloatingOrPositioned() || flowAroundFloats()) ) + m_overflowHeight = m_height = floatBottom() + toAdd; + + int oldHeight = m_height; |