void-linux · Gottox · Oct 6, 2022 · Oct 6, 2022 · Oct 6, 2022 · Oct 6, 2022
diff --git a/srcpkgs/PrusaSlicer/patches/cmake-relax-dependency.patch b/srcpkgs/PrusaSlicer/patches/cmake-relax-dependency.patch
@@ -0,0 +1,11 @@
+--- PrusaSlicer-version_2.5.0/src/occt_wrapper/CMakeLists.txt.orig	2022-09-17 11:47:02.398209546 +0200
++++ PrusaSlicer-version_2.5.0/src/occt_wrapper/CMakeLists.txt	2022-09-17 11:47:30.092595307 +0200
+@@ -19,7 +19,7 @@ include(GenerateExportHeader)
+
+ generate_export_header(OCCTWrapper)
+
+-find_package(OpenCASCADE 7.6.2 REQUIRED)
++find_package(OpenCASCADE 7.6.3 REQUIRED)
+
+ set(OCCT_LIBS
+     TKXDESTEP
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,7 @@
 # Template file for 'PrusaSlicer'
 pkgname=PrusaSlicer
-version=2.4.2
-revision=2
+version=2.5.0
+revision=1
 wrksrc="PrusaSlicer-version_${version}"
 build_style=cmake
 build_helper="qemu cmake-wxWidgets-gtk3"
@@ -11,13 +11,13 @@ hostmakedepends="pkg-config"
 makedepends=" boost-devel cereal cgal-devel dbus-devel eigen glew-devel
  glu-devel gmpxx-devel gtest-devel gtk+3-devel libcurl-devel libglib-devel
  libpng-devel nlopt-devel openvdb-devel tbb-devel wxWidgets-devel
- c-blosc-devel ilmbase-devel libopenexr-devel wxWidgets-gtk3-devel"
+ c-blosc-devel ilmbase-devel libopenexr-devel wxWidgets-gtk3-devel occt-devel"
 short_desc="G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.prusa3d.com/prusaslicer/"
 distfiles="https://github.com/prusa3d/Prusaslicer/archive/version_${version}.tar.gz"
-checksum=ac3a77212260e8d0baf9df027c29e0ae965bc77f371e59fd27b8fe103ebb1f23
+checksum=dbbf3e10c812d1dc7bae4bd6879e60f864d763b2738b099dd34b9636d0e5eb6a
 
 post_extract() {
 	# Mark tests that fail on certain targets

diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
@@ -1,7 +1,7 @@
 # Template file for 'freecad'
 pkgname=freecad
 version=0.20.1
-revision=4
+revision=5
 wrksrc="FreeCAD-${version}"
 build_style=cmake
 

diff --git a/srcpkgs/gmsh/template b/srcpkgs/gmsh/template
@@ -1,7 +1,7 @@
 # Template file for 'gmsh'
 pkgname=gmsh
 version=4.8.4
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}-source"
 build_style=cmake
 configure_args="-DENABLE_SYSTEM_CONTRIB=ON

diff --git a/srcpkgs/horizon/template b/srcpkgs/horizon/template
@@ -1,7 +1,7 @@
 # Template file for 'horizon'
 pkgname=horizon
 version=2.3.1
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="GOLD="
 make_install_target="install install-man"

diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template
@@ -1,7 +1,7 @@
 # Template file for 'kicad'
 pkgname=kicad
 version=6.0.7
-revision=1
+revision=2
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 configure_args="-DKICAD_SCRIPTING_WXPYTHON=ON

diff --git a/srcpkgs/occt/patches/cmake-build-type-none.patch b/srcpkgs/occt/patches/cmake-build-type-none.patch
diff --git a/srcpkgs/occt/patches/musl-fenv.patch b/srcpkgs/occt/patches/musl-fenv.patch
@@ -5,18 +5,18 @@ is probably wrong, but I don't have a replacement for the
 non-posix functions fegetexcept(3) and feenableexcept(3).
 """
 
---- a/src/OSD/OSD_signal.cxx
-+++ b/src/OSD/OSD_signal.cxx
-@@ -703,7 +703,7 @@
+--- a/src/OSD/OSD_signal.cxx.orig	2022-07-22 10:53:38.000000000 +0200
++++ b/src/OSD/OSD_signal.cxx	2022-10-06 09:19:02.286414340 +0200
+@@ -761,7 +761,7 @@ typedef void (* SIG_PFV) (int);
 
  #include <signal.h>
 
--#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 <sys/signal.h>
  #endif
 
-@@ -914,7 +914,7 @@
+@@ -977,7 +977,7 @@ static void SegvHandler(const int theSig
  //=======================================================================
  void OSD::SetFloatingSignal (Standard_Boolean theFloatingSignal)
  {
@@ -25,7 +25,7 @@ non-posix functions fegetexcept(3) and feenableexcept(3).
    feclearexcept (FE_ALL_EXCEPT);
    if (theFloatingSignal)
    {
-@@ -947,7 +947,7 @@
+@@ -1010,7 +1010,7 @@ void OSD::SetFloatingSignal (Standard_Bo
  //=======================================================================
  Standard_Boolean OSD::ToCatchFloatingSignals()
  {

diff --git a/srcpkgs/occt/patches/musl-mallinfo.patch b/srcpkgs/occt/patches/musl-mallinfo.patch
@@ -1,17 +1,21 @@
 In musl libc there is no struct mallinfo and no function mallinf()
 
---- a/src/OSD/OSD_MemInfo.cxx
-+++ b/src/OSD/OSD_MemInfo.cxx
-@@ -147,8 +147,12 @@
-   }
-   aFile.close();
+--- a/src/OSD/OSD_MemInfo.cxx.orig	2022-10-06 09:21:55.466236104 +0200
++++ b/src/OSD/OSD_MemInfo.cxx	2022-10-06 09:25:34.105323581 +0200
+@@ -188,12 +188,16 @@ void OSD_MemInfo::Update()
+     #endif
+   #endif
 
 +  #if defined(__GLIBC__)
-   struct mallinfo aMI = mallinfo();
-   myCounters[MemHeapUsage] = aMI.uordblks;
-+  #else /* XXX not yet coded */
-+  myCounters[MemHeapUsage] = 0;
+   #ifdef HAS_MALLINFO2
+     const struct mallinfo2 aMI = mallinfo2();
+   #else
+     const struct mallinfo aMI = mallinfo();
+   #endif
+     myCounters[MemHeapUsage] = aMI.uordblks;
++  #else
++    myCounters[MemHeapUsage] = 0;
 +  #endif
+   }
 
- #elif (defined(__APPLE__))
-   struct task_basic_info aTaskInfo;
+   if (!IsActive (MemVirtual)
diff --git a/srcpkgs/occt/template b/srcpkgs/occt/template
@@ -1,8 +1,7 @@
 # Template file for 'occt'
 pkgname=occt
-reverts=7.5.0_1
-version=7.4.0p1
-revision=5
+version=7.6.3
+revision=1
 _gittag="V${version//./_}"
 wrksrc=occt-${_gittag}
 build_style=cmake
@@ -18,8 +17,17 @@ 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
+checksum=baae5b3a7a38825396fc45ef9d170db406339f5eeec62e21b21036afeda31200
 conflicts="oce>=0"
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+	makedepends+=" libexecinfo-devel"
+	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-lexecinfo"
+fi
+
+pre_build() {
+	cp build/OpenCASCADECompileDefinitionsAndFlags-release.cmake \
+		build/OpenCASCADECompileDefinitionsAndFlags-none.cmake
+}
 
 post_install() {
 	rm ${PKGDESTDIR}/usr/share/doc/opencascade/*_LGPL_*.txt

diff --git a/srcpkgs/python3-occ/template b/srcpkgs/python3-occ/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-occ'
 pkgname=python3-occ
 version=7.4.1
-revision=3
+revision=4
 archs="i686* x86_64* armv7l* aarch64* ppc*"
 wrksrc="pythonocc-core-${version}"
 build_style=cmake