products/patches/SMESH_sphinx_ext_napoleon.patch

   1 diff --git a/CMakeLists.txt b/CMakeLists.txt
   2 index 6796fcfe9..522790eac 100644
   3 --- a/CMakeLists.txt
   4 +++ b/CMakeLists.txt
   5 @@ -130,7 +130,7 @@ IF(SALOME_BUILD_TESTS)
   6  ENDIF()
   7  IF(SALOME_BUILD_DOC)
   8    FIND_PACKAGE(SalomeDoxygen)
   9 -  SET(Sphinx_EXTENSIONS sphinxcontrib.napoleon)
  10 +  SET(Sphinx_EXTENSIONS sphinx.ext.napoleon)
  11    FIND_PACKAGE(SalomeSphinx)
  12    SALOME_LOG_OPTIONAL_PACKAGE(Doxygen SALOME_BUILD_DOC)
  13    SALOME_LOG_OPTIONAL_PACKAGE(Sphinx SALOME_BUILD_DOC)
  14 diff --git a/doc/salome/gui/SMESH/conf.py.in b/doc/salome/gui/SMESH/conf.py.in
  15 index 66efe32d3..f86270ab8 100644
  16 --- a/doc/salome/gui/SMESH/conf.py.in
  17 +++ b/doc/salome/gui/SMESH/conf.py.in
  18 @@ -26,8 +26,8 @@ import sphinx
  19  # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
  20  extensions = ['sphinx.ext.autodoc','sphinx.ext.autosummary']
  21  try:
  22 -  import sphinxcontrib.napoleon
  23 -  extensions += ['sphinxcontrib.napoleon']
  24 +  import sphinx.ext.napoleon
  25 +  extensions += ['sphinx.ext.napoleon']
  26  except:
  27    pass
  28  try: