Adapt QML Cache patch for Qt 5.5

[Timo Jyrinki]

QML cache patch QML-Compilation-unit-caching-and-JIT-changes.patch does not apply against Qt 5.5, and would need adjusting. Bug #1426288 is a bug about upstreaming it so that it wouldn't need to be carried in the first place.

More information about Qt 5.5 at https://wiki.ubuntu.com/Touch/QtTesting

[Timo Jyrinki (timo-jyrinki)]

I was able to rebase the patch as the Qt 5.5 changes did not seem as big as with Qt 5.4. The revised patch attached. But it fails to build with:

---
In file included from /usr/include/x86_64-linux-gnu/qt5/QtCore/qnamespace.h:37:0,
                 from /usr/include/x86_64-linux-gnu/qt5/QtCore/qobjectdefs.h:41,
                 from /usr/include/x86_64-linux-gnu/qt5/QtCore/qobject.h:40,
                 from /usr/include/x86_64-linux-gnu/qt5/QtCore/qabstractanimation.h:37,
                 from /usr/include/x86_64-linux-gnu/qt5/QtCore/QtCore:4,
                 from ../../include/QtQml/QtQmlDepends:3:
compiler/qv4isel_p.cpp: In member function ‘QQmlRefPointer<QV4::CompiledData::CompilationUnit> QV4::EvalInstructionSelection::compile(bool)’:
compiler/qv4isel_p.cpp:340:40: error: ‘codeRefLen’ was not declared in this scope
             Q_ASSERT(dummySize == (int)codeRefLen);
---

[Timo Jyrinki (timo-jyrinki)]

And here are the rebasing changes as a diff I did to the patch.

[Ricardo Mendoza (ricmm)]

I'll find some time this week to look at it.

[Timo Jyrinki (timo-jyrinki)]

I now ended up commenting out the ASSERT. Also a QDataStream change in 5.5 required a slight change, but now it builds with this version attached.

Unable to test yet because of the GCC5 transition.

[Timo Jyrinki (timo-jyrinki)]

Seems to work on x86 at least after setting the environment variable, unable to test on arm at the moment on wily.

[Timo Jyrinki (timo-jyrinki)]

Now finally fully testable on the phone, seems to work fine on armhf too.

[Launchpad Janitor (janitor)]

This bug was fixed in the package qtdeclarative-opensource-src - 5.5.1-2ubuntu2

---------------
qtdeclarative-opensource-src (5.5.1-2ubuntu2) xenial; urgency=high

  * Fix symbols for s390x.

 -- Dimitri John Ledkov <email address hidden> Wed, 09 Dec 2015 13:14:34 +0000

[Timo Jyrinki (timo-jyrinki)]

qtdeclarative-opensource-src (5.5.1-2ubuntu1) xenial; urgency=medium

  * New upstream release. (LP: #1502883)
  * Remove patches no longer needed:
    - debian/patches/High-dpi-SVG-and-QQuickImageProvider-Images.patch
    - debian/patches/aarch64.patch
    - debian/patches/check_system_double-conversion.patch
    - debian/patches/ppc64el.patch
  * Rebase patches:
    - debian/patches/Add-QQuickAsyncImageProvider.patch
    - debian/patches/disable_failing_tests.patch
    - debian/patches/QML-Compilation-unit-caching-and-JIT-changes.patch
      (LP: #1437320)
  * Drop upstreamed patches:
    - debian/patches/Fix-memory-leak-when-QQuickPixmapReply-Event-is-dele.patch
  * Update .install files.
  * Skip tests also on ppc64el, they are flaky.
  * Update symbols and mark/unmark private ones.
  * Bump ABI version to 5-5-0.
  * Bump build dependencies.
  * Build dep on libqt5xcbqpa5 to be able to run the tests under xvfb.
  * Update Vcs url:s to Debian git.
  * Add qmlplugindump-Don-t-try-to-import-Qt.test.qtestroot.patch
    (LP: #1473976)

 -- Timo Jyrinki <email address hidden> Tue, 01 Dec 2015 08:12:31 +0000