pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11/qt4-libs Include pthread.h before including pthrea...
details: https://anonhg.NetBSD.org/pkgsrc/rev/915c69fb946d
branches: trunk
changeset: 547471:915c69fb946d
user: joerg <joerg%pkgsrc.org@localhost>
date: Wed Sep 17 12:23:01 2008 +0000
description:
Include pthread.h before including pthread_np.h.
>From Hasso Tepper in PR 39268.
diffstat:
x11/qt4-libs/distinfo | 4 ++--
x11/qt4-libs/patches/patch-at | 20 ++++++++++++++++----
2 files changed, 18 insertions(+), 6 deletions(-)
diffs (43 lines):
diff -r e65b97aa939c -r 915c69fb946d x11/qt4-libs/distinfo
--- a/x11/qt4-libs/distinfo Wed Sep 17 12:01:34 2008 +0000
+++ b/x11/qt4-libs/distinfo Wed Sep 17 12:23:01 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.23 2008/07/24 12:55:20 markd Exp $
+$NetBSD: distinfo,v 1.24 2008/09/17 12:23:01 joerg Exp $
SHA1 (qt-x11-opensource-src-4.4.0.tar.bz2) = 71acc53f5ec7bdc6abbc85409568d0d006a040e3
RMD160 (qt-x11-opensource-src-4.4.0.tar.bz2) = ddcfe3390e65761a45a6112a8466b3b1e22cc584
@@ -21,4 +21,4 @@
SHA1 (patch-aq) = b26e4a3e099bc4710728e30972ad1d74e05964f4
SHA1 (patch-ar) = d690a582dd3dfb16fe17938c77a01940df1e7c8f
SHA1 (patch-as) = 614250b087b195c38979f6aa9c000d3d742f544e
-SHA1 (patch-at) = a3b0a81abef7a209cd6a71322eff6771bf0f9c2e
+SHA1 (patch-at) = c8c818dcf45822c8510568bc738b819493f38b11
diff -r e65b97aa939c -r 915c69fb946d x11/qt4-libs/patches/patch-at
--- a/x11/qt4-libs/patches/patch-at Wed Sep 17 12:01:34 2008 +0000
+++ b/x11/qt4-libs/patches/patch-at Wed Sep 17 12:23:01 2008 +0000
@@ -1,8 +1,20 @@
-$NetBSD: patch-at,v 1.1 2008/07/24 12:55:20 markd Exp $
+$NetBSD: patch-at,v 1.2 2008/09/17 12:23:01 joerg Exp $
---- ./src/3rdparty/webkit/JavaScriptCore/kjs/collector.cpp.orig 2008-04-29 01:11:16.000000000 +1200
-+++ ./src/3rdparty/webkit/JavaScriptCore/kjs/collector.cpp
-@@ -347,7 +347,7 @@ static inline void* currentThreadStackBa
+--- src/3rdparty/webkit/JavaScriptCore/kjs/collector.cpp.orig 2008-04-28 15:11:16.000000000 +0200
++++ src/3rdparty/webkit/JavaScriptCore/kjs/collector.cpp
+@@ -72,10 +72,9 @@ extern int *__libc_stack_end;
+ #include <thread.h>
+ #endif
+
++#include <pthread.h>
+ #if HAVE(PTHREAD_NP_H)
+ #include <pthread_np.h>
+-#else
+-#include <pthread.h>
+ #endif
+
+ #endif
+@@ -347,7 +346,7 @@ static inline void* currentThreadStackBa
if (stackBase == 0 || thread != stackThread) {
pthread_attr_t sattr;
pthread_attr_init(&sattr);
Home |
Main Index |
Thread Index |
Old Index