[SCM] qtdeclarative packaging branch, experimental, updated. debian/5.7.1-2-7-g3753ed5

[Simon Quigley]

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

The following commit has been merged in the experimental branch:
commit 38f31cd6f288f305bd4b81df6b992662c94964b3
Author: Simon Quigley <tsimonq2 at ubuntu.com>
Date:   Mon Apr 17 18:20:46 2017 -0500

    Refresh disableopengltests.patch
    
    (part of it has been dropped because it's reverse-applicable)
---
 debian/changelog                        |  2 ++
 debian/patches/disableopengltests.patch | 45 +++++++++++----------------------
 2 files changed, 17 insertions(+), 30 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 95b5843..b0c1184 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ qtdeclarative-opensource-src (5.9.0~beta-1) UNRELEASED; urgency=medium
   * Bump dpkg-dev build-dependency to 1.17.14, for build profiles.
   * Do not build the documentation packages when the nodoc profile is enabled.
   * Drop fix_tst_qqmlapplicationengine.diff as it's reverse-applicable.
+  * Refresh patches:
+   - disableopengltests.patch
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 17 Apr 2017 06:43:41 -0500
 
diff --git a/debian/patches/disableopengltests.patch b/debian/patches/disableopengltests.patch
index 8f465eb..68a88f2 100644
--- a/debian/patches/disableopengltests.patch
+++ b/debian/patches/disableopengltests.patch
@@ -7,18 +7,17 @@ Last-Update: 2016-10-18
 
 --- a/tests/auto/auto.pro
 +++ b/tests/auto/auto.pro
-@@ -9,8 +9,6 @@ SUBDIRS=\
-     installed_cmake \
-     toolsupport
+@@ -11,7 +11,6 @@ SUBDIRS=\
  
--qtHaveModule(widgets): SUBDIRS += quickwidgets
--
- qmldevtools.CONFIG = host_build
+ qtHaveModule(gui):qtConfig(opengl(es1|es2)?) {
+     SUBDIRS += particles
+-    qtHaveModule(widgets): SUBDIRS += quickwidgets
+ 
+ }
  
- installed_cmake.depends = cmake
 --- a/tests/auto/qml/debugger/debugger.pro
 +++ b/tests/auto/qml/debugger/debugger.pro
-@@ -5,7 +5,6 @@
+@@ -5,7 +5,6 @@ PUBLICTESTS += \
      qqmlenginedebugservice \
      qqmldebugjs \
      qqmlinspector \
@@ -28,7 +27,7 @@ Last-Update: 2016-10-18
      qqmlenginecontrol \
 --- a/tests/auto/qml/qml.pro
 +++ b/tests/auto/qml/qml.pro
-@@ -21,7 +21,6 @@ PUBLICTESTS += \
+@@ -23,7 +23,6 @@ PUBLICTESTS += \
      qqmlmoduleplugin \
      qqmlnotifier \
      qqmlqt \
@@ -36,27 +35,13 @@ Last-Update: 2016-10-18
      qtqmlmodules \
      qquickfolderlistmodel \
      qqmlapplicationengine \
-@@ -69,8 +68,7 @@
-         qjsvalue
- }
- 
--SUBDIRS += $$PUBLICTESTS \
--    qqmlextensionplugin
-+SUBDIRS += $$PUBLICTESTS
- SUBDIRS += $$METATYPETESTS
- !winrt { # no QProcess on winrt
-     !contains(QT_CONFIG, no-qml-debug): SUBDIRS += debugger
 --- a/tests/auto/quick/quick.pro
 +++ b/tests/auto/quick/quick.pro
-@@ -2,11 +2,8 @@ TEMPLATE = subdirs
- 
- PUBLICTESTS += \
-     geometry \
--    rendernode \
-     qquickpixmapcache
- 
--qtHaveModule(widgets): PUBLICTESTS += nodes
--
- !cross_compile: PRIVATETESTS += examples
+@@ -8,7 +8,6 @@ qtConfig(opengl(es1|es2)?) {
+     PUBLICTESTS += \
+         drawingmodes \
+         rendernode
+-    qtHaveModule(widgets): PUBLICTESTS += nodes
  
- # This test requires the qtconcurrent module
+     QUICKTESTS += \
+         qquickanimatedsprite \

-- 
qtdeclarative packaging