From 1c23d710f7430f7dcb440324c7e5d8282299dd45 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Wed, 17 Mar 2021 12:13:19 -0400
Subject: [PATCH] Revert "occt: update to 7.5.0."

OCCT 7.5.0 breaks ABI, and downstream packages such as FreeCAD fail to
build.

Keep the license change. We should also stick with their repository
instead of GitHub, which doesn't have all the releases.

This reverts commit abe75dc062e4353618830b563b0ae0596d0606ad.

Closes: #29541 [via git-merge-pr]
---
 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                      | 15 ++++++++------
 srcpkgs/occt/update                        |  2 ++
 5 files changed, 25 insertions(+), 21 deletions(-)
 create mode 100644 srcpkgs/occt/update

diff --git a/srcpkgs/occt/patches/fix-cmake-regex.patch b/srcpkgs/occt/patches/fix-cmake-regex.patch
index 6d2ca83463d..4742ed9f2e7 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
-@@ -27,7 +27,7 @@
+@@ -26,7 +26,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 1720d12ce29..c4fd770646d 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__) && !defined(__EMSCRIPTEN__)
-+#if !defined(__ANDROID__) && !defined(__QNX__) && !defined(__EMSCRIPTEN__) && defined(__GLIBC__)
+-#if !defined(__ANDROID__) && !defined(__QNX__)
++#if !defined(__ANDROID__) && !defined(__QNX__) && defined(__GLIBC__)
    #include <sys/signal.h>
  #endif
  
diff --git a/srcpkgs/occt/patches/musl-mallinfo.patch b/srcpkgs/occt/patches/musl-mallinfo.patch
index 632ca3f04ca..3561c31f05a 100644
--- a/srcpkgs/occt/patches/musl-mallinfo.patch
+++ b/srcpkgs/occt/patches/musl-mallinfo.patch
@@ -2,17 +2,16 @@ In musl libc there is no struct mallinfo and no function mallinf()
 
 --- src/OSD/OSD_MemInfo.cxx.orig
 +++ src/OSD/OSD_MemInfo.cxx
-
-@@ -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
+@@ -147,8 +147,12 @@
    }
+   aFile.close();
  
-   if (!IsActive (MemVirtual)
++  #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;
diff --git a/srcpkgs/occt/template b/srcpkgs/occt/template
index cc240b6f5e4..9298edc76e0 100644
--- a/srcpkgs/occt/template
+++ b/srcpkgs/occt/template
@@ -1,9 +1,10 @@
 # Template file for 'occt'
 pkgname=occt
-version=7.5.0
-revision=1
-_ver="${version//./_}"
-wrksrc=OCCT-${_ver}
+reverts=7.5.0_1
+version=7.4.0p1
+revision=3
+_gittag="V${version//./_}"
+wrksrc=occt-${_gittag}
 build_style=cmake
 configure_args="-DUSE_FREEIMAGE=ON -DUSE_TBB=ON -DUSE_GL2PS=ON -DUSE_VTK=OFF
  -DINSTALL_SAMPLES=ON"
@@ -13,8 +14,10 @@ short_desc="OpenCASCADE Technology - library for CAD/CAM/CAE applications"
 maintainer="Piraty <piraty1@inbox.ru>"
 license="custom:LGPL-2.1-only-with-exceptions"
 homepage="https://www.opencascade.com"
-distfiles="https://github.com/Open-Cascade-SAS/OCCT/archive/V${_ver}.tar.gz"
-checksum=dbe1d62a9317ad1516bd4575293d9aab2dc20206ca7a60a7705c9a3b77dc59c9
+# 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
 conflicts="oce>=0"
 
 post_install() {
diff --git a/srcpkgs/occt/update b/srcpkgs/occt/update
new file mode 100644
index 00000000000..c128eec6d9c
--- /dev/null
+++ b/srcpkgs/occt/update
@@ -0,0 +1,2 @@
+site="https://git.dev.opencascade.org/gitweb/?p=occt.git;a=tags"
+pattern=">V\K[\d_p]+(?=</a>)"