[SCM] subtitlecomposer packaging branch, master, updated. debian/0.6.2-1-6-g323c87e

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/subtitlecomposer.git;a=commitdiff;h=323c87e

The following commit has been merged in the master branch:
commit 323c87e89a89aa58b56160274b182dbbdf716882
Author: Pino Toscano <pino at debian.org>
Date:   Tue Apr 5 00:02:55 2016 +0200

    fix loading of videoplayer plugins
---
 debian/changelog                        |  1 +
 debian/patches/fix-plugins-loading.diff | 31 +++++++++++++++++++++++++++++++
 debian/patches/series                   |  1 +
 3 files changed, 33 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index bb8dbf8..524c97a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ subtitlecomposer (0.6.3-0r1) UNRELEASED; urgency=medium
   * Fix Vcs-Git field.
   * Update the patches:
     - link-x11.diff: drop, fixed upstream
+  * Fix the loading of videoplayer plugins; patch fix-plugins-loading.diff.
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Mon, 04 Apr 2016 22:35:30 +0200
 
diff --git a/debian/patches/fix-plugins-loading.diff b/debian/patches/fix-plugins-loading.diff
new file mode 100644
index 0000000..02aff7c
--- /dev/null
+++ b/debian/patches/fix-plugins-loading.diff
@@ -0,0 +1,31 @@
+Author: Pino Toscano <pino at debian.org>
+Description: Fix the loading of plugins
+ Disable the loading of plugins from a location relative to the executable
+ path, which is done on non-release builds.  Since NDEBUG is not debug in our
+ case, make sure these relative paths are not used, using instead the proper
+ system path.
+Last-Update: 2016-04-05
+Forwarded: not-needed
+
+--- a/src/speechprocessor/speechprocessor.cpp
++++ b/src/speechprocessor/speechprocessor.cpp
+@@ -71,7 +71,7 @@ SpeechProcessor::SpeechProcessor(QWidget
+ 	// Using Qt::DirectConnection here makes SpeechProcessor::onStreamData() to execute in GStreamer's thread
+ 	connect(m_stream, &StreamProcessor::audioDataAvailable, this, &SpeechProcessor::onStreamData, Qt::DirectConnection);
+ 
+-#ifndef NDEBUG
++#if 0
+ 	const QString exePath(qApp->applicationDirPath());
+ 	pluginLoad(exePath + QStringLiteral("/../speechplugins/pocketsphinx/pocketsphinxasr.so"));
+ #else
+--- a/src/videoplayer/videoplayer.cpp
++++ b/src/videoplayer/videoplayer.cpp
+@@ -102,7 +102,7 @@ VideoPlayer::VideoPlayer() :
+ {
+ 	backendAdd(new DummyPlayerBackend());
+ 
+-#ifndef NDEBUG
++#if 0
+ 	const QString exePath(qApp->applicationDirPath());
+ 	backendLoad(exePath + QStringLiteral("/../videoplayerplugins/gstreamer/gstplayer.so"));
+ 	backendLoad(exePath + QStringLiteral("/../videoplayerplugins/mplayer/mplayer.so"));
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..e7b5044
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix-plugins-loading.diff

-- 
subtitlecomposer packaging