diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template index f5fe59d0790..e11932b7f78 100644 --- a/srcpkgs/freecad/template +++ b/srcpkgs/freecad/template @@ -5,7 +5,7 @@ # - python3: freecad code not yet ready for it, probably at 0.18 pkgname=freecad version=0.17 -revision=8 +revision=9 wrksrc="FreeCAD-${version}" build_style=cmake diff --git a/srcpkgs/occt/patches/fix-cmake-regex.patch b/srcpkgs/occt/patches/fix-cmake-regex.patch new file mode 100644 index 00000000000..4742ed9f2e7 --- /dev/null +++ b/srcpkgs/occt/patches/fix-cmake-regex.patch @@ -0,0 +1,14 @@ +# fix regex for cmake Config file +# inspired by https://git.archlinux.org/svntogit/community.git/commit/trunk/cmake-fix-variable.patch?h=packages/opencascade&id=c99074d88da40ae59882aaf173de94cd0ec73ca7 + +--- 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 @@ + if (OpenCASCADE_INSTALL_PREFIX MATCHES "/cmake$") + get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH) + endif() +-if (OpenCASCADE_INSTALL_PREFIX MATCHES "/lib$") ++if (OpenCASCADE_INSTALL_PREFIX MATCHES "/lib(32|64)?$") + get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH) + endif() + diff --git a/srcpkgs/occt/patches/xlocale.patch b/srcpkgs/occt/patches/xlocale.patch deleted file mode 100644 index 2efd3719c3f..00000000000 --- a/srcpkgs/occt/patches/xlocale.patch +++ /dev/null @@ -1,19 +0,0 @@ -Description: fix xlocale.h include for glibc 2.26+ compat - This patch fixes compatibility with glibc 2.26+ due to xlocale.h removal. -Origin: vendor, https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=opencascade7 -Author: Grey Christoforo -Bug: https://tracker.dev.opencascade.org/view.php?id=28971. -=================================================================== - ---- src/Standard/Standard_CLocaleSentry.hxx -+++ src/Standard/Standard_CLocaleSentry.hxx -@@ -37,7 +37,7 @@ - - #if defined(HAVE_XLOCALE_H) && !(defined(__GLIBC__) && (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 24)) - // xlocale.h is actually a non-standard header file; glibc 2.26 has removed it altogether (all definition comes from locale.h) -- #include -+ #include - #endif - - #if !defined(__ANDROID__) - diff --git a/srcpkgs/occt/template b/srcpkgs/occt/template index e982435c08d..ea65fd936b8 100644 --- a/srcpkgs/occt/template +++ b/srcpkgs/occt/template @@ -1,7 +1,7 @@ # Template file for 'occt' pkgname=occt -version=7.2.0p1 -revision=2 +version=7.3.0p2 +revision=1 _gittag="V${version//./_}" wrksrc=occt-${_gittag} build_style=cmake @@ -16,7 +16,7 @@ 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 +checksum=c54f2f584d800c75177df0637cb9a04cfb8a6a88758bad2cd0eed044cab6f27f conflicts="oce>=0" post_install() {