[med-svn] [fw4spl] 01/01: fix runtime link error when loading data.
Flavien Bridault
fbridault-guest at moszumanska.debian.org
Thu Mar 2 14:37:12 UTC 2017
This is an automated email from the git hooks/post-receive script.
fbridault-guest pushed a commit to branch master
in repository fw4spl.
commit 448495d41a311621604b0cc6eba26c218e13f71c
Author: Flavien Bridault <fbridault at ircad.fr>
Date: Thu Mar 2 14:36:33 2017 +0000
fix runtime link error when loading data.
---
debian/patches/fix_install.patch | 85 +++++++++++++++++++++++++++-------------
1 file changed, 57 insertions(+), 28 deletions(-)
diff --git a/debian/patches/fix_install.patch b/debian/patches/fix_install.patch
index 898ebe7..4c14b39 100644
--- a/debian/patches/fix_install.patch
+++ b/debian/patches/fix_install.patch
@@ -1,7 +1,7 @@
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
+--- fw4spl-old.orig/CMake/install/linux/template.sh.in
++++ fw4spl-old/CMake/install/linux/template.sh.in
@@ -18,7 +18,7 @@
esac
}
@@ -32,8 +32,8 @@ Author: Flavien Bridault <fbridault at ircad.fr>
-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
+--- fw4spl-old.orig/CMake/install/linux_install.cmake
++++ fw4spl-old/CMake/install/linux_install.cmake
@@ -55,8 +55,9 @@
set(CPACK_PACKAGE_VERSION "${VERSION}")
@@ -46,8 +46,8 @@ Author: Flavien Bridault <fbridault at ircad.fr>
endif()
if(NOT USE_SYSTEM_LIB)
---- fw4spl.orig/SrcLib/io/fwItkIO/CMakeLists.txt
-+++ fw4spl/SrcLib/io/fwItkIO/CMakeLists.txt
+--- fw4spl-old.orig/SrcLib/io/fwItkIO/CMakeLists.txt
++++ fw4spl-old/SrcLib/io/fwItkIO/CMakeLists.txt
@@ -4,22 +4,12 @@
find_package(JPEG REQUIRED)
find_package(ZLIB REQUIRED )
@@ -84,8 +84,8 @@ Author: Flavien Bridault <fbridault at ircad.fr>
ITKCommon
ITKIOImageBase
ITKIOJPEG
---- fw4spl.orig/SrcLib/visu/fwRenderVTK/CMakeLists.txt
-+++ fw4spl/SrcLib/visu/fwRenderVTK/CMakeLists.txt
+--- fw4spl-old.orig/SrcLib/visu/fwRenderVTK/CMakeLists.txt
++++ fw4spl-old/SrcLib/visu/fwRenderVTK/CMakeLists.txt
@@ -23,7 +23,7 @@
vtkInteractionStyle
vtkRenderingCore
@@ -95,8 +95,8 @@ Author: Flavien Bridault <fbridault at ircad.fr>
vtkRenderingVolumeOpenGL
REQUIRED
NO_MODULE)
---- fw4spl.orig/CMakeLists.txt
-+++ fw4spl/CMakeLists.txt
+--- fw4spl-old.orig/CMakeLists.txt
++++ fw4spl-old/CMakeLists.txt
@@ -7,6 +7,7 @@
include(CheckVariableExists)
@@ -192,8 +192,8 @@ Author: Flavien Bridault <fbridault at ircad.fr>
endif()
fwBundleExtra()
endmacro()
---- fw4spl.orig/SrcLib/core/fwDataIO/src/fwDataIO/reader/DictionaryReader.cpp
-+++ fw4spl/SrcLib/core/fwDataIO/src/fwDataIO/reader/DictionaryReader.cpp
+--- fw4spl-old.orig/SrcLib/core/fwDataIO/src/fwDataIO/reader/DictionaryReader.cpp
++++ fw4spl-old/SrcLib/core/fwDataIO/src/fwDataIO/reader/DictionaryReader.cpp
@@ -359,7 +359,7 @@
::boost::filesystem::path DictionaryReader::getDefaultDictionaryPath()
@@ -203,8 +203,8 @@ Author: Flavien Bridault <fbridault at ircad.fr>
return dicoPath;
}
---- fw4spl.orig/SrcLib/core/fwRuntime/src/io/BundleDescriptorReader.cpp
-+++ fw4spl/SrcLib/core/fwRuntime/src/io/BundleDescriptorReader.cpp
+--- fw4spl-old.orig/SrcLib/core/fwRuntime/src/io/BundleDescriptorReader.cpp
++++ fw4spl-old/SrcLib/core/fwRuntime/src/io/BundleDescriptorReader.cpp
@@ -103,7 +103,7 @@
// Validation
@@ -223,8 +223,8 @@ Author: Flavien Bridault <fbridault at ircad.fr>
const ::boost::filesystem::path pluginXSDLocation(
::fwRuntime::Runtime::getDefault()->getWorkingPath() / fileLocation.str() );
---- fw4spl.orig/SrcLib/core/fwRuntime/src/io/ProfileReader.cpp
-+++ fw4spl/SrcLib/core/fwRuntime/src/io/ProfileReader.cpp
+--- fw4spl-old.orig/SrcLib/core/fwRuntime/src/io/ProfileReader.cpp
++++ fw4spl-old/SrcLib/core/fwRuntime/src/io/ProfileReader.cpp
@@ -52,7 +52,7 @@
// Validation
@@ -234,8 +234,8 @@ Author: Flavien Bridault <fbridault at ircad.fr>
const ::boost::filesystem::path profileXSDLocation(
::fwRuntime::Runtime::getDefault()->getWorkingPath() / fileLocation.str() );
---- fw4spl.orig/SrcLib/io/fwDcmtkTools/src/fwDcmtkTools/Dictionary.cpp
-+++ fw4spl/SrcLib/io/fwDcmtkTools/src/fwDcmtkTools/Dictionary.cpp
+--- fw4spl-old.orig/SrcLib/io/fwDcmtkTools/src/fwDcmtkTools/Dictionary.cpp
++++ fw4spl-old/SrcLib/io/fwDcmtkTools/src/fwDcmtkTools/Dictionary.cpp
@@ -25,7 +25,7 @@
if (!dcmDataDict.isDictionaryLoaded())
{
@@ -245,8 +245,8 @@ Author: Flavien Bridault <fbridault at ircad.fr>
bool loaded = dcmDataDict.wrlock().loadDictionary(dicoPath.c_str());
dcmDataDict.unlock();
SLM_ERROR_IF("Unable to load DICOM dictionary !", loaded);
---- fw4spl.orig/SrcLib/io/fwGdcmIO/src/fwGdcmIO/writer/ie/Surface.cpp
-+++ fw4spl/SrcLib/io/fwGdcmIO/src/fwGdcmIO/writer/ie/Surface.cpp
+--- fw4spl-old.orig/SrcLib/io/fwGdcmIO/src/fwGdcmIO/writer/ie/Surface.cpp
++++ fw4spl-old/SrcLib/io/fwGdcmIO/src/fwGdcmIO/writer/ie/Surface.cpp
@@ -57,7 +57,7 @@
// Ready the dictionary
::fwDataIO::reader::DictionaryReader::sptr dictionaryReader = ::fwDataIO::reader::DictionaryReader::New();
@@ -256,8 +256,8 @@ Author: Flavien Bridault <fbridault at ircad.fr>
try
{
dictionaryReader->read();
---- fw4spl.orig/SrcLib/io/fwPacsIO/src/fwPacsIO/SeriesRetriever.cpp
-+++ fw4spl/SrcLib/io/fwPacsIO/src/fwPacsIO/SeriesRetriever.cpp
+--- fw4spl-old.orig/SrcLib/io/fwPacsIO/src/fwPacsIO/SeriesRetriever.cpp
++++ fw4spl-old/SrcLib/io/fwPacsIO/src/fwPacsIO/SeriesRetriever.cpp
@@ -62,7 +62,7 @@
// Load configuration
@@ -267,8 +267,8 @@ Author: Flavien Bridault <fbridault at ircad.fr>
SLM_ASSERT("storescp.cfg not found !", ::boost::filesystem::exists(cfgPath));
this->loadAssociationCfgFile(cfgPath.string().c_str());
this->setAndCheckAssociationProfile("Default");
---- fw4spl.orig/SrcLib/patch/fwMDSemanticPatch/src/fwMDSemanticPatch/PatchLoader.cpp
-+++ fw4spl/SrcLib/patch/fwMDSemanticPatch/src/fwMDSemanticPatch/PatchLoader.cpp
+--- fw4spl-old.orig/SrcLib/patch/fwMDSemanticPatch/src/fwMDSemanticPatch/PatchLoader.cpp
++++ fw4spl-old/SrcLib/patch/fwMDSemanticPatch/src/fwMDSemanticPatch/PatchLoader.cpp
@@ -14,8 +14,8 @@
void PatchLoader::loadPatches()
{
@@ -280,8 +280,8 @@ Author: Flavien Bridault <fbridault at ircad.fr>
}
//------------------------------------------------------------------------------
---- fw4spl.orig/Bundles/style/CMakeLists.txt
-+++ fw4spl/Bundles/style/CMakeLists.txt
+--- fw4spl-old.orig/Bundles/style/CMakeLists.txt
++++ fw4spl-old/Bundles/style/CMakeLists.txt
@@ -2,6 +2,8 @@
find_package(Qt5 COMPONENTS Core REQUIRED)
@@ -291,11 +291,40 @@ Author: Flavien Bridault <fbridault at ircad.fr>
qt5_add_binary_resources(${FWPROJECT_NAME}_DARKSTYLE_RCC
"rc/darkstyle.qrc"
DESTINATION "${CMAKE_BINARY_DIR}/${BUNDLE_PREFIX}/${FWPROJECT_NAME}_${DASH_VERSION}/darkstyle.rcc"
---- fw4spl.orig/Bundles/LeafUI/uiGenericQt/CMakeLists.txt
-+++ fw4spl/Bundles/LeafUI/uiGenericQt/CMakeLists.txt
+--- fw4spl-old.orig/Bundles/LeafUI/uiGenericQt/CMakeLists.txt
++++ fw4spl-old/Bundles/LeafUI/uiGenericQt/CMakeLists.txt
@@ -18,4 +18,5 @@
set_target_properties(${FWPROJECT_NAME} PROPERTIES AUTOMOC TRUE)
+target_compile_definitions(${FWPROJECT_NAME} PUBLIC "-DQT_NO_KEYWORDS")
+--- fw4spl-old.orig/Bundles/core/dataReg/include/dataReg/Plugin.hpp
++++ fw4spl-old/Bundles/core/dataReg/include/dataReg/Plugin.hpp
+@@ -32,6 +32,8 @@
+ /// Overrides stop method. Do nothing
+ DATAREG_API void stop() throw();
+
++ int m_fwDataCampVersion;
++ int m_fwMedDataCampVersion;
+ };
+
+ } // namespace dataReg
+--- fw4spl-old.orig/Bundles/core/dataReg/src/dataReg/Plugin.cpp
++++ fw4spl-old/Bundles/core/dataReg/src/dataReg/Plugin.cpp
+@@ -40,12 +40,11 @@
+ pat->getClassname();
+
+ //Force link with fwDataCamp
+- static const int fwDataCampVersion = ::fwDataCamp::Version::s_CURRENT_VERSION;
+- FwCoreNotUsedMacro(fwDataCampVersion);
++ m_fwDataCampVersion = ::fwDataCamp::Version::s_CURRENT_VERSION;
++
+
+ //Force link with rdDataCamp
+- static const int fwMedDataCampVersion = ::fwMedDataCamp::Version::s_CURRENT_VERSION;
+- FwCoreNotUsedMacro(fwMedDataCampVersion);
++ m_fwMedDataCampVersion = ::fwMedDataCamp::Version::s_CURRENT_VERSION;
+ }
+
+ //-----------------------------------------------------------------------------
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/fw4spl.git
More information about the debian-med-commit
mailing list