diff options
| author | jlam <jlam@pkgsrc.org> | 2001-11-16 09:08:05 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2001-11-16 09:08:05 +0000 |
| commit | 778144e57ec4f74d7c18881fc8def7a8be0644d5 (patch) | |
| tree | 7ff09c96649478d1a9d67644114f795b1b0ae73d /x11 | |
| parent | ed2f44d9963138ad4ededa9b1c0cf81ea18c549b (diff) | |
| download | pkgsrc-778144e57ec4f74d7c18881fc8def7a8be0644d5.tar.gz | |
Update qt2-libs to 2.3.1nb1. Changes from version 2.3.1 are making
QDir::mkdir and QDir::rmdir work when passed a directory name with trailing
slashes by removing the trailing slashes prior to making the mkdir(2) and
rmdir(2) system calls. KDE2 seems to rely heavily on this behaviour.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/qt2-libs/Makefile | 4 | ||||
| -rw-r--r-- | x11/qt2-libs/distinfo | 3 | ||||
| -rw-r--r-- | x11/qt2-libs/patches/patch-al | 46 |
3 files changed, 50 insertions, 3 deletions
diff --git a/x11/qt2-libs/Makefile b/x11/qt2-libs/Makefile index 6e9f31e2b05..2f15f3f8da5 100644 --- a/x11/qt2-libs/Makefile +++ b/x11/qt2-libs/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.14 2001/10/24 22:11:14 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2001/11/16 09:08:05 jlam Exp $ # #USE_MESA= yes .include "../qt2-libs/Makefile.common" -PKGNAME= qt2-libs-${QTVERSION} +PKGNAME= qt2-libs-${QTVERSION}nb1 COMMENT= C++ X GUI toolkit USE_BUILDLINK_ONLY= yes diff --git a/x11/qt2-libs/distinfo b/x11/qt2-libs/distinfo index 7885500ad92..f25c1e6cdcb 100644 --- a/x11/qt2-libs/distinfo +++ b/x11/qt2-libs/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2001/08/29 22:41:29 jlam Exp $ +$NetBSD: distinfo,v 1.6 2001/11/16 09:08:05 jlam Exp $ SHA1 (qt-x11-2.3.1.tar.gz) = f1403700fe80fbfb125ec84731d0dfe9c576c823 Size (qt-x11-2.3.1.tar.gz) = 8967271 bytes @@ -13,3 +13,4 @@ SHA1 (patch-ah) = aed767e01998aa5093e3932f6ab1032d0a35b9bb SHA1 (patch-ai) = 20a61cefe445fdc8cac90da9800d0836ac57caf8 SHA1 (patch-aj) = ed0cd262eca3ff190c221421a62ce2970121a4d4 SHA1 (patch-ak) = 3eac0d921f3535231aab9ff1f6738f9541b8b564 +SHA1 (patch-al) = 32f6b13393b115c56a4ca75f62f5916034189174 diff --git a/x11/qt2-libs/patches/patch-al b/x11/qt2-libs/patches/patch-al new file mode 100644 index 00000000000..34b24ad94bb --- /dev/null +++ b/x11/qt2-libs/patches/patch-al @@ -0,0 +1,46 @@ +$NetBSD: patch-al,v 1.1 2001/11/16 09:08:05 jlam Exp $ + +--- src/tools/qdir_unix.cpp.orig Wed Jun 13 04:53:47 2001 ++++ src/tools/qdir_unix.cpp +@@ -95,13 +95,39 @@ + + bool QDir::mkdir( const QString &dirName, bool acceptAbsPath ) const + { +- return MKDIR( QFile::encodeName(filePath(dirName,acceptAbsPath)), 0777 ) ++ // Remove trailing slashes from the directory name. ++ QString tmp = QFile::encodeName(filePath(dirName,acceptAbsPath)); ++ int pos = tmp.length(); ++ if (pos > 0) { ++ while ( (pos - 1) >= 0 && tmp[pos - 1] == '/' ) { ++ --pos; ++ }; ++ if ( pos == 0 ) { ++ tmp = QDir::rootDirPath(); ++ } else { ++ tmp.truncate( pos ); ++ } ++ } ++ return MKDIR( tmp, 0777 ) + == 0; + } + + bool QDir::rmdir( const QString &dirName, bool acceptAbsPath ) const + { +- return RMDIR( QFile::encodeName(filePath(dirName,acceptAbsPath)) ) == 0; ++ // Remove trailing slashes from the directory name. ++ QString tmp = QFile::encodeName(filePath(dirName,acceptAbsPath)); ++ int pos = tmp.length(); ++ if (pos > 0) { ++ while ( (pos - 1) >= 0 && tmp[pos - 1] == '/' ) { ++ --pos; ++ }; ++ if ( pos == 0 ) { ++ tmp = QDir::rootDirPath(); ++ } else { ++ tmp.truncate( pos ); ++ } ++ } ++ return RMDIR( tmp ) == 0; + } + + bool QDir::isReadable() const |