[pkgsrc/trunk]: pkgsrc/x11/qt4-libs We are forcing an installation on MacOS X...

[schwarz <schwarz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ffbedc0f0fd7
branches:  trunk
changeset: 555348:ffbedc0f0fd7
user:      schwarz <schwarz%pkgsrc.org@localhost>
date:      Sat Feb 28 11:38:01 2009 +0000

description:
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:

 x11/qt4-libs/distinfo         |   3 ++-
 x11/qt4-libs/patches/patch-an |  22 ++++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletions(-)

diffs (43 lines):

diff -r d9379983c6d9 -r ffbedc0f0fd7 x11/qt4-libs/distinfo
--- a/x11/qt4-libs/distinfo     Sat Feb 28 01:22:07 2009 +0000
+++ b/x11/qt4-libs/distinfo     Sat Feb 28 11:38:01 2009 +0000
@@ -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-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 -r d9379983c6d9 -r ffbedc0f0fd7 x11/qt4-libs/patches/patch-an
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/qt4-libs/patches/patch-an     Sat Feb 28 11:38:01 2009 +0000
@@ -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()
+ {