svn commit: r431847 - in branches/2017Q1/devel/qt4-linguist: . files

[Jan Beich]

Author: jbeich
Date: Thu Jan 19 05:25:15 2017
New Revision: 431847
URL: https://svnweb.freebsd.org/changeset/ports/431847

Log:
  MFH: r431792
  
  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)
  Approved by:	ports-secteam (junovitch)
  Differential Revision:	https://reviews.freebsd.org/D9184

Added:
  branches/2017Q1/devel/qt4-linguist/files/patch-tools_linguist_linguist_messagemodel.cpp
     - copied unchanged from r431792, head/devel/qt4-linguist/files/patch-tools_linguist_linguist_messagemodel.cpp
Modified:
  branches/2017Q1/devel/qt4-linguist/Makefile
Directory Properties:
  branches/2017Q1/   (props changed)

Modified: branches/2017Q1/devel/qt4-linguist/Makefile
==============================================================================
--- branches/2017Q1/devel/qt4-linguist/Makefile	Thu Jan 19 05:23:15 2017	(r431846)
+++ branches/2017Q1/devel/qt4-linguist/Makefile	Thu Jan 19 05:25:15 2017	(r431847)
@@ -3,6 +3,7 @@
 
 PORTNAME=	linguist
 DISTVERSION=	${QT4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt4-
 

Copied: branches/2017Q1/devel/qt4-linguist/files/patch-tools_linguist_linguist_messagemodel.cpp (from r431792, head/devel/qt4-linguist/files/patch-tools_linguist_linguist_messagemodel.cpp)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2017Q1/devel/qt4-linguist/files/patch-tools_linguist_linguist_messagemodel.cpp	Thu Jan 19 05:25:15 2017	(r431847, copy of r431792, head/devel/qt4-linguist/files/patch-tools_linguist_linguist_messagemodel.cpp)
@@ -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;
+             }
+         }