From 43e2fab036147eec05be3ed1daf73d37edf300be Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Tue, 27 Jul 2021 17:21:50 +0200 Subject: [PATCH] GUI SALOME 9.3.0 - Windows -backporting patch --- products/GUI.pyconf | 28 +++++++++++++++++++ .../GUI-V9_3_0-LightApplication_windows.patch | 18 ++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 products/patches/GUI-V9_3_0-LightApplication_windows.patch diff --git a/products/GUI.pyconf b/products/GUI.pyconf index 98e0a66..64e370c 100644 --- a/products/GUI.pyconf +++ b/products/GUI.pyconf @@ -128,6 +128,34 @@ version_9_4_0_win: build_depend : ["cmake", "swig", "doxygen", "cppunit"] } +version_V9_3_0_win : +{ + depend : ["KERNEL", + "Python", + "qt", + "sip", + "PyQt", + "boost", + "CAS", + "qwt", + "hdf5", + "freetype", + "freeimage", + "gl2ps", + "ParaView", + "omniORB", + "docutils", + "libxml2", + "sphinxintl", + "sphinxcontrib_websupport", + "sphinxcontrib_applehelp", + "sphinxcontrib_serializinghtml", + "sphinxcontrib_napoleon" + ] + build_depend : ["cmake", "swig", "doxygen", "cppunit"] + patches : ['GUI-V9_3_0-LightApplication_windows.patch'] +} + # OP 19/04/2018 Add section for SALOME 7.8.0 to 8.4.0 due to new dependencies in SALOME 8.5.0 version_7_8_0_to_8_4_0 : { diff --git a/products/patches/GUI-V9_3_0-LightApplication_windows.patch b/products/patches/GUI-V9_3_0-LightApplication_windows.patch new file mode 100644 index 0000000..71fb5e2 --- /dev/null +++ b/products/patches/GUI-V9_3_0-LightApplication_windows.patch @@ -0,0 +1,18 @@ +diff --git a/src/LightApp/LightApp_Application.cxx b/src/LightApp/LightApp_Application.cxx +index f33201e5b..7586e48aa 100644 +--- a/src/LightApp/LightApp_Application.cxx ++++ b/src/LightApp/LightApp_Application.cxx +@@ -3997,7 +3997,12 @@ bool LightApp_Application::checkModule( const QString& title ) + if ( isPyModule ) + { + QString pyModule = QString( "%1GUI.py" ).arg( name ); +- paths = QString( ::getenv( "PYTHONPATH" ) ).split( ":", QString::SkipEmptyParts ); ++ ++#if defined(WIN32) ++ paths = QString( Qtx::getenv( "PYTHONPATH" ) ).split( ";", QString::SkipEmptyParts ); ++#else ++ paths = QString( Qtx::getenv( "PYTHONPATH" ) ).split( ":", QString::SkipEmptyParts ); ++#endif + + isFound = false; + for ( it = paths.begin(); it != paths.end() && !isFound; ++it ) -- 2.39.2