From cd23cc9be00b9468583e82df71d1d9a399d40144 Mon Sep 17 00:00:00 2001 From: Karl Nilsson 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 --#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 #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 " -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]+(?=)"