Page MenuHomeFreeBSD
Files F136711407

D9184.id24150.diff
No OneTemporary
Actions

D9184.id24150.diff
View Options

Index: devel/qt4-linguist/Makefile
===================================================================
--- devel/qt4-linguist/Makefile
+++ devel/qt4-linguist/Makefile
@@ -3,6 +3,7 @@
PORTNAME= linguist
DISTVERSION= ${QT4_VERSION}
+PORTREVISION= 1
CATEGORIES= devel
PKGNAMEPREFIX= qt4-
Index: devel/qt4-linguist/files/patch-tools__linguist__lrelease__main.cpp
===================================================================
--- devel/qt4-linguist/files/patch-tools__linguist__lrelease__main.cpp
+++ devel/qt4-linguist/files/patch-tools__linguist__lrelease__main.cpp
@@ -1,10 +0,0 @@
---- ./tools/linguist/lrelease/main.cpp.orig 2010-11-06 04:55:12.000000000 +0300
-+++ ./tools/linguist/lrelease/main.cpp 2010-11-11 17:08:48.303472069 +0300
-@@ -45,6 +45,7 @@
- #ifndef QT_BOOTSTRAPPED
- #include <QtCore/QCoreApplication>
- #include <QtCore/QTranslator>
-+#include <QtCore/QLibraryInfo>
- #endif
- #include <QtCore/QDebug>
- #include <QtCore/QDir>
Index: devel/qt4-linguist/files/patch-tools_linguist_linguist_messagemodel.cpp
===================================================================
--- /dev/null
+++ 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;
+ }
+ }
Index: devel/qt4-linguist/files/patch-tools_linguist_lrelease_main.cpp
===================================================================
--- devel/qt4-linguist/files/patch-tools_linguist_lrelease_main.cpp
+++ devel/qt4-linguist/files/patch-tools_linguist_lrelease_main.cpp
@@ -1,6 +1,6 @@
---- ./tools/linguist/lrelease/main.cpp.orig 2010-11-06 04:55:12.000000000 +0300
-+++ ./tools/linguist/lrelease/main.cpp 2010-11-11 17:08:48.303472069 +0300
-@@ -45,6 +45,7 @@
+--- tools/linguist/lrelease/main.cpp.orig 2015-05-07 14:14:39 UTC
++++ tools/linguist/lrelease/main.cpp
+@@ -47,6 +47,7 @@
#ifndef QT_BOOTSTRAPPED
#include <QtCore/QCoreApplication>
#include <QtCore/QTranslator>

File Metadata

Mime Type
text/plain
Expires
Thu, Nov 20, 12:18 AM (14 h, 39 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
25693803
Default Alt Text
D9184.id24150.diff (2 KB)

Event Timeline