[med-svn] [fw4spl] 06/08: update patches to apply on 11.0.4

[Flavien Bridault]

This is an automated email from the git hooks/post-receive script.

fbridault-guest pushed a commit to branch master
in repository fw4spl.

commit 8e049a26ff9e6a75e9c7abbc00e00d70d6b9a61d
Author: Flavien Bridault <fbridault at ircad.fr>
Date:   Wed Mar 1 15:00:05 2017 +0100

    update patches to apply on 11.0.4
---
 debian/patches/fix_install.patch | 64 +++++++++++++++++++---------------------
 1 file changed, 31 insertions(+), 33 deletions(-)

diff --git a/debian/patches/fix_install.patch b/debian/patches/fix_install.patch
index 88be7d1..53d561d 100644
--- a/debian/patches/fix_install.patch
+++ b/debian/patches/fix_install.patch
@@ -1,3 +1,5 @@
+Description: Fix the install paths to comply to standard paths
+Author: Flavien Bridault <fbridault at ircad.fr>
 --- fw4spl.orig/CMake/install/linux/template.sh.in
 +++ fw4spl/CMake/install/linux/template.sh.in
 @@ -18,7 +18,7 @@
@@ -9,7 +11,7 @@
  if test -L "$me"; then
      # Try readlink(1)
      readlink=`type readlink 2>/dev/null` || readlink=
-@@ -33,16 +33,12 @@
+@@ -33,10 +33,9 @@
      fi
  fi
  #Find the directories
@@ -23,27 +25,27 @@
  
  #export LD_LIBRARY_PATH
  LD_LIBRARY_PATH=$libdir:${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
- export LD_LIBRARY_PATH
--#export the path to the fonts (mandatory for Qt)
--QT_QPA_FONTDIR=$fontdir
--export QT_QPA_FONTDIR
+@@ -45,4 +44,5 @@
+ QT_QPA_FONTDIR=$fontdir
+ export QT_QPA_FONTDIR
  #Use CMAKE Variable of fwlauncher and Profile.xml path
--exec "$bindir/@LAUNCHER@" "$bundledir/@PROFILE_PATH@" "-B" "$bundledir" "--rwd" "$bindir/.."
+-exec "$bindir/bin/@LAUNCHER@" "$bundledir/@PROFILE_PATH@" "-B" "$bundledir" "--rwd" "$bindir/"
 +exec "$bindir/@LAUNCHER@" "$bundledir/@PROFILE_PATH@" "-B" "$bundledir" "--rwd" "$me"
++
 --- fw4spl.orig/CMake/install/linux_install.cmake
 +++ fw4spl/CMake/install/linux_install.cmake
-@@ -50,8 +50,9 @@
+@@ -55,8 +55,9 @@
      set(CPACK_PACKAGE_VERSION "${VERSION}")
  
      if("${${PRJ_NAME}_TYPE}" STREQUAL  "APP")
 -        configure_file(${FWCMAKE_RESOURCE_PATH}/install/linux/template.sh.in ${CMAKE_CURRENT_BINARY_DIR}/${PRJ_NAME}_${DASH_VERSION}.sh @ONLY)
--        install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${PRJ_NAME}_${DASH_VERSION}.sh DESTINATION ${CMAKE_INSTALL_PREFIX}/bin )
+-        install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${PRJ_NAME}_${DASH_VERSION}.sh DESTINATION ${CMAKE_INSTALL_PREFIX} )
 +        string(TOLOWER ${PRJ_NAME} APP_NAME)
 +        configure_file(${FWCMAKE_RESOURCE_PATH}/install/linux/template.sh.in ${CMAKE_CURRENT_BINARY_DIR}/${APP_NAME} @ONLY)
-+        install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${APP_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin )
++        install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${APP_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
      endif()
  
- 
+     if(NOT USE_SYSTEM_LIB)
 --- fw4spl.orig/SrcLib/io/fwItkIO/CMakeLists.txt
 +++ fw4spl/SrcLib/io/fwItkIO/CMakeLists.txt
 @@ -4,22 +4,12 @@
@@ -103,27 +105,23 @@
  include(${CMAKE_CURRENT_SOURCE_DIR}/CMake/build/profile_config.cmake)
  include(${CMAKE_CURRENT_SOURCE_DIR}/CMake/build/plugin_config.cmake)
  include(${CMAKE_CURRENT_SOURCE_DIR}/CMake/install/generic_install.cmake)
-@@ -70,6 +71,7 @@
+@@ -95,12 +96,14 @@
+     endforeach()
  endif()
  
- set(BUNDLE_PREFIX "Bundles")
 +set(RC_PREFIX "share")
  
- # Set warning level and function export visibility on Unix
- if(UNIX)
-@@ -84,8 +86,9 @@
- 
-         #To make a debian package we should install our bundle in /usr/share/...
-         if(DEBIAN_INSTALL)
--            set(BUNDLE_PREFIX "share/Bundles")
--        endif()
-+            set(BUNDLE_PREFIX "${CMAKE_INSTALL_LIBDIR}/fw4spl")
-+	    set(RC_PREFIX "${CMAKE_INSTALL_LIBDIR}/fw4spl")
-+         endif()
- 
-     endif()
-     # Color for ninja and Clang on Linux and OSX
-@@ -145,6 +148,7 @@
+ if(ANDROID)
+     set(BUNDLE_PREFIX "/data/data/com.fw4spl.${PROJECTS_TO_INSTALL}/Bundles")
+ elseif(DEBIAN_INSTALL)
+     #To make a debian package we should install our bundle in /usr/share/...
+-    set(BUNDLE_PREFIX "share/Bundles")
++    set(BUNDLE_PREFIX "${CMAKE_INSTALL_LIBDIR}/fw4spl")
++    set(RC_PREFIX "${CMAKE_INSTALL_LIBDIR}/fw4spl")
+ else()
+     set(BUNDLE_PREFIX "Bundles")
+ endif()
+@@ -177,6 +180,7 @@
  endif()
  
  add_definitions(-DBUNDLE_PREFIX="${BUNDLE_PREFIX}")
@@ -131,7 +129,7 @@
  
  macro(groupMaker FWPROJECT_NAME)
      file(GLOB_RECURSE PRJ_SOURCES "${${FWPROJECT_NAME}_DIR}/*")
-@@ -336,7 +340,7 @@
+@@ -375,7 +379,7 @@
          add_dependencies( ${FWPROJECT_NAME} ${FWPROJECT_NAME}_rc )
  
          if(${FWPROJECT_NAME}_INSTALL)
@@ -140,7 +138,7 @@
          endif()
      endif()
  
-@@ -390,7 +394,7 @@
+@@ -429,7 +433,7 @@
          add_dependencies( ${FWPROJECT_NAME} ${FWPROJECT_NAME}_rc )
  
          if(${FWPROJECT_NAME}_INSTALL)
@@ -149,7 +147,7 @@
          endif()
      endif()
  
-@@ -448,7 +452,7 @@
+@@ -496,7 +500,7 @@
          add_dependencies( ${FWPROJECT_NAME} ${FWPROJECT_NAME}_rc )
  
          if(${FWPROJECT_NAME}_INSTALL)
@@ -158,7 +156,7 @@
          endif()
  
      endif()
-@@ -457,7 +461,7 @@
+@@ -505,7 +509,7 @@
          install(
              TARGETS ${FWPROJECT_NAME}
              RUNTIME DESTINATION bin
@@ -167,7 +165,7 @@
              OPTIONAL NAMELINK_SKIP
              )
      endif()
-@@ -564,7 +568,7 @@
+@@ -652,7 +656,7 @@
      endif()
  
      if(${FWPROJECT_NAME}_INSTALL)
@@ -178,7 +176,7 @@
  endmacro()
 --- fw4spl.orig/SrcLib/core/fwDataIO/src/fwDataIO/reader/DictionaryReader.cpp
 +++ fw4spl/SrcLib/core/fwDataIO/src/fwDataIO/reader/DictionaryReader.cpp
-@@ -362,7 +362,7 @@
+@@ -359,7 +359,7 @@
  
  ::boost::filesystem::path DictionaryReader::getDefaultDictionaryPath()
  {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/fw4spl.git