[pkgsrc/trunk]: pkgsrc/x11/kdelibs3 Fix the render_root.cpp backport botch.

[skrll <skrll%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/fc4054e9c280
branches:  trunk
changeset: 459823:fc4054e9c280
user:      skrll <skrll%pkgsrc.org@localhost>
date:      Fri Aug 08 12:56:25 2003 +0000

description:
Fix the render_root.cpp backport botch.

date: 2003/08/02 21:28:49;  author: mueller;  state: Exp;  lines: +2 -2
grr, automatic backporting patch made it automatically wrong :(
CCMAIL: 61730-done%bugs.kde.org@localhost

diffstat:

 x11/kdelibs3/Makefile         |   4 ++--
 x11/kdelibs3/distinfo         |   3 ++-
 x11/kdelibs3/patches/patch-cf |  22 ++++++++++++++++++++++
 3 files changed, 26 insertions(+), 3 deletions(-)

diffs (53 lines):

diff -r 3e989fadf08c -r fc4054e9c280 x11/kdelibs3/Makefile
--- a/x11/kdelibs3/Makefile     Fri Aug 08 12:52:12 2003 +0000
+++ b/x11/kdelibs3/Makefile     Fri Aug 08 12:56:25 2003 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.36 2003/08/05 19:21:29 skrll Exp $
+# $NetBSD: Makefile,v 1.37 2003/08/08 12:56:25 skrll Exp $
 
 DISTNAME=      kdelibs-3.1.3
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    x11
 COMMENT=       Support libraries for the KDE integrated X11 desktop
 
diff -r 3e989fadf08c -r fc4054e9c280 x11/kdelibs3/distinfo
--- a/x11/kdelibs3/distinfo     Fri Aug 08 12:52:12 2003 +0000
+++ b/x11/kdelibs3/distinfo     Fri Aug 08 12:56:25 2003 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.25 2003/08/02 13:43:16 mrg Exp $
+$NetBSD: distinfo,v 1.26 2003/08/08 12:56:25 skrll Exp $
 
 SHA1 (kdelibs-3.1.3.tar.bz2) = 1bc987bd7b5a171e4efe5b5edad3134a3959e50b
 Size (kdelibs-3.1.3.tar.bz2) = 10533062 bytes
@@ -40,3 +40,4 @@
 SHA1 (patch-cc) = f0154cf753a61271366ec3f57d62c1cf21bffc14
 SHA1 (patch-cd) = e9f1096e9c293c545a2121c73ceb238d98e9b486
 SHA1 (patch-ce) = 08e965336563bc818bbfd6dcef6b3bdbcfd89497
+SHA1 (patch-cf) = 7b5c022a0b323cd5407cf2879541ed5fd43dabc6
diff -r 3e989fadf08c -r fc4054e9c280 x11/kdelibs3/patches/patch-cf
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/kdelibs3/patches/patch-cf     Fri Aug 08 12:56:25 2003 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-cf,v 1.5 2003/08/08 12:56:25 skrll Exp $
+
+--- khtml/rendering/render_root.cpp.orig       Wed Jul 16 01:57:40 2003
++++ khtml/rendering/render_root.cpp
+@@ -118,7 +118,7 @@ void RenderRoot::layout()
+ #endif
+     if (!m_printingMode) {
+         QSize s = m_view->viewportSize(m_view->contentsWidth(),
+-                                       0);
++                                       m_view->contentsHeight());
+         m_width = s.width();
+         m_height = s.height();
+     }
+@@ -132,7 +132,7 @@ void RenderRoot::layout()
+     if (!m_printingMode) {
+         m_view->resizeContents(docWidth(), docHeight());
+         QSize s = m_view->viewportSize(m_view->contentsWidth(),
+-                                       m_view->contentsHeight());
++                                       0);
+         setWidth( m_viewportWidth = s.width() );
+         setHeight(  m_viewportHeight = s.height() );
+     }