[phonon] refresh rpath patch
Rex Dieter
rdieter at fedoraproject.org
Sun May 20 19:38:06 UTC 2012
commit a70e09c9521e21ffa84dc8b1f24b3d639d8cb5d5
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Sun May 20 14:40:40 2012 -0500
refresh rpath patch
phonon-4.4.4-no_rpath.patch | 14 --------------
phonon-4.6.0-rpath.patch | 15 +++++++++++++++
phonon.spec | 11 +++++++----
3 files changed, 22 insertions(+), 18 deletions(-)
---
diff --git a/phonon-4.6.0-rpath.patch b/phonon-4.6.0-rpath.patch
new file mode 100644
index 0000000..85cc17e
--- /dev/null
+++ b/phonon-4.6.0-rpath.patch
@@ -0,0 +1,15 @@
+diff -up phonon-4.6.0/cmake/FindPhononInternal.cmake.rpath phonon-4.6.0/cmake/FindPhononInternal.cmake
+--- phonon-4.6.0/cmake/FindPhononInternal.cmake.rpath 2011-12-19 14:30:45.000000000 -0600
++++ phonon-4.6.0/cmake/FindPhononInternal.cmake 2012-05-20 14:38:23.366555537 -0500
+@@ -123,7 +123,11 @@ 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)
++list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${LIB_INSTALL_DIR}" _isSystemPlatformLibDir)
++list(FIND CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES "${LIB_INSTALL_DIR}" _isSystemCxxLibDir)
++if("${_isSystemPlatformLibDir}" STREQUAL "-1" AND "${_isSystemCxxLibDir}" STREQUAL "-1")
+ set(CMAKE_INSTALL_RPATH "${LIB_INSTALL_DIR}")
++endif("${_isSystemPlatformLibDir}" STREQUAL "-1" AND "${_isSystemCxxLibDir}" STREQUAL "-1")
+
+
+ # Uninstall Target
diff --git a/phonon.spec b/phonon.spec
index 7cf8066..29b27f6 100644
--- a/phonon.spec
+++ b/phonon.spec
@@ -9,7 +9,7 @@
Summary: Multimedia framework api
Name: phonon
Version: 4.6.0
-Release: 3%{?dist}
+Release: 4%{?dist}
Group: System Environment/Libraries
License: LGPLv2+
URL: http://phonon.kde.org/
@@ -20,13 +20,13 @@ Source0: ftp://ftp.kde.org/pub/kde/stable/phonon/%{version}/src/phonon-%{version
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch1: phonon-4.4.4-no_rpath.patch
-
## upstreamable patches
# phonon_backend ... could not be loaded
# http://bugzilla.redhat.com/760039
Patch50: phonon-4.5.57-plugindir.patch
Patch51: phonon-4.6.0-syntax.patch
+# https://git.reviewboard.kde.org/r/103423
+Patch52: phonon-4.6.0-rpath.patch
## Upstream patches
@@ -93,9 +93,9 @@ Includes experimental and unstable apis.
%prep
%setup -q
-%patch1 -p1 -b .no_rpath
%patch50 -p1 -b .plugindir
%patch51 -p1 -b .syntax
+%patch52 -p1 -b .rpath
%build
mkdir -p %{_target_platform}
@@ -181,6 +181,9 @@ rm -rf %{buildroot}
%changelog
+* Sun May 20 2012 Rex Dieter <rdieter at fedoraproject.org> 4.6.0-4
+- refresh rpath patch
+
* Wed Mar 28 2012 Than Ngo <than at redhat.com> - 4.6.0-3
- fix syntax in *.pri file
More information about the scm-commits
mailing list