summaryrefslogtreecommitdiff
path: root/x11/kdelibs3
diff options
context:
space:
mode:
authormarkd <markd@pkgsrc.org>2006-02-26 11:46:41 +0000
committermarkd <markd@pkgsrc.org>2006-02-26 11:46:41 +0000
commit4d0bab7f91ac2338b80d3319217d2f61473055f0 (patch)
tree8f60bfb5029e071825193dddaa01d13ca5083c71 /x11/kdelibs3
parent579601a25e296c195ed2bcd30748a4de59dabace (diff)
downloadpkgsrc-4d0bab7f91ac2338b80d3319217d2f61473055f0.tar.gz
Patch from kde svn to fix compilation with gcc 2.95. Should fix build
on NetBSD 1.6.2. Bump PKGREVISION.
Diffstat (limited to 'x11/kdelibs3')
-rw-r--r--x11/kdelibs3/Makefile4
-rw-r--r--x11/kdelibs3/distinfo3
-rw-r--r--x11/kdelibs3/patches/patch-ai13
3 files changed, 17 insertions, 3 deletions
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index 574e2260aba..f2b7a6ccfc3 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.104 2006/02/07 10:06:53 markd Exp $
+# $NetBSD: Makefile,v 1.105 2006/02/26 11:46:41 markd Exp $
DISTNAME= kdelibs-${_KDE_VERSION}
-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 c141030dc07..a1a3c00cade 100644
--- a/x11/kdelibs3/distinfo
+++ b/x11/kdelibs3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.68 2006/02/07 10:06:53 markd Exp $
+$NetBSD: distinfo,v 1.69 2006/02/26 11:46:41 markd Exp $
SHA1 (kdelibs-3.5.1.tar.bz2) = 669dbefc1880f17493462ce724d4c38520724ece
RMD160 (kdelibs-3.5.1.tar.bz2) = db974aa14ff8f8d5a9d279ba8cabb5dcdc3ecc1c
@@ -10,6 +10,7 @@ SHA1 (patch-ae) = a85911eb156ea53aca02bb2f3d550edbf377981d
SHA1 (patch-af) = 7fbb3abcbf56020e3827ddf9d056beab9d1f3cd7
SHA1 (patch-ag) = e471fdf5428e0f515ef3fe5427622854886ef952
SHA1 (patch-ah) = 467772a737072baa4af76b22f58bf1741b6633eb
+SHA1 (patch-ai) = b4b6902423af8905e10d1652f2174b27280412ac
SHA1 (patch-an) = a65dd672b26a12a6690d1109ba5ee6f58c69457a
SHA1 (patch-ao) = 7ae360b2ee2332ec3017dfd468457f2c1b139308
SHA1 (patch-ap) = 94037230bb3d12549195d52b98ffdd821f94f90d
diff --git a/x11/kdelibs3/patches/patch-ai b/x11/kdelibs3/patches/patch-ai
new file mode 100644
index 00000000000..e4b2c0528c5
--- /dev/null
+++ b/x11/kdelibs3/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.6 2006/02/26 11:46:41 markd Exp $
+
+--- khtml/html/html_formimpl.cpp.orig 2006-01-20 19:53:03.000000000 +1300
++++ khtml/html/html_formimpl.cpp
+@@ -2303,7 +2303,7 @@ void HTMLSelectElementImpl::recalcListIt
+ NodeImpl* const parent = current->parentNode();
+ current = current->nextSibling();
+ if (!current) {
+- if (parent != this)
++ if (static_cast<const NodeImpl *>(parent) != this)
+ current = parent->nextSibling();
+ }
+ }