From owner-svn-ports-all@freebsd.org Fri Jan 19 22:57:08 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2F486ECDAB5; Fri, 19 Jan 2018 22:57:08 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0B7347AF0D; Fri, 19 Jan 2018 22:57:08 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 60D6613D90; Fri, 19 Jan 2018 22:57:07 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0JMv7CL058131; Fri, 19 Jan 2018 22:57:07 GMT (envelope-from adridg@FreeBSD.org) Received: (from adridg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0JMv7fv058129; Fri, 19 Jan 2018 22:57:07 GMT (envelope-from adridg@FreeBSD.org) Message-Id: <201801192257.w0JMv7fv058129@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adridg set sender to adridg@FreeBSD.org using -f From: Adriaan de Groot Date: Fri, 19 Jan 2018 22:57:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r459481 - in head/textproc/qt4-clucene: . files X-SVN-Group: ports-head X-SVN-Commit-Author: adridg X-SVN-Commit-Paths: in head/textproc/qt4-clucene: . files X-SVN-Commit-Revision: 459481 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 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: Fri, 19 Jan 2018 22:57:08 -0000 Author: adridg Date: Fri Jan 19 22:57:06 2018 New Revision: 459481 URL: https://svnweb.freebsd.org/changeset/ports/459481 Log: Fix build of textproc/qt4-clucene on aarch64. The error message is similar to a lot of the recent clang6 fixes, but doesn't show up on amd64: ../../../../src/3rdparty/clucene/src/CLucene/queryParser/Lexer.cpp:120:23: error: non-constant -expression cannot be narrowed from type 'int' to 'wchar_t' in initializer list [-Wc++11-narrowing] This only becomes visible now that Qt4 atomics are fixed on aarch64 and the build gets to this point. Bump PORTREVISION to be on the safe side: it's a code change, after all. Approved by: tcberner (mentor) Differential Revision: https://reviews.freebsd.org/D13991 Added: head/textproc/qt4-clucene/files/patch-src_3rdparty_clucene_src_CLucene_queryParser_Lexer.cpp (contents, props changed) Modified: head/textproc/qt4-clucene/Makefile Modified: head/textproc/qt4-clucene/Makefile ============================================================================== --- head/textproc/qt4-clucene/Makefile Fri Jan 19 22:54:20 2018 (r459480) +++ head/textproc/qt4-clucene/Makefile Fri Jan 19 22:57:06 2018 (r459481) @@ -3,7 +3,7 @@ PORTNAME= clucene DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc PKGNAMEPREFIX= qt4- Added: head/textproc/qt4-clucene/files/patch-src_3rdparty_clucene_src_CLucene_queryParser_Lexer.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/qt4-clucene/files/patch-src_3rdparty_clucene_src_CLucene_queryParser_Lexer.cpp Fri Jan 19 22:57:06 2018 (r459481) @@ -0,0 +1,11 @@ +--- src/3rdparty/clucene/src/CLucene/queryParser/Lexer.cpp.orig 2018-01-19 16:28:34 UTC ++++ src/3rdparty/clucene/src/CLucene/queryParser/Lexer.cpp +@@ -117,7 +117,7 @@ bool Lexer::GetNextToken(QueryToken* tok + if( _istspace(ch)!=0 ) { + continue; + } +- TCHAR buf[2] = {ch,'\0'}; ++ TCHAR buf[2] = {static_cast(ch),'\0'}; + switch(ch) { + case '+': + token->set(buf, QueryToken::PLUS);