summaryrefslogtreecommitdiff
path: root/x11/qt4-libs
diff options
context:
space:
mode:
authorschwarz <schwarz>2009-02-28 11:38:01 +0000
committerschwarz <schwarz>2009-02-28 11:38:01 +0000
commit6eb167eca29ba2b25ed799b8c3b19a15ff83cebf (patch)
treeed9db0781bac3368407daaf6085f577df3ee5c58 /x11/qt4-libs
parentd7d0f34613f034fc4bfcc505767d2928da208471 (diff)
downloadpkgsrc-6eb167eca29ba2b25ed799b8c3b19a15ff83cebf.tar.gz
We are forcing an installation on MacOS X to behave just like a generic UNIX
installation (cf. patch-ar). However, MacOS X does not have clock_gettime(). This patch therefore ensures that for that functionality the MacOS X specific code is used.
Diffstat (limited to 'x11/qt4-libs')
-rw-r--r--x11/qt4-libs/distinfo3
-rw-r--r--x11/qt4-libs/patches/patch-an22
2 files changed, 24 insertions, 1 deletions
diff --git a/x11/qt4-libs/distinfo b/x11/qt4-libs/distinfo
index 23383653d24..416e4402d30 100644
--- a/x11/qt4-libs/distinfo
+++ b/x11/qt4-libs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.27 2009/02/11 17:41:38 wiz Exp $
+$NetBSD: distinfo,v 1.28 2009/02/28 11:38:01 schwarz Exp $
SHA1 (qt-x11-opensource-src-4.4.3.tar.bz2) = 099bcc2dfda73f093f7e80e9004114d41db40b51
RMD160 (qt-x11-opensource-src-4.4.3.tar.bz2) = 3c73d9c549523efa0e760965c38c7876b4636861
@@ -16,6 +16,7 @@ SHA1 (patch-aj) = 9d3bbda1523ef1ca3ad25646d6c0457a30c3e203
SHA1 (patch-ak) = 9aaf62149ec555f990e2216710ba5b88d532224a
SHA1 (patch-al) = ae85006d95f8a55521219442cc642dfa4377671c
SHA1 (patch-am) = 0d4a4f2767cad5414c8bfe4dc8485064a9be4381
+SHA1 (patch-an) = 34c50ed3a7e4e985d372b89dca9453df2f5b40e1
SHA1 (patch-ao) = e74125f5230db3e1b339c76c06a54470dd0631db
SHA1 (patch-ap) = 99402ac9ef527e7fa9b1825c8e1b8a299bc4ffe7
SHA1 (patch-aq) = 401bf595bfe3854e36b0260d24be95b712f9d6a2
diff --git a/x11/qt4-libs/patches/patch-an b/x11/qt4-libs/patches/patch-an
new file mode 100644
index 00000000000..7668621b118
--- /dev/null
+++ b/x11/qt4-libs/patches/patch-an
@@ -0,0 +1,22 @@
+$NetBSD: patch-an,v 1.5 2009/02/28 11:38:02 schwarz Exp $
+
+--- src/corelib/concurrent/qtconcurrentiteratekernel.cpp.orig 2009-02-15 16:19:07.000000000 +0100
++++ src/corelib/concurrent/qtconcurrentiteratekernel.cpp 2009-02-15 16:21:41.000000000 +0100
+@@ -37,7 +37,7 @@
+
+ #include "qtconcurrentiteratekernel.h"
+
+-#if defined(Q_OS_MAC)
++#if defined(Q_OS_MAC) || defined(__APPLE__)
+
+ #include <mach/mach.h>
+ #include <mach/mach_time.h>
+@@ -64,7 +64,7 @@
+ MedianSize = 7
+ };
+
+-#if defined(Q_OS_MAC)
++#if defined(Q_OS_MAC) || defined(__APPLE__)
+
+ static qint64 getticks()
+ {