From owner-svn-ports-all@FreeBSD.ORG Thu Jul 19 17:39:10 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C19A8106566C; Thu, 19 Jul 2012 17:39:10 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id ABF728FC14; Thu, 19 Jul 2012 17:39:10 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6JHdA8U004299; Thu, 19 Jul 2012 17:39:10 GMT (envelope-from rakuco@svn.freebsd.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6JHdA0c004296; Thu, 19 Jul 2012 17:39:10 GMT (envelope-from rakuco@svn.freebsd.org) Message-Id: <201207191739.q6JHdA0c004296@svn.freebsd.org> From: Raphael Kubo da Costa Date: Thu, 19 Jul 2012 17:39:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r301174 - head/textproc/qt4-clucene/files X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Jul 2012 17:39:10 -0000 Author: rakuco Date: Thu Jul 19 17:39:10 2012 New Revision: 301174 URL: http://svn.freebsd.org/changeset/ports/301174 Log: 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 Added: head/textproc/qt4-clucene/files/ head/textproc/qt4-clucene/files/patch-src__3rdparty__clucene__src__CLucene__search__FieldCacheImpl.cpp (contents, props changed) Added: head/textproc/qt4-clucene/files/patch-src__3rdparty__clucene__src__CLucene__search__FieldCacheImpl.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/qt4-clucene/files/patch-src__3rdparty__clucene__src__CLucene__search__FieldCacheImpl.cpp Thu Jul 19 17:39:10 2012 (r301174) @@ -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){ + }