From: karl-nilsson <karl-nilsson@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] Revert "occt: update to 7.5.0."
Date: Wed, 17 Mar 2021 17:23:22 +0100 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29541@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 457 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_revert
https://github.com/void-linux/void-packages/pull/29541
Revert "occt: update to 7.5.0."
OCCT 7.5.0 breaks ABI, and downstream packages fail to build
This reverts commit abe75dc062e4353618830b563b0ae0596d0606ad.
A patch file from https://github.com/void-linux/void-packages/pull/29541.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-occt_revert-29541.patch --]
[-- Type: text/x-diff, Size: 4690 bytes --]
From 23a865dcd99bead71be59429249c66a878de0ce5 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 fail to build
This reverts commit abe75dc062e4353618830b563b0ae0596d0606ad.
---
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 | 17 +++++++++-------
srcpkgs/occt/update | 2 ++
5 files changed, 26 insertions(+), 22 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 6d2ca83463da..4742ed9f2e7f 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 1720d12ce298..c4fd770646db 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 632ca3f04ca9..3561c31f05a9 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 defined(__GLIBC__)
+ struct mallinfo aMI = mallinfo();
+ myCounters[MemHeapUsage] = aMI.uordblks;
++ #else /* XXX not yet coded */
++ myCounters[MemHeapUsage] = 0;
++ #endif
- if (!IsActive (MemVirtual)
+ #elif (defined(__APPLE__))
+ struct task_basic_info aTaskInfo;
diff --git a/srcpkgs/occt/template b/srcpkgs/occt/template
index cc240b6f5e43..d7091dc43246 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"
@@ -11,10 +12,12 @@ 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="custom:LGPL-2.1-only-with-exceptions"
+license="LGPL-2.1-only"
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 000000000000..c128eec6d9c9
--- /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>)"
next reply other threads:[~2021-03-17 16:23 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-17 16:23 karl-nilsson [this message]
2021-03-17 17:04 ` ericonr
2021-03-17 17:20 ` ericonr
2021-03-17 17:20 ` [PR PATCH] [Closed]: " ericonr
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29541@inbox.vuxu.org \
--to=karl-nilsson@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).