[SCM] qtdeclarative packaging branch, ubuntu+1, updated. debian/5.6.0-rc-1-56-gbcad5c2

Timo Jyrinki timo at moszumanska.debian.org
Mon Mar 14 09:15:04 UTC 2016


Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtdeclarative.git;a=commitdiff;h=bcad5c2

The following commit has been merged in the ubuntu+1 branch:
commit bcad5c2f53f10a09e19993aa9f9f256c82b120da
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Mon Mar 14 09:14:12 2016 +0000

    QML-Compilation-unit-caching-and-JIT-changes.patch: fix 32-bit archs
---
 debian/changelog                                                  | 2 +-
 debian/patches/QML-Compilation-unit-caching-and-JIT-changes.patch | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4160da3..c5be3de 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,7 +16,7 @@ qtdeclarative-opensource-src (5.6.0~rc-1ubuntu1) UNRELEASED; urgency=medium
     - WIP-QQuickItem-fix-another-infinite-loop-in-nextItem.patch
     - qmlplugindump-Don-t-try-to-import-Qt.test.qtestroot.patch
   * Refresh QML cache and test binary location patches to apply.
-  * Modify QML cache patch to Qt 5.6 changes.
+  * Modify QML cache patch to Qt 5.6 changes. (LP: #1556824)
 
  -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Tue, 26 Jan 2016 10:07:50 +0000
 
diff --git a/debian/patches/QML-Compilation-unit-caching-and-JIT-changes.patch b/debian/patches/QML-Compilation-unit-caching-and-JIT-changes.patch
index 9a773bb..9776e38 100644
--- a/debian/patches/QML-Compilation-unit-caching-and-JIT-changes.patch
+++ b/debian/patches/QML-Compilation-unit-caching-and-JIT-changes.patch
@@ -779,8 +779,8 @@ Index: qtdeclarative-opensource-src-5.6.0-rc/src/qml/jit/qv4assembler_p.h
 +            QV4::Primitive vv = convertToValue(c);
 +            FPRegisterID scratchFp;
 +            scratchFp = target;
-+            move(TrustedImm32(vv.int_32), ReturnValueRegister);
-+            move(TrustedImm32(vv.tag), ScratchRegister);
++            move(TrustedImm32(vv.int_32()), ReturnValueRegister);
++            move(TrustedImm32(vv.tag()), ScratchRegister);
 +            moveIntsToDouble(ReturnValueRegister, ScratchRegister, target, scratchFp);
  #endif
              return target;

-- 
qtdeclarative packaging



More information about the pkg-kde-commits mailing list