[SCM] qtmultimedia packaging branch, master, updated. debian/5.2.1-3-3-g46cd3a5

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit 46cd3a5e6fe30ba5257e2428feb8bccf8ef79013
Author: Pino Toscano <pino at debian.org>
Date:   Wed May 21 08:24:23 2014 +0200

    spectrum example: enable RPATH also on kFreeBSD and Hurd (#748816)
---
 debian/changelog                   |  4 ++++
 debian/patches/rpath_nonlinux.diff | 21 +++++++++++++++++++++
 debian/patches/series              |  1 +
 3 files changed, 26 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index c3b52f5..726cfec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,10 @@ qtmultimedia-opensource-src (5.2.1-4) UNRELEASED; urgency=medium
   * Add config.tests/mmrenderer/* to debian/copyright. Thanks Scott Kitterman
     for noticing!
 
+  [ Pino Toscano ]
+  * Enable RPATH in the spectrum example also on kFreeBSD and Hurd; patch
+    rpath_nonlinux.diff. (Closes: #748816)
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 09 Apr 2014 15:14:16 -0300
 
 qtmultimedia-opensource-src (5.2.1-3) unstable; urgency=medium
diff --git a/debian/patches/rpath_nonlinux.diff b/debian/patches/rpath_nonlinux.diff
new file mode 100644
index 0000000..7c906ce
--- /dev/null
+++ b/debian/patches/rpath_nonlinux.diff
@@ -0,0 +1,21 @@
+Author: Pino Toscano <toscano.pino at tiscali.it>
+Description: Enable RPATH also on Hurd and kFreeBSD
+ Enable RPATH also on those platforms so the spectrum example can locate the
+ fftreal library in its own directory.
+ .
+ The "hurd-*" addition can be upstreamed, while the "gnukfreebsd-*" depends on
+ a (currently) Debian-only mkspec.
+Last-Update: 2014-05-21
+Forwarded: no
+
+--- a/examples/multimedia/spectrum/app/app.pro
++++ b/examples/multimedia/spectrum/app/app.pro
+@@ -76,7 +76,7 @@ macx {
+                                 ../spectrum.app/Contents/MacOS/spectrum
+     }
+ } else {
+-    linux-g++*: {
++    linux-g++*|hurd-*|gnukfreebsd-*: {
+         # Provide relative path from application to fftreal library
+         QMAKE_LFLAGS += -Wl,--rpath=\\$\$ORIGIN
+     }
diff --git a/debian/patches/series b/debian/patches/series
index 22291c6..e4ed803 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 gstreamer_cleanup_system_includes.patch
+rpath_nonlinux.diff

-- 
qtmultimedia packaging