From owner-svn-ports-branches@freebsd.org Thu Jan 19 05:25:17 2017 Return-Path: Delivered-To: svn-ports-branches@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 77989CB73DC; Thu, 19 Jan 2017 05:25:17 +0000 (UTC) (envelope-from jbeich@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 mx1.freebsd.org (Postfix) with ESMTPS id 2BCEC1B2C; Thu, 19 Jan 2017 05:25:17 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0J5PGl0044550; Thu, 19 Jan 2017 05:25:16 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0J5PG57044547; Thu, 19 Jan 2017 05:25:16 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201701190525.v0J5PG57044547@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 19 Jan 2017 05:25:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431847 - in branches/2017Q1/devel/qt4-linguist: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Jan 2017 05:25:17 -0000 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 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; + } + }