From 5cfdf50f79998a3bb9fe787015b96eb2922532db Mon Sep 17 00:00:00 2001 From: vsr Date: Thu, 27 Nov 2014 09:06:35 +0300 Subject: [PATCH] Add dependency of ParaView on freetype and libxml2 --- config_CentOS_5.5_64bit.xml | 28 +++++++++++++++------------- config_CentOS_6.3_64bit.xml | 26 ++++++++++++++------------ config_Debian_6.0_64bit.xml | 26 ++++++++++++++------------ config_Debian_7_64bit.xml | 26 ++++++++++++++------------ config_Fedora_18_64bit.xml | 26 ++++++++++++++------------ config_Mandriva_2010.0_64bit.xml | 25 +++++++++++++------------ config_Ubuntu_13.10_64bit.xml | 26 ++++++++++++++------------ config_files/ParaView.sh | 8 ++++++++ 8 files changed, 106 insertions(+), 85 deletions(-) diff --git a/config_CentOS_5.5_64bit.xml b/config_CentOS_5.5_64bit.xml index 329735a..58f7c9a 100755 --- a/config_CentOS_5.5_64bit.xml +++ b/config_CentOS_5.5_64bit.xml @@ -590,6 +590,15 @@ installdiskspace="2970,9509,19100" script="scotch.sh"/> + + + @@ -689,15 +698,6 @@ installdiskspace="18030,0,18030" script="homard.sh"/> - - - @@ -1146,6 +1146,10 @@ gcc + + gcc + Python + gcc Python @@ -1244,6 +1248,8 @@ Qt boost gl2ps + freetype + libxml2 gcc @@ -1266,10 +1272,6 @@ gcc Python - - gcc - Python - gcc tcltk diff --git a/config_CentOS_6.3_64bit.xml b/config_CentOS_6.3_64bit.xml index 08a46c6..a624255 100755 --- a/config_CentOS_6.3_64bit.xml +++ b/config_CentOS_6.3_64bit.xml @@ -581,6 +581,15 @@ installdiskspace="2970,9509,19100" script="scotch.sh"/> + + + @@ -680,15 +689,6 @@ installdiskspace="18030,0,18030" script="homard.sh"/> - - - @@ -1103,6 +1103,9 @@ tcltk + + Python + Python Qt @@ -1170,6 +1173,8 @@ Qt boost gl2ps + freetype + libxml2 Python @@ -1185,9 +1190,6 @@ Python - - Python - tcltk OpenCascade diff --git a/config_Debian_6.0_64bit.xml b/config_Debian_6.0_64bit.xml index b09268d..a82294c 100755 --- a/config_Debian_6.0_64bit.xml +++ b/config_Debian_6.0_64bit.xml @@ -581,6 +581,15 @@ installdiskspace="2970,9509,19100" script="scotch.sh"/> + + + @@ -680,15 +689,6 @@ installdiskspace="18030,0,18030" script="homard.sh"/> - - - @@ -1103,6 +1103,9 @@ tcltk + + Python + Python Qt @@ -1170,6 +1173,8 @@ Qt boost gl2ps + freetype + libxml2 Python @@ -1185,9 +1190,6 @@ Python - - Python - tcltk OpenCascade diff --git a/config_Debian_7_64bit.xml b/config_Debian_7_64bit.xml index 9395927..02141ec 100644 --- a/config_Debian_7_64bit.xml +++ b/config_Debian_7_64bit.xml @@ -581,6 +581,15 @@ installdiskspace="2970,9509,19100" script="scotch.sh"/> + + + @@ -680,15 +689,6 @@ installdiskspace="18030,0,18030" script="homard.sh"/> - - - @@ -1103,6 +1103,9 @@ tcltk + + Python + Python Qt @@ -1170,6 +1173,8 @@ Qt boost gl2ps + freetype + libxml2 Python @@ -1185,9 +1190,6 @@ Python - - Python - tcltk OpenCascade diff --git a/config_Fedora_18_64bit.xml b/config_Fedora_18_64bit.xml index 740f751..f1ce0f3 100755 --- a/config_Fedora_18_64bit.xml +++ b/config_Fedora_18_64bit.xml @@ -581,6 +581,15 @@ installdiskspace="2970,9509,19100" script="scotch.sh"/> + + + @@ -680,15 +689,6 @@ installdiskspace="18030,0,18030" script="homard.sh"/> - - - @@ -1103,6 +1103,9 @@ tcltk + + Python + Python Qt @@ -1170,6 +1173,8 @@ Qt boost gl2ps + freetype + libxml2 Python @@ -1185,9 +1190,6 @@ Python - - Python - tcltk OpenCascade diff --git a/config_Mandriva_2010.0_64bit.xml b/config_Mandriva_2010.0_64bit.xml index 5e0564a..2d4a047 100755 --- a/config_Mandriva_2010.0_64bit.xml +++ b/config_Mandriva_2010.0_64bit.xml @@ -581,6 +581,15 @@ installdiskspace="2970,9509,19100" script="scotch.sh"/> + + + @@ -680,15 +689,6 @@ installdiskspace="18030,0,18030" script="homard.sh"/> - - - @@ -1098,6 +1098,9 @@ tcltk + + Python + Python Qt @@ -1165,6 +1168,7 @@ Qt boost gl2ps + freetype Python @@ -1180,9 +1184,6 @@ Python - - Python - tcltk OpenCascade diff --git a/config_Ubuntu_13.10_64bit.xml b/config_Ubuntu_13.10_64bit.xml index 90c329c..9047ac9 100644 --- a/config_Ubuntu_13.10_64bit.xml +++ b/config_Ubuntu_13.10_64bit.xml @@ -581,6 +581,15 @@ installdiskspace="2970,9509,19100" script="scotch.sh"/> + + + @@ -680,15 +689,6 @@ installdiskspace="18030,0,18030" script="homard.sh"/> - - - @@ -1103,6 +1103,9 @@ tcltk + + Python + Python Qt @@ -1170,6 +1173,8 @@ Qt boost gl2ps + freetype + libxml2 Python @@ -1185,9 +1190,6 @@ Python - - Python - tcltk OpenCascade diff --git a/config_files/ParaView.sh b/config_files/ParaView.sh index 2852f55..cd4478c 100755 --- a/config_files/ParaView.sh +++ b/config_files/ParaView.sh @@ -361,6 +361,8 @@ if [ "${patch_vtkconfig}" = "1" ] ; then sed -i "s%[^;\"]\+/Python-[0-9\.]\+/lib/\([^;]\+\)%${PYTHON_ROOT_DIR}/lib/\1%g" ${PRODUCT_DIR}/lib/cmake/paraview-${PVLIBVERSION}/VTKTargets.cmake sed -i "s%[^;\"]\+/hdf5-[0-9\.]\+/lib/\([^;]\+\)%${HDF5_ROOT_DIR}/lib/\1%g" ${PRODUCT_DIR}/lib/cmake/paraview-${PVLIBVERSION}/VTKTargets.cmake sed -i "s%[^;\"]\+/gl2ps-[0-9\.]\+/lib/\([^;]\+\)%${GL2PS_ROOT_DIR}/lib/\1%g" ${PRODUCT_DIR}/lib/cmake/paraview-${PVLIBVERSION}/VTKTargets.cmake + sed -i "s%[^;\"]\+/freetype-[0-9\.]\+/lib/\([^;]\+\)%${FREETYPE_ROOT_DIR}/lib/\1%g" ${PRODUCT_DIR}/lib/cmake/paraview-${PVLIBVERSION}/VTKTargets.cmake + sed -i "s%[^;\"]\+/libxml2-[0-9\.]\+/lib/\([^;]\+\)%${LIBXML2_ROOT_DIR}/lib/\1%g" ${PRODUCT_DIR}/lib/cmake/paraview-${PVLIBVERSION}/VTKTargets.cmake fi # patch: fix wrong NVidia drivers dependencies @@ -428,6 +430,12 @@ sed -e "s%/[^\";]*/bin/moc%${QT4_ROOT_DIR}/bin/moc%g" \ -e "s%/[^\";]*/gl2ps-[0-9]\+\.[0-9]\+\.[0-9]\+/include%${GL2PS_ROOT_DIR}/include%g" \ -e "s%/[^\";]*/lib/libgl2ps.so%${GL2PS_ROOT_DIR}/lib/libgl2ps.so%g" \ -e "s%/[^\";]*/lib64/libgl2ps.so%${GL2PS_ROOT_DIR}/lib64/libgl2ps.so%g" \ + -e "s%/[^\";]*/lib/libfreetype.so%${FREETYPE_ROOT_DIR}/lib/libfreetype.so%g" \ + -e "s%/[^\";]*/lib64/libfreetype.so%${FREETYPE_ROOT_DIR}/lib64/libfreetype.so%g" \ + -e "s%/[^\";]*/freetype-[0-9\.]\+/include%${FREETYPE_ROOT_DIR}/include%g" \ + -e "s%/[^\";]*/lib/libxml2.so%${LIBXML2_ROOT_DIR}/lib/libxml2.so%g" \ + -e "s%/[^\";]*/lib64/libxml2.so%${LIBXML2_ROOT_DIR}/lib64/libxml2.so%g" \ + -e "s%/[^\";]*/libxml2-[0-9\.]\+/include%${LIBXML2_ROOT_DIR}/include%g" \ -e "s%\(IMPORTED_LOCATION_RELEASE.*\"\).*/lib/paraview-${PVLIBVERSION}/\([^/]\+\"\)%\1${PRODUCT_DIR}/lib/paraview-${PVLIBVERSION}/\2%g" \ -e "s%\(IMPORTED_LOCATION_RELEASE.* \"\).*/bin/\([^/]\+\"\)%\1${PRODUCT_DIR}/bin/\2%g" \ ${f} > ${f}.new -- 2.39.2