bos #23972 remove sphinxext.napoleon patches applied to SHAPER and SMESH

diff --git a/products/SHAPER.pyconf b/products/SHAPER.pyconf
index 75ac6ab006876fc3fc6dbd306f2c25f895fcc00a..5fcc5cecc3f8b65160badfad75c05742e727824f 100644 (file)
--- a/products/SHAPER.pyconf
+++ b/products/SHAPER.pyconf
@@ -45,7 +45,7 @@ default :
         has_unit_tests : "yes"
     }
     cmake_options :   "-DCMAKE_CXX_FLAGS=-fpermissive -DNO_SolveSpace=TRUE -DSWIG_EXECUTABLE=${SWIG_ROOT_DIR}/bin/swig -DADD_COMPATIBILITY_TESTS=ON -DADD_MODELS_TESTS=ON -DADD_HDF_TESTS=ON"
-    patches : ['patch_shaper_cursor_cross.diff', 'SHAPER_sphinx_ext_napoleon.patch']
+    patches : ['patch_shaper_cursor_cross.diff']
 }
 
 default_win :

diff --git a/products/SMESH.pyconf b/products/SMESH.pyconf
index 0ae2354d5d6f7e630b7381422b20c3f31e91e0ce..d526be37e08e114d44b2c4332e39b798700b3830 100644 (file)
--- a/products/SMESH.pyconf
+++ b/products/SMESH.pyconf
@@ -42,7 +42,7 @@ default :
               "tbb"
              ]
     build_depend : ["cmake", "swig", "doxygen", "cppunit"]
-    patches : ["SMESH_sphinx_ext_napoleon.patch"]
+    patches : []
     check_install : ["share/doc/salome/gui/SMESH/yams/index.html"]
     source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name
     build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name

diff --git a/products/patches/SHAPER_sphinx_ext_napoleon.patch b/products/patches/SHAPER_sphinx_ext_napoleon.patch
deleted file mode 100644 (file)
index 9abdd9d..0000000
--- a/products/patches/SHAPER_sphinx_ext_napoleon.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/doc/gui/conf.py.in b/doc/gui/conf.py.in
-index d1327b144..e5e040494 100644
---- a/doc/gui/conf.py.in
-+++ b/doc/gui/conf.py.in
-@@ -33,8 +33,8 @@ import sphinx
- # ones.
- extensions = ['sphinx.ext.autodoc','sphinx.ext.autosummary']
- try:
--  import sphinxcontrib.napoleon
--  extensions += ['sphinxcontrib.napoleon']
-+  import sphinx.ext.napoleon
-+  extensions += ['sphinx.ext.napoleon']
- except:
-   pass
- try:

diff --git a/products/patches/SMESH_sphinx_ext_napoleon.patch b/products/patches/SMESH_sphinx_ext_napoleon.patch
deleted file mode 100644 (file)
index b2a5acc..0000000
--- a/products/patches/SMESH_sphinx_ext_napoleon.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6796fcfe9..522790eac 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -130,7 +130,7 @@ IF(SALOME_BUILD_TESTS)
- ENDIF()
- IF(SALOME_BUILD_DOC)
-   FIND_PACKAGE(SalomeDoxygen)
--  SET(Sphinx_EXTENSIONS sphinxcontrib.napoleon)
-+  SET(Sphinx_EXTENSIONS sphinx.ext.napoleon)
-   FIND_PACKAGE(SalomeSphinx)
-   SALOME_LOG_OPTIONAL_PACKAGE(Doxygen SALOME_BUILD_DOC)
-   SALOME_LOG_OPTIONAL_PACKAGE(Sphinx SALOME_BUILD_DOC)
-diff --git a/doc/salome/gui/SMESH/conf.py.in b/doc/salome/gui/SMESH/conf.py.in
-index 66efe32d3..f86270ab8 100644
---- a/doc/salome/gui/SMESH/conf.py.in
-+++ b/doc/salome/gui/SMESH/conf.py.in
-@@ -26,8 +26,8 @@ import sphinx
- # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
- extensions = ['sphinx.ext.autodoc','sphinx.ext.autosummary']
- try:
--  import sphinxcontrib.napoleon
--  extensions += ['sphinxcontrib.napoleon']
-+  import sphinx.ext.napoleon
-+  extensions += ['sphinx.ext.napoleon']
- except:
-   pass
- try: