rev 18383 - in trunk/packages/kdelibs/debian: . patches

[Modestas Vainius]

Author: modax
Date: 2010-06-20 09:57:45 +0000 (Sun, 20 Jun 2010)
New Revision: 18383

Modified:
   trunk/packages/kdelibs/debian/changelog
   trunk/packages/kdelibs/debian/patches/09_disable_usr_lib_install_rpath.diff
Log:
Replace 09_disable_usr_lib_install_rpath.diff with a less extreme version
of the patch from kde4libs trunk which should keep support for
custom prefix builds (Closes: #586512).

Modified: trunk/packages/kdelibs/debian/changelog
===================================================================
--- trunk/packages/kdelibs/debian/changelog	2010-06-19 21:23:02 UTC (rev 18382)
+++ trunk/packages/kdelibs/debian/changelog	2010-06-20 09:57:45 UTC (rev 18383)
@@ -7,6 +7,9 @@
       not in implicit link directory list;
     - extend absolute exe path resolution to libkdeinit4_*s in the kdeinit4
       daemon.
+  * Replace 09_disable_usr_lib_install_rpath.diff with a less extreme version
+    of the patch from kde4libs trunk which should keep support for
+    custom prefix builds (Closes: #586512).
 
  -- Modestas Vainius <modax at debian.org>  Mon, 07 Jun 2010 20:58:22 +0300
 

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-19 21:23:02 UTC (rev 18382)
+++ trunk/packages/kdelibs/debian/patches/09_disable_usr_lib_install_rpath.diff	2010-06-20 09:57:45 UTC (rev 18383)
@@ -1,39 +1,29 @@
-From: Modestas Vainius <modax at debian.org>
-Subject: Do not set install RPATH to /usr/lib by default
- /usr/lib RPATH is disallowed on Debian systems and is a bad practise in
- general
-Forwarded: not-needed
+From: Alexander Neundorf <neundorf at kde.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).
+Forwarded: yes
+Origin: backport, http://websvn.kde.org/?view=revision&revision=1124215
+Last-Update: 2010-06-20
 
 --- a/cmake/modules/FindKDE4Internal.cmake
 +++ b/cmake/modules/FindKDE4Internal.cmake
-@@ -943,11 +943,9 @@ if (UNIX)
+@@ -943,8 +943,14 @@ if (UNIX)
     if (APPLE)
        set(CMAKE_INSTALL_NAME_DIR ${LIB_INSTALL_DIR})
     else (APPLE)
 -      # add our LIB_INSTALL_DIR to the RPATH and use the RPATH figured out by cmake when compiling
 -      set(CMAKE_INSTALL_RPATH ${LIB_INSTALL_DIR} )
++      # add our LIB_INSTALL_DIR to the RPATH (but only when it is not one of the standard system link
++      # directories listed in CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES) and use the RPATH figured out by cmake when compiling
++
++      list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${LIB_INSTALL_DIR}" _isSystemLibDir)
++      if("${_isSystemLibDir}" STREQUAL "-1")
++         set(CMAKE_INSTALL_RPATH "${LIB_INSTALL_DIR}")
++      endif("${_isSystemLibDir}" STREQUAL "-1")
++
        set(CMAKE_SKIP_BUILD_RPATH FALSE)
        set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
--      set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
-+      set(CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE)
-    endif (APPLE)
- endif (UNIX)
- 
---- 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)
- 
+       set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)