summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorrillig <rillig>2005-12-20 19:58:04 +0000
committerrillig <rillig>2005-12-20 19:58:04 +0000
commit152c2e79d6c3deeb0b93d506dddb55a6d229dd8b (patch)
tree09c1db536ff8621314b4f19be8361562b4166168 /x11
parent53902f28a2349f7491a153b0b04fbefc333f9113 (diff)
downloadpkgsrc-152c2e79d6c3deeb0b93d506dddb55a6d229dd8b.tar.gz
Added two patches that fix the build on NetBSD 1.6.2/i386.
Diffstat (limited to 'x11')
-rw-r--r--x11/kdelibs3/distinfo4
-rw-r--r--x11/kdelibs3/patches/patch-da18
-rw-r--r--x11/kdelibs3/patches/patch-db17
3 files changed, 38 insertions, 1 deletions
diff --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo
index 8ab1ab8d6b0..3b1fc9b6198 100644
--- a/x11/kdelibs3/distinfo
+++ b/x11/kdelibs3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.62 2005/12/11 10:53:54 markd Exp $
+$NetBSD: distinfo,v 1.63 2005/12/20 19:58:04 rillig Exp $
SHA1 (kdelibs-3.5.0.tar.bz2) = c03bc6b09add3c487b3e28a5fb1d89efd30a9723
RMD160 (kdelibs-3.5.0.tar.bz2) = a170428a7166f322ab86d1c0280f12e23a8f6df3
@@ -22,3 +22,5 @@ SHA1 (patch-ce) = e9f7a348b0e4be1475ba8f56a8b474f139eb7781
SHA1 (patch-cf) = 0409b64ee00f355bfc2056e596b519a241fcf522
SHA1 (patch-ch) = 2b3d573fbeefa4b1b0fb0946cb853b23fe8779eb
SHA1 (patch-ci) = 83dd08af553c05c5d088880fa86d0633a8e4745a
+SHA1 (patch-da) = a9b3e79e5312b64d65e688255c23e2c75bc29751
+SHA1 (patch-db) = 8c0181e1211029a2a73a7cfa3fe78218d892b853
diff --git a/x11/kdelibs3/patches/patch-da b/x11/kdelibs3/patches/patch-da
new file mode 100644
index 00000000000..b58cff3802e
--- /dev/null
+++ b/x11/kdelibs3/patches/patch-da
@@ -0,0 +1,18 @@
+$NetBSD: patch-da,v 1.3 2005/12/20 19:58:04 rillig Exp $
+
+NetBSD 1.6.2 does not know ENOTSUP.
+
+--- kioslave/file/file.cpp.orig Tue Dec 20 12:15:37 2005
++++ kioslave/file/file.cpp Tue Dec 20 19:09:58 2005
+@@ -193,9 +193,11 @@ void FileProtocol::chmod( const KURL& ur
+ case EACCES:
+ error( KIO::ERR_ACCESS_DENIED, url.path() );
+ break;
++#ifdef ENOTSUP
+ case ENOTSUP:
+ error( KIO::ERR_UNSUPPORTED_ACTION, url.path() );
+ break;
++#endif
+ case ENOSPC:
+ error( KIO::ERR_DISK_FULL, url.path() );
+ break;
diff --git a/x11/kdelibs3/patches/patch-db b/x11/kdelibs3/patches/patch-db
new file mode 100644
index 00000000000..03229317f63
--- /dev/null
+++ b/x11/kdelibs3/patches/patch-db
@@ -0,0 +1,17 @@
+$NetBSD: patch-db,v 1.3 2005/12/20 19:58:04 rillig Exp $
+
+For some reason, g++-2.95 on NetBSD 1.6.2/i386 did not accept the ==
+operator here. The QT documentation says that using QString::compare is
+equivalent.
+
+--- khtml/rendering/font.h.orig Mon Oct 10 17:06:06 2005
++++ khtml/rendering/font.h Tue Dec 20 20:24:55 2005
+@@ -43,7 +43,7 @@ public:
+ FontDef()
+ : size( 0 ), italic( false ), smallCaps( false ), weight( 50 ), hasNbsp( true ) {}
+ bool operator == ( const FontDef &other ) const {
+- return ( family == other.family &&
++ return ( QString::compare(family, other.family) == 0 &&
+ size == other.size &&
+ italic == other.italic &&
+ smallCaps == other.smallCaps &&