D9184.id.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D9184.id.diff
View Options

	Index: head/devel/qt4-linguist/Makefile
	===================================================================
	--- head/devel/qt4-linguist/Makefile
	+++ head/devel/qt4-linguist/Makefile
	@@ -3,6 +3,7 @@

	PORTNAME= linguist
	DISTVERSION= ${QT4_VERSION}
	+PORTREVISION= 1
	CATEGORIES= devel
	PKGNAMEPREFIX= qt4-

	Index: head/devel/qt4-linguist/files/patch-tools_linguist_linguist_messagemodel.cpp
	===================================================================
	--- head/devel/qt4-linguist/files/patch-tools_linguist_linguist_messagemodel.cpp
	+++ 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;
	+ }
	+ }