| 1 |
hwoarang 09/04/22 11:06:12 |
| 2 |
|
| 3 |
Added: qt-x11-opensource-src-4.5.0-lrelease.patch |
| 4 |
qt-x11-opensource-src-4.5.0-linguist-crash.patch |
| 5 |
Log: |
| 6 |
New revbump for qt-gui. Fixes bug 265878, bug 260244, bug 259414 |
| 7 |
(Portage version: 2.2_rc31/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 x11-libs/qt-gui/files/qt-x11-opensource-src-4.5.0-lrelease.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-gui/files/qt-x11-opensource-src-4.5.0-lrelease.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-gui/files/qt-x11-opensource-src-4.5.0-lrelease.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: qt-x11-opensource-src-4.5.0-lrelease.patch |
| 16 |
=================================================================== |
| 17 |
Index: qt-x11-opensource-src-4.5.0/tools/linguist/lrelease/main.cpp |
| 18 |
=================================================================== |
| 19 |
--- qt-x11-opensource-src-4.5.0.orig/tools/linguist/lrelease/main.cpp |
| 20 |
+++ qt-x11-opensource-src-4.5.0/tools/linguist/lrelease/main.cpp |
| 21 |
@@ -88,6 +88,8 @@ static bool loadTsFile(Translator &tor, |
| 22 |
bool ok = tor.load(tsFileName, cd, QLatin1String("auto")); |
| 23 |
if (!ok) { |
| 24 |
qWarning("lrelease error: %s\n", qPrintable(cd.error())); |
| 25 |
+ // dont fail |
| 26 |
+ ok = true; |
| 27 |
} else { |
| 28 |
if (!cd.errors().isEmpty()) |
| 29 |
printOut(cd.error()); |
| 30 |
@@ -102,7 +104,8 @@ static bool loadTsFile(Translator &tor, |
| 31 |
if (!msg.comment().isEmpty()) |
| 32 |
qWarning("\n* Comment: %s", qPrintable(msg.comment())); |
| 33 |
} |
| 34 |
- ok = false; |
| 35 |
+ // dont fail |
| 36 |
+ //ok = false; |
| 37 |
} |
| 38 |
} |
| 39 |
return ok; |
| 40 |
|
| 41 |
|
| 42 |
|
| 43 |
1.1 x11-libs/qt-gui/files/qt-x11-opensource-src-4.5.0-linguist-crash.patch |
| 44 |
|
| 45 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-gui/files/qt-x11-opensource-src-4.5.0-linguist-crash.patch?rev=1.1&view=markup |
| 46 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-gui/files/qt-x11-opensource-src-4.5.0-linguist-crash.patch?rev=1.1&content-type=text/plain |
| 47 |
|
| 48 |
Index: qt-x11-opensource-src-4.5.0-linguist-crash.patch |
| 49 |
=================================================================== |
| 50 |
diff -up qt-x11-opensource-src-4.5.0/tools/linguist/shared/profileevaluator.cpp.orig qt-x11-opensource-src-4.5.0/tools/linguist/shared/profileevaluator.cpp |
| 51 |
--- qt-x11-opensource-src-4.5.0/tools/linguist/shared/profileevaluator.cpp.orig 2009-03-16 12:50:03.000000000 +0100 |
| 52 |
+++ qt-x11-opensource-src-4.5.0/tools/linguist/shared/profileevaluator.cpp 2009-03-17 00:42:51.000000000 +0100 |
| 53 |
@@ -86,6 +86,7 @@ public: |
| 54 |
void enterScope(bool multiLine); |
| 55 |
void leaveScope(); |
| 56 |
void finalizeBlock(); |
| 57 |
+ void cleanup(); |
| 58 |
|
| 59 |
// implementation of AbstractProItemVisitor |
| 60 |
bool visitBeginProBlock(ProBlock *block); |
| 61 |
@@ -164,6 +165,15 @@ ProFileEvaluator::Private::Private(ProFi |
| 62 |
m_contNextLine = false; |
| 63 |
} |
| 64 |
|
| 65 |
+void ProFileEvaluator::Private::cleanup() |
| 66 |
+{ |
| 67 |
+ m_commentItem = 0; |
| 68 |
+ m_block = 0; |
| 69 |
+ m_proitem.clear(); |
| 70 |
+ m_blockstack.clear(); |
| 71 |
+ m_pendingComment.clear(); |
| 72 |
+} |
| 73 |
+ |
| 74 |
bool ProFileEvaluator::Private::read(ProFile *pro) |
| 75 |
{ |
| 76 |
QFile file(pro->fileName()); |
| 77 |
@@ -180,11 +190,14 @@ bool ProFileEvaluator::Private::read(Pro |
| 78 |
while (!ts.atEnd()) { |
| 79 |
QString line = ts.readLine(); |
| 80 |
if (!parseLine(line)) { |
| 81 |
+ cleanup(); |
| 82 |
q->errorMessage(format(".pro parse failure.")); |
| 83 |
return false; |
| 84 |
} |
| 85 |
++m_lineNo; |
| 86 |
} |
| 87 |
+ |
| 88 |
+ cleanup(); |
| 89 |
return true; |
| 90 |
} |
Archives