summaryrefslogtreecommitdiff
path: root/x11/kdelibs3/patches
diff options
context:
space:
mode:
authorrillig <rillig@pkgsrc.org>2005-12-20 19:58:04 +0000
committerrillig <rillig@pkgsrc.org>2005-12-20 19:58:04 +0000
commit99d18b3450aca0bb5d98ef1e4fd2f9e62269cfe8 (patch)
tree09c1db536ff8621314b4f19be8361562b4166168 /x11/kdelibs3/patches
parentc8425484718ae8b16d1789dd5fa8de12b14e248f (diff)
downloadpkgsrc-99d18b3450aca0bb5d98ef1e4fd2f9e62269cfe8.tar.gz
Added two patches that fix the build on NetBSD 1.6.2/i386.
Diffstat (limited to 'x11/kdelibs3/patches')
-rw-r--r--x11/kdelibs3/patches/patch-da18
-rw-r--r--x11/kdelibs3/patches/patch-db17
2 files changed, 35 insertions, 0 deletions
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 &&