rev 18397 - trunk/packages/kdelibs/debian/patches

[Modestas Vainius]

Author: modax
Date: 2010-06-23 07:54:59 +0000 (Wed, 23 Jun 2010)
New Revision: 18397

Modified:
   trunk/packages/kdelibs/debian/patches/09_disable_usr_lib_install_rpath.diff
Log:
Sigh. Keep kdewidgets/CMakeLists.txt RPATH sanitization code in kdewidgets/CMakeLists.txt as well.

Modified: trunk/packages/kdelibs/debian/patches/09_disable_usr_lib_install_rpath.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/09_disable_usr_lib_install_rpath.diff	2010-06-23 07:07:07 UTC (rev 18396)
+++ trunk/packages/kdelibs/debian/patches/09_disable_usr_lib_install_rpath.diff	2010-06-23 07:54:59 UTC (rev 18397)
@@ -1,12 +1,15 @@
 From: Alexander Neundorf <neundorf at kde.org>
+From: Modestas Vainius <modax at debian.org>
 Subject: don't set the install RPATH to LIB_INSTALL_DIR
  don't set the install RPATH to LIB_INSTALL_DIR if LIB_INSTALL_DIR is one of
  the standard system link directories, like e.g. /usr/lib (which are listed in
  CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES, which is set in
  Modules/Platform/UnixPaths.cmake).
+ .
+ Also drop custom INSTALL_RPATHs in kdewidgets/CMakeLists.txt.
 Forwarded: yes
 Origin: backport, http://websvn.kde.org/?view=revision&revision=1124215
-Last-Update: 2010-06-20
+Last-Update: 2010-06-23
 
 --- a/cmake/modules/FindKDE4Internal.cmake
 +++ b/cmake/modules/FindKDE4Internal.cmake
@@ -27,3 +30,21 @@
        set(CMAKE_SKIP_BUILD_RPATH FALSE)
        set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
        set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+--- a/kdewidgets/CMakeLists.txt
++++ b/kdewidgets/CMakeLists.txt
+@@ -51,7 +51,6 @@ if(NOT WIN32)
+                                    INSTALL_RPATH_USE_LINK_PATH TRUE
+                                    SKIP_BUILD_RPATH TRUE
+                                    BUILD_WITH_INSTALL_RPATH TRUE
+-                                   INSTALL_RPATH ${LIB_INSTALL_DIR}
+                        )
+ endif(NOT WIN32)
+ 
+@@ -86,7 +85,6 @@ if (QT_QT3SUPPORT_FOUND)
+                                    INSTALL_RPATH_USE_LINK_PATH TRUE
+                                    SKIP_BUILD_RPATH TRUE
+                                    BUILD_WITH_INSTALL_RPATH TRUE
+-                                   INSTALL_RPATH ${LIB_INSTALL_DIR}
+                            )
+    endif(NOT WIN32)
+