svn commit: r431792 - in head/devel/qt4-linguist: . files
Jan Beich
jbeich at FreeBSD.org
Wed Jan 18 11:53:58 UTC 2017
Author: jbeich
Date: Wed Jan 18 11:53:56 2017
New Revision: 431792
URL: https://svnweb.freebsd.org/changeset/ports/431792
Log:
devel/qt4-linguist: unbreak with clang 4.0
messagemodel.cpp:186:61: error: ordered comparison between pointer and zero ('MessageItem *' and 'int')
if (c->findMessage(m->text(), m->comment()) >= 0)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~
PR: 216051
Submitted by: Adriaan de Groot <groot at kde.org>
Obtained from: upstream (Qt5)
Approved by: kde (tcberner)
MFH: 2017Q1 (changes behavior)
Differential Revision: https://reviews.freebsd.org/D9184
Added:
head/devel/qt4-linguist/files/patch-tools_linguist_linguist_messagemodel.cpp (contents, props changed)
Modified:
head/devel/qt4-linguist/Makefile (contents, props changed)
Modified: head/devel/qt4-linguist/Makefile
==============================================================================
--- head/devel/qt4-linguist/Makefile Wed Jan 18 11:40:35 2017 (r431791)
+++ head/devel/qt4-linguist/Makefile Wed Jan 18 11:53:56 2017 (r431792)
@@ -3,6 +3,7 @@
PORTNAME= linguist
DISTVERSION= ${QT4_VERSION}
+PORTREVISION= 1
CATEGORIES= devel
PKGNAMEPREFIX= qt4-
Added: head/devel/qt4-linguist/files/patch-tools_linguist_linguist_messagemodel.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/qt4-linguist/files/patch-tools_linguist_linguist_messagemodel.cpp Wed Jan 18 11:53:56 2017 (r431792)
@@ -0,0 +1,14 @@
+Fix bogus pointer comparison. Backport of upstream commit
+https://github.com/qt/qttools/commit/7138c963f9d1258bc1b49cb4d63c3e2b7d0ccfda
+
+--- tools/linguist/linguist/messagemodel.cpp.orig 2015-05-07 14:14:39 UTC
++++ tools/linguist/linguist/messagemodel.cpp
+@@ -183,7 +183,7 @@ static int calcMergeScore(const DataMode
+ if (ContextItem *c = one->findContext(oc->context())) {
+ for (int j = 0; j < oc->messageCount(); ++j) {
+ MessageItem *m = oc->messageItem(j);
+- if (c->findMessage(m->text(), m->comment()) >= 0)
++ if (c->findMessage(m->text(), m->comment()))
+ ++inBoth;
+ }
+ }
More information about the svn-ports-all
mailing list