Sat Feb 28 11:38:02 2009 UTC ()
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.


(schwarz)
diff -r1.27 -r1.28 pkgsrc/x11/qt4-libs/distinfo
diff -r0 -r1.5 pkgsrc/x11/qt4-libs/patches/patch-an
cvs diff -r1.27 -r1.28 pkgsrc/x11/qt4-libs/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/distinfo 2009/02/11 17:41:38 1.27
+++ pkgsrc/x11/qt4-libs/distinfo 2009/02/28 11:38:01 1.28
@@ -1,25 +1,26 @@ @@ -1,25 +1,26 @@
1$NetBSD: distinfo,v 1.27 2009/02/11 17:41:38 wiz Exp $ 1$NetBSD: distinfo,v 1.28 2009/02/28 11:38:01 schwarz Exp $
2 2
3SHA1 (qt-x11-opensource-src-4.4.3.tar.bz2) = 099bcc2dfda73f093f7e80e9004114d41db40b51 3SHA1 (qt-x11-opensource-src-4.4.3.tar.bz2) = 099bcc2dfda73f093f7e80e9004114d41db40b51
4RMD160 (qt-x11-opensource-src-4.4.3.tar.bz2) = 3c73d9c549523efa0e760965c38c7876b4636861 4RMD160 (qt-x11-opensource-src-4.4.3.tar.bz2) = 3c73d9c549523efa0e760965c38c7876b4636861
5Size (qt-x11-opensource-src-4.4.3.tar.bz2) = 103961247 bytes 5Size (qt-x11-opensource-src-4.4.3.tar.bz2) = 103961247 bytes
6SHA1 (patch-aa) = 7f2bd5a4052e931b1562d02eaa6a9c2966567e37 6SHA1 (patch-aa) = 7f2bd5a4052e931b1562d02eaa6a9c2966567e37
7SHA1 (patch-ab) = 0575619a679ec81a17ede2a39cdaccb938b16fcd 7SHA1 (patch-ab) = 0575619a679ec81a17ede2a39cdaccb938b16fcd
8SHA1 (patch-ac) = baab52ce87e4dcf11ae76b56851e92f58455d94b 8SHA1 (patch-ac) = baab52ce87e4dcf11ae76b56851e92f58455d94b
9SHA1 (patch-ad) = bfa4b61e32b26dac23a33ab29ce68eb62d6f5fb5 9SHA1 (patch-ad) = bfa4b61e32b26dac23a33ab29ce68eb62d6f5fb5
10SHA1 (patch-ae) = a23a2cc4271b5613f59ab5550e9aeccca15573a9 10SHA1 (patch-ae) = a23a2cc4271b5613f59ab5550e9aeccca15573a9
11SHA1 (patch-af) = b43a2e4b92435f9b7a7e5b46821e2943c343a7f4 11SHA1 (patch-af) = b43a2e4b92435f9b7a7e5b46821e2943c343a7f4
12SHA1 (patch-ag) = 0ae6efe5f9283a567bd069779ba36b77fa61006e 12SHA1 (patch-ag) = 0ae6efe5f9283a567bd069779ba36b77fa61006e
13SHA1 (patch-ah) = 62c50fe48b9ff1ce9fb757b432c8b1db7693e112 13SHA1 (patch-ah) = 62c50fe48b9ff1ce9fb757b432c8b1db7693e112
14SHA1 (patch-ai) = b15936b85b2b1946e8c9a92bf393c3d3a1fc6950 14SHA1 (patch-ai) = b15936b85b2b1946e8c9a92bf393c3d3a1fc6950
15SHA1 (patch-aj) = 9d3bbda1523ef1ca3ad25646d6c0457a30c3e203 15SHA1 (patch-aj) = 9d3bbda1523ef1ca3ad25646d6c0457a30c3e203
16SHA1 (patch-ak) = 9aaf62149ec555f990e2216710ba5b88d532224a 16SHA1 (patch-ak) = 9aaf62149ec555f990e2216710ba5b88d532224a
17SHA1 (patch-al) = ae85006d95f8a55521219442cc642dfa4377671c 17SHA1 (patch-al) = ae85006d95f8a55521219442cc642dfa4377671c
18SHA1 (patch-am) = 0d4a4f2767cad5414c8bfe4dc8485064a9be4381 18SHA1 (patch-am) = 0d4a4f2767cad5414c8bfe4dc8485064a9be4381
 19SHA1 (patch-an) = 34c50ed3a7e4e985d372b89dca9453df2f5b40e1
19SHA1 (patch-ao) = e74125f5230db3e1b339c76c06a54470dd0631db 20SHA1 (patch-ao) = e74125f5230db3e1b339c76c06a54470dd0631db
20SHA1 (patch-ap) = 99402ac9ef527e7fa9b1825c8e1b8a299bc4ffe7 21SHA1 (patch-ap) = 99402ac9ef527e7fa9b1825c8e1b8a299bc4ffe7
21SHA1 (patch-aq) = 401bf595bfe3854e36b0260d24be95b712f9d6a2 22SHA1 (patch-aq) = 401bf595bfe3854e36b0260d24be95b712f9d6a2
22SHA1 (patch-ar) = 5bc9a1d384c9a888f1295b87968a09236b48af65 23SHA1 (patch-ar) = 5bc9a1d384c9a888f1295b87968a09236b48af65
23SHA1 (patch-as) = 244a3017e2780270b61ac50af000cd6fd1bb9cf5 24SHA1 (patch-as) = 244a3017e2780270b61ac50af000cd6fd1bb9cf5
24SHA1 (patch-at) = c8c818dcf45822c8510568bc738b819493f38b11 25SHA1 (patch-at) = c8c818dcf45822c8510568bc738b819493f38b11
25SHA1 (patch-au) = 811c582bb0ad252b8b5ae91685109a7410dd662d 26SHA1 (patch-au) = 811c582bb0ad252b8b5ae91685109a7410dd662d
File Added: pkgsrc/x11/qt4-libs/patches/patch-an
$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()
 {