Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs
In directory vz-cvs-3.sog:/tmp/cvs-serv28197
Modified Files:
qt4-base-mac.info qt4-base-x11.info qt4-base.patch
Log Message:
apply possible fix for QProcess spawning failures (good find, Snaggle!)
(WorksForMe(tm))
Index: qt4-base.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/qt4-base.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- qt4-base.patch 8 Jul 2011 02:45:18 -0000 1.2
+++ qt4-base.patch 25 Feb 2012 14:25:05 -0000 1.3
@@ -49,6 +49,25 @@
QMAKE_FIX_RPATH = install_name_tool -id
QMAKE_LIBS_DYNLOAD =
+diff -Nurd qt-kde-qt-mac/src/corelib/kernel/qcore_unix.cpp
qt-kde-qt-mac-new/src/corelib/kernel/qcore_unix.cpp
+--- qt-kde-qt-mac/src/corelib/kernel/qcore_unix.cpp 2011-05-08
23:25:04.000000000 -0400
++++ qt-kde-qt-mac-new/src/corelib/kernel/qcore_unix.cpp 2012-02-25
07:32:43.000000000 -0500
+@@ -58,12 +58,9 @@
+ static inline bool time_update(struct timeval *tv, const struct timeval
&start,
+ const struct timeval &timeout)
+ {
+- if (!QElapsedTimer::isMonotonic()) {
+- // we cannot recalculate the timeout without a monotonic clock as the
time may have changed
+- return false;
+- }
+-
+- // clock source is monotonic, so we can recalculate how much timeout is
left
++ // We don't check for a monotonic clock, because on systems without
++ // one, that would make qt_safe_select() return 0 to fake a timeout
++ // on EINTR.
+ struct timeval now = qt_gettime();
+ *tv = timeout + start - now;
+ return tv->tv_sec >= 0;
diff -Nurd qt-kde-qt-mac/tools/assistant/tools/assistant/assistant.pro
qt-kde-qt-mac-new/tools/assistant/tools/assistant/assistant.pro
--- qt-kde-qt-mac/tools/assistant/tools/assistant/assistant.pro
2010-12-27 15:21:54.000000000 -0500
+++ qt-kde-qt-mac-new/tools/assistant/tools/assistant/assistant.pro
2011-07-07 14:44:15.000000000 -0400
Index: qt4-base-mac.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/qt4-base-mac.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- qt4-base-mac.info 8 Jul 2011 02:45:18 -0000 1.3
+++ qt4-base-mac.info 25 Feb 2012 14:25:05 -0000 1.4
@@ -1,7 +1,7 @@
Info4: <<
Package: qt4-base-mac
Version: 4.7.3
-Revision: 2
+Revision: 3
Description: Cross-Platform framework (%type_pkg[qt])
Type: qt (mac)
License: LGPL
@@ -70,7 +70,7 @@
perl -pi -e 's,CFG_MAC_XARCH=auto,CFG_MAC_XARCH=no,g' configure
<<
PatchFile: qt4-base.patch
-PatchFile-MD5: ac6ba07393f4e001076db6f64ddd2d70
+PatchFile-MD5: ceb27ddd19fe3f245700b664b0f610ab
NoSetLDFLAGS: true
UseMaxBuildJobs: true
@@ -822,5 +822,9 @@
make
<<
DescPackaging: This package is dedicated to Boo Fulbright.
+DescPort: <<
+ Fix QProcess timeout (thanks for no monotonic clock, apple!).
+ See: https://bugreports.qt-project.org/browse/QTBUG-22301
+<<
<<
Index: qt4-base-x11.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/qt4-base-x11.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- qt4-base-x11.info 8 Jul 2011 02:45:18 -0000 1.4
+++ qt4-base-x11.info 25 Feb 2012 14:25:05 -0000 1.5
@@ -1,7 +1,7 @@
Info4: <<
Package: qt4-base-x11
Version: 4.7.3
-Revision: 2
+Revision: 3
Description: Cross-Platform framework (%type_pkg[qt])
Type: qt (x11)
License: LGPL
@@ -74,7 +74,7 @@
perl -pi -e 's,CFG_MAC_XARCH=auto,CFG_MAC_XARCH=no,g' configure
<<
PatchFile: qt4-base.patch
-PatchFile-MD5: ac6ba07393f4e001076db6f64ddd2d70
+PatchFile-MD5: ceb27ddd19fe3f245700b664b0f610ab
NoSetLDFLAGS: true
UseMaxBuildJobs: true
@@ -694,5 +694,9 @@
make
<<
DescPackaging: This package is dedicated to Boo Fulbright.
+DescPort: <<
+ Fix QProcess timeout (thanks for no monotonic clock, apple!).
+ See: https://bugreports.qt-project.org/browse/QTBUG-22301
+<<
<<
------------------------------------------------------------------------------
Virtualization & Cloud Management Using Capacity Planning
Cloud computing makes use of virtualization - but cloud computing
also focuses on allowing computing to be delivered as a service.
http://www.accelacomm.com/jaw/sfnl/114/51521223/
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
