[oce] 02/16: Refresh patches

[Anton Gladky]

This is an automated email from the git hooks/post-receive script.

gladk pushed a commit to branch experimental
in repository oce.

commit 1686d2bfefbe25f3c9e4f00e16f8ad276fe741f5
Author: Anton Gladky <gladk at debian.org>
Date:   Fri Aug 25 21:23:56 2017 +0200

    Refresh patches
---
 debian/patches/fix_FTBFS_gcc72.patch       | 21 +++++++++++++++++++++
 debian/patches/series                      |  2 +-
 debian/patches/speedup-BRepMesh_test.patch |  8 ++++----
 debian/patches/split-export.patch          | 22 +++++++++++-----------
 4 files changed, 37 insertions(+), 16 deletions(-)

diff --git a/debian/patches/fix_FTBFS_gcc72.patch b/debian/patches/fix_FTBFS_gcc72.patch
new file mode 100644
index 0000000..22fcbdd
--- /dev/null
+++ b/debian/patches/fix_FTBFS_gcc72.patch
@@ -0,0 +1,21 @@
+Description: Fix FTBFS with gcc-7.2
+Author: Anton Gladky <gladk at debian.org>
+Last-Update: 2017-08-23
+
+--- oce-0.18.2.orig/src/QABugs/QABugs_19.cxx
++++ oce-0.18.2/src/QABugs/QABugs_19.cxx
+@@ -393,12 +393,12 @@ static Standard_Address GeomConvertTest
+   GeomConvert_ApproxSurface aGAS (info->surf, 1e-4, GeomAbs_C1, GeomAbs_C1, 9, 9, 100, 1);
+   if (!aGAS.IsDone()) {
+     cout << "Error: ApproxSurface is not done!" << endl;
+-    return Standard_False;
++    return 0;
+   }
+   const Handle(Geom_BSplineSurface)& aBSurf = aGAS.Surface();
+   if (aBSurf.IsNull()) {
+     cout << "Error: BSplineSurface is not created!" << endl;
+-    return Standard_False;
++    return 0;
+   }
+   cout << "Number of UPoles:" << aBSurf->NbUPoles();
+   if (aBSurf->NbUPoles() == info->nbupoles)
diff --git a/debian/patches/series b/debian/patches/series
index 95bb020..4e488a9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
 split-export.patch
 speedup-BRepMesh_test.patch
-do_not_add_drawexe.patch
+fix_FTBFS_gcc72.patch
diff --git a/debian/patches/speedup-BRepMesh_test.patch b/debian/patches/speedup-BRepMesh_test.patch
index 943a0bc..9bf55e3 100644
--- a/debian/patches/speedup-BRepMesh_test.patch
+++ b/debian/patches/speedup-BRepMesh_test.patch
@@ -8,11 +8,11 @@ Changes in OCCT 6.6.0 make this test run slower, and mips
 again timeouts.  As this test already takes 1 hour, let
 it perform less operations.
 
-Index: oce-OCE-0.17.2/test/BRepMesh_test/BRepMesh_test.cpp
+Index: oce-OCE-0.18.2/test/BRepMesh_test/BRepMesh_test.cpp
 ===================================================================
---- oce-OCE-0.17.2.orig/test/BRepMesh_test/BRepMesh_test.cpp
-+++ oce-OCE-0.17.2/test/BRepMesh_test/BRepMesh_test.cpp
-@@ -49,7 +49,7 @@ int nbTriangle(const TopoDS_Face & s)
+--- oce-OCE-0.18.2.orig/test/BRepMesh_test/BRepMesh_test.cpp
++++ oce-OCE-0.18.2/test/BRepMesh_test/BRepMesh_test.cpp
+@@ -50,7 +50,7 @@ int nbTriangle(const TopoDS_Face & s)
  
  TEST(BRepMeshTestSuite, testMeshTorus)
  {
diff --git a/debian/patches/split-export.patch b/debian/patches/split-export.patch
index 9096dc7..0847e21 100644
--- a/debian/patches/split-export.patch
+++ b/debian/patches/split-export.patch
@@ -26,11 +26,11 @@ Forwarded: no
 Last-Update: 2013-08-07
 
 
-Index: oce-OCE-0.17.2/CMakeLists.txt
+Index: oce-OCE-0.18.2/CMakeLists.txt
 ===================================================================
---- oce-OCE-0.17.2.orig/CMakeLists.txt
-+++ oce-OCE-0.17.2/CMakeLists.txt
-@@ -985,6 +985,19 @@ configure_file (${CMAKE_CURRENT_SOURCE_D
+--- oce-OCE-0.18.2.orig/CMakeLists.txt
++++ oce-OCE-0.18.2/CMakeLists.txt
+@@ -998,6 +998,19 @@ configure_file (${CMAKE_CURRENT_SOURCE_D
  set ( OCE_WIN32_RES_FILE ${CMAKE_CURRENT_BINARY_DIR}/Version.rc )
  endif(NOT OCE_NO_LIBRARY_VERSION)
  
@@ -50,7 +50,7 @@ Index: oce-OCE-0.17.2/CMakeLists.txt
  macro(process_module modulename modules_std)
  	set(modules ${modules_std})
  	if(NOT OCE_DISABLE_X11)
-@@ -1059,7 +1072,12 @@ configure_file( ${CMAKE_CURRENT_SOURCE_D
+@@ -1074,7 +1087,12 @@ configure_file( ${CMAKE_CURRENT_SOURCE_D
  install(FILES ${PROJECT_BINARY_DIR}/OCEConfig.cmake ${PROJECT_BINARY_DIR}/OCEConfigVersion.cmake
  	DESTINATION ${OCE_INSTALL_CMAKE_DATA_DIR} COMPONENT Development )
  
@@ -64,10 +64,10 @@ Index: oce-OCE-0.17.2/CMakeLists.txt
  
  ############
  # PostBuild Step
-Index: oce-OCE-0.17.2/adm/cmake/BuildToolkit.cmake
+Index: oce-OCE-0.18.2/adm/cmake/BuildToolkit.cmake
 ===================================================================
---- oce-OCE-0.17.2.orig/adm/cmake/BuildToolkit.cmake
-+++ oce-OCE-0.17.2/adm/cmake/BuildToolkit.cmake
+--- oce-OCE-0.18.2.orig/adm/cmake/BuildToolkit.cmake
++++ oce-OCE-0.18.2/adm/cmake/BuildToolkit.cmake
 @@ -382,7 +382,7 @@ install(FILES ${TOOLKIT_HEADER_FILES}
  )
  
@@ -77,10 +77,10 @@ Index: oce-OCE-0.17.2/adm/cmake/BuildToolkit.cmake
  	RUNTIME DESTINATION ${TOOLKIT_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
  	LIBRARY DESTINATION ${TOOLKIT_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
  	ARCHIVE DESTINATION ${TOOLKIT_INSTALL_LIB_DIR} COMPONENT Development
-Index: oce-OCE-0.17.2/adm/cmake/config/ProjectConfig.cmake.in
+Index: oce-OCE-0.18.2/adm/cmake/config/ProjectConfig.cmake.in
 ===================================================================
---- oce-OCE-0.17.2.orig/adm/cmake/config/ProjectConfig.cmake.in
-+++ oce-OCE-0.17.2/adm/cmake/config/ProjectConfig.cmake.in
+--- oce-OCE-0.18.2.orig/adm/cmake/config/ProjectConfig.cmake.in
++++ oce-OCE-0.18.2/adm/cmake/config/ProjectConfig.cmake.in
 @@ -20,7 +20,11 @@ get_filename_component(SELF_DIR "${CMAKE
  set(OCE_INCLUDE_DIRS "${SELF_DIR}/@OCE_CMAKE_DATA_TO_INCLUDE_RELATIVE_DIR@")
  set(OCE_LIBRARIES "@OCE_LIBRARIES@")

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/oce.git