From: rnv Date: Mon, 13 Apr 2020 11:46:13 +0000 (+0300) Subject: Add libxml2 and freetype patches X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=66d3996e9d4a703f87fa677ab817ca8fc499b3e9;p=tools%2Fconfiguration.git Add libxml2 and freetype patches --- diff --git a/config/patches/paraview.0006-ParaView_find_libxml2.patch b/config/patches/paraview.0006-ParaView_find_libxml2.patch new file mode 100644 index 0000000..a741d50 --- /dev/null +++ b/config/patches/paraview.0006-ParaView_find_libxml2.patch @@ -0,0 +1,14 @@ +--- ParaView-5.8.0_SRC_orig/VTK/CMake/FindLibXml2.cmake 2020-03-23 22:17:27.000000000 +0100 ++++ ParaView-5.8.0_SRC_modif/VTK/CMake/FindLibXml2.cmake 2020-04-10 09:56:00.627562062 +0200 +@@ -53,6 +53,11 @@ + PKG_CHECK_MODULES(PC_LIBXML QUIET libxml-2.0) + set(LIBXML2_DEFINITIONS ${PC_LIBXML_CFLAGS_OTHER}) + ++SET(LIBXML2_ROOT_DIR $ENV{LIBXML2_ROOT_DIR} CACHE PATH "Path to the LIBXML2.") ++IF(LIBXML2_ROOT_DIR) ++ LIST(APPEND CMAKE_PREFIX_PATH "${LIBXML2_ROOT_DIR}") ++ENDIF(LIBXML2_ROOT_DIR) ++ + find_path(LIBXML2_INCLUDE_DIR NAMES libxml/xpath.h + HINTS + ${PC_LIBXML_INCLUDEDIR} diff --git a/config/patches/paraview.0007-ParaView_find_freetype.patch b/config/patches/paraview.0007-ParaView_find_freetype.patch new file mode 100644 index 0000000..04e86fa --- /dev/null +++ b/config/patches/paraview.0007-ParaView_find_freetype.patch @@ -0,0 +1,15 @@ +diff -Naur ParaView-5.8.0_SRC_orig/VTK/CMake/FindFreetype.cmake ParaView-5.8.0_SRC_modif/VTK/CMake/FindFreetype.cmake +--- ParaView-5.8.0_SRC_orig/VTK/CMake/FindFreetype.cmake 2020-03-23 13:31:26.000000000 +0300 ++++ ParaView-5.8.0_SRC_modif/VTK/CMake/FindFreetype.cmake 2020-04-10 22:27:24.194525121 +0300 +@@ -63,6 +63,11 @@ + # I'm going to attempt to cut out the middleman and hope + # everything still works. + ++SET(FREETYPE_ROOT_DIR $ENV{FREETYPE_ROOT_DIR} CACHE PATH "Path to the FreeType.") ++IF(FREETYPE_ROOT_DIR) ++ LIST(APPEND CMAKE_PREFIX_PATH "${FREETYPE_ROOT_DIR}") ++ENDIF(FREETYPE_ROOT_DIR) ++ + set(FREETYPE_FIND_ARGS + HINTS + ENV FREETYPE_DIR