From: Quentin Cozette <quentin.cozette@cea.fr>
Date: Thu, 15 Apr 2021 18:15:08 +0000 (+0200)
Subject: Add HEXABLOCK patch need for dedicated occ20256 dev build
X-Git-Tag: V9_7_0~63^2~13
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=d8a9b3e49127301d1843e489f1d79ccea0d83558;p=tools%2Fsat_salome.git

Add HEXABLOCK patch need for dedicated occ20256 dev build
---

diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf
index 4318fe4..5f3ddc3 100644
--- a/applications/SALOME-master.pyconf
+++ b/applications/SALOME-master.pyconf
@@ -183,6 +183,7 @@ __overwrite__ :
     'APPLICATION.products.GUI' : {tag : 'occ/20256'}
     'APPLICATION.products.SMESH' : {tag : 'occ/20256'}
     'APPLICATION.products.HEXABLOCK' : {tag : 'occ/20256'}
+    'PRODUCTS.HEXABLOCK.default.patches' : ['HEXABLOCK_occ20256.patch']
     'APPLICATION.products.HEXABLOCKPLUGIN' : {tag : 'occ/20256'}
     'APPLICATION.products.NETGENPLUGIN' : {tag : 'occ/20256'}
     'APPLICATION.products.GHS3DPRLPLUGIN' : {tag : 'occ/20256'}
diff --git a/products/patches/HEXABLOCK_occ20256.patch b/products/patches/HEXABLOCK_occ20256.patch
new file mode 100644
index 0000000..a285623
--- /dev/null
+++ b/products/patches/HEXABLOCK_occ20256.patch
@@ -0,0 +1,13 @@
+diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI.cxx b/src/HEXABLOCKGUI/HEXABLOCKGUI.cxx
+index b01745b..f7998d0 100644
+--- a/src/HEXABLOCKGUI/HEXABLOCKGUI.cxx
++++ b/src/HEXABLOCKGUI/HEXABLOCKGUI.cxx
+@@ -413,7 +413,7 @@ bool HEXABLOCKGUI::deactivateModule( SUIT_Study* theStudy )
+ 
+ SALOMEDS::Study_var HEXABLOCKGUI::getStudyServant()
+ {
+-  SALOME_NamingService *aNamingService = SalomeApp_Application::namingService();
++  SALOME_NamingService_Abstract *aNamingService = SalomeApp_Application::namingService();
+   CORBA::Object_var aSMObject = aNamingService->Resolve("/Study");
+   SALOMEDS::Study_var aDSStudy = SALOMEDS::Study::_narrow(aSMObject);
+   return aDSStudy._retn();