svn commit: r459481 - in head/textproc/qt4-clucene: . files
Adriaan de Groot
adridg at FreeBSD.org
Fri Jan 19 22:57:08 UTC 2018
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<TCHAR>(ch),'\0'};
+ switch(ch) {
+ case '+':
+ token->set(buf, QueryToken::PLUS);
More information about the svn-ports-all
mailing list