[SCM] qtdeclarative packaging branch, ubuntu, updated. debian/5.6.1-11-108-g2918e4a

Mon Oct 17 11:50:13 UTC 2016

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

The following commit has been merged in the ubuntu branch:
commit c22d5014dbc98a9296dd89f57744bb6a02d4022c
Merge: 614b756ba3e604a55b54c748390fdedabde9026f c6c8cf325d7a7436646bd79907dce23ac40d49c0
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Mon Oct 17 06:57:10 2016 +0000

    Merge branch 'master' into ubuntu

 debian/changelog                                   |  40 +++++-
 debian/control                                     |   1 +
 debian/libqt5qml5.symbols                          |  16 +--
 debian/patches/Fix-V4-on-big-endian.patch          |  52 -------
 debian/patches/disable_failing_tests.patch         | 123 ----------------
 debian/patches/disableopengltests.patch            |  65 +++++++++
 debian/patches/fix-V4-on-big-endian.patch          |  48 +++++++
 debian/patches/fix_binary_location_for_tests.patch |  78 ----------
 debian/patches/fix_test_remove_qlibraryinfo.patch  | 160 +++++++++++++++++++++
 debian/patches/series                              |   6 +-
 debian/rules                                       |  37 +++--
 11 files changed, 341 insertions(+), 285 deletions(-)

diff --cc debian/changelog
index 8e35668,d0439c8..3e1e0af

--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,30 -1,40 +1,68 @@@
- qtdeclarative-opensource-src (5.6.1-7ubuntu3) UNRELEASED; urgency=medium
++qtdeclarative-opensource-src (5.6.1-11ubuntu1) UNRELEASED; urgency=medium
 +
 +  * debian/patches/V4-Free-up-2-address-bits-in-64bit-mode.patch:
 +    Add-a-facility-to-version-type-information-for-debug.patch
 +    - Upstream suggested update for arm64 (LP: #1630906)
 +  * Update symbols.
++  * Merge with Debian 5.6.1-11 changes.
 +
 + -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Thu, 06 Oct 2016 14:39:07 +0000
 +
+ qtdeclarative-opensource-src (5.6.1-11) unstable; urgency=medium
+ 
+   * Run make check with -k flag to get as much output as possible.
+   * Update fix-V4-on-big-endian.patch with a fix for 32-bit big endian
+     architectures.
+   * Drop fix_engine_64bits_big_endian.diff, now redundant.
+ 
+  -- Dmitry Shachnev <mitya57 at debian.org>  Fri, 07 Oct 2016 10:03:28 +0300
+ 
+ qtdeclarative-opensource-src (5.6.1-10) unstable; urgency=medium
+ 
+   * Do not use dbus-launch during tests running, not needed (and wrong).
+   * Drop useless build-dependency on libgl1-mesa-glx.
+   * Set LD_LIBRARY_PATH when running tests, to fix failures on buildds.
+ 
+  -- Dmitry Shachnev <mitya57 at debian.org>  Thu, 29 Sep 2016 11:57:15 +0300
+ 
+ qtdeclarative-opensource-src (5.6.1-9) unstable; 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
+ 
+  -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Tue, 27 Sep 2016 21:02:13 -0300
+ 
+ qtdeclarative-opensource-src (5.6.1-8) unstable; urgency=medium
+ 
+   * Update symbols files with buildds' logs (Closes: #836379).
+ 
+  -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Sun, 11 Sep 2016 09:30:31 -0300
+ 
 +qtdeclarative-opensource-src (5.6.1-7ubuntu2~1) yakkety; urgency=medium
 +
 +  * debian/patches/Revert-Remove-this-piece-of-code.patch:
 +    - Cherry-pick from Qt 5.6.2 (LP: #1613670)
 +
 + -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Mon, 26 Sep 2016 13:13:20 +0000
 +
 +qtdeclarative-opensource-src (5.6.1-7ubuntu1~2) yakkety; urgency=medium
 +
 +  * debian/patches/Fix-visibility-of-properties-in-value-types.patch:
 +    - Fix compare() in QML (LP: #1610349)
 +  * Update symbols. 
 +  * debian/patches/Fix-V4-on-big-endian.patch:
 +    - Fixes value/tag reads on 32-bit big-endian and offsets on 64-bit.
 +      (LP: #1606927)
 +
 + -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Mon, 22 Aug 2016 13:31:32 +0000
 +
  qtdeclarative-opensource-src (5.6.1-7) unstable; urgency=medium
  
    * Update libqt5qml5.symbols from buildds’ logs.
diff --cc debian/patches/series
index 9fec74d,09562e6..523c6e4
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,21 -1,9 +1,21 @@@
  # Backported patches
 +QQuickItemView-forceLayout-Also-call-layout-when-d-f.patch
  qml_only_release_types_if_they_arent_referenced_anymore.patch
  no_lifetime_dse.diff
+ fix-V4-on-big-endian.patch
 +V4-Always-set-the-tag-when-boxing-a-pointer-in-QV4-V.patch
 +Fix-QQmlEngine-crash-on-big-endian-64-bit-architectu.patch
 +Flickable-fix-minXExtent-minYExtent-when-content-is-.patch
 +QQuickWindow-Fill-out-timestamps-in-QHoverEvents-sen.patch
 +Fix-visibility-of-properties-in-value-types.patch
- Fix-V4-on-big-endian.patch
 +Revert-Remove-this-piece-of-code.patch
 +Add-a-facility-to-version-type-information-for-debug.patch
 +V4-Free-up-2-address-bits-in-64bit-mode.patch
  
  # Debian patches
  check_system_double-conversion.patch
+ disableopengltests.patch
+ fix_test_remove_qlibraryinfo.patch
 +
 +# Ubuntu patches
- fix_binary_location_for_tests.patch
- disable_failing_tests.patch
 +QML-Compilation-unit-caching-and-JIT-changes.patch
diff --cc debian/rules
index 3924cde,6e04367..40dcf61
--- a/debian/rules
+++ b/debian/rules
@@@ -62,21 -64,16 +64,16 @@@ override_dh_link
  	done
  
  override_dh_makeshlibs:
 -	dh_makeshlibs -V
 +	# On Ubuntu no -V due to -gles twin packages
 +	dh_makeshlibs
  
- override_dh_auto_test:
- 	cp -a src/imports/qtquick2/qmldir qml/QtQuick.2
- 	cp -a src/imports/folderlistmodel/qmldir qml/Qt/labs/folderlistmodel/
- 	cp -a src/imports/settings/qmldir qml/Qt/labs/settings/
- 	cp -a src/imports/window/qmldir qml/QtQuick/Window.2/
- 	cp -a src/imports/models/qmldir qml/QtQml/Models.2/
- 	cp -a src/imports/testlib/qmldir qml/QtTest
- 	cp -a src/imports/testlib/TestCase.qml qml/QtTest
- 	cp -a src/imports/testlib/SignalSpy.qml qml/QtTest
- 	cp -a src/imports/testlib/testlogger.js qml/QtTest
- ifneq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(testskip_architectures)))
- ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
- 	xvfb-run -a -s "-screen 0 1024x768x24 +extension RANDR +extension RENDER +extension GLX" dh_auto_test -- QT_PLUGIN_PATH=$(CURDIR)/plugins LD_LIBRARY_PATH=$(CURDIR)/lib QML2_IMPORT_PATH=$(CURDIR)/qml
- endif
- endif
+ override_dh_auto_test-arch:
+ 	$(MAKE) install -Csrc/imports INSTALL_ROOT=$(CURDIR)/test_root
+ 	mkdir -p $(CURDIR)/.local/share/QtProject/tst_qqmlengine
+ 	xvfb-run -a \
+ 	         -s "-screen 0 1024x768x24 +extension RANDR +extension RENDER +extension GLX" \
+ 	         dh_auto_test --max-parallel=1 -- -k -Ctests/auto \
+ 	         QML2_IMPORT_PATH=$(CURDIR)/test_root/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/qml \
+ 	         HOME=$(CURDIR) LD_LIBRARY_PATH=$(CURDIR)/lib
+ 
+ override_dh_auto_test-indep:
 -

-- 
qtdeclarative packaging

