[SCM] qtmultimedia packaging branch, ubuntu+1, updated. debian/5.9.0-2-59-g8aefec3

[Dmitry Shachnev]

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

The following commit has been merged in the ubuntu+1 branch:
commit 8aefec32ae8cac8f9e211a82834c1bbb52ed311b
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Wed Jun 21 17:03:48 2017 +0300

    Refresh skip_failing_tests.patch.
---
 debian/patches/skip_failing_tests.patch | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/debian/patches/skip_failing_tests.patch b/debian/patches/skip_failing_tests.patch
index eaa5a27..c8a3f2f 100644
--- a/debian/patches/skip_failing_tests.patch
+++ b/debian/patches/skip_failing_tests.patch
@@ -5,10 +5,9 @@ Bug: https://bugreports.qt-project.org/browse/QTBUG-35420
 Bug-Ubuntu: https://launchpad.net/bugs/1261384
 Author: Omer Akram <om26er at ubuntu.com>
 
-=== modified file 'tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp'
---- a/tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp	2013-09-20 19:21:01 +0000
-+++ b/tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp	2013-12-05 16:30:52 +0000
-@@ -341,6 +341,7 @@
+--- a/tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp
++++ b/tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp
+@@ -447,6 +447,7 @@
  
  void tst_QMediaPlaylist::saveAndLoad()
  {
@@ -16,7 +15,7 @@ Author: Omer Akram <om26er at ubuntu.com>
      QMediaPlaylist playlist;
      playlist.addMedia(content1);
      playlist.addMedia(content2);
-@@ -649,6 +650,7 @@
+@@ -1101,6 +1102,7 @@
  
  void tst_QMediaPlaylist::testLoaded_signal()
  {
@@ -24,11 +23,9 @@ Author: Omer Akram <om26er at ubuntu.com>
      //create an instance of QMediaPlaylist class.
      QMediaPlaylist playlist;
      playlist.addMedia(content1); //set the media to playlist
-
-=== modified file 'tests/auto/unit/multimedia.pro'
---- a/tests/auto/unit/multimedia.pro	2013-05-23 19:47:12 +0000
-+++ b/tests/auto/unit/multimedia.pro	2013-12-12 19:46:46 +0000
-@@ -13,7 +13,7 @@
+--- a/tests/auto/unit/multimedia.pro
++++ b/tests/auto/unit/multimedia.pro
+@@ -14,13 +14,13 @@
      qmediacontent \
      qmediaobject \
      qmediaplayer \
@@ -37,8 +34,6 @@ Author: Omer Akram <om26er at ubuntu.com>
      qmediaplaylistnavigator \
      qmediapluginloader \
      qmediarecorder \
-@@ -19,7 +19,7 @@
-     qmediarecorder \
      qmediaresource \
      qmediaservice \
 -    qmediaserviceprovider \
@@ -46,9 +41,8 @@ Author: Omer Akram <om26er at ubuntu.com>
      qmediatimerange \
      qmetadatareadercontrol \
      qmetadatawritercontrol \
-=== modified file 'tests/auto/unit/unit.pro'
---- a/tests/auto/unit/unit.pro    2015-06-29 20:05:38.000000000 +0000
-+++ b/tests/auto/unit/unit.pro    2015-10-13 12:18:36.808963658 +0000
+--- a/tests/auto/unit/unit.pro
++++ b/tests/auto/unit/unit.pro
 @@ -2,4 +2,5 @@
  
  SUBDIRS += multimedia.pro
@@ -56,4 +50,3 @@ Author: Omer Akram <om26er at ubuntu.com>
 -qtHaveModule(qml): SUBDIRS += multimediaqml.pro
 +# Does not find the multimedia module despite paths being set
 +#qtHaveModule(qml): SUBDIRS += multimediaqml.pro
-

-- 
qtmultimedia packaging