rev 20397 - in kde-extras/kwave/trunk/debian: . patches

[Pino Toscano]

Author: pino
Date: 2016-03-25 09:44:39 +0000 (Fri, 25 Mar 2016)
New Revision: 20397

Modified:
   kde-extras/kwave/trunk/debian/changelog
   kde-extras/kwave/trunk/debian/patches/07-no-rpath
   kde-extras/kwave/trunk/debian/patches/cmake-verbose.diff
Log:
update the remaining patches

- 07-no-rpath: refresh
- cmake-verbose.diff: refresh


Modified: kde-extras/kwave/trunk/debian/changelog
===================================================================
--- kde-extras/kwave/trunk/debian/changelog	2016-03-25 09:40:17 UTC (rev 20396)
+++ kde-extras/kwave/trunk/debian/changelog	2016-03-25 09:44:39 UTC (rev 20397)
@@ -3,8 +3,10 @@
   [ Pino Toscano ]
   * New upstream release.
   * Update the patches:
+    - 07-no-rpath: refresh
     - upstream_fix-for-cmake-issues-with-l10n-fix-for-policy-CMP005.patch:
       drop, backported from upstream
+    - cmake-verbose.diff: refresh
     - upstream_compile-fix-for-armv7l.patch: drop, backported from upstream
   * Update the build dependencies following the port to Frameworks:
     - remove kdelibs5-dev

Modified: kde-extras/kwave/trunk/debian/patches/07-no-rpath
===================================================================
--- kde-extras/kwave/trunk/debian/patches/07-no-rpath	2016-03-25 09:40:17 UTC (rev 20396)
+++ kde-extras/kwave/trunk/debian/patches/07-no-rpath	2016-03-25 09:44:39 UTC (rev 20397)
@@ -4,18 +4,18 @@
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -201,11 +201,11 @@ INCLUDE_DIRECTORIES(
+@@ -241,11 +241,11 @@ INCLUDE_DIRECTORIES(
  #############################################################################
  ### RPATH settings                                                        ###
  
 -SET(CMAKE_SKIP_BUILD_RPATH TRUE)
 -SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
--SET(CMAKE_INSTALL_RPATH "${LIB_INSTALL_DIR}")
+-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}")
 -SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 -MESSAGE(STATUS "Using ${CMAKE_INSTALL_RPATH} as install RPATH")
 +#SET(CMAKE_SKIP_BUILD_RPATH TRUE)
 +#SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
-+#SET(CMAKE_INSTALL_RPATH "${LIB_INSTALL_DIR}")
++#SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}")
 +#SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 +#MESSAGE(STATUS "Using ${CMAKE_INSTALL_RPATH} as install RPATH")
  

Modified: kde-extras/kwave/trunk/debian/patches/cmake-verbose.diff
===================================================================
--- kde-extras/kwave/trunk/debian/patches/cmake-verbose.diff	2016-03-25 09:40:17 UTC (rev 20396)
+++ kde-extras/kwave/trunk/debian/patches/cmake-verbose.diff	2016-03-25 09:44:39 UTC (rev 20397)
@@ -7,7 +7,7 @@
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -132,7 +132,7 @@ INCLUDE(CheckFunctionExists)
+@@ -144,7 +144,7 @@ INCLUDE(CheckFunctionExists)
  
  #############################################################################