Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/libs
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv1807
Modified Files:
qt4-base.patch
Log Message:
add fixes to build on future os
Index: qt4-base.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/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 20 Apr 2012 19:30:36 -0000 1.2
+++ qt4-base.patch 8 Aug 2013 16:12:39 -0000 1.3
@@ -153,3 +153,85 @@
target.path=$$[QT_INSTALL_BINS]
INSTALLS += target
+---
qt-kde-qt-mac/src/3rdparty/javascriptcore/JavaScriptCore/wtf/HashTable.h.orig
2013-08-07 12:25:07.000000000 -0400
++++ qt-kde-qt-mac/src/3rdparty/javascriptcore/JavaScriptCore/wtf/HashTable.h
2013-08-07 12:22:06.000000000 -0400
+@@ -257,8 +257,8 @@
+
+ using std::swap;
+
+-#if !COMPILER(MSVC)
+- // Visual C++ has a swap for pairs defined.
++#if !COMPILER(MSVC) && !OS(QNX) && !defined(_LIBCPP_VERSION)
++ // The Dinkumware C++ library (used by MSVC and QNX) and clang's libc++
have a swap for pairs defined.
+
+ // swap pairs by component, in case of pair members that specialize swap
+ template<typename T, typename U> inline void swap(pair<T, U>& a, pair<T,
U>& b)
+---
qt-kde-qt-mac/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp.orig
2013-08-07 12:22:21.000000000 -0400
++++
qt-kde-qt-mac/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp
2013-08-07 12:23:43.000000000 -0400
+@@ -52,6 +52,8 @@
+ #include <mach/task.h>
+ #include <mach/thread_act.h>
+ #include <mach/vm_map.h>
++// clang's libc++ headers does not pull in pthread.h (but libstdc++ does)
++#include <pthread.h>
+
+ #elif OS(WINDOWS)
+
+--- qt-kde-qt-mac/src/declarative/util/qdeclarativefontloader.cpp.orig
2013-08-07 12:42:40.000000000 -0400
++++ qt-kde-qt-mac/src/declarative/util/qdeclarativefontloader.cpp
2013-08-07 12:43:31.000000000 -0400
+@@ -64,7 +64,7 @@
+ Q_OBJECT
+
+ public:
+- QDeclarativeFontObject(int _id);
++ QDeclarativeFontObject(int _id = -1);
+
+ void download(const QUrl &url, QNetworkAccessManager *manager);
+
+@@ -84,7 +84,7 @@
+ Q_DISABLE_COPY(QDeclarativeFontObject)
+ };
+
+-QDeclarativeFontObject::QDeclarativeFontObject(int _id = -1)
++QDeclarativeFontObject::QDeclarativeFontObject(int _id)
+ : QObject(0), id(_id), reply(0), redirectCount(0) {}
+
+
+--- qt-kde-qt-mac/src/corelib/tools/qiterator.h.orig 2013-08-07
20:08:24.000000000 -0400
++++ qt-kde-qt-mac/src/corelib/tools/qiterator.h 2013-08-07
20:08:48.000000000 -0400
+@@ -42,15 +42,11 @@
+ #ifndef QITERATOR_H
+ #define QITERATOR_H
+
++#include <iterator>
+ #include <QtCore/qglobal.h>
+
+ QT_BEGIN_HEADER
+
+-namespace std {
+- struct bidirectional_iterator_tag;
+- struct random_access_iterator_tag;
+-}
+-
+ QT_BEGIN_NAMESPACE
+
+ QT_MODULE(Core)
+--- qt-kde-qt-mac/src/3rdparty/clucene/src/CLucene/StdHeader.h.orig
2013-08-07 20:24:16.000000000 -0400
++++ qt-kde-qt-mac/src/3rdparty/clucene/src/CLucene/StdHeader.h 2013-08-07
20:26:02.000000000 -0400
+@@ -463,8 +463,16 @@
+
+ //use std namespace
+ #ifndef LUCENE_NO_STDC_NAMESPACE
++#ifdef _LIBCPP_VERSION
++// clang's libc++ pulls in cwchar, clucene pulls in wchar.h and the entire std
++// namespace which causes ambiguity between ::wcschar() and std::wcschar(),
but
++// clucene is only using std::min() and std::max()
++using std::min;
++using std::max;
++#else
+ using namespace std;
+ #endif
++#endif
+
+
+ ////////////////////////////////////////////////////////
------------------------------------------------------------------------------
Get 100% visibility into Java/.NET code with AppDynamics Lite!
It's a free troubleshooting tool designed for production.
Get down to code-level detail for bottlenecks, with <2% overhead.
Download for free and get started troubleshooting in minutes.
http://pubads.g.doubleclick.net/gampad/clk?id=48897031&iu=/4140/ostg.clktrk
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
