diff options
| author | salo <salo@pkgsrc.org> | 2005-01-06 00:19:42 +0000 |
|---|---|---|
| committer | salo <salo@pkgsrc.org> | 2005-01-06 00:19:42 +0000 |
| commit | 34d76c59c652d6bed163cc63b8c4a36ed4848bb7 (patch) | |
| tree | 3650d11fdd961fe2b075ba25cc826e9671407ac4 /x11 | |
| parent | 2552de54559c491e929a0afd4270d19479d94942 (diff) | |
| download | pkgsrc-34d76c59c652d6bed163cc63b8c4a36ed4848bb7.tar.gz | |
Pullup ticet 207 - requested by Mark Davies
portability fix for kdelibs3
Module Name: pkgsrc
Committed By: markd
Date: Wed Jan 5 10:27:43 UTC 2005
Modified Files:
pkgsrc/x11/kdelibs3: Makefile distinfo
pkgsrc/x11/kdelibs3/patches: patch-cg
Log Message:
patch from KDE_3_3_BRANCH to stop SIGBUS on Solaris during URL
completion. Bump PKGREVISION.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/kdelibs3/Makefile | 4 | ||||
| -rw-r--r-- | x11/kdelibs3/distinfo | 4 | ||||
| -rw-r--r-- | x11/kdelibs3/patches/patch-cg | 30 |
3 files changed, 27 insertions, 11 deletions
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile index c10af65667e..d2a20b83a62 100644 --- a/x11/kdelibs3/Makefile +++ b/x11/kdelibs3/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.71 2004/12/14 11:02:18 markd Exp $ +# $NetBSD: Makefile,v 1.71.2.1 2005/01/06 00:19:42 salo Exp $ DISTNAME= kdelibs-${_KDE_VERSION} -PKGREVISION= 2 +PKGREVISION= 5 CATEGORIES= x11 COMMENT= Support libraries for the KDE integrated X11 desktop diff --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo index 8d09db2be2f..5326200d95f 100644 --- a/x11/kdelibs3/distinfo +++ b/x11/kdelibs3/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.46 2004/12/14 11:02:18 markd Exp $ +$NetBSD: distinfo,v 1.46.2.1 2005/01/06 00:19:42 salo Exp $ SHA1 (kdelibs-3.3.2.tar.bz2) = 69325b603375d31d4d537955383f4893e4a7945f Size (kdelibs-3.3.2.tar.bz2) = 15623180 bytes @@ -17,4 +17,4 @@ SHA1 (patch-bv) = 882355f9dd9cdbbbe14d54e5c59b630ef0347e1c SHA1 (patch-cc) = d52e3beff19ed287a4635c8da5ab7a69a8e3c0f3 SHA1 (patch-ce) = e9f7a348b0e4be1475ba8f56a8b474f139eb7781 SHA1 (patch-cf) = 0409b64ee00f355bfc2056e596b519a241fcf522 -SHA1 (patch-cg) = 40f7dc34c6c87e05c53b3d94d12d2b9e7b34c97a +SHA1 (patch-cg) = 7954707b14994d6ed78d36bb4f6aa0b249fa6772 diff --git a/x11/kdelibs3/patches/patch-cg b/x11/kdelibs3/patches/patch-cg index 910eeffa03b..21efc8832b7 100644 --- a/x11/kdelibs3/patches/patch-cg +++ b/x11/kdelibs3/patches/patch-cg @@ -1,26 +1,42 @@ -$NetBSD: patch-cg,v 1.1 2004/08/26 04:04:11 markd Exp $ +$NetBSD: patch-cg,v 1.1.4.1 2005/01/06 00:19:42 salo Exp $ --- kio/kio/kurlcompletion.cpp.orig 2004-06-23 05:36:41.000000000 +1200 +++ kio/kio/kurlcompletion.cpp -@@ -54,6 +54,9 @@ +@@ -54,6 +54,7 @@ #include <sys/stat.h> #include <pwd.h> #include <time.h> -+#ifdef __NetBSD__ +#include <sys/param.h> -+#endif #include "kurlcompletion.h" -@@ -222,7 +225,11 @@ void DirectoryListThread::run() - struct dirent dirPosition; +@@ -218,11 +219,18 @@ void DirectoryListThread::run() + QDir::setCurrent( *it ); + + // Loop through all directory entries ++ // Solaris and IRIX dirent structures do not allocate space for d_name. On ++ // systems that do (HP-UX, Linux, Tru64 UNIX), we overallocate space but ++ // that's ok. + +- struct dirent dirPosition; ++ struct dirent *dirPosition = (struct dirent *) malloc( sizeof( struct dirent ) + MAXPATHLEN + 1 ); struct dirent *dirEntry = 0; while ( !terminationRequested() && +- ::readdir_r( dir, &dirPosition, &dirEntry ) == 0 && dirEntry ) +#if defined(__NetBSD__) && __NetBSD_Version__ < 106210000 /* NetBSD 1.6U */ + (dirEntry = ::readdir( dir ))) +#else - ::readdir_r( dir, &dirPosition, &dirEntry ) == 0 && dirEntry ) ++ ::readdir_r( dir, dirPosition, &dirEntry ) == 0 && dirEntry ) +#endif { // Skip hidden files if m_noHidden is true +@@ -280,6 +288,8 @@ void DirectoryListThread::run() + + ::closedir( dir ); + dir = 0; ++ ++ free( dirPosition ); + } + + done(); |