[SCM] Phonon Multimedia Framework packaging branch, master, updated. debian/4.7.0.0-1

[Modestas Vainius]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-req/phonon.git;a=commitdiff;h=aad00eb

The following commit has been merged in the master branch:
commit aad00eb49025da14c9938ef559cc0d03bc9b0eb6
Author: Modestas Vainius <modax at debian.org>
Date:   Tue Nov 5 10:04:24 2013 +0200

    Adapt no_rpath.patch to upstream changes.
---
 debian/changelog              |    1 +
 debian/patches/no_rpath.patch |   11 ++++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0e7987b..98b054f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 phonon (4:4.7.0.0-0r1) UNRELEASED; urgency=low
 
   * New upstream release (4.7.0).
+  * Adapt no_rpath.patch to upstream changes.
 
  -- Modestas Vainius <modax at debian.org>  Tue, 05 Nov 2013 09:55:14 +0200
 
diff --git a/debian/patches/no_rpath.patch b/debian/patches/no_rpath.patch
index acadf9b..df0dbc0 100644
--- a/debian/patches/no_rpath.patch
+++ b/debian/patches/no_rpath.patch
@@ -10,11 +10,12 @@ to ensure LIB_INSTALL_DIR is absolute before checking.
 
 --- a/cmake/FindPhononInternal.cmake
 +++ b/cmake/FindPhononInternal.cmake
-@@ -123,7 +123,16 @@ endif(APPLE)
+@@ -217,10 +217,15 @@ endif(APPLE)
  # RPATH directories outside the current CMAKE_BINARY_DIR and also the library 
  # install directory. Alex
  set(CMAKE_INSTALL_RPATH_USE_LINK_PATH  TRUE)
--set(CMAKE_INSTALL_RPATH "${LIB_INSTALL_DIR}")
+-list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${LIB_INSTALL_DIR}" _isSystemPlatformLibDir)
+-list(FIND CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES "${LIB_INSTALL_DIR}" _isSystemCxxLibDir)
 +if (IS_ABSOLUTE "${LIB_INSTALL_DIR}")
 +    set(_rpath_abs_lib_install_dir "${LIB_INSTALL_DIR}")
 +else()
@@ -22,9 +23,9 @@ to ensure LIB_INSTALL_DIR is absolute before checking.
 +endif()
 +list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${_rpath_abs_lib_install_dir}" _isSystemPlatformLibDir)
 +list(FIND CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES "${_rpath_abs_lib_install_dir}" _isSystemCxxLibDir)
-+if("${_isSystemPlatformLibDir}" STREQUAL "-1" AND "${_isSystemCxxLibDir}" STREQUAL "-1")
+ if("${_isSystemPlatformLibDir}" STREQUAL "-1" AND "${_isSystemCxxLibDir}" STREQUAL "-1")
+-   set(CMAKE_INSTALL_RPATH "${LIB_INSTALL_DIR}")
 +   set(CMAKE_INSTALL_RPATH "${_rpath_abs_lib_install_dir}")
-+endif("${_isSystemPlatformLibDir}" STREQUAL "-1" AND "${_isSystemCxxLibDir}" STREQUAL "-1")
+ endif("${_isSystemPlatformLibDir}" STREQUAL "-1" AND "${_isSystemCxxLibDir}" STREQUAL "-1")
  
  
- # Uninstall Target

-- 
Phonon Multimedia Framework packaging