[SCM] qtmultimedia packaging branch, ubuntu, updated. debian/5.5.1-1-17-g8a76737

Timo Jyrinki timo at moszumanska.debian.org
Mon Oct 19 09:20:24 UTC 2015


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

The following commit has been merged in the ubuntu branch:
commit 8a767370495e3b9a575da194644366a814b3986d
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Mon Oct 19 09:20:08 2015 +0000

    Rebase audio role API patch
---
 debian/patches/Add-audio-role-API-to-QMediaPlayer.patch | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/debian/patches/Add-audio-role-API-to-QMediaPlayer.patch b/debian/patches/Add-audio-role-API-to-QMediaPlayer.patch
index 8c20915..780ca42 100644
--- a/debian/patches/Add-audio-role-API-to-QMediaPlayer.patch
+++ b/debian/patches/Add-audio-role-API-to-QMediaPlayer.patch
@@ -79,7 +79,7 @@ index fda8768..9d28cab 100644
          \qmlproperty bool Video::seekable
  
          This property holds whether the playback position of the video can be
-@@ -413,6 +442,20 @@ Item {
+@@ -413,4 +442,18 @@ Item {
          player.seek(offset);
      }
  
@@ -98,8 +98,6 @@ index fda8768..9d28cab 100644
 +    }
 +
  }
- 
- // ***************************************
 diff --git a/src/imports/multimedia/plugins.qmltypes b/src/imports/multimedia/plugins.qmltypes
 index d01c988..11d423f 100644
 --- a/src/imports/multimedia/plugins.qmltypes

-- 
qtmultimedia packaging



More information about the pkg-kde-commits mailing list