[phonon] import new patch
Rex Dieter
rdieter at fedoraproject.org
Wed Jan 5 18:41:32 UTC 2011
commit ed9d3228edea2ea45866499544fbaa30277937e5
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Wed Jan 5 12:42:57 2011 -0600
import new patch
phonon-4.4.4-no_rpath.patch | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
---
diff --git a/phonon-4.4.4-no_rpath.patch b/phonon-4.4.4-no_rpath.patch
new file mode 100644
index 0000000..07e6de5
--- /dev/null
+++ b/phonon-4.4.4-no_rpath.patch
@@ -0,0 +1,21 @@
+diff -up phonon-4.4.4/cmake/FindPhononInternal.cmake.no_rpath phonon-4.4.4/cmake/FindPhononInternal.cmake
+--- phonon-4.4.4/cmake/FindPhononInternal.cmake.no_rpath 2011-01-03 12:22:10.000000000 -0600
++++ phonon-4.4.4/cmake/FindPhononInternal.cmake 2011-01-04 12:18:57.923070047 -0600
+@@ -232,8 +232,8 @@ endif(APPLE)
+ # These two options below make it set the RPATH of the installed targets to all
+ # 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}")
++#set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
++#set(CMAKE_INSTALL_RPATH "${LIB_INSTALL_DIR}")
+
+
+ # Uninstall Target
+@@ -435,4 +435,4 @@ if(MSVC)
+ # to avoid a lot of deprecated warnings
+ add_definitions( -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_SCL_SECURE_NO_WARNINGS )
+ endif(CMAKE_COMPILER_2005)
+-endif(MSVC)
+\ No newline at end of file
++endif(MSVC)
More information about the scm-commits
mailing list