summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2007-08-04 00:02:35 +0000
committerjoerg <joerg@pkgsrc.org>2007-08-04 00:02:35 +0000
commitb4c28793a362b3befc29890d9146a1fa6b2e31d1 (patch)
tree0ba400d27cd07e29982e86b8ea55b920cc711e99 /x11
parent5a4f6849f1ecfcc2b72224203b04d1ce95434cfe (diff)
downloadpkgsrc-b4c28793a362b3befc29890d9146a1fa6b2e31d1.tar.gz
Fixes for DragonFly.
Diffstat (limited to 'x11')
-rw-r--r--x11/qt4-libs/distinfo3
-rw-r--r--x11/qt4-libs/patches/patch-am16
-rw-r--r--x11/qt4-libs/patches/patch-an13
3 files changed, 31 insertions, 1 deletions
diff --git a/x11/qt4-libs/distinfo b/x11/qt4-libs/distinfo
index 99421adbdaa..b9d11b0f80d 100644
--- a/x11/qt4-libs/distinfo
+++ b/x11/qt4-libs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2007/07/28 07:37:51 adam Exp $
+$NetBSD: distinfo,v 1.11 2007/08/04 00:02:35 joerg Exp $
SHA1 (qt-x11-opensource-src-4.3.0.tar.gz) = e433cf5482f24e81fa0b83bd1ed9a9c0abeb6ea4
RMD160 (qt-x11-opensource-src-4.3.0.tar.gz) = 2106dd8dda7a5b16305ba701e33c17e9349fddc3
@@ -15,3 +15,4 @@ SHA1 (patch-ai) = b15936b85b2b1946e8c9a92bf393c3d3a1fc6950
SHA1 (patch-aj) = 7e8528c6ab1bad239142464b49ee073939a868b0
SHA1 (patch-ak) = 16eef0675a63da937637c8fc654664f1cb155d18
SHA1 (patch-al) = a46ad5c1236d8a63900faaca62b13827b9c1c08e
+SHA1 (patch-am) = a360456b2ce150d00643640db821c31ee77adc3a
diff --git a/x11/qt4-libs/patches/patch-am b/x11/qt4-libs/patches/patch-am
new file mode 100644
index 00000000000..7c232661058
--- /dev/null
+++ b/x11/qt4-libs/patches/patch-am
@@ -0,0 +1,16 @@
+$NetBSD: patch-am,v 1.3 2007/08/04 00:02:35 joerg Exp $
+
+--- src/corelib/io/qfsfileengine_iterator_unix.cpp.orig 2007-08-03 22:54:41.000000000 +0000
++++ src/corelib/io/qfsfileengine_iterator_unix.cpp
+@@ -99,7 +99,11 @@ bool QFSFileEngineIterator::hasNext() co
+ // ### Race condition; we should use fpathconf and dirfd().
+ long maxPathName = ::pathconf(QFile::encodeName(path()).data(), _PC_NAME_MAX);
+ if (maxPathName == -1)
++#ifdef NAME_MAX
++ maxPathName = (sizeof(dirent) + NAME_MAX + 1);
++#else
+ maxPathName = (sizeof(dirent) + MAXNAMLEN + 1);
++#endif
+ #if defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_CYGWIN)
+ if (that->platform->mt_file)
+ delete [] that->platform->mt_file;
diff --git a/x11/qt4-libs/patches/patch-an b/x11/qt4-libs/patches/patch-an
new file mode 100644
index 00000000000..10535f4517c
--- /dev/null
+++ b/x11/qt4-libs/patches/patch-an
@@ -0,0 +1,13 @@
+$NetBSD: patch-an,v 1.1 2007/08/04 00:02:36 joerg Exp $
+
+--- src/script/qscriptlexer.cpp.orig 2007-08-03 23:04:51.000000000 +0000
++++ src/script/qscriptlexer.cpp
+@@ -683,7 +683,7 @@ int QScript::Lexer::lex()
+
+ double dval = 0;
+ if (state == Number) {
+-#if defined(Q_WS_WIN) || defined(Q_OS_SOLARIS) || defined(Q_OS_IRIX) || defined(Q_CC_HPACC) || defined(Q_OS_AIX) || defined(Q_OS_OPENBSD)
++#if defined(Q_WS_WIN) || defined(Q_OS_SOLARIS) || defined(Q_OS_IRIX) || defined(Q_CC_HPACC) || defined(Q_OS_AIX) || defined(Q_OS_OPENBSD) || defined(__DragonFly__)
+ // ### This may cause autotest failure, but that's just plain weird...
+ dval = strtod(buffer8, 0L);
+ #else