[PR PATCH] [WIP] occt: update to 7.5.0.

[PR PATCH] [WIP] occt: update to 7.5.0.

[karl-nilsson]

[-- Attachment #1: Type: text/plain, Size: 570 bytes --]

There is a new pull request by karl-nilsson against master on the void-packages repository

https://github.com/karl-nilsson/void-packages occt_7.5
https://github.com/void-linux/void-packages/pull/29403

[WIP] occt: update to 7.5.0.
ping @Piraty 

- I need to fix patches
- occt dev is now mirrored on github, I think that's a better download location
- right now, the regular git repo is down:
https://old.opencascade.com/content/scheduled-maintenance-starting-march-2-2021

A patch file from https://github.com/void-linux/void-packages/pull/29403.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-occt_7.5-29403.patch --]
[-- Type: text/x-diff, Size: 1426 bytes --]

From 718f8a6c8257f7b81af3cb383f9797850af2b0df Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Thu, 11 Mar 2021 12:56:42 -0500
Subject: [PATCH] occt: update to 7.5.0.

---
 srcpkgs/occt/template | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/occt/template b/srcpkgs/occt/template
index f9777bfe27b..8c2049d84b2 100644
--- a/srcpkgs/occt/template
+++ b/srcpkgs/occt/template
@@ -1,9 +1,9 @@
 # Template file for 'occt'
 pkgname=occt
-version=7.4.0p1
-revision=2
-_gittag="V${version//./_}"
-wrksrc=occt-${_gittag}
+version=7.5.0
+revision=1
+_ver="${version//./_}"
+wrksrc=OCCT-${_ver}
 build_style=cmake
 configure_args="-DUSE_FREEIMAGE=ON -DUSE_TBB=ON -DUSE_GL2PS=ON -DUSE_VTK=OFF
  -DINSTALL_SAMPLES=ON"
@@ -13,9 +13,7 @@ short_desc="OpenCASCADE Technology - library for CAD/CAM/CAE applications"
 maintainer="Piraty <piraty1@inbox.ru>"
 license="LGPL-2.1-only"
 homepage="https://www.opencascade.com"
-# distfile: use git instead of official tarball, which requires registration
-# see https://www.opencascade.com/content/packaging-again-debian
-distfiles="https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=refs/tags/${_gittag};sf=tgz>occt-${_gittag}.tar.gz"
+distfiles="https://github.com/Open-Cascade-SAS/OCCT/archive/V${_ver}.tar.gz"
 checksum=e00fedc221560fda31653c23a8f3d0eda78095c87519f338d4f4088e2ee9a9c0
 conflicts="oce>=0"
 

Re: [WIP] occt: update to 7.5.0.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 221 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/29403#issuecomment-797009257

Comment:
You seem to have a hash mismatch? But I like the idea of moving to GH very much!

Re: [PR PATCH] [Updated] [WIP] occt: update to 7.5.0.

[karl-nilsson]

[-- Attachment #1: Type: text/plain, Size: 575 bytes --]

There is an updated pull request by karl-nilsson against master on the void-packages repository

https://github.com/karl-nilsson/void-packages occt_7.5
https://github.com/void-linux/void-packages/pull/29403

[WIP] occt: update to 7.5.0.
ping @Piraty 

- I need to fix patches
- occt dev is now mirrored on github, I think that's a better download location
- right now, the regular git repo is down:
https://old.opencascade.com/content/scheduled-maintenance-starting-march-2-2021

A patch file from https://github.com/void-linux/void-packages/pull/29403.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-occt_7.5-29403.patch --]
[-- Type: text/x-diff, Size: 3423 bytes --]

From cd23cc9be00b9468583e82df71d1d9a399d40144 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Thu, 11 Mar 2021 12:56:42 -0500
Subject: [PATCH] occt: update to 7.5.0.

---
 srcpkgs/occt/patches/fix-cmake-regex.patch |  2 +-
 srcpkgs/occt/patches/musl-fenv.patch       |  4 ++--
 srcpkgs/occt/template                      | 16 +++++++---------
 srcpkgs/occt/update                        |  2 --
 4 files changed, 10 insertions(+), 14 deletions(-)
 delete mode 100644 srcpkgs/occt/update

diff --git a/srcpkgs/occt/patches/fix-cmake-regex.patch b/srcpkgs/occt/patches/fix-cmake-regex.patch
index 4742ed9f2e7..6d2ca83463d 100644
--- a/srcpkgs/occt/patches/fix-cmake-regex.patch
+++ b/srcpkgs/occt/patches/fix-cmake-regex.patch
@@ -3,7 +3,7 @@
 
 --- adm/templates/OpenCASCADEConfig.cmake.in	2019-01-27 00:18:42.763819658 -0500
 +++ adm/templates/OpenCASCADEConfig.cmake.in	2019-01-27 23:40:32.872489521 -0500
-@@ -26,7 +26,7 @@
+@@ -27,7 +27,7 @@
  if (OpenCASCADE_INSTALL_PREFIX MATCHES "/cmake$")
    get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH)
  endif()
diff --git a/srcpkgs/occt/patches/musl-fenv.patch b/srcpkgs/occt/patches/musl-fenv.patch
index c4fd770646d..1720d12ce29 100644
--- a/srcpkgs/occt/patches/musl-fenv.patch
+++ b/srcpkgs/occt/patches/musl-fenv.patch
@@ -11,8 +11,8 @@ non-posix functions fegetexcept(3) and feenableexcept(3).
  
  #include <signal.h>
  
--#if !defined(__ANDROID__) && !defined(__QNX__)
-+#if !defined(__ANDROID__) && !defined(__QNX__) && defined(__GLIBC__)
+-#if !defined(__ANDROID__) && !defined(__QNX__) && !defined(__EMSCRIPTEN__)
++#if !defined(__ANDROID__) && !defined(__QNX__) && !defined(__EMSCRIPTEN__) && defined(__GLIBC__)
    #include <sys/signal.h>
  #endif
  
diff --git a/srcpkgs/occt/template b/srcpkgs/occt/template
index f9777bfe27b..cc240b6f5e4 100644
--- a/srcpkgs/occt/template
+++ b/srcpkgs/occt/template
@@ -1,9 +1,9 @@
 # Template file for 'occt'
 pkgname=occt
-version=7.4.0p1
-revision=2
-_gittag="V${version//./_}"
-wrksrc=occt-${_gittag}
+version=7.5.0
+revision=1
+_ver="${version//./_}"
+wrksrc=OCCT-${_ver}
 build_style=cmake
 configure_args="-DUSE_FREEIMAGE=ON -DUSE_TBB=ON -DUSE_GL2PS=ON -DUSE_VTK=OFF
  -DINSTALL_SAMPLES=ON"
@@ -11,12 +11,10 @@ makedepends="freetype-devel glu-devel freeimage-devel gl2ps-devel tbb-devel
  tcl-devel tk-devel"
 short_desc="OpenCASCADE Technology - library for CAD/CAM/CAE applications"
 maintainer="Piraty <piraty1@inbox.ru>"
-license="LGPL-2.1-only"
+license="custom:LGPL-2.1-only-with-exceptions"
 homepage="https://www.opencascade.com"
-# distfile: use git instead of official tarball, which requires registration
-# see https://www.opencascade.com/content/packaging-again-debian
-distfiles="https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=refs/tags/${_gittag};sf=tgz>occt-${_gittag}.tar.gz"
-checksum=e00fedc221560fda31653c23a8f3d0eda78095c87519f338d4f4088e2ee9a9c0
+distfiles="https://github.com/Open-Cascade-SAS/OCCT/archive/V${_ver}.tar.gz"
+checksum=dbe1d62a9317ad1516bd4575293d9aab2dc20206ca7a60a7705c9a3b77dc59c9
 conflicts="oce>=0"
 
 post_install() {
diff --git a/srcpkgs/occt/update b/srcpkgs/occt/update
deleted file mode 100644
index c128eec6d9c..00000000000
--- a/srcpkgs/occt/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://git.dev.opencascade.org/gitweb/?p=occt.git;a=tags"
-pattern=">V\K[\d_p]+(?=</a>)"

Re: [PR PATCH] [Updated] [WIP] occt: update to 7.5.0.

[karl-nilsson]

[-- Attachment #1: Type: text/plain, Size: 575 bytes --]

There is an updated pull request by karl-nilsson against master on the void-packages repository

https://github.com/karl-nilsson/void-packages occt_7.5
https://github.com/void-linux/void-packages/pull/29403

[WIP] occt: update to 7.5.0.
ping @Piraty 

- I need to fix patches
- occt dev is now mirrored on github, I think that's a better download location
- right now, the regular git repo is down:
https://old.opencascade.com/content/scheduled-maintenance-starting-march-2-2021

A patch file from https://github.com/void-linux/void-packages/pull/29403.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-occt_7.5-29403.patch --]
[-- Type: text/x-diff, Size: 4532 bytes --]

From 42c07417e2ea5a2ac60d12bff30b8346866ae8b3 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Thu, 11 Mar 2021 12:56:42 -0500
Subject: [PATCH] occt: update to 7.5.0.

---
 srcpkgs/occt/patches/fix-cmake-regex.patch |  2 +-
 srcpkgs/occt/patches/musl-fenv.patch       |  4 ++--
 srcpkgs/occt/patches/musl-mallinfo.patch   | 23 +++++++++++-----------
 srcpkgs/occt/template                      | 16 +++++++--------
 srcpkgs/occt/update                        |  2 --
 5 files changed, 22 insertions(+), 25 deletions(-)
 delete mode 100644 srcpkgs/occt/update

diff --git a/srcpkgs/occt/patches/fix-cmake-regex.patch b/srcpkgs/occt/patches/fix-cmake-regex.patch
index 4742ed9f2e7..6d2ca83463d 100644
--- a/srcpkgs/occt/patches/fix-cmake-regex.patch
+++ b/srcpkgs/occt/patches/fix-cmake-regex.patch
@@ -3,7 +3,7 @@
 
 --- adm/templates/OpenCASCADEConfig.cmake.in	2019-01-27 00:18:42.763819658 -0500
 +++ adm/templates/OpenCASCADEConfig.cmake.in	2019-01-27 23:40:32.872489521 -0500
-@@ -26,7 +26,7 @@
+@@ -27,7 +27,7 @@
  if (OpenCASCADE_INSTALL_PREFIX MATCHES "/cmake$")
    get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH)
  endif()
diff --git a/srcpkgs/occt/patches/musl-fenv.patch b/srcpkgs/occt/patches/musl-fenv.patch
index c4fd770646d..1720d12ce29 100644
--- a/srcpkgs/occt/patches/musl-fenv.patch
+++ b/srcpkgs/occt/patches/musl-fenv.patch
@@ -11,8 +11,8 @@ non-posix functions fegetexcept(3) and feenableexcept(3).
  
  #include <signal.h>
  
--#if !defined(__ANDROID__) && !defined(__QNX__)
-+#if !defined(__ANDROID__) && !defined(__QNX__) && defined(__GLIBC__)
+-#if !defined(__ANDROID__) && !defined(__QNX__) && !defined(__EMSCRIPTEN__)
++#if !defined(__ANDROID__) && !defined(__QNX__) && !defined(__EMSCRIPTEN__) && defined(__GLIBC__)
    #include <sys/signal.h>
  #endif
  
diff --git a/srcpkgs/occt/patches/musl-mallinfo.patch b/srcpkgs/occt/patches/musl-mallinfo.patch
index 3561c31f05a..632ca3f04ca 100644
--- a/srcpkgs/occt/patches/musl-mallinfo.patch
+++ b/srcpkgs/occt/patches/musl-mallinfo.patch
@@ -2,16 +2,17 @@ In musl libc there is no struct mallinfo and no function mallinf()
 
 --- src/OSD/OSD_MemInfo.cxx.orig
 +++ src/OSD/OSD_MemInfo.cxx
-@@ -147,8 +147,12 @@
+
+@@ -182,8 +182,12 @@
+ #elif (defined(__linux__) || defined(__linux))
+   if (IsActive (MemHeapUsage))
+   {
++    #if defined(__GLIBC__)
+     const struct mallinfo aMI = mallinfo();
+     myCounters[MemHeapUsage] = aMI.uordblks;
++    #else /* XXX not yet coded */
++    myCounters[MemHeapUsage] = 0;
++    #endif
    }
-   aFile.close();
- 
-+  #if defined(__GLIBC__)
-   struct mallinfo aMI = mallinfo();
-   myCounters[MemHeapUsage] = aMI.uordblks;
-+  #else /* XXX not yet coded */
-+  myCounters[MemHeapUsage] = 0;
-+  #endif
  
- #elif (defined(__APPLE__))
-   struct task_basic_info aTaskInfo;
+   if (!IsActive (MemVirtual)
diff --git a/srcpkgs/occt/template b/srcpkgs/occt/template
index f9777bfe27b..cc240b6f5e4 100644
--- a/srcpkgs/occt/template
+++ b/srcpkgs/occt/template
@@ -1,9 +1,9 @@
 # Template file for 'occt'
 pkgname=occt
-version=7.4.0p1
-revision=2
-_gittag="V${version//./_}"
-wrksrc=occt-${_gittag}
+version=7.5.0
+revision=1
+_ver="${version//./_}"
+wrksrc=OCCT-${_ver}
 build_style=cmake
 configure_args="-DUSE_FREEIMAGE=ON -DUSE_TBB=ON -DUSE_GL2PS=ON -DUSE_VTK=OFF
  -DINSTALL_SAMPLES=ON"
@@ -11,12 +11,10 @@ makedepends="freetype-devel glu-devel freeimage-devel gl2ps-devel tbb-devel
  tcl-devel tk-devel"
 short_desc="OpenCASCADE Technology - library for CAD/CAM/CAE applications"
 maintainer="Piraty <piraty1@inbox.ru>"
-license="LGPL-2.1-only"
+license="custom:LGPL-2.1-only-with-exceptions"
 homepage="https://www.opencascade.com"
-# distfile: use git instead of official tarball, which requires registration
-# see https://www.opencascade.com/content/packaging-again-debian
-distfiles="https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=refs/tags/${_gittag};sf=tgz>occt-${_gittag}.tar.gz"
-checksum=e00fedc221560fda31653c23a8f3d0eda78095c87519f338d4f4088e2ee9a9c0
+distfiles="https://github.com/Open-Cascade-SAS/OCCT/archive/V${_ver}.tar.gz"
+checksum=dbe1d62a9317ad1516bd4575293d9aab2dc20206ca7a60a7705c9a3b77dc59c9
 conflicts="oce>=0"
 
 post_install() {
diff --git a/srcpkgs/occt/update b/srcpkgs/occt/update
deleted file mode 100644
index c128eec6d9c..00000000000
--- a/srcpkgs/occt/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://git.dev.opencascade.org/gitweb/?p=occt.git;a=tags"
-pattern=">V\K[\d_p]+(?=</a>)"

Re: [WIP] occt: update to 7.5.0.

[karl-nilsson]

[-- Attachment #1: Type: text/plain, Size: 372 bytes --]

New comment by karl-nilsson on void-packages repository

https://github.com/void-linux/void-packages/pull/29403#issuecomment-797687309

Comment:
Alpine uses this patch to approximate mallinfo on musl. Is it a better choice than our current patch?

https://git.alpinelinux.org/aports/tree/testing/opencascade/no_mallinfo.patch?id=cc09448dc3b0ed20643dbc894c515c88407ebc37

Re: [WIP] occt: update to 7.5.0.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 256 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/29403#issuecomment-797697493

Comment:
I don't think we need to replace ours...

Regarding the `fenv` patch, couldn't it be fixed by including `fenv.h`?

Re: [WIP] occt: update to 7.5.0.

[karl-nilsson]

[-- Attachment #1: Type: text/plain, Size: 232 bytes --]

New comment by karl-nilsson on void-packages repository

https://github.com/void-linux/void-packages/pull/29403#issuecomment-797866523

Comment:

> Regarding the `fenv` patch, couldn't it be fixed by including `fenv.h`?

No clue

Re: [WIP] occt: update to 7.5.0.

[karl-nilsson]

[-- Attachment #1: Type: text/plain, Size: 277 bytes --]

New comment by karl-nilsson on void-packages repository

https://github.com/void-linux/void-packages/pull/29403#issuecomment-799611129

Comment:
The source does include fenv.h (through cfenv), but musl doesn't implement fegetexcept or feenableexcept, so the patch must remain.

Re: [PR PATCH] [Merged]: [WIP] occt: update to 7.5.0.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 408 bytes --]

There's a merged pull request on the void-packages repository

[WIP] occt: update to 7.5.0.
https://github.com/void-linux/void-packages/pull/29403

Description:
ping @Piraty 

- I need to fix patches
- occt dev is now mirrored on github, I think that's a better download location
- right now, the regular git repo is down:
https://old.opencascade.com/content/scheduled-maintenance-starting-march-2-2021

Re: [WIP] occt: update to 7.5.0.

[Piraty]

[-- Attachment #1: Type: text/plain, Size: 151 bytes --]

New comment by Piraty on void-packages repository

https://github.com/void-linux/void-packages/pull/29403#issuecomment-802921489

Comment:
late but +1