pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11/qt5-qtbase Explicitly include unistd.h for getconf...
details: https://anonhg.NetBSD.org/pkgsrc/rev/c654a62edc83
branches: trunk
changeset: 627893:c654a62edc83
user: joerg <joerg%pkgsrc.org@localhost>
date: Tue Dec 17 23:22:35 2013 +0000
description:
Explicitly include unistd.h for getconf defines.
diffstat:
x11/qt5-qtbase/distinfo | 4 +-
x11/qt5-qtbase/patches/patch-qtwebkit_Source_WTF_wtf_NumberOfCores.cpp | 16 +++++++--
2 files changed, 14 insertions(+), 6 deletions(-)
diffs (52 lines):
diff -r 5a3ecce7b242 -r c654a62edc83 x11/qt5-qtbase/distinfo
--- a/x11/qt5-qtbase/distinfo Tue Dec 17 19:10:11 2013 +0000
+++ b/x11/qt5-qtbase/distinfo Tue Dec 17 23:22:35 2013 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2013/12/15 19:51:19 joerg Exp $
+$NetBSD: distinfo,v 1.4 2013/12/17 23:22:35 joerg Exp $
SHA1 (qt-everywhere-opensource-src-5.2.0.tar.xz) = 7d9d8cad4434bc200d9ed87b3c7cb39654a2f1b4
RMD160 (qt-everywhere-opensource-src-5.2.0.tar.xz) = b2dd68f622fa7ff271ef621a7c7f17f2ecf7be9d
@@ -57,7 +57,7 @@
SHA1 (patch-qtwebkit_Source_WTF_WTF.pro) = 1273b662feaa30ba42cefc1f11fb8854e11405a9
SHA1 (patch-qtwebkit_Source_WTF_wtf_Assertions.cpp) = b56a5cf3a7f03976f78b7eeac801571aa4fa9142
SHA1 (patch-qtwebkit_Source_WTF_wtf_InlineASM.h) = f66cfe90357638d868f4c55bd3628305774bdc99
-SHA1 (patch-qtwebkit_Source_WTF_wtf_NumberOfCores.cpp) = 10c91530cb3d0bcf7dfd733224f92f768596da04
+SHA1 (patch-qtwebkit_Source_WTF_wtf_NumberOfCores.cpp) = b17efd2ba90f28f0184ab5f3f9ef69a72be3ac0f
SHA1 (patch-qtwebkit_Source_WTF_wtf_Platform.h) = a999f608962affebc99f55d93cede5a180b542a9
SHA1 (patch-qtwebkit_Source_WTF_wtf_RAMSize.cpp) = 4e7412a8eba669bdec436458229a998e782bedd3
SHA1 (patch-qtwebkit_Source_WTF_wtf_ThreadIdentifierDataPthreads.cpp) = 5d5a21dd636f0667219af916990740883478b651
diff -r 5a3ecce7b242 -r c654a62edc83 x11/qt5-qtbase/patches/patch-qtwebkit_Source_WTF_wtf_NumberOfCores.cpp
--- a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_WTF_wtf_NumberOfCores.cpp Tue Dec 17 19:10:11 2013 +0000
+++ b/x11/qt5-qtbase/patches/patch-qtwebkit_Source_WTF_wtf_NumberOfCores.cpp Tue Dec 17 23:22:35 2013 +0000
@@ -1,10 +1,18 @@
-$NetBSD: patch-qtwebkit_Source_WTF_wtf_NumberOfCores.cpp,v 1.1 2013/12/13 14:38:35 ryoon Exp $
+$NetBSD: patch-qtwebkit_Source_WTF_wtf_NumberOfCores.cpp,v 1.2 2013/12/17 23:22:35 joerg Exp $
* Add NetBSD support
---- qtwebkit/Source/WTF/wtf/NumberOfCores.cpp.orig 2013-11-27 01:01:21.000000000 +0000
+--- qtwebkit/Source/WTF/wtf/NumberOfCores.cpp.orig 2013-12-08 17:09:59.000000000 +0000
+++ qtwebkit/Source/WTF/wtf/NumberOfCores.cpp
-@@ -50,7 +50,7 @@ int numberOfProcessorCores()
+@@ -32,6 +32,7 @@
+ // data types defined in the former. See sysctl(3) and style(9).
+ #include <sys/types.h>
+ #include <sys/sysctl.h>
++#include <unistd.h>
+ #elif OS(LINUX) || OS(AIX) || OS(SOLARIS)
+ #include <unistd.h>
+ #elif OS(WINDOWS)
+@@ -50,7 +51,7 @@ int numberOfProcessorCores()
if (s_numberOfCores > 0)
return s_numberOfCores;
@@ -13,7 +21,7 @@
unsigned result;
size_t length = sizeof(result);
int name[] = {
-@@ -60,7 +60,7 @@ int numberOfProcessorCores()
+@@ -60,7 +61,7 @@ int numberOfProcessorCores()
int sysctlResult = sysctl(name, sizeof(name) / sizeof(int), &result, &length, 0, 0);
s_numberOfCores = sysctlResult < 0 ? defaultIfUnavailable : result;
Home |
Main Index |
Thread Index |
Old Index