aboutsummaryrefslogtreecommitdiff
path: root/textproc/qt4-clucene
diff options
context:
space:
mode:
authorRaphael Kubo da Costa <rakuco@FreeBSD.org>2012-07-19 17:39:10 +0000
committerRaphael Kubo da Costa <rakuco@FreeBSD.org>2012-07-19 17:39:10 +0000
commit64c8e0c6ab181452d66ae2e4487040d76880441e (patch)
treeec7052d3bf3fdf4558a4a97f1d19b8ec57ded9d9 /textproc/qt4-clucene
parent7c5c5a4ee3100347c8e206d5400853ba57980219 (diff)
Apply patch to make the port build with libc++.
libc++'s cwchar header introduces an ambiguity with clang that makes a few different versions of wcschr() be found. Talking to theraven@ it looks like a problem in the C++ standard itself, so there is not much more to do other than working around the issue with this patch. Since the clucene copy in Qt is old and has no maintainer, there is not much value in committing this upstream, even though it may be worth a try in the future. No PORTREVISION bump, as users of libstdc++ are not affected, and no dependencies have been changed. PR: ports/169872 Submitted by: Jan Beich <jbeich@tormail.org>
Notes
Notes: svn path=/head/; revision=301174
Diffstat (limited to 'textproc/qt4-clucene')
-rw-r--r--textproc/qt4-clucene/files/patch-src__3rdparty__clucene__src__CLucene__search__FieldCacheImpl.cpp11
1 files changed, 11 insertions, 0 deletions
diff --git a/textproc/qt4-clucene/files/patch-src__3rdparty__clucene__src__CLucene__search__FieldCacheImpl.cpp b/textproc/qt4-clucene/files/patch-src__3rdparty__clucene__src__CLucene__search__FieldCacheImpl.cpp
new file mode 100644
index 000000000000..1e6b73d69a4e
--- /dev/null
+++ b/textproc/qt4-clucene/files/patch-src__3rdparty__clucene__src__CLucene__search__FieldCacheImpl.cpp
@@ -0,0 +1,11 @@
+--- src/3rdparty/clucene/src/CLucene/search/FieldCacheImpl.cpp~
++++ src/3rdparty/clucene/src/CLucene/search/FieldCacheImpl.cpp
+@@ -11,6 +11,8 @@ CL_NS_USE(util)
+ CL_NS_USE(index)
+ CL_NS_DEF(search)
+
++using ::wcschr;
++
+ FieldCacheImpl::FieldCacheImpl():
+ cache(false,true){
+ }