cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qhull steals tricks from qt4, along with portability bugs.

Browse Source 
use the same trick as qt4 to fix it.
This commit is contained in:
espie 2017-04-27 20:46:17 +00:00
parent db4d656061
commit c9ae8ec27e
2 changed files with 47 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
math/qhull/patches/patch-src_libqhullcpp_QhullIterator_h Normal file
View File

@ -0,0 +1,23 @@
$OpenBSD: patch-src_libqhullcpp_QhullIterator_h,v 1.1 2017/04/27 20:46:17 espie Exp $
--- src/libqhullcpp/QhullIterator.h.orig Thu Apr 27 22:36:05 2017
+++ src/libqhullcpp/QhullIterator.h Thu Apr 27 22:37:44 2017
@@ -16,8 +16,19 @@ extern "C" {
#include <assert.h>
#include <string>
#include <vector>
+#if defined(_LIBCPP_VERSION)
+// shut up clang
+# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wc++11-extensions"
+_LIBCPP_BEGIN_NAMESPACE_STD
+ struct bidirectional_iterator_tag;
+ struct random_access_iterator_tag;
+_LIBCPP_END_NAMESPACE_STD
+# pragma GCC diagnostic pop
+#else
//! Avoid dependence on <iterator>
namespace std { struct bidirectional_iterator_tag; struct random_access_iterator_tag; }
+#endif
namespace orgQhull {

24
math/qhull/patches/patch-src_libqhullcpp_QhullLinkedList_h Normal file
View File

@ -0,0 +1,24 @@
$OpenBSD: patch-src_libqhullcpp_QhullLinkedList_h,v 1.1 2017/04/27 20:46:17 espie Exp $
--- src/libqhullcpp/QhullLinkedList.h.orig Thu Apr 27 22:39:48 2017
+++ src/libqhullcpp/QhullLinkedList.h Thu Apr 27 22:40:55 2017
@@ -9,7 +9,20 @@
#ifndef QHULLLINKEDLIST_H
#define QHULLLINKEDLIST_H
+#include <new>
+#if defined(_LIBCPP_VERSION)
+// shut up clang
+# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wc++11-extensions"
+_LIBCPP_BEGIN_NAMESPACE_STD
+ struct bidirectional_iterator_tag;
+ struct random_access_iterator_tag;
+_LIBCPP_END_NAMESPACE_STD
+# pragma GCC diagnostic pop
+#else
+//! Avoid dependence on <iterator>
namespace std { struct bidirectional_iterator_tag; struct random_access_iterator_tag; }
+#endif
#include "QhullError.h"