diff --git a/srcpkgs/occt/patches/musl-fenv.patch b/srcpkgs/occt/patches/musl-fenv.patch index 5a09d241121..4a2e880db4f 100644 --- a/srcpkgs/occt/patches/musl-fenv.patch +++ b/srcpkgs/occt/patches/musl-fenv.patch @@ -1,5 +1,21 @@ +As stated by srcpkgs/flightgear/patches/musl-fenv.patch: +""" +Simply disabling the code which enables floating point exceptions +is probably wrong, but I don't have a replacement for the +non-posix functions fegetexcept(3) and feenableexcept(3). +""" + --- src/OSD/OSD_signal.cxx.orig +++ src/OSD/OSD_signal.cxx +@@ -645,7 +645,7 @@ + + #include + +-#if !defined(__ANDROID__) && !defined(__QNX__) ++#if !defined(__ANDROID__) && !defined(__QNX__) && defined(__GLIBC__) + #include + #endif + @@ -687,7 +687,7 @@ // cout << "OSD::Handler: signal " << (int) theSignal << " occured inside a try block " << endl ; if ( ADR_ACT_SIGIO_HANDLER != NULL ) @@ -18,20 +34,22 @@ if (fFltExceptions) feenableexcept (FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW); //feenableexcept (FE_INVALID | FE_DIVBYZERO); -@@ -891,14 +891,14 @@ - cerr << "ieee_handler does not work !!! KO " << endl; +@@ -892,14 +892,18 @@ #endif } --#elif defined (__linux__) -+#elif defined(__linux__) && defined(__GLIBC__) + #elif defined (__linux__) ++#if defined(__GLIBC__) feenableexcept (FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW); ++#endif fFltExceptions = Standard_True; #endif } else { --#if defined (__linux__) -+#if defined(__linux__) && defined(__GLIBC__) + #if defined (__linux__) ++#if defined(__GLIBC__) fedisableexcept (FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW); ++#endif fFltExceptions = Standard_False; #endif + } diff --git a/srcpkgs/occt/template b/srcpkgs/occt/template index 2728824e919..e982435c08d 100644 --- a/srcpkgs/occt/template +++ b/srcpkgs/occt/template @@ -1,8 +1,8 @@ # Template file for 'occt' pkgname=occt -_gittag="V7_2_0p1" version=7.2.0p1 -revision=1 +revision=2 +_gittag="V${version//./_}" wrksrc=occt-${_gittag} build_style=cmake configure_args="-DUSE_FREEIMAGE=ON -DUSE_TBB=ON -DUSE_GL2PS=ON -DUSE_VTK=OFF @@ -11,13 +11,16 @@ 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 " -license="LGPL-2.1" +license="LGPL-2.1-only" homepage="https://www.opencascade.com" +# distifile: use git instead of official tarball that 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=530f9981e6026e6cc04c462ab039b4977a568f943d6086dc502262d100a07a79 conflicts="oce>=0" post_install() { + rm ${PKGDESTDIR}/usr/share/doc/opencascade/*_LGPL_*.txt vlicense OCCT_LGPL_EXCEPTION.txt rm ${DESTDIR}/usr/bin/custom*.sh } @@ -29,7 +32,6 @@ occt-devel_package() { vmove usr/include vmove "usr/lib/*.so" vmove "usr/lib/cmake" - mkdir -p ${PKGDESTDIR}/usr/share/${pkgname} - vcopy samples usr/share/${pkgname} + vmove "usr/share/opencascade/samples" } } diff --git a/srcpkgs/occt/update b/srcpkgs/occt/update index bea48285cbd..c128eec6d9c 100644 --- a/srcpkgs/occt/update +++ b/srcpkgs/occt/update @@ -1,2 +1,2 @@ -site=https://git.dev.opencascade.org/gitweb/?p=occt.git;a=summary -pattern="refs/tags/V\K[\d_]*(?=\")" +site="https://git.dev.opencascade.org/gitweb/?p=occt.git;a=tags" +pattern=">V\K[\d_p]+(?=)"