[SCM] qtdeclarative packaging branch, experimental, updated. debian/5.7.0-2-19-g3092e63
Lisandro Damián Nicanor Pérez
lisandro at moszumanska.debian.org
Tue Sep 27 23:40:20 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtdeclarative.git;a=commitdiff;h=3092e63
The following commit has been merged in the experimental branch:
commit 3092e63f1ee1c68bf8ee906d2b4d9af6e372ba3a
Merge: 09f63cace17186d941fe6752e474df191685b047 4d598d5ee8bb0fbd6d2513b329897a050d6e817e
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date: Tue Sep 27 20:38:33 2016 -0300
Merge branch 'master' into experimental
debian/changelog | 14 ++
debian/control | 7 +-
debian/patches/disableopengltests.patch | 65 +++++++++
debian/patches/fix-V4-on-big-endian.patch | 44 ++++++
debian/patches/fix_engine_64bits_big_endian.diff | 32 ++++-
debian/patches/fix_test_remove_qlibraryinfo.patch | 160 ++++++++++++++++++++++
debian/patches/series | 8 +-
debian/rules | 20 ++-
8 files changed, 339 insertions(+), 11 deletions(-)
diff --cc debian/changelog
index b1208b5,8103e57..9f5bb4a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,40 -1,17 +1,54 @@@
+qtdeclarative-opensource-src (5.7.0-3) UNRELEASED; urgency=medium
+
+ [ Dmitry Shachnev ]
+ * Merge 5.6.1-7 from unstable.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Mon, 29 Aug 2016 21:49:25 +0300
+
+qtdeclarative-opensource-src (5.7.0-2) experimental; urgency=medium
+
+ * Merge 5.6.1-5 from unstable; replace fix_engine_64bits_big_endian.diff
+ with a patch that got applied upstream.
+ * Update symbols files from buildds’ logs.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Thu, 21 Jul 2016 20:47:19 +0300
+
+qtdeclarative-opensource-src (5.7.0-1) experimental; urgency=medium
+
+ [ Harald Sitter ]
+ * New upstream release.
+ * Drop qml_only_release_types_if_they_arent_referenced_anymore.patch
+ (upstream)
+ * New package qml-module-qtquick-layouts (moved from qtquickcontrols)
+ * Update install files.
+ * qtdeclarative5-examples breaks/replaces qtquickcontrols5-examples because
+ of moved example files.
+ * qtdeclarative5-examples depends on the new layouts module
+
+ [ Dmitry Shachnev ]
+ * Drop check_system_double-conversion.patch and libdouble-conversion-dev
+ build-dependency, upstream no longer uses double-conversion.
+ * Bump Qt build-dependencies to 5.7.0.
+ * Update symbols files from amd64 and i386 build logs.
+ * Bump qtdeclarative-abi version to 5-7-0.
+ * Update debian/copyright.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Tue, 05 Jul 2016 15:53:55 +0300
+
+ qtdeclarative-opensource-src (5.6.1-9) UNRELEASED; urgency=medium
+
+ [ Sandro Knauß ]
+ * Backport upstream change to fix V4 on big-endian (closes #836412)
+ (fix-V4-on-big-endian.patch; see QTBUG-55730)
+ (refresh fix_engine_64bits_big_endian.diff)
+ * Enable auto tests.
+ * Create patch to disable tests, that fails with xvfb
+ disableopengltests.patch
+ * Create patch to run the tests against own build binaries
+ fix_test_remove_qlibraryinfo.patch
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sat, 24 Sep 2016 15:53:40 +0200
+
qtdeclarative-opensource-src (5.6.1-8) unstable; urgency=medium
* Update symbols files with buildds' logs (Closes: #836379).
diff --cc debian/control
index 0b90021,698e361..5edf9e1
--- a/debian/control
+++ b/debian/control
@@@ -9,13 -9,20 +9,18 @@@ Uploaders: Sune Vuorela <debian at pusling
Dmitry Shachnev <mitya57 at debian.org>
Build-Depends: debhelper (>= 9),
dpkg-dev (>= 1.16.1),
- libdouble-conversion-dev,
- libqt5opengl5-dev (>= 5.6.1~),
- libqt5xmlpatterns5-dev (>= 5.6.1~),
+ libqt5xmlpatterns5-dev (>= 5.7.0~),
pkg-kde-tools (>= 0.15.17~),
python,
- qtbase5-private-dev (>= 5.7.0+dfsg~)
- qtbase5-private-dev (>= 5.6.1+dfsg~),
++ qtbase5-private-dev (>= 5.7.0+dfsg~),
+ xvfb,
+ xauth,
+ dbus-x11,
+ libgl1-mesa-dri,
+ libgl1-mesa-glx
-Build-Depends-Indep: libqt5sql5-sqlite (>= 5.6.1+dfsg~),
- qtbase5-doc-html (>= 5.6.1+dfsg~),
- qttools5-dev-tools (>= 5.6.1~)
+Build-Depends-Indep: libqt5sql5-sqlite (>= 5.7.0+dfsg~),
+ qtbase5-doc-html (>= 5.7.0+dfsg~),
+ qttools5-dev-tools (>= 5.7.0~)
Standards-Version: 3.9.8
Homepage: http://qt-project.org/
Vcs-Git: https://anonscm.debian.org/git/pkg-kde/qt/qtdeclarative.git
diff --cc debian/patches/fix_engine_64bits_big_endian.diff
index fb0ee00,d54d931..1e96458
--- a/debian/patches/fix_engine_64bits_big_endian.diff
+++ b/debian/patches/fix_engine_64bits_big_endian.diff
@@@ -1,22 -1,26 +1,42 @@@
- Description: fix QQmlEngine crash on big endian 64 bit architectures (s390x)
- Origin: upstream, https://code.qt.io/cgit/qt/qtdeclarative.git/commit/?id=d6ac86f59250e05e
- Last-Update: 2016-07-20
-From: Maximilaino Curia <maxy at debian.org>
-Date: Tue, 19 Jul 2016 12:20:00 +0200
-Subject: Fix engine in big endian 64 arches (s390x)
++From d6ac86f59250e05eb5e7db5bb8a45a85db1f0f25 Mon Sep 17 00:00:00 2001
++From: Maximiliano Curia <maxy at debian.org>
++Date: Tue, 19 Jul 2016 15:49:48 +0200
++Subject: [PATCH] Fix QQmlEngine crash on big endian 64 bit architectures
++ (s390x)
-This fixes https://bugreports.qt.io/browse/QTBUG-54717
++This change disables the BIG_ENDIAN 32 bits words mangling in 64 bits
++machines (where the words are 64 bits long); this would otherwise result
++in a segfault.
+
++Task-number: QTBUG-54717
++Change-Id: I6b5ab6f213880b030795185c05e609d290168901
++Reviewed-by: Simon Hausmann <simon.hausmann at qt.io>
++Reviewed-by: Timo Jyrinki <timo.jyrinki at iki.fi>
++Reviewed-by: Erik Verbruggen <erik.verbruggen at qt.io>
++---
++ src/qml/jsruntime/qv4value_p.h | 4 ++--
++ 1 file changed, 2 insertions(+), 2 deletions(-)
++
++diff --git a/src/qml/jsruntime/qv4value_p.h b/src/qml/jsruntime/qv4value_p.h
++index 7c2bb31..5abf5ad 100644
--- a/src/qml/jsruntime/qv4value_p.h
+++ b/src/qml/jsruntime/qv4value_p.h
- @@ -101,13 +101,13 @@
-@@ -92,10 +92,16 @@ struct Q_QML_PRIVATE_EXPORT Value
-
- Q_ALWAYS_INLINE quint64 val() const { return _val; }
- Q_ALWAYS_INLINE void setVal(quint64 v) { _val = v; }
-+
-+#if defined(QV4_USE_64_BIT_VALUE_ENCODING) && Q_BYTE_ORDER == Q_BIG_ENDIAN
-+ Q_ALWAYS_INLINE void setValue(quint32 t) { memcpy(4 + (quint8 *)&_val, &t, 4); }
-+ Q_ALWAYS_INLINE void setTag(quint32 v) { memcpy(&_val, &v, 4); }
-+#else
-- Q_ALWAYS_INLINE void setValue(quint32 v) { memcpy(&_val, &v, 4); }
-- Q_ALWAYS_INLINE void setTag(quint32 t) { memcpy(4 + (quint8 *)&_val, &t, 4); }
-+#endif
++@@ -96,13 +96,13 @@ public:
++ Q_ALWAYS_INLINE quint64 rawValue() const { return _val; }
++ Q_ALWAYS_INLINE void setRawValue(quint64 raw) { _val = raw; }
-#if Q_BYTE_ORDER == Q_LITTLE_ENDIAN
+#if Q_BYTE_ORDER == Q_LITTLE_ENDIAN || defined(QV4_USE_64_BIT_VALUE_ENCODING)
static inline int valueOffset() { return 0; }
static inline int tagOffset() { return 4; }
- #else // !Q_LITTLE_ENDIAN
+ Q_ALWAYS_INLINE void setTagValue(quint32 tag, quint32 value) { _val = quint64(tag) << 32 | value; }
+ Q_ALWAYS_INLINE quint32 value() const { return _val & quint64(~quint32(0)); }
+ Q_ALWAYS_INLINE quint32 tag() const { return _val >> 32; }
+-#else // !Q_LITTLE_ENDIAN
++#else // !Q_LITTLE_ENDIAN && !defined(QV4_USE_64_BIT_VALUE_ENCODING)
+ static inline int valueOffset() { return 4; }
+ static inline int tagOffset() { return 0; }
+ Q_ALWAYS_INLINE void setTagValue(quint32 tag, quint32 value) { _val = quint64(value) << 32 | tag; }
++--
++2.9.3
++
diff --cc debian/patches/series
index 143bdfd,29b9c5e..e027e9f
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,10 +1,8 @@@
- fix_engine_64bits_big_endian.diff
+ # Backported patches
-qml_only_release_types_if_they_arent_referenced_anymore.patch
no_lifetime_dse.diff
+ fix-V4-on-big-endian.patch
+
+ # Debian patches
-check_system_double-conversion.patch
+ fix_engine_64bits_big_endian.diff
+ disableopengltests.patch
+ fix_test_remove_qlibraryinfo.patch
--
qtdeclarative packaging
More information about the pkg-kde-commits
mailing list