[SCM] qtdeclarative packaging branch, experimental, updated. debian/5.7.1-2-8-g8d05c30

Dmitry Shachnev mitya57 at moszumanska.debian.org
Mon Apr 24 12:51:30 UTC 2017


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

The following commit has been merged in the experimental branch:
commit 8d05c30122cbf6706e752c5788bcc3c775504797
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Mon Apr 24 15:48:46 2017 +0300

    Disable qqmlextensionplugin and rendernode tests.
    
    They were disabled in the 5.7.1 version of the patch, but accidentally
    dropped when rebasing.
---
 debian/patches/disableopengltests.patch | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/debian/patches/disableopengltests.patch b/debian/patches/disableopengltests.patch
index 68a88f2..c4ca16e 100644
--- a/debian/patches/disableopengltests.patch
+++ b/debian/patches/disableopengltests.patch
@@ -3,7 +3,7 @@ Description: Disable all tests that fails with xvfb
 Author: Sandro Knauß <bugs at sandroknauss.de>
 Origin: Debian
 Forwarded: not-needed - it is a limitation so far inside Debian
-Last-Update: 2016-10-18
+Last-Update: 2017-04-24
 
 --- a/tests/auto/auto.pro
 +++ b/tests/auto/auto.pro
@@ -35,13 +35,27 @@ Last-Update: 2016-10-18
      qtqmlmodules \
      qquickfolderlistmodel \
      qqmlapplicationengine \
+@@ -87,10 +86,6 @@
+     SUBDIRS += qmllint qmlplugindump
+ }
+ 
+-qtConfig(library) {
+-    SUBDIRS += qqmlextensionplugin
+-}
+-
+ qtConfig(private_tests): \
+     SUBDIRS += $$PRIVATETESTS
+ 
 --- a/tests/auto/quick/quick.pro
 +++ b/tests/auto/quick/quick.pro
-@@ -8,7 +8,6 @@ qtConfig(opengl(es1|es2)?) {
+@@ -6,9 +6,7 @@
+ 
+ qtConfig(opengl(es1|es2)?) {
      PUBLICTESTS += \
-         drawingmodes \
-         rendernode
+-        drawingmodes \
+-        rendernode
 -    qtHaveModule(widgets): PUBLICTESTS += nodes
++        drawingmodes
  
      QUICKTESTS += \
          qquickanimatedsprite \

-- 
qtdeclarative packaging



More information about the pkg-kde-commits mailing list