23:01 rakuco 

Update to 3.3.0.

A lot of patches can be removed, and the only ones left are backported from
upstream. The port now uses Qt5 instead of Qt4, and should finally be
MAKE_JOBS_SAFE.

Other smaller changes:
* The paths for gnuplot and ant in the sed calls in the Makefile were wrong,
  and have been fixed.
* There was no explanation for why "CONFIG+=configure" was required in
  QMAKE_ARGS, so it has been removed.

Huge thanks to Tobias Berner for working on this and following my picky
suggestions!

PR:		196167
Submitted by:	Tobias C. Berner <tcberner@gmail.com>

 

12:20 rakuco 

Add upstream patch that fixes the build on -CURRENT.

In file included from
../../../../../../qt-creator-2.8.0-src/src/shared/qbs/src/lib/language/itemreader.cpp:36:
../../../../../../qt-creator-2.8.0-src/src/shared/qbs/src/lib/parser/qmljsparser_p.h:156:17:
error: logical not is only applied to the left hand side of this comparison
[-Werror,-Wlogical-not-parentheses]
            if (! d.kind == DiagnosticMessage::Warning)
                ^        ~~
../../../../../../qt-creator-2.8.0-src/src/shared/qbs/src/lib/parser/qmljsparser_p.h:156:17:
note: add parentheses after the '!' to evaluate the comparison first
            if (! d.kind == DiagnosticMessage::Warning)
                ^
                  (                                   )
../../../../../../qt-creator-2.8.0-src/src/shared/qbs/src/lib/parser/qmljsparser_p.h:156:17:
note: add parentheses around left hand side expression to silence this warning
            if (! d.kind == DiagnosticMessage::Warning)
                ^
                (       )
1 error generated.

MFH:		2014Q2