diff options
| author | Michael Nottebrock <lofi@FreeBSD.org> | 2004-04-28 17:00:54 +0000 |
|---|---|---|
| committer | Michael Nottebrock <lofi@FreeBSD.org> | 2004-04-28 17:00:54 +0000 |
| commit | 211896480c823cf95997e54ce6a8a95bb7921b2f (patch) | |
| tree | 418af43d491c46bc33b30378d9a7ae4234714f44 /x11/kdelibs4 | |
| parent | miau (fluffy little fellow), yet another IRC bouncer (diff) | |
Add a patch which fixes a khtml crashbug
( http://bugs.kde.org/show_bug.cgi?id=75806 ).
Bump PORTREVISION.
Obtained from: KDE CVS
Notes
Notes:
svn path=/head/; revision=107832
Diffstat (limited to 'x11/kdelibs4')
| -rw-r--r-- | x11/kdelibs4/Makefile | 2 | ||||
| -rw-r--r-- | x11/kdelibs4/files/patch-khtml-rendering-render_block.cpp | 22 |
2 files changed, 23 insertions, 1 deletions
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile index f996c1cd6231..a7639bcba687 100644 --- a/x11/kdelibs4/Makefile +++ b/x11/kdelibs4/Makefile @@ -8,7 +8,7 @@ PORTNAME= kdelibs PORTVERSION= ${KDE_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src diff --git a/x11/kdelibs4/files/patch-khtml-rendering-render_block.cpp b/x11/kdelibs4/files/patch-khtml-rendering-render_block.cpp new file mode 100644 index 000000000000..c8569bd92bfc --- /dev/null +++ b/x11/kdelibs4/files/patch-khtml-rendering-render_block.cpp @@ -0,0 +1,22 @@ +--- khtml/rendering/render_block.cpp 2004/03/01 04:46:27 1.20.2.6 ++++ khtml/rendering/render_block.cpp 2004/04/26 21:05:27 1.20.2.7 +@@ -422,14 +422,16 @@ void RenderBlock::layout() + + void RenderBlock::layoutBlock(bool relayoutChildren) + { ++ if (isInline() && !isReplacedBlock()) { ++ setLayouted(); ++ return; ++ } ++ + // kdDebug( 6040 ) << renderName() << " " << this << "::layoutBlock() start" << endl; + // QTime t; + // t.start(); + KHTMLAssert( !layouted() ); + KHTMLAssert( minMaxKnown() ); +- +- if (isInline()) // Inline <form>s inside various table elements can cause us to +- return; // come in here. Just bail. -dwh + + int oldWidth = m_width; + |