summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Theodore <tonyt@logyst.com>2017-09-30 05:28:48 (GMT)
committerGitHub <noreply@github.com>2017-09-30 05:28:48 (GMT)
commit098231b2bdc00e65ae1fa1cd5eb3b410a53acee8 (patch)
tree2689683ff8a8ce3fa60c994ac046373cde8f3230
parent400dfb860cf199dbba2bac2a477ff407dc94cb46 (diff)
parent69c205da6e1d82f52b9f62ee155bec63aac70e62 (diff)
downloadmxe-098231b2bdc00e65ae1fa1cd5eb3b410a53acee8.zip
mxe-098231b2bdc00e65ae1fa1cd5eb3b410a53acee8.tar.gz
mxe-098231b2bdc00e65ae1fa1cd5eb3b410a53acee8.tar.bz2
Merge pull request #1914 from sibuserv/update-oce
update oce
-rw-r--r--src/oce-1-fixes.patch24
-rw-r--r--src/oce.mk4
2 files changed, 2 insertions, 26 deletions
diff --git a/src/oce-1-fixes.patch b/src/oce-1-fixes.patch
deleted file mode 100644
index 96f9892..0000000
--- a/src/oce-1-fixes.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-This file is part of MXE. See LICENSE.md for licensing information.
-
-Taken from https://github.com/tpaviot/oce/pull/673
-
---- a/src/BRepBuilderAPI/BRepBuilderAPI_Copy.cxx
-+++ b/src/BRepBuilderAPI/BRepBuilderAPI_Copy.cxx
-@@ -25,8 +25,6 @@
- #include <gp_Pnt.hxx>
- #include <Poly_Triangulation.hxx>
-
--namespace {
--
- //! Tool class implementing necessary functionality for copying geometry
- class BRepBuilderAPI_Copy_Modification : public BRepTools_Modification
- {
-@@ -147,8 +145,6 @@ DEFINE_STANDARD_HANDLE(BRepBuilderAPI_Copy_Modification, BRepTools_Modification)
- IMPLEMENT_STANDARD_HANDLE(BRepBuilderAPI_Copy_Modification, BRepTools_Modification)
- IMPLEMENT_STANDARD_RTTIEXT(BRepBuilderAPI_Copy_Modification, BRepTools_Modification)
-
--} // anonymous namespace
--
- //=======================================================================
- //function : BRepBuilderAPI_Copy
- //purpose :
diff --git a/src/oce.mk b/src/oce.mk
index bc63277..e963db4 100644
--- a/src/oce.mk
+++ b/src/oce.mk
@@ -4,8 +4,8 @@ PKG := oce
$(PKG)_WEBSITE := https://github.com/tpaviot/oce
$(PKG)_DESCR := Open CASCADE Community Edition
$(PKG)_IGNORE :=
-$(PKG)_VERSION := 0.18.1
-$(PKG)_CHECKSUM := 1acf5da4bffa3592ca9f3535af9b927b79fcfeadcb81e9963e89aec192929a6c
+$(PKG)_VERSION := 0.18.2
+$(PKG)_CHECKSUM := dc21ddea678a500ad87c773e9a502ed7a71768cf83d9af0bd4c43294186a7fef
$(PKG)_GH_CONF := tpaviot/oce,OCE-
$(PKG)_DEPS := gcc freetype