[oce] 04/05: Refresh patches, remove old ones.

Anton Gladky gladk at moszumanska.debian.org
Thu Jun 16 21:35:58 UTC 2016 

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

gladk pushed a commit to branch debian
in repository oce.

commit b7ab920581dbad8edca56c93cef5f721c5a11fd9
Author: Anton Gladky <gladk at debian.org>
Date:   Thu Jun 16 22:58:30 2016 +0200

    Refresh patches, remove old ones.
---
 debian/patches/disable_BRepAlgoAPI_text.patch | 41 ---------------------------
 debian/patches/disable_Brep_unittest.patch    | 22 --------------
 debian/patches/fix-Mesa-failures.patch        | 31 --------------------
 debian/patches/options                        |  2 --
 debian/patches/speedup-BRepMesh_test.patch    |  6 ++--
 debian/patches/split-export.patch             | 22 +++++++-------
 6 files changed, 14 insertions(+), 110 deletions(-)

diff --git a/debian/patches/disable_BRepAlgoAPI_text.patch b/debian/patches/disable_BRepAlgoAPI_text.patch
deleted file mode 100644
index 5a16c4f..0000000
--- a/debian/patches/disable_BRepAlgoAPI_text.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Description: disable BRepAlgoAPI test
-Bug-Debian: https://bugs.debian.org/798760
-Author: Anton Gladky <gladk at debian.org>
-Last-Update: 2015-10-08
---- oce-0.15.orig/test/BRepAlgoAPI_test/boolean_ops.cpp
-+++ oce-0.15/test/BRepAlgoAPI_test/boolean_ops.cpp
-@@ -5,34 +5,6 @@
- 
- #include <gtest/gtest.h>
- 
--TEST(BRepAlgoAPITestSuite, testCutBox)
--{
--    // create the first shape: a cube, a corner at the origin
--    TopoDS_Solid box1 = (TopoDS_Solid) BRepPrimAPI_MakeBox(10.,10.,10.);
--    ASSERT_FALSE(box1.IsNull());
--    // the second shape: a smaller cube, a corner at the origin
--    TopoDS_Solid box2 = (TopoDS_Solid) BRepPrimAPI_MakeBox(5.,5.,5.);
--    ASSERT_FALSE(box2.IsNull());
--    // boolean cut
--    TopoDS_Shape shp_result = BRepAlgoAPI_Cut(box1,box2);
--    ASSERT_FALSE(shp_result.IsNull());
--    TopoDS_Shape shp_result2 = BRepAlgoAPI_Cut(box2,box1);
--    ASSERT_FALSE(shp_result2.IsNull());
--}
--
--TEST(BRepAlgoAPITestSuite, testCutCylSphere)
--{
--    // create the first shape: a sphere, centered at the origin
--    TopoDS_Solid sphere = BRepPrimAPI_MakeSphere(10.);
--    ASSERT_FALSE(sphere.IsNull());
--    // the second shape: a cylinder cube, a corner at the origin
--    TopoDS_Solid cylinder = BRepPrimAPI_MakeCylinder(5.,15.);
--    ASSERT_FALSE(cylinder.IsNull());
--    // boolean cut
--    TopoDS_Shape shp_result = BRepAlgoAPI_Cut(sphere,cylinder);
--    ASSERT_FALSE(shp_result.IsNull());
--}
--
- int main(int argc, char **argv){
-   testing::InitGoogleTest(&argc, argv);
-   return RUN_ALL_TESTS();
diff --git a/debian/patches/disable_Brep_unittest.patch b/debian/patches/disable_Brep_unittest.patch
deleted file mode 100644
index 597981c..0000000
--- a/debian/patches/disable_Brep_unittest.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: Disables Brep* unittest
-  This patch should be removed in the next oce-version
-Bug-Debian: https://bugs.debian.org/778032
-Author: Anton Gladky <gladk at debian.org>
-Last-Update: 2015-07-14
-Index: oce-0.15/test/BRepOffsetAPI_test/BRepOffsetAPI_test.cpp
-===================================================================
---- oce-0.15.orig/test/BRepOffsetAPI_test/BRepOffsetAPI_test.cpp
-+++ oce-0.15/test/BRepOffsetAPI_test/BRepOffsetAPI_test.cpp
-@@ -16,9 +16,9 @@ TEST(BRepOffsetAPITestSuite, testEvolved
-     P.Add(gp_Pnt(0.,200.,0.));
-     P.Add(gp_Pnt(0.,0.,0.));
-     BRepBuilderAPI_MakePolygon wprof(gp_Pnt(0.,0.,0.),gp_Pnt(-60.,-60.,-200.));
--    BRepOffsetAPI_MakeEvolved S(P.Wire(),wprof.Wire(),GeomAbs_Arc,Standard_True,Standard_False,Standard_True,0.0001);
--    S.Build();
--    ASSERT_TRUE(S.IsDone());
-+    //BRepOffsetAPI_MakeEvolved S(P.Wire(),wprof.Wire(),GeomAbs_Arc,Standard_True,Standard_False,Standard_True,0.0001);
-+    //S.Build();
-+    //ASSERT_TRUE(S.IsDone());
- }
- 
- TEST(BRepOffsetAPITestSuite, testOffsetBox)
diff --git a/debian/patches/fix-Mesa-failures.patch b/debian/patches/fix-Mesa-failures.patch
deleted file mode 100644
index ed6a11a..0000000
--- a/debian/patches/fix-Mesa-failures.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Description: Fix build failures with Mesa 10.3.1
-Author: Denis Barbier <bouzim at gmail.com>
-Origin: Upstream
-Forwarded: https://github.com/tpaviot/oce/issues/534
-Last-Update: 2014-10-29
-
-Newer Mesa looks buggy, several errors like this one are reported:
- /usr/include/GL/glxext.h:480:143: error: ‘GLintptr’ has not been declared
- typedef void ( *PFNGLXCOPYBUFFERSUBDATANVPROC) (Display *dpy, GLXContext readCtx, GLXContext writeCtx, GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
-Work around this issue by defining GLX_GLXEXT_LEGACY.
-
-Fix issue #534.
----
- src/OpenGl/OpenGl_GlCore11.hxx | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/OpenGl/OpenGl_GlCore11.hxx b/src/OpenGl/OpenGl_GlCore11.hxx
-index fe76d31..e14c020 100644
---- a/src/OpenGl/OpenGl_GlCore11.hxx
-+++ b/src/OpenGl/OpenGl_GlCore11.hxx
-@@ -36,6 +36,7 @@
- 
- // exclude modern definitions and system-provided glext.h, should be defined before gl.h inclusion
- #define GL_GLEXT_LEGACY
-+#define GLX_GLXEXT_LEGACY
- 
- // include main OpenGL header provided with system
- #if defined(__APPLE__) && !defined(MACOSX_USE_GLX)
--- 
-2.1.1
-
diff --git a/debian/patches/options b/debian/patches/options
deleted file mode 100644
index 363b87a..0000000
--- a/debian/patches/options
+++ /dev/null
@@ -1,2 +0,0 @@
-QUILT_NO_DIFF_TIMESTAMPS=1
-QUILT_DIFF_OPTS=-p
diff --git a/debian/patches/speedup-BRepMesh_test.patch b/debian/patches/speedup-BRepMesh_test.patch
index 10584a4..943a0bc 100644
--- a/debian/patches/speedup-BRepMesh_test.patch
+++ b/debian/patches/speedup-BRepMesh_test.patch
@@ -8,10 +8,10 @@ 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.1/test/BRepMesh_test/BRepMesh_test.cpp
+Index: oce-OCE-0.17.2/test/BRepMesh_test/BRepMesh_test.cpp
 ===================================================================
---- oce-OCE-0.17.1.orig/test/BRepMesh_test/BRepMesh_test.cpp
-+++ oce-OCE-0.17.1/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)
  
  TEST(BRepMeshTestSuite, testMeshTorus)
diff --git a/debian/patches/split-export.patch b/debian/patches/split-export.patch
index 3652710..9096dc7 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.1/CMakeLists.txt
+Index: oce-OCE-0.17.2/CMakeLists.txt
 ===================================================================
---- oce-OCE-0.17.1.orig/CMakeLists.txt
-+++ oce-OCE-0.17.1/CMakeLists.txt
-@@ -978,6 +978,19 @@ configure_file (${CMAKE_CURRENT_SOURCE_D
+--- 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
  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.1/CMakeLists.txt
  macro(process_module modulename modules_std)
  	set(modules ${modules_std})
  	if(NOT OCE_DISABLE_X11)
-@@ -1052,7 +1065,12 @@ configure_file( ${CMAKE_CURRENT_SOURCE_D
+@@ -1059,7 +1072,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.1/CMakeLists.txt
  
  ############
  # PostBuild Step
-Index: oce-OCE-0.17.1/adm/cmake/BuildToolkit.cmake
+Index: oce-OCE-0.17.2/adm/cmake/BuildToolkit.cmake
 ===================================================================
---- oce-OCE-0.17.1.orig/adm/cmake/BuildToolkit.cmake
-+++ oce-OCE-0.17.1/adm/cmake/BuildToolkit.cmake
+--- oce-OCE-0.17.2.orig/adm/cmake/BuildToolkit.cmake
++++ oce-OCE-0.17.2/adm/cmake/BuildToolkit.cmake
 @@ -382,7 +382,7 @@ install(FILES ${TOOLKIT_HEADER_FILES}
  )
  
@@ -77,10 +77,10 @@ Index: oce-OCE-0.17.1/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.1/adm/cmake/config/ProjectConfig.cmake.in
+Index: oce-OCE-0.17.2/adm/cmake/config/ProjectConfig.cmake.in
 ===================================================================
---- oce-OCE-0.17.1.orig/adm/cmake/config/ProjectConfig.cmake.in
-+++ oce-OCE-0.17.1/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
 @@ -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

More information about the debian-science-commits mailing list