summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorskrll <skrll>2003-08-08 12:56:25 +0000
committerskrll <skrll>2003-08-08 12:56:25 +0000
commit367394cb688da7ebc70f1d702ce2a9b714acca79 (patch)
tree171274a5de340d2d96cc5d8c984eb0a909a6717f /x11
parent59009b40aba8ad132f3e56600d1ae30f64999e7e (diff)
downloadpkgsrc-367394cb688da7ebc70f1d702ce2a9b714acca79.tar.gz
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
Diffstat (limited to 'x11')
-rw-r--r--x11/kdelibs3/Makefile4
-rw-r--r--x11/kdelibs3/distinfo3
-rw-r--r--x11/kdelibs3/patches/patch-cf22
3 files changed, 26 insertions, 3 deletions
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index 08253f5dd12..bf39c10f5c8 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -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 --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo
index 0c06b35dbe5..b94974ac334 100644
--- a/x11/kdelibs3/distinfo
+++ b/x11/kdelibs3/distinfo
@@ -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-bv) = 882355f9dd9cdbbbe14d54e5c59b630ef0347e1c
SHA1 (patch-cc) = f0154cf753a61271366ec3f57d62c1cf21bffc14
SHA1 (patch-cd) = e9f1096e9c293c545a2121c73ceb238d98e9b486
SHA1 (patch-ce) = 08e965336563bc818bbfd6dcef6b3bdbcfd89497
+SHA1 (patch-cf) = 7b5c022a0b323cd5407cf2879541ed5fd43dabc6
diff --git a/x11/kdelibs3/patches/patch-cf b/x11/kdelibs3/patches/patch-cf
new file mode 100644
index 00000000000..474b472a505
--- /dev/null
+++ b/x11/kdelibs3/patches/patch-cf
@@ -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() );
+ }