[PR PATCH] Update PrusaSlicer-2.5.2 [ci skip]

Github messages for voidlinux
 help / color / mirror / Atom feed

* [PR PATCH] Update PrusaSlicer-2.5.2 [ci skip]
@ 2023-05-31 21:34 Gottox
  2023-05-31 22:23 ` [PR PATCH] [Updated] " Gottox
                   ` (3 more replies)
  0 siblings, 4 replies; 5+ messages in thread
From: Gottox @ 2023-05-31 21:34 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1114 bytes --]

There is a new pull request by Gottox against master on the void-packages repository

https://github.com/Gottox/void-packages PrusaSlicer-2.5.2
https://github.com/void-linux/void-packages/pull/44200

Update PrusaSlicer-2.5.2 [ci skip]
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)


A patch file from https://github.com/void-linux/void-packages/pull/44200.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-PrusaSlicer-2.5.2-44200.patch --]
[-- Type: text/x-diff, Size: 19375 bytes --]

From 7bd777c403babb64a7dadb398998422f809eb242 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 6 Oct 2022 11:45:57 +0200
Subject: [PATCH 1/7] occt: update to 7.7.1.

---
 common/shlibs                                 | 118 +++++++++---------
 srcpkgs/freecad/template                      |   2 +-
 .../occt/patches/cmake-build-type-none.patch  |  13 --
 srcpkgs/occt/patches/fix-install-dir.patch    |  26 +---
 srcpkgs/occt/patches/musl-fenv.patch          |  14 +--
 srcpkgs/occt/patches/musl-mallinfo.patch      |  26 ++--
 srcpkgs/occt/template                         |  16 ++-
 7 files changed, 102 insertions(+), 113 deletions(-)
 delete mode 100644 srcpkgs/occt/patches/cmake-build-type-none.patch

diff --git a/common/shlibs b/common/shlibs
index df0384d3b218..6ca0e6a256bc 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3397,63 +3397,67 @@ libvolume_key.so.1 volume_key-0.3.9_1
 librand48_r.so.0 rand48_r-0.1_1
 libxxhash.so.0 libxxHash-0.6.5_2
 libcapnp_c.so.0 c-capnproto-0.3_1
-libTKBin.so.7 occt-7.2.0p1_1
-libTKDraw.so.7 occt-7.2.0p1_1
-libTKSTEP209.so.7 occt-7.2.0p1_1
-libTKOpenGl.so.7 occt-7.2.0p1_1
-libTKBinTObj.so.7 occt-7.2.0p1_1
-libTKSTL.so.7 occt-7.2.0p1_1
-libTKViewerTest.so.7 occt-7.2.0p1_1
-libTKCAF.so.7 occt-7.2.0p1_1
-libTKService.so.7 occt-7.2.0p1_1
-libTKV3d.so.7 occt-7.2.0p1_1
-libTKXCAF.so.7 occt-7.2.0p1_1
-libTKMesh.so.7 occt-7.2.0p1_1
-libTKSTEP.so.7 occt-7.2.0p1_1
-libTKMath.so.7 occt-7.2.0p1_1
-libTKLCAF.so.7 occt-7.2.0p1_1
-libTKShHealing.so.7 occt-7.2.0p1_1
-libTKGeomAlgo.so.7 occt-7.2.0p1_1
-libTKTObjDRAW.so.7 occt-7.2.0p1_1
-libTKTObj.so.7 occt-7.2.0p1_1
-libTKStd.so.7 occt-7.2.0p1_1
-libTKSTEPBase.so.7 occt-7.2.0p1_1
-libTKIGES.so.7 occt-7.2.0p1_1
-libTKGeomBase.so.7 occt-7.2.0p1_1
-libTKFillet.so.7 occt-7.2.0p1_1
-libTKFeat.so.7 occt-7.2.0p1_1
-libTKG2d.so.7 occt-7.2.0p1_1
-libTKXSBase.so.7 occt-7.2.0p1_1
-libTKDCAF.so.7 occt-7.2.0p1_1
-libTKXml.so.7 occt-7.2.0p1_1
-libTKTopTest.so.7 occt-7.2.0p1_1
-libTKG3d.so.7 occt-7.2.0p1_1
-libTKBRep.so.7 occt-7.2.0p1_1
-libTKVRML.so.7 occt-7.2.0p1_1
-libTKCDF.so.7 occt-7.2.0p1_1
-libTKXSDRAW.so.7 occt-7.2.0p1_1
-libTKXMesh.so.7 occt-7.2.0p1_1
-libTKernel.so.7 occt-7.2.0p1_1
-libTKTopAlgo.so.7 occt-7.2.0p1_1
-libTKHLR.so.7 occt-7.2.0p1_1
-libTKBinXCAF.so.7 occt-7.2.0p1_1
-libTKVCAF.so.7 occt-7.2.0p1_1
-libTKBinL.so.7 occt-7.2.0p1_1
-libTKXmlXCAF.so.7 occt-7.2.0p1_1
-libTKXDEIGES.so.7 occt-7.2.0p1_1
-libTKBO.so.7 occt-7.2.0p1_1
-libTKStdL.so.7 occt-7.2.0p1_1
-libTKXDEDRAW.so.7 occt-7.2.0p1_1
-libTKXmlTObj.so.7 occt-7.2.0p1_1
-libTKPrim.so.7 occt-7.2.0p1_1
-libTKMeshVS.so.7 occt-7.2.0p1_1
-libTKSTEPAttr.so.7 occt-7.2.0p1_1
-libTKBool.so.7 occt-7.2.0p1_1
-libTKOffset.so.7 occt-7.2.0p1_1
-libTKXDESTEP.so.7 occt-7.2.0p1_1
-libTKQADraw.so.7 occt-7.2.0p1_1
-libTKXmlL.so.7 occt-7.2.0p1_1
-libTKRWMesh.so.7 occt-7.4.0_1
+libTKernel.so.7.7 occt-7.7.1_1
+libTKXmlXCAF.so.7.7 occt-7.7.1_1
+libTKXmlTObj.so.7.7 occt-7.7.1_1
+libTKXmlL.so.7.7 occt-7.7.1_1
+libTKXml.so.7.7 occt-7.7.1_1
+libTKXSDRAW.so.7.7 occt-7.7.1_1
+libTKXSBase.so.7.7 occt-7.7.1_1
+libTKXMesh.so.7.7 occt-7.7.1_1
+libTKXDESTEP.so.7.7 occt-7.7.1_1
+libTKXDEIGES.so.7.7 occt-7.7.1_1
+libTKXDEDRAW.so.7.7 occt-7.7.1_1
+libTKXDECascade.so.7.7 occt-7.7.1_1
+libTKXDE.so.7.7 occt-7.7.1_1
+libTKXCAF.so.7.7 occt-7.7.1_1
+libTKViewerTest.so.7.7 occt-7.7.1_1
+libTKVRML.so.7.7 occt-7.7.1_1
+libTKVCAF.so.7.7 occt-7.7.1_1
+libTKV3d.so.7.7 occt-7.7.1_1
+libTKTopTest.so.7.7 occt-7.7.1_1
+libTKTopAlgo.so.7.7 occt-7.7.1_1
+libTKTObjDRAW.so.7.7 occt-7.7.1_1
+libTKTObj.so.7.7 occt-7.7.1_1
+libTKStdL.so.7.7 occt-7.7.1_1
+libTKStd.so.7.7 occt-7.7.1_1
+libTKShHealing.so.7.7 occt-7.7.1_1
+libTKService.so.7.7 occt-7.7.1_1
+libTKSTL.so.7.7 occt-7.7.1_1
+libTKSTEPBase.so.7.7 occt-7.7.1_1
+libTKSTEPAttr.so.7.7 occt-7.7.1_1
+libTKSTEP209.so.7.7 occt-7.7.1_1
+libTKSTEP.so.7.7 occt-7.7.1_1
+libTKRWMesh.so.7.7 occt-7.7.1_1
+libTKQADraw.so.7.7 occt-7.7.1_1
+libTKPrim.so.7.7 occt-7.7.1_1
+libTKOpenGlTest.so.7.7 occt-7.7.1_1
+libTKOpenGl.so.7.7 occt-7.7.1_1
+libTKOffset.so.7.7 occt-7.7.1_1
+libTKMeshVS.so.7.7 occt-7.7.1_1
+libTKMesh.so.7.7 occt-7.7.1_1
+libTKMath.so.7.7 occt-7.7.1_1
+libTKLCAF.so.7.7 occt-7.7.1_1
+libTKIGES.so.7.7 occt-7.7.1_1
+libTKHLR.so.7.7 occt-7.7.1_1
+libTKGeomBase.so.7.7 occt-7.7.1_1
+libTKGeomAlgo.so.7.7 occt-7.7.1_1
+libTKG3d.so.7.7 occt-7.7.1_1
+libTKG2d.so.7.7 occt-7.7.1_1
+libTKFillet.so.7.7 occt-7.7.1_1
+libTKFeat.so.7.7 occt-7.7.1_1
+libTKExpress.so.7.7 occt-7.7.1_1
+libTKDraw.so.7.7 occt-7.7.1_1
+libTKDCAF.so.7.7 occt-7.7.1_1
+libTKCDF.so.7.7 occt-7.7.1_1
+libTKCAF.so.7.7 occt-7.7.1_1
+libTKBool.so.7.7 occt-7.7.1_1
+libTKBinXCAF.so.7.7 occt-7.7.1_1
+libTKBinTObj.so.7.7 occt-7.7.1_1
+libTKBinL.so.7.7 occt-7.7.1_1
+libTKBin.so.7.7 occt-7.7.1_1
+libTKBRep.so.7.7 occt-7.7.1_1
+libTKBO.so.7.7 occt-7.7.1_1
 libargon2.so.1 libargon2-20171227_1
 libdazzle-1.0.so.0 libdazzle-3.28.0_1
 libjsonrpc-glib-1.0.so.1 jsonrpc-glib-3.28.0_1
diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
index e301f32d3540..a4a3f5f76b29 100644
--- a/srcpkgs/freecad/template
+++ b/srcpkgs/freecad/template
@@ -1,7 +1,7 @@
 # Template file for 'freecad'
 pkgname=freecad
 version=0.20.2
-revision=4
+revision=5
 build_style=cmake
 
 _inst_prefix=/usr/lib/${pkgname}
diff --git a/srcpkgs/occt/patches/cmake-build-type-none.patch b/srcpkgs/occt/patches/cmake-build-type-none.patch
deleted file mode 100644
index ecb0e3da3929..000000000000
--- a/srcpkgs/occt/patches/cmake-build-type-none.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: CMakeLists.txt
-===================================================================
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -4,7 +4,7 @@ set (CMAKE_MODULE_PATH "${CMAKE_SOURCE_D
- 
- set (CMAKE_SUPPRESS_REGENERATION TRUE)
- 
--set (CMAKE_CONFIGURATION_TYPES Release Debug RelWithDebInfo CACHE INTERNAL "" FORCE)
-+set (CMAKE_CONFIGURATION_TYPES None Release Debug RelWithDebInfo CACHE INTERNAL "" FORCE)
- 
- # macro: include patched file if it exists
- macro (OCCT_INCLUDE_CMAKE_FILE BEING_INCLUDED_FILE)
diff --git a/srcpkgs/occt/patches/fix-install-dir.patch b/srcpkgs/occt/patches/fix-install-dir.patch
index 68b3ee4ef4fe..931587bef990 100644
--- a/srcpkgs/occt/patches/fix-install-dir.patch
+++ b/srcpkgs/occt/patches/fix-install-dir.patch
@@ -1,26 +1,12 @@
-# fix cmake install dir references
-# source: https://aur.archlinux.org/cgit/aur.git/commit/fix-install-dir-references.patch?h=opencascade7&id=a6a582af3688e26236cf0d4469f8f782908a9ff9
-
---- a/CMakeLists.txt	2016-11-25 11:50:18.000000000 +0100
-+++ b/CMakeLists.txt	2017-03-18 08:44:10.406668714 +0100
-@@ -906,7 +906,7 @@
- endforeach()
- # install OpenCASCADE config file with compile definitions and C/C++ flags ONLY for current configuration
- install (CODE "string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWER)")
--install (CODE "configure_file(\"${CMAKE_BINARY_DIR}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" \"${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" COPYONLY)")
-+install (CODE "configure_file(\"${CMAKE_BINARY_DIR}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" \"\$ENV{DESTDIR}${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" COPYONLY)")
+diff --color -upr occt-7.7.1.orig/adm/cmake/occt_macros.cmake occt-7.7.1/adm/cmake/occt_macros.cmake
+--- occt-7.7.1.orig/adm/cmake/occt_macros.cmake	2023-05-31 20:05:47.619869450 +0200
++++ occt-7.7.1/adm/cmake/occt_macros.cmake	2023-05-31 20:07:25.611036417 +0200
+@@ -592,7 +592,7 @@ macro (OCCT_UPDATE_TARGET_FILE)
  
- foreach (OCCT_MODULE ${OCCT_MODULES})
-   if (BUILD_MODULE_${OCCT_MODULE})
---- a/adm/cmake/occt_macros.cmake	2016-11-25 11:50:18.000000000 +0100
-+++ b/adm/cmake/occt_macros.cmake	2017-03-18 08:44:10.406668714 +0100
-@@ -558,7 +558,7 @@
-   "cmake_policy(PUSH)
-   cmake_policy(SET CMP0007 NEW)
-   string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWERCASE)
+   install (CODE
+   "string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWERCASE)
 -  file (GLOB ALL_OCCT_TARGET_FILES \"${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\")
 +  file (GLOB ALL_OCCT_TARGET_FILES \"\$ENV{DESTDIR}${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\")
    foreach(TARGET_FILENAME \${ALL_OCCT_TARGET_FILES})
      file (STRINGS \"\${TARGET_FILENAME}\" TARGET_FILE_CONTENT)
      file (REMOVE \"\${TARGET_FILENAME}\")
-<Paste>
diff --git a/srcpkgs/occt/patches/musl-fenv.patch b/srcpkgs/occt/patches/musl-fenv.patch
index 09da8d0afeae..a8a776ce29a9 100644
--- 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
index 4e5825bf1cb0..1ce5b16b793f 100644
--- 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
index 5f9ef2d060e4..296a52de5a1b 100644
--- 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.7.1
+revision=1
 _gittag="V${version//./_}"
 build_style=cmake
 # XXX: re-enable -DUSE_TBB=ON if possible when updating
@@ -17,8 +16,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=f413d30a8a06d6164e94860a652cbc96ea58fe262df36ce4eaa92a9e3561fd12
 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

From 7f033415d392c3980218f6dc9550940696245ebb Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 6 Oct 2022 09:55:54 +0200
Subject: [PATCH 2/7] gmsh: rebuild for occt-7.6.3_1

---
 srcpkgs/gmsh/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gmsh/template b/srcpkgs/gmsh/template
index ca44c92cf8e1..c3727d90e4c9 100644
--- 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
 build_style=cmake
 configure_args="-DENABLE_SYSTEM_CONTRIB=ON
  -DENABLE_HXT=$(vopt_if hxt ON OFF)

From 3734ebb9827f252bb12f8592f1a3abf3634ae768 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Wed, 31 May 2023 23:13:49 +0200
Subject: [PATCH 3/7] freecad: rebuilt for occt-7.7.1_1

---
 srcpkgs/freecad/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
index a4a3f5f76b29..8608d1670c87 100644
--- a/srcpkgs/freecad/template
+++ b/srcpkgs/freecad/template
@@ -1,7 +1,7 @@
 # Template file for 'freecad'
 pkgname=freecad
 version=0.20.2
-revision=5
+revision=6
 build_style=cmake
 
 _inst_prefix=/usr/lib/${pkgname}

From 9ab134cd165094bd1cc30b5e79e8099dadeedae1 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Wed, 31 May 2023 23:13:52 +0200
Subject: [PATCH 4/7] horizon: rebuilt for occt-7.7.1_1

---
 srcpkgs/horizon/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/horizon/template b/srcpkgs/horizon/template
index 34b04ee11a99..4d7fe5cb44d9 100644
--- a/srcpkgs/horizon/template
+++ b/srcpkgs/horizon/template
@@ -1,7 +1,7 @@
 # Template file for 'horizon'
 pkgname=horizon
 version=2.4.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="GOLD="
 make_install_target="install install-man"

From ff7400bb356af94f30078f360088d768d4294fb4 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Wed, 31 May 2023 23:13:52 +0200
Subject: [PATCH 5/7] kicad: rebuilt for occt-7.7.1_1

---
 srcpkgs/kicad/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

From 58f306efafcded898090561cf7b18f33a76982c9 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Wed, 31 May 2023 23:13:53 +0200
Subject: [PATCH 6/7] python3-occ: rebuilt for occt-7.7.1_1

---
 srcpkgs/python3-occ/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-occ/template b/srcpkgs/python3-occ/template
index 6e9967154c5c..ea123cb059b7 100644
--- 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=4
+revision=5
 archs="i686* x86_64* armv7l* aarch64* ppc*"
 build_style=cmake
 configure_args="-DPYTHONOCC_BUILD_TYPE=None -DCMAKE_BUILD_TYPE=None"

From f7d1094b7154503e70fcf0da8ac1505d96a58305 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 6 Oct 2022 11:46:51 +0200
Subject: [PATCH 7/7] PrusaSlicer: update to 2.5.2.

---
 .../PrusaSlicer/patches/cereal-is-header-only.patch   |  2 +-
 .../PrusaSlicer/patches/cmake-relax-dependency.patch  | 11 +++++++++++
 srcpkgs/PrusaSlicer/template                          |  8 ++++----
 3 files changed, 16 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/PrusaSlicer/patches/cmake-relax-dependency.patch

diff --git a/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch b/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch
index 10b9a29864ae..24897e503efb 100644
--- a/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch
+++ b/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch
@@ -20,9 +20,9 @@ Index: PrusaSlicer-2.4.2/src/CMakeLists.txt
  
 -target_link_libraries(PrusaSlicer libslic3r cereal)
 +target_link_libraries(PrusaSlicer libslic3r)
+
  if (APPLE)
  #    add_compile_options(-stdlib=libc++)
- #    add_definitions(-DBOOST_THREAD_DONT_USE_CHRONO -DBOOST_NO_CXX11_RVALUE_REFERENCES -DBOOST_THREAD_USES_MOVE)
 Index: PrusaSlicer-2.4.2/src/slic3r/CMakeLists.txt
 ===================================================================
 --- PrusaSlicer-2.4.2.orig/src/slic3r/CMakeLists.txt
diff --git a/srcpkgs/PrusaSlicer/patches/cmake-relax-dependency.patch b/srcpkgs/PrusaSlicer/patches/cmake-relax-dependency.patch
new file mode 100644
index 000000000000..b0f1448779a0
--- /dev/null
+++ 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 REQUIRED)
+ 
+ set(OCCT_LIBS
+     TKXDESTEP
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index e645926e76f7..47ec80940155 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,7 @@
 # Template file for 'PrusaSlicer'
 pkgname=PrusaSlicer
-version=2.4.2
-revision=5
+version=2.5.2
+revision=1
 build_style=cmake
 build_helper="qemu cmake-wxWidgets-gtk3"
 # Pre-Compiled Headers seems to be slower
@@ -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 mpfr-devel
- c-blosc-devel imath-devel libopenexr-devel wxWidgets-gtk3-devel"
+ c-blosc-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=e58278067b9d49a42dc9bb02b74307b3cb365bb737f28e246ca8c6f466095d6b
 
 post_extract() {
 	# Mark tests that fail on certain targets

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PR PATCH] [Updated] Update PrusaSlicer-2.5.2 [ci skip]
  2023-05-31 21:34 [PR PATCH] Update PrusaSlicer-2.5.2 [ci skip] Gottox
@ 2023-05-31 22:23 ` Gottox
  2023-06-05  9:53 ` Gottox
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 5+ messages in thread
From: Gottox @ 2023-05-31 22:23 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1119 bytes --]

There is an updated pull request by Gottox against master on the void-packages repository

https://github.com/Gottox/void-packages PrusaSlicer-2.5.2
https://github.com/void-linux/void-packages/pull/44200

Update PrusaSlicer-2.5.2 [ci skip]
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)


A patch file from https://github.com/void-linux/void-packages/pull/44200.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-PrusaSlicer-2.5.2-44200.patch --]
[-- Type: text/x-diff, Size: 19757 bytes --]

From 7bd777c403babb64a7dadb398998422f809eb242 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 6 Oct 2022 11:45:57 +0200
Subject: [PATCH 1/7] occt: update to 7.7.1.

---
 common/shlibs                                 | 118 +++++++++---------
 srcpkgs/freecad/template                      |   2 +-
 .../occt/patches/cmake-build-type-none.patch  |  13 --
 srcpkgs/occt/patches/fix-install-dir.patch    |  26 +---
 srcpkgs/occt/patches/musl-fenv.patch          |  14 +--
 srcpkgs/occt/patches/musl-mallinfo.patch      |  26 ++--
 srcpkgs/occt/template                         |  16 ++-
 7 files changed, 102 insertions(+), 113 deletions(-)
 delete mode 100644 srcpkgs/occt/patches/cmake-build-type-none.patch

diff --git a/common/shlibs b/common/shlibs
index df0384d3b218..6ca0e6a256bc 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3397,63 +3397,67 @@ libvolume_key.so.1 volume_key-0.3.9_1
 librand48_r.so.0 rand48_r-0.1_1
 libxxhash.so.0 libxxHash-0.6.5_2
 libcapnp_c.so.0 c-capnproto-0.3_1
-libTKBin.so.7 occt-7.2.0p1_1
-libTKDraw.so.7 occt-7.2.0p1_1
-libTKSTEP209.so.7 occt-7.2.0p1_1
-libTKOpenGl.so.7 occt-7.2.0p1_1
-libTKBinTObj.so.7 occt-7.2.0p1_1
-libTKSTL.so.7 occt-7.2.0p1_1
-libTKViewerTest.so.7 occt-7.2.0p1_1
-libTKCAF.so.7 occt-7.2.0p1_1
-libTKService.so.7 occt-7.2.0p1_1
-libTKV3d.so.7 occt-7.2.0p1_1
-libTKXCAF.so.7 occt-7.2.0p1_1
-libTKMesh.so.7 occt-7.2.0p1_1
-libTKSTEP.so.7 occt-7.2.0p1_1
-libTKMath.so.7 occt-7.2.0p1_1
-libTKLCAF.so.7 occt-7.2.0p1_1
-libTKShHealing.so.7 occt-7.2.0p1_1
-libTKGeomAlgo.so.7 occt-7.2.0p1_1
-libTKTObjDRAW.so.7 occt-7.2.0p1_1
-libTKTObj.so.7 occt-7.2.0p1_1
-libTKStd.so.7 occt-7.2.0p1_1
-libTKSTEPBase.so.7 occt-7.2.0p1_1
-libTKIGES.so.7 occt-7.2.0p1_1
-libTKGeomBase.so.7 occt-7.2.0p1_1
-libTKFillet.so.7 occt-7.2.0p1_1
-libTKFeat.so.7 occt-7.2.0p1_1
-libTKG2d.so.7 occt-7.2.0p1_1
-libTKXSBase.so.7 occt-7.2.0p1_1
-libTKDCAF.so.7 occt-7.2.0p1_1
-libTKXml.so.7 occt-7.2.0p1_1
-libTKTopTest.so.7 occt-7.2.0p1_1
-libTKG3d.so.7 occt-7.2.0p1_1
-libTKBRep.so.7 occt-7.2.0p1_1
-libTKVRML.so.7 occt-7.2.0p1_1
-libTKCDF.so.7 occt-7.2.0p1_1
-libTKXSDRAW.so.7 occt-7.2.0p1_1
-libTKXMesh.so.7 occt-7.2.0p1_1
-libTKernel.so.7 occt-7.2.0p1_1
-libTKTopAlgo.so.7 occt-7.2.0p1_1
-libTKHLR.so.7 occt-7.2.0p1_1
-libTKBinXCAF.so.7 occt-7.2.0p1_1
-libTKVCAF.so.7 occt-7.2.0p1_1
-libTKBinL.so.7 occt-7.2.0p1_1
-libTKXmlXCAF.so.7 occt-7.2.0p1_1
-libTKXDEIGES.so.7 occt-7.2.0p1_1
-libTKBO.so.7 occt-7.2.0p1_1
-libTKStdL.so.7 occt-7.2.0p1_1
-libTKXDEDRAW.so.7 occt-7.2.0p1_1
-libTKXmlTObj.so.7 occt-7.2.0p1_1
-libTKPrim.so.7 occt-7.2.0p1_1
-libTKMeshVS.so.7 occt-7.2.0p1_1
-libTKSTEPAttr.so.7 occt-7.2.0p1_1
-libTKBool.so.7 occt-7.2.0p1_1
-libTKOffset.so.7 occt-7.2.0p1_1
-libTKXDESTEP.so.7 occt-7.2.0p1_1
-libTKQADraw.so.7 occt-7.2.0p1_1
-libTKXmlL.so.7 occt-7.2.0p1_1
-libTKRWMesh.so.7 occt-7.4.0_1
+libTKernel.so.7.7 occt-7.7.1_1
+libTKXmlXCAF.so.7.7 occt-7.7.1_1
+libTKXmlTObj.so.7.7 occt-7.7.1_1
+libTKXmlL.so.7.7 occt-7.7.1_1
+libTKXml.so.7.7 occt-7.7.1_1
+libTKXSDRAW.so.7.7 occt-7.7.1_1
+libTKXSBase.so.7.7 occt-7.7.1_1
+libTKXMesh.so.7.7 occt-7.7.1_1
+libTKXDESTEP.so.7.7 occt-7.7.1_1
+libTKXDEIGES.so.7.7 occt-7.7.1_1
+libTKXDEDRAW.so.7.7 occt-7.7.1_1
+libTKXDECascade.so.7.7 occt-7.7.1_1
+libTKXDE.so.7.7 occt-7.7.1_1
+libTKXCAF.so.7.7 occt-7.7.1_1
+libTKViewerTest.so.7.7 occt-7.7.1_1
+libTKVRML.so.7.7 occt-7.7.1_1
+libTKVCAF.so.7.7 occt-7.7.1_1
+libTKV3d.so.7.7 occt-7.7.1_1
+libTKTopTest.so.7.7 occt-7.7.1_1
+libTKTopAlgo.so.7.7 occt-7.7.1_1
+libTKTObjDRAW.so.7.7 occt-7.7.1_1
+libTKTObj.so.7.7 occt-7.7.1_1
+libTKStdL.so.7.7 occt-7.7.1_1
+libTKStd.so.7.7 occt-7.7.1_1
+libTKShHealing.so.7.7 occt-7.7.1_1
+libTKService.so.7.7 occt-7.7.1_1
+libTKSTL.so.7.7 occt-7.7.1_1
+libTKSTEPBase.so.7.7 occt-7.7.1_1
+libTKSTEPAttr.so.7.7 occt-7.7.1_1
+libTKSTEP209.so.7.7 occt-7.7.1_1
+libTKSTEP.so.7.7 occt-7.7.1_1
+libTKRWMesh.so.7.7 occt-7.7.1_1
+libTKQADraw.so.7.7 occt-7.7.1_1
+libTKPrim.so.7.7 occt-7.7.1_1
+libTKOpenGlTest.so.7.7 occt-7.7.1_1
+libTKOpenGl.so.7.7 occt-7.7.1_1
+libTKOffset.so.7.7 occt-7.7.1_1
+libTKMeshVS.so.7.7 occt-7.7.1_1
+libTKMesh.so.7.7 occt-7.7.1_1
+libTKMath.so.7.7 occt-7.7.1_1
+libTKLCAF.so.7.7 occt-7.7.1_1
+libTKIGES.so.7.7 occt-7.7.1_1
+libTKHLR.so.7.7 occt-7.7.1_1
+libTKGeomBase.so.7.7 occt-7.7.1_1
+libTKGeomAlgo.so.7.7 occt-7.7.1_1
+libTKG3d.so.7.7 occt-7.7.1_1
+libTKG2d.so.7.7 occt-7.7.1_1
+libTKFillet.so.7.7 occt-7.7.1_1
+libTKFeat.so.7.7 occt-7.7.1_1
+libTKExpress.so.7.7 occt-7.7.1_1
+libTKDraw.so.7.7 occt-7.7.1_1
+libTKDCAF.so.7.7 occt-7.7.1_1
+libTKCDF.so.7.7 occt-7.7.1_1
+libTKCAF.so.7.7 occt-7.7.1_1
+libTKBool.so.7.7 occt-7.7.1_1
+libTKBinXCAF.so.7.7 occt-7.7.1_1
+libTKBinTObj.so.7.7 occt-7.7.1_1
+libTKBinL.so.7.7 occt-7.7.1_1
+libTKBin.so.7.7 occt-7.7.1_1
+libTKBRep.so.7.7 occt-7.7.1_1
+libTKBO.so.7.7 occt-7.7.1_1
 libargon2.so.1 libargon2-20171227_1
 libdazzle-1.0.so.0 libdazzle-3.28.0_1
 libjsonrpc-glib-1.0.so.1 jsonrpc-glib-3.28.0_1
diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
index e301f32d3540..a4a3f5f76b29 100644
--- a/srcpkgs/freecad/template
+++ b/srcpkgs/freecad/template
@@ -1,7 +1,7 @@
 # Template file for 'freecad'
 pkgname=freecad
 version=0.20.2
-revision=4
+revision=5
 build_style=cmake
 
 _inst_prefix=/usr/lib/${pkgname}
diff --git a/srcpkgs/occt/patches/cmake-build-type-none.patch b/srcpkgs/occt/patches/cmake-build-type-none.patch
deleted file mode 100644
index ecb0e3da3929..000000000000
--- a/srcpkgs/occt/patches/cmake-build-type-none.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: CMakeLists.txt
-===================================================================
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -4,7 +4,7 @@ set (CMAKE_MODULE_PATH "${CMAKE_SOURCE_D
- 
- set (CMAKE_SUPPRESS_REGENERATION TRUE)
- 
--set (CMAKE_CONFIGURATION_TYPES Release Debug RelWithDebInfo CACHE INTERNAL "" FORCE)
-+set (CMAKE_CONFIGURATION_TYPES None Release Debug RelWithDebInfo CACHE INTERNAL "" FORCE)
- 
- # macro: include patched file if it exists
- macro (OCCT_INCLUDE_CMAKE_FILE BEING_INCLUDED_FILE)
diff --git a/srcpkgs/occt/patches/fix-install-dir.patch b/srcpkgs/occt/patches/fix-install-dir.patch
index 68b3ee4ef4fe..931587bef990 100644
--- a/srcpkgs/occt/patches/fix-install-dir.patch
+++ b/srcpkgs/occt/patches/fix-install-dir.patch
@@ -1,26 +1,12 @@
-# fix cmake install dir references
-# source: https://aur.archlinux.org/cgit/aur.git/commit/fix-install-dir-references.patch?h=opencascade7&id=a6a582af3688e26236cf0d4469f8f782908a9ff9
-
---- a/CMakeLists.txt	2016-11-25 11:50:18.000000000 +0100
-+++ b/CMakeLists.txt	2017-03-18 08:44:10.406668714 +0100
-@@ -906,7 +906,7 @@
- endforeach()
- # install OpenCASCADE config file with compile definitions and C/C++ flags ONLY for current configuration
- install (CODE "string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWER)")
--install (CODE "configure_file(\"${CMAKE_BINARY_DIR}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" \"${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" COPYONLY)")
-+install (CODE "configure_file(\"${CMAKE_BINARY_DIR}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" \"\$ENV{DESTDIR}${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" COPYONLY)")
+diff --color -upr occt-7.7.1.orig/adm/cmake/occt_macros.cmake occt-7.7.1/adm/cmake/occt_macros.cmake
+--- occt-7.7.1.orig/adm/cmake/occt_macros.cmake	2023-05-31 20:05:47.619869450 +0200
++++ occt-7.7.1/adm/cmake/occt_macros.cmake	2023-05-31 20:07:25.611036417 +0200
+@@ -592,7 +592,7 @@ macro (OCCT_UPDATE_TARGET_FILE)
  
- foreach (OCCT_MODULE ${OCCT_MODULES})
-   if (BUILD_MODULE_${OCCT_MODULE})
---- a/adm/cmake/occt_macros.cmake	2016-11-25 11:50:18.000000000 +0100
-+++ b/adm/cmake/occt_macros.cmake	2017-03-18 08:44:10.406668714 +0100
-@@ -558,7 +558,7 @@
-   "cmake_policy(PUSH)
-   cmake_policy(SET CMP0007 NEW)
-   string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWERCASE)
+   install (CODE
+   "string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWERCASE)
 -  file (GLOB ALL_OCCT_TARGET_FILES \"${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\")
 +  file (GLOB ALL_OCCT_TARGET_FILES \"\$ENV{DESTDIR}${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\")
    foreach(TARGET_FILENAME \${ALL_OCCT_TARGET_FILES})
      file (STRINGS \"\${TARGET_FILENAME}\" TARGET_FILE_CONTENT)
      file (REMOVE \"\${TARGET_FILENAME}\")
-<Paste>
diff --git a/srcpkgs/occt/patches/musl-fenv.patch b/srcpkgs/occt/patches/musl-fenv.patch
index 09da8d0afeae..a8a776ce29a9 100644
--- 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
index 4e5825bf1cb0..1ce5b16b793f 100644
--- 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
index 5f9ef2d060e4..296a52de5a1b 100644
--- 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.7.1
+revision=1
 _gittag="V${version//./_}"
 build_style=cmake
 # XXX: re-enable -DUSE_TBB=ON if possible when updating
@@ -17,8 +16,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=f413d30a8a06d6164e94860a652cbc96ea58fe262df36ce4eaa92a9e3561fd12
 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

From 7f033415d392c3980218f6dc9550940696245ebb Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 6 Oct 2022 09:55:54 +0200
Subject: [PATCH 2/7] gmsh: rebuild for occt-7.6.3_1

---
 srcpkgs/gmsh/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gmsh/template b/srcpkgs/gmsh/template
index ca44c92cf8e1..c3727d90e4c9 100644
--- 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
 build_style=cmake
 configure_args="-DENABLE_SYSTEM_CONTRIB=ON
  -DENABLE_HXT=$(vopt_if hxt ON OFF)

From 3734ebb9827f252bb12f8592f1a3abf3634ae768 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Wed, 31 May 2023 23:13:49 +0200
Subject: [PATCH 3/7] freecad: rebuilt for occt-7.7.1_1

---
 srcpkgs/freecad/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
index a4a3f5f76b29..8608d1670c87 100644
--- a/srcpkgs/freecad/template
+++ b/srcpkgs/freecad/template
@@ -1,7 +1,7 @@
 # Template file for 'freecad'
 pkgname=freecad
 version=0.20.2
-revision=5
+revision=6
 build_style=cmake
 
 _inst_prefix=/usr/lib/${pkgname}

From 9ab134cd165094bd1cc30b5e79e8099dadeedae1 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Wed, 31 May 2023 23:13:52 +0200
Subject: [PATCH 4/7] horizon: rebuilt for occt-7.7.1_1

---
 srcpkgs/horizon/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/horizon/template b/srcpkgs/horizon/template
index 34b04ee11a99..4d7fe5cb44d9 100644
--- a/srcpkgs/horizon/template
+++ b/srcpkgs/horizon/template
@@ -1,7 +1,7 @@
 # Template file for 'horizon'
 pkgname=horizon
 version=2.4.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="GOLD="
 make_install_target="install install-man"

From ff7400bb356af94f30078f360088d768d4294fb4 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Wed, 31 May 2023 23:13:52 +0200
Subject: [PATCH 5/7] kicad: rebuilt for occt-7.7.1_1

---
 srcpkgs/kicad/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

From 6c7c3049076a3682a3e69cabfb106a38500357bf Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Wed, 31 May 2023 23:13:53 +0200
Subject: [PATCH 6/7] python3-occ: update to 7.7.0.

---
 srcpkgs/python3-occ/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-occ/template b/srcpkgs/python3-occ/template
index 6e9967154c5c..1fd02e0b26a0 100644
--- 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=4
+version=7.7.0
+revision=1
 archs="i686* x86_64* armv7l* aarch64* ppc*"
 build_style=cmake
 configure_args="-DPYTHONOCC_BUILD_TYPE=None -DCMAKE_BUILD_TYPE=None"
@@ -13,4 +13,4 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="LGPL-3.0-or-later"
 homepage="http://pythonocc.org"
 distfiles="https://github.com/tpaviot/pythonocc-core/archive/${version}.tar.gz"
-checksum=6d62002244a0e7f4e5c1ad590d332a60601c44b2501ad017361443b54371e667
+checksum=9b27003b87799badfae04f8cacd03b8faa1309600c9de8021434d7511e718f82

From 48e6d6968dc6604b3174881d40414bed4d9f1878 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 6 Oct 2022 11:46:51 +0200
Subject: [PATCH 7/7] PrusaSlicer: update to 2.5.2.

---
 .../PrusaSlicer/patches/cereal-is-header-only.patch   |  2 +-
 .../PrusaSlicer/patches/cmake-relax-dependency.patch  | 11 +++++++++++
 srcpkgs/PrusaSlicer/template                          |  8 ++++----
 3 files changed, 16 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/PrusaSlicer/patches/cmake-relax-dependency.patch

diff --git a/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch b/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch
index 10b9a29864ae..24897e503efb 100644
--- a/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch
+++ b/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch
@@ -20,9 +20,9 @@ Index: PrusaSlicer-2.4.2/src/CMakeLists.txt
  
 -target_link_libraries(PrusaSlicer libslic3r cereal)
 +target_link_libraries(PrusaSlicer libslic3r)
+
  if (APPLE)
  #    add_compile_options(-stdlib=libc++)
- #    add_definitions(-DBOOST_THREAD_DONT_USE_CHRONO -DBOOST_NO_CXX11_RVALUE_REFERENCES -DBOOST_THREAD_USES_MOVE)
 Index: PrusaSlicer-2.4.2/src/slic3r/CMakeLists.txt
 ===================================================================
 --- PrusaSlicer-2.4.2.orig/src/slic3r/CMakeLists.txt
diff --git a/srcpkgs/PrusaSlicer/patches/cmake-relax-dependency.patch b/srcpkgs/PrusaSlicer/patches/cmake-relax-dependency.patch
new file mode 100644
index 000000000000..b0f1448779a0
--- /dev/null
+++ 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 REQUIRED)
+ 
+ set(OCCT_LIBS
+     TKXDESTEP
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index e645926e76f7..47ec80940155 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,7 @@
 # Template file for 'PrusaSlicer'
 pkgname=PrusaSlicer
-version=2.4.2
-revision=5
+version=2.5.2
+revision=1
 build_style=cmake
 build_helper="qemu cmake-wxWidgets-gtk3"
 # Pre-Compiled Headers seems to be slower
@@ -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 mpfr-devel
- c-blosc-devel imath-devel libopenexr-devel wxWidgets-gtk3-devel"
+ c-blosc-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=e58278067b9d49a42dc9bb02b74307b3cb365bb737f28e246ca8c6f466095d6b
 
 post_extract() {
 	# Mark tests that fail on certain targets

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PR PATCH] [Updated] Update PrusaSlicer-2.5.2 [ci skip]
  2023-05-31 21:34 [PR PATCH] Update PrusaSlicer-2.5.2 [ci skip] Gottox
  2023-05-31 22:23 ` [PR PATCH] [Updated] " Gottox
@ 2023-06-05  9:53 ` Gottox
  2023-06-05  9:59 ` Gottox
  2023-06-05 10:01 ` [PR PATCH] [Merged]: " Gottox
  3 siblings, 0 replies; 5+ messages in thread
From: Gottox @ 2023-06-05  9:53 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1119 bytes --]

There is an updated pull request by Gottox against master on the void-packages repository

https://github.com/Gottox/void-packages PrusaSlicer-2.5.2
https://github.com/void-linux/void-packages/pull/44200

Update PrusaSlicer-2.5.2 [ci skip]
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)


A patch file from https://github.com/void-linux/void-packages/pull/44200.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-PrusaSlicer-2.5.2-44200.patch --]
[-- Type: text/x-diff, Size: 21269 bytes --]

From d1b02413884099bd2c438a6416b674a3a855cae4 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 30 May 2023 18:00:45 +0200
Subject: [PATCH 1/8] quickjs: Fix stack overflow in CVE-2023-31922

---
 .../patch-gh-issue-178-cve-2023-31922.patch   | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 srcpkgs/quickjs/patches/patch-gh-issue-178-cve-2023-31922.patch

diff --git a/srcpkgs/quickjs/patches/patch-gh-issue-178-cve-2023-31922.patch b/srcpkgs/quickjs/patches/patch-gh-issue-178-cve-2023-31922.patch
new file mode 100644
index 000000000000..754924c60639
--- /dev/null
+++ b/srcpkgs/quickjs/patches/patch-gh-issue-178-cve-2023-31922.patch
@@ -0,0 +1,42 @@
+From 056459314305f666aee132565df710c42f41ec04 Mon Sep 17 00:00:00 2001
+From: Nick Vatamaniuc <vatamane@gmail.com>
+Date: Sun, 28 May 2023 01:50:46 -0400
+Subject: [PATCH] Fix stack overflow in CVE-2023-31922
+
+isArray and proxy isArray can call each other indefinitely in a mutually
+recursive loop.
+
+Add a stack overflow check in the js_proxy_isArray function before calling
+JS_isArray(ctx, s->target).
+
+With ASAN the the poc.js from issue 178:
+
+```
+./qjs ./poc.js
+InternalError: stack overflow
+  at isArray (native)
+  at <eval> (./poc.js:4)
+```
+
+Fix: https://github.com/bellard/quickjs/issues/178
+---
+ quickjs.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/quickjs.c b/quickjs.c
+index 79160139..a3b0b55f 100644
+--- a/quickjs.c
++++ b/quickjs.c
+@@ -45243,6 +45243,12 @@ static int js_proxy_isArray(JSContext *ctx, JSValueConst obj)
+     JSProxyData *s = JS_GetOpaque(obj, JS_CLASS_PROXY);
+     if (!s)
+         return FALSE;
++
++    if (js_check_stack_overflow(ctx->rt, 0)) {
++        JS_ThrowStackOverflow(ctx);
++        return -1;
++    }
++
+     if (s->is_revoked) {
+         JS_ThrowTypeErrorRevokedProxy(ctx);
+         return -1;

From ae79c08793163d13fcc73e9102302c3ae2045b00 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 6 Oct 2022 11:45:57 +0200
Subject: [PATCH 2/8] occt: update to 7.7.1.

---
 common/shlibs                                 | 118 +++++++++---------
 .../occt/patches/cmake-build-type-none.patch  |  13 --
 srcpkgs/occt/patches/fix-install-dir.patch    |  26 +---
 srcpkgs/occt/patches/musl-fenv.patch          |  14 +--
 srcpkgs/occt/patches/musl-mallinfo.patch      |  26 ++--
 srcpkgs/occt/template                         |  16 ++-
 6 files changed, 101 insertions(+), 112 deletions(-)
 delete mode 100644 srcpkgs/occt/patches/cmake-build-type-none.patch

diff --git a/common/shlibs b/common/shlibs
index df0384d3b218..6ca0e6a256bc 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3397,63 +3397,67 @@ libvolume_key.so.1 volume_key-0.3.9_1
 librand48_r.so.0 rand48_r-0.1_1
 libxxhash.so.0 libxxHash-0.6.5_2
 libcapnp_c.so.0 c-capnproto-0.3_1
-libTKBin.so.7 occt-7.2.0p1_1
-libTKDraw.so.7 occt-7.2.0p1_1
-libTKSTEP209.so.7 occt-7.2.0p1_1
-libTKOpenGl.so.7 occt-7.2.0p1_1
-libTKBinTObj.so.7 occt-7.2.0p1_1
-libTKSTL.so.7 occt-7.2.0p1_1
-libTKViewerTest.so.7 occt-7.2.0p1_1
-libTKCAF.so.7 occt-7.2.0p1_1
-libTKService.so.7 occt-7.2.0p1_1
-libTKV3d.so.7 occt-7.2.0p1_1
-libTKXCAF.so.7 occt-7.2.0p1_1
-libTKMesh.so.7 occt-7.2.0p1_1
-libTKSTEP.so.7 occt-7.2.0p1_1
-libTKMath.so.7 occt-7.2.0p1_1
-libTKLCAF.so.7 occt-7.2.0p1_1
-libTKShHealing.so.7 occt-7.2.0p1_1
-libTKGeomAlgo.so.7 occt-7.2.0p1_1
-libTKTObjDRAW.so.7 occt-7.2.0p1_1
-libTKTObj.so.7 occt-7.2.0p1_1
-libTKStd.so.7 occt-7.2.0p1_1
-libTKSTEPBase.so.7 occt-7.2.0p1_1
-libTKIGES.so.7 occt-7.2.0p1_1
-libTKGeomBase.so.7 occt-7.2.0p1_1
-libTKFillet.so.7 occt-7.2.0p1_1
-libTKFeat.so.7 occt-7.2.0p1_1
-libTKG2d.so.7 occt-7.2.0p1_1
-libTKXSBase.so.7 occt-7.2.0p1_1
-libTKDCAF.so.7 occt-7.2.0p1_1
-libTKXml.so.7 occt-7.2.0p1_1
-libTKTopTest.so.7 occt-7.2.0p1_1
-libTKG3d.so.7 occt-7.2.0p1_1
-libTKBRep.so.7 occt-7.2.0p1_1
-libTKVRML.so.7 occt-7.2.0p1_1
-libTKCDF.so.7 occt-7.2.0p1_1
-libTKXSDRAW.so.7 occt-7.2.0p1_1
-libTKXMesh.so.7 occt-7.2.0p1_1
-libTKernel.so.7 occt-7.2.0p1_1
-libTKTopAlgo.so.7 occt-7.2.0p1_1
-libTKHLR.so.7 occt-7.2.0p1_1
-libTKBinXCAF.so.7 occt-7.2.0p1_1
-libTKVCAF.so.7 occt-7.2.0p1_1
-libTKBinL.so.7 occt-7.2.0p1_1
-libTKXmlXCAF.so.7 occt-7.2.0p1_1
-libTKXDEIGES.so.7 occt-7.2.0p1_1
-libTKBO.so.7 occt-7.2.0p1_1
-libTKStdL.so.7 occt-7.2.0p1_1
-libTKXDEDRAW.so.7 occt-7.2.0p1_1
-libTKXmlTObj.so.7 occt-7.2.0p1_1
-libTKPrim.so.7 occt-7.2.0p1_1
-libTKMeshVS.so.7 occt-7.2.0p1_1
-libTKSTEPAttr.so.7 occt-7.2.0p1_1
-libTKBool.so.7 occt-7.2.0p1_1
-libTKOffset.so.7 occt-7.2.0p1_1
-libTKXDESTEP.so.7 occt-7.2.0p1_1
-libTKQADraw.so.7 occt-7.2.0p1_1
-libTKXmlL.so.7 occt-7.2.0p1_1
-libTKRWMesh.so.7 occt-7.4.0_1
+libTKernel.so.7.7 occt-7.7.1_1
+libTKXmlXCAF.so.7.7 occt-7.7.1_1
+libTKXmlTObj.so.7.7 occt-7.7.1_1
+libTKXmlL.so.7.7 occt-7.7.1_1
+libTKXml.so.7.7 occt-7.7.1_1
+libTKXSDRAW.so.7.7 occt-7.7.1_1
+libTKXSBase.so.7.7 occt-7.7.1_1
+libTKXMesh.so.7.7 occt-7.7.1_1
+libTKXDESTEP.so.7.7 occt-7.7.1_1
+libTKXDEIGES.so.7.7 occt-7.7.1_1
+libTKXDEDRAW.so.7.7 occt-7.7.1_1
+libTKXDECascade.so.7.7 occt-7.7.1_1
+libTKXDE.so.7.7 occt-7.7.1_1
+libTKXCAF.so.7.7 occt-7.7.1_1
+libTKViewerTest.so.7.7 occt-7.7.1_1
+libTKVRML.so.7.7 occt-7.7.1_1
+libTKVCAF.so.7.7 occt-7.7.1_1
+libTKV3d.so.7.7 occt-7.7.1_1
+libTKTopTest.so.7.7 occt-7.7.1_1
+libTKTopAlgo.so.7.7 occt-7.7.1_1
+libTKTObjDRAW.so.7.7 occt-7.7.1_1
+libTKTObj.so.7.7 occt-7.7.1_1
+libTKStdL.so.7.7 occt-7.7.1_1
+libTKStd.so.7.7 occt-7.7.1_1
+libTKShHealing.so.7.7 occt-7.7.1_1
+libTKService.so.7.7 occt-7.7.1_1
+libTKSTL.so.7.7 occt-7.7.1_1
+libTKSTEPBase.so.7.7 occt-7.7.1_1
+libTKSTEPAttr.so.7.7 occt-7.7.1_1
+libTKSTEP209.so.7.7 occt-7.7.1_1
+libTKSTEP.so.7.7 occt-7.7.1_1
+libTKRWMesh.so.7.7 occt-7.7.1_1
+libTKQADraw.so.7.7 occt-7.7.1_1
+libTKPrim.so.7.7 occt-7.7.1_1
+libTKOpenGlTest.so.7.7 occt-7.7.1_1
+libTKOpenGl.so.7.7 occt-7.7.1_1
+libTKOffset.so.7.7 occt-7.7.1_1
+libTKMeshVS.so.7.7 occt-7.7.1_1
+libTKMesh.so.7.7 occt-7.7.1_1
+libTKMath.so.7.7 occt-7.7.1_1
+libTKLCAF.so.7.7 occt-7.7.1_1
+libTKIGES.so.7.7 occt-7.7.1_1
+libTKHLR.so.7.7 occt-7.7.1_1
+libTKGeomBase.so.7.7 occt-7.7.1_1
+libTKGeomAlgo.so.7.7 occt-7.7.1_1
+libTKG3d.so.7.7 occt-7.7.1_1
+libTKG2d.so.7.7 occt-7.7.1_1
+libTKFillet.so.7.7 occt-7.7.1_1
+libTKFeat.so.7.7 occt-7.7.1_1
+libTKExpress.so.7.7 occt-7.7.1_1
+libTKDraw.so.7.7 occt-7.7.1_1
+libTKDCAF.so.7.7 occt-7.7.1_1
+libTKCDF.so.7.7 occt-7.7.1_1
+libTKCAF.so.7.7 occt-7.7.1_1
+libTKBool.so.7.7 occt-7.7.1_1
+libTKBinXCAF.so.7.7 occt-7.7.1_1
+libTKBinTObj.so.7.7 occt-7.7.1_1
+libTKBinL.so.7.7 occt-7.7.1_1
+libTKBin.so.7.7 occt-7.7.1_1
+libTKBRep.so.7.7 occt-7.7.1_1
+libTKBO.so.7.7 occt-7.7.1_1
 libargon2.so.1 libargon2-20171227_1
 libdazzle-1.0.so.0 libdazzle-3.28.0_1
 libjsonrpc-glib-1.0.so.1 jsonrpc-glib-3.28.0_1
diff --git a/srcpkgs/occt/patches/cmake-build-type-none.patch b/srcpkgs/occt/patches/cmake-build-type-none.patch
deleted file mode 100644
index ecb0e3da3929..000000000000
--- a/srcpkgs/occt/patches/cmake-build-type-none.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: CMakeLists.txt
-===================================================================
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -4,7 +4,7 @@ set (CMAKE_MODULE_PATH "${CMAKE_SOURCE_D
- 
- set (CMAKE_SUPPRESS_REGENERATION TRUE)
- 
--set (CMAKE_CONFIGURATION_TYPES Release Debug RelWithDebInfo CACHE INTERNAL "" FORCE)
-+set (CMAKE_CONFIGURATION_TYPES None Release Debug RelWithDebInfo CACHE INTERNAL "" FORCE)
- 
- # macro: include patched file if it exists
- macro (OCCT_INCLUDE_CMAKE_FILE BEING_INCLUDED_FILE)
diff --git a/srcpkgs/occt/patches/fix-install-dir.patch b/srcpkgs/occt/patches/fix-install-dir.patch
index 68b3ee4ef4fe..931587bef990 100644
--- a/srcpkgs/occt/patches/fix-install-dir.patch
+++ b/srcpkgs/occt/patches/fix-install-dir.patch
@@ -1,26 +1,12 @@
-# fix cmake install dir references
-# source: https://aur.archlinux.org/cgit/aur.git/commit/fix-install-dir-references.patch?h=opencascade7&id=a6a582af3688e26236cf0d4469f8f782908a9ff9
-
---- a/CMakeLists.txt	2016-11-25 11:50:18.000000000 +0100
-+++ b/CMakeLists.txt	2017-03-18 08:44:10.406668714 +0100
-@@ -906,7 +906,7 @@
- endforeach()
- # install OpenCASCADE config file with compile definitions and C/C++ flags ONLY for current configuration
- install (CODE "string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWER)")
--install (CODE "configure_file(\"${CMAKE_BINARY_DIR}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" \"${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" COPYONLY)")
-+install (CODE "configure_file(\"${CMAKE_BINARY_DIR}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" \"\$ENV{DESTDIR}${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" COPYONLY)")
+diff --color -upr occt-7.7.1.orig/adm/cmake/occt_macros.cmake occt-7.7.1/adm/cmake/occt_macros.cmake
+--- occt-7.7.1.orig/adm/cmake/occt_macros.cmake	2023-05-31 20:05:47.619869450 +0200
++++ occt-7.7.1/adm/cmake/occt_macros.cmake	2023-05-31 20:07:25.611036417 +0200
+@@ -592,7 +592,7 @@ macro (OCCT_UPDATE_TARGET_FILE)
  
- foreach (OCCT_MODULE ${OCCT_MODULES})
-   if (BUILD_MODULE_${OCCT_MODULE})
---- a/adm/cmake/occt_macros.cmake	2016-11-25 11:50:18.000000000 +0100
-+++ b/adm/cmake/occt_macros.cmake	2017-03-18 08:44:10.406668714 +0100
-@@ -558,7 +558,7 @@
-   "cmake_policy(PUSH)
-   cmake_policy(SET CMP0007 NEW)
-   string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWERCASE)
+   install (CODE
+   "string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWERCASE)
 -  file (GLOB ALL_OCCT_TARGET_FILES \"${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\")
 +  file (GLOB ALL_OCCT_TARGET_FILES \"\$ENV{DESTDIR}${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\")
    foreach(TARGET_FILENAME \${ALL_OCCT_TARGET_FILES})
      file (STRINGS \"\${TARGET_FILENAME}\" TARGET_FILE_CONTENT)
      file (REMOVE \"\${TARGET_FILENAME}\")
-<Paste>
diff --git a/srcpkgs/occt/patches/musl-fenv.patch b/srcpkgs/occt/patches/musl-fenv.patch
index 09da8d0afeae..a8a776ce29a9 100644
--- 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
index 4e5825bf1cb0..1ce5b16b793f 100644
--- 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
index 5f9ef2d060e4..296a52de5a1b 100644
--- 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.7.1
+revision=1
 _gittag="V${version//./_}"
 build_style=cmake
 # XXX: re-enable -DUSE_TBB=ON if possible when updating
@@ -17,8 +16,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=f413d30a8a06d6164e94860a652cbc96ea58fe262df36ce4eaa92a9e3561fd12
 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

From 1f28095c7810950c91298aa9186b1c5d326f3a08 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Mon, 5 Jun 2023 11:48:53 +0200
Subject: [PATCH 3/8] freecad: rebuild for occt-7.7.1_1

---
 srcpkgs/freecad/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
index e301f32d3540..a4a3f5f76b29 100644
--- a/srcpkgs/freecad/template
+++ b/srcpkgs/freecad/template
@@ -1,7 +1,7 @@
 # Template file for 'freecad'
 pkgname=freecad
 version=0.20.2
-revision=4
+revision=5
 build_style=cmake
 
 _inst_prefix=/usr/lib/${pkgname}

From 068266f94127b280afb8658f81e8b766a2a521ad Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 6 Oct 2022 09:55:54 +0200
Subject: [PATCH 4/8] gmsh: rebuild for occt-7.7.1_1

---
 srcpkgs/gmsh/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gmsh/template b/srcpkgs/gmsh/template
index ca44c92cf8e1..c3727d90e4c9 100644
--- 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
 build_style=cmake
 configure_args="-DENABLE_SYSTEM_CONTRIB=ON
  -DENABLE_HXT=$(vopt_if hxt ON OFF)

From 1fade425b905da489018b7bcf7cec10ea8272165 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Wed, 31 May 2023 23:13:52 +0200
Subject: [PATCH 5/8] horizon: rebuilt for occt-7.7.0_1

---
 srcpkgs/horizon/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/horizon/template b/srcpkgs/horizon/template
index 34b04ee11a99..4d7fe5cb44d9 100644
--- a/srcpkgs/horizon/template
+++ b/srcpkgs/horizon/template
@@ -1,7 +1,7 @@
 # Template file for 'horizon'
 pkgname=horizon
 version=2.4.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="GOLD="
 make_install_target="install install-man"

From abe283af55151e11d75ef5f70d868924038a2b1f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Wed, 31 May 2023 23:13:52 +0200
Subject: [PATCH 6/8] kicad: rebuilt for occt-7.7.1_1

---
 srcpkgs/kicad/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

From 685d816ec3fd8067398556d5c6b8b7ba192147f2 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Wed, 31 May 2023 23:13:53 +0200
Subject: [PATCH 7/8] python3-occ: update to 7.7.0.

---
 srcpkgs/python3-occ/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-occ/template b/srcpkgs/python3-occ/template
index 6e9967154c5c..1fd02e0b26a0 100644
--- 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=4
+version=7.7.0
+revision=1
 archs="i686* x86_64* armv7l* aarch64* ppc*"
 build_style=cmake
 configure_args="-DPYTHONOCC_BUILD_TYPE=None -DCMAKE_BUILD_TYPE=None"
@@ -13,4 +13,4 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="LGPL-3.0-or-later"
 homepage="http://pythonocc.org"
 distfiles="https://github.com/tpaviot/pythonocc-core/archive/${version}.tar.gz"
-checksum=6d62002244a0e7f4e5c1ad590d332a60601c44b2501ad017361443b54371e667
+checksum=9b27003b87799badfae04f8cacd03b8faa1309600c9de8021434d7511e718f82

From af585ac784d1396cf7aa865c28a9ec1f99b70fc6 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 6 Oct 2022 11:46:51 +0200
Subject: [PATCH 8/8] PrusaSlicer: update to 2.5.2.

---
 .../PrusaSlicer/patches/cereal-is-header-only.patch   |  2 +-
 .../PrusaSlicer/patches/cmake-relax-dependency.patch  | 11 +++++++++++
 srcpkgs/PrusaSlicer/template                          |  8 ++++----
 3 files changed, 16 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/PrusaSlicer/patches/cmake-relax-dependency.patch

diff --git a/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch b/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch
index 10b9a29864ae..24897e503efb 100644
--- a/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch
+++ b/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch
@@ -20,9 +20,9 @@ Index: PrusaSlicer-2.4.2/src/CMakeLists.txt
  
 -target_link_libraries(PrusaSlicer libslic3r cereal)
 +target_link_libraries(PrusaSlicer libslic3r)
+
  if (APPLE)
  #    add_compile_options(-stdlib=libc++)
- #    add_definitions(-DBOOST_THREAD_DONT_USE_CHRONO -DBOOST_NO_CXX11_RVALUE_REFERENCES -DBOOST_THREAD_USES_MOVE)
 Index: PrusaSlicer-2.4.2/src/slic3r/CMakeLists.txt
 ===================================================================
 --- PrusaSlicer-2.4.2.orig/src/slic3r/CMakeLists.txt
diff --git a/srcpkgs/PrusaSlicer/patches/cmake-relax-dependency.patch b/srcpkgs/PrusaSlicer/patches/cmake-relax-dependency.patch
new file mode 100644
index 000000000000..b0f1448779a0
--- /dev/null
+++ 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 REQUIRED)
+ 
+ set(OCCT_LIBS
+     TKXDESTEP
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index e645926e76f7..47ec80940155 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,7 @@
 # Template file for 'PrusaSlicer'
 pkgname=PrusaSlicer
-version=2.4.2
-revision=5
+version=2.5.2
+revision=1
 build_style=cmake
 build_helper="qemu cmake-wxWidgets-gtk3"
 # Pre-Compiled Headers seems to be slower
@@ -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 mpfr-devel
- c-blosc-devel imath-devel libopenexr-devel wxWidgets-gtk3-devel"
+ c-blosc-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=e58278067b9d49a42dc9bb02b74307b3cb365bb737f28e246ca8c6f466095d6b
 
 post_extract() {
 	# Mark tests that fail on certain targets

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PR PATCH] [Updated] Update PrusaSlicer-2.5.2 [ci skip]
  2023-05-31 21:34 [PR PATCH] Update PrusaSlicer-2.5.2 [ci skip] Gottox
  2023-05-31 22:23 ` [PR PATCH] [Updated] " Gottox
  2023-06-05  9:53 ` Gottox
@ 2023-06-05  9:59 ` Gottox
  2023-06-05 10:01 ` [PR PATCH] [Merged]: " Gottox
  3 siblings, 0 replies; 5+ messages in thread
From: Gottox @ 2023-06-05  9:59 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1119 bytes --]

There is an updated pull request by Gottox against master on the void-packages repository

https://github.com/Gottox/void-packages PrusaSlicer-2.5.2
https://github.com/void-linux/void-packages/pull/44200

Update PrusaSlicer-2.5.2 [ci skip]
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)


A patch file from https://github.com/void-linux/void-packages/pull/44200.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-PrusaSlicer-2.5.2-44200.patch --]
[-- Type: text/x-diff, Size: 19374 bytes --]

From 9eaa0697deb9ac517715dcae205dae15f9729a87 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 6 Oct 2022 11:45:57 +0200
Subject: [PATCH 1/7] occt: update to 7.7.1.

---
 common/shlibs                                 | 118 +++++++++---------
 .../occt/patches/cmake-build-type-none.patch  |  13 --
 srcpkgs/occt/patches/fix-install-dir.patch    |  26 +---
 srcpkgs/occt/patches/musl-fenv.patch          |  14 +--
 srcpkgs/occt/patches/musl-mallinfo.patch      |  26 ++--
 srcpkgs/occt/template                         |  16 ++-
 6 files changed, 101 insertions(+), 112 deletions(-)
 delete mode 100644 srcpkgs/occt/patches/cmake-build-type-none.patch

diff --git a/common/shlibs b/common/shlibs
index df0384d3b218..6ca0e6a256bc 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3397,63 +3397,67 @@ libvolume_key.so.1 volume_key-0.3.9_1
 librand48_r.so.0 rand48_r-0.1_1
 libxxhash.so.0 libxxHash-0.6.5_2
 libcapnp_c.so.0 c-capnproto-0.3_1
-libTKBin.so.7 occt-7.2.0p1_1
-libTKDraw.so.7 occt-7.2.0p1_1
-libTKSTEP209.so.7 occt-7.2.0p1_1
-libTKOpenGl.so.7 occt-7.2.0p1_1
-libTKBinTObj.so.7 occt-7.2.0p1_1
-libTKSTL.so.7 occt-7.2.0p1_1
-libTKViewerTest.so.7 occt-7.2.0p1_1
-libTKCAF.so.7 occt-7.2.0p1_1
-libTKService.so.7 occt-7.2.0p1_1
-libTKV3d.so.7 occt-7.2.0p1_1
-libTKXCAF.so.7 occt-7.2.0p1_1
-libTKMesh.so.7 occt-7.2.0p1_1
-libTKSTEP.so.7 occt-7.2.0p1_1
-libTKMath.so.7 occt-7.2.0p1_1
-libTKLCAF.so.7 occt-7.2.0p1_1
-libTKShHealing.so.7 occt-7.2.0p1_1
-libTKGeomAlgo.so.7 occt-7.2.0p1_1
-libTKTObjDRAW.so.7 occt-7.2.0p1_1
-libTKTObj.so.7 occt-7.2.0p1_1
-libTKStd.so.7 occt-7.2.0p1_1
-libTKSTEPBase.so.7 occt-7.2.0p1_1
-libTKIGES.so.7 occt-7.2.0p1_1
-libTKGeomBase.so.7 occt-7.2.0p1_1
-libTKFillet.so.7 occt-7.2.0p1_1
-libTKFeat.so.7 occt-7.2.0p1_1
-libTKG2d.so.7 occt-7.2.0p1_1
-libTKXSBase.so.7 occt-7.2.0p1_1
-libTKDCAF.so.7 occt-7.2.0p1_1
-libTKXml.so.7 occt-7.2.0p1_1
-libTKTopTest.so.7 occt-7.2.0p1_1
-libTKG3d.so.7 occt-7.2.0p1_1
-libTKBRep.so.7 occt-7.2.0p1_1
-libTKVRML.so.7 occt-7.2.0p1_1
-libTKCDF.so.7 occt-7.2.0p1_1
-libTKXSDRAW.so.7 occt-7.2.0p1_1
-libTKXMesh.so.7 occt-7.2.0p1_1
-libTKernel.so.7 occt-7.2.0p1_1
-libTKTopAlgo.so.7 occt-7.2.0p1_1
-libTKHLR.so.7 occt-7.2.0p1_1
-libTKBinXCAF.so.7 occt-7.2.0p1_1
-libTKVCAF.so.7 occt-7.2.0p1_1
-libTKBinL.so.7 occt-7.2.0p1_1
-libTKXmlXCAF.so.7 occt-7.2.0p1_1
-libTKXDEIGES.so.7 occt-7.2.0p1_1
-libTKBO.so.7 occt-7.2.0p1_1
-libTKStdL.so.7 occt-7.2.0p1_1
-libTKXDEDRAW.so.7 occt-7.2.0p1_1
-libTKXmlTObj.so.7 occt-7.2.0p1_1
-libTKPrim.so.7 occt-7.2.0p1_1
-libTKMeshVS.so.7 occt-7.2.0p1_1
-libTKSTEPAttr.so.7 occt-7.2.0p1_1
-libTKBool.so.7 occt-7.2.0p1_1
-libTKOffset.so.7 occt-7.2.0p1_1
-libTKXDESTEP.so.7 occt-7.2.0p1_1
-libTKQADraw.so.7 occt-7.2.0p1_1
-libTKXmlL.so.7 occt-7.2.0p1_1
-libTKRWMesh.so.7 occt-7.4.0_1
+libTKernel.so.7.7 occt-7.7.1_1
+libTKXmlXCAF.so.7.7 occt-7.7.1_1
+libTKXmlTObj.so.7.7 occt-7.7.1_1
+libTKXmlL.so.7.7 occt-7.7.1_1
+libTKXml.so.7.7 occt-7.7.1_1
+libTKXSDRAW.so.7.7 occt-7.7.1_1
+libTKXSBase.so.7.7 occt-7.7.1_1
+libTKXMesh.so.7.7 occt-7.7.1_1
+libTKXDESTEP.so.7.7 occt-7.7.1_1
+libTKXDEIGES.so.7.7 occt-7.7.1_1
+libTKXDEDRAW.so.7.7 occt-7.7.1_1
+libTKXDECascade.so.7.7 occt-7.7.1_1
+libTKXDE.so.7.7 occt-7.7.1_1
+libTKXCAF.so.7.7 occt-7.7.1_1
+libTKViewerTest.so.7.7 occt-7.7.1_1
+libTKVRML.so.7.7 occt-7.7.1_1
+libTKVCAF.so.7.7 occt-7.7.1_1
+libTKV3d.so.7.7 occt-7.7.1_1
+libTKTopTest.so.7.7 occt-7.7.1_1
+libTKTopAlgo.so.7.7 occt-7.7.1_1
+libTKTObjDRAW.so.7.7 occt-7.7.1_1
+libTKTObj.so.7.7 occt-7.7.1_1
+libTKStdL.so.7.7 occt-7.7.1_1
+libTKStd.so.7.7 occt-7.7.1_1
+libTKShHealing.so.7.7 occt-7.7.1_1
+libTKService.so.7.7 occt-7.7.1_1
+libTKSTL.so.7.7 occt-7.7.1_1
+libTKSTEPBase.so.7.7 occt-7.7.1_1
+libTKSTEPAttr.so.7.7 occt-7.7.1_1
+libTKSTEP209.so.7.7 occt-7.7.1_1
+libTKSTEP.so.7.7 occt-7.7.1_1
+libTKRWMesh.so.7.7 occt-7.7.1_1
+libTKQADraw.so.7.7 occt-7.7.1_1
+libTKPrim.so.7.7 occt-7.7.1_1
+libTKOpenGlTest.so.7.7 occt-7.7.1_1
+libTKOpenGl.so.7.7 occt-7.7.1_1
+libTKOffset.so.7.7 occt-7.7.1_1
+libTKMeshVS.so.7.7 occt-7.7.1_1
+libTKMesh.so.7.7 occt-7.7.1_1
+libTKMath.so.7.7 occt-7.7.1_1
+libTKLCAF.so.7.7 occt-7.7.1_1
+libTKIGES.so.7.7 occt-7.7.1_1
+libTKHLR.so.7.7 occt-7.7.1_1
+libTKGeomBase.so.7.7 occt-7.7.1_1
+libTKGeomAlgo.so.7.7 occt-7.7.1_1
+libTKG3d.so.7.7 occt-7.7.1_1
+libTKG2d.so.7.7 occt-7.7.1_1
+libTKFillet.so.7.7 occt-7.7.1_1
+libTKFeat.so.7.7 occt-7.7.1_1
+libTKExpress.so.7.7 occt-7.7.1_1
+libTKDraw.so.7.7 occt-7.7.1_1
+libTKDCAF.so.7.7 occt-7.7.1_1
+libTKCDF.so.7.7 occt-7.7.1_1
+libTKCAF.so.7.7 occt-7.7.1_1
+libTKBool.so.7.7 occt-7.7.1_1
+libTKBinXCAF.so.7.7 occt-7.7.1_1
+libTKBinTObj.so.7.7 occt-7.7.1_1
+libTKBinL.so.7.7 occt-7.7.1_1
+libTKBin.so.7.7 occt-7.7.1_1
+libTKBRep.so.7.7 occt-7.7.1_1
+libTKBO.so.7.7 occt-7.7.1_1
 libargon2.so.1 libargon2-20171227_1
 libdazzle-1.0.so.0 libdazzle-3.28.0_1
 libjsonrpc-glib-1.0.so.1 jsonrpc-glib-3.28.0_1
diff --git a/srcpkgs/occt/patches/cmake-build-type-none.patch b/srcpkgs/occt/patches/cmake-build-type-none.patch
deleted file mode 100644
index ecb0e3da3929..000000000000
--- a/srcpkgs/occt/patches/cmake-build-type-none.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: CMakeLists.txt
-===================================================================
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -4,7 +4,7 @@ set (CMAKE_MODULE_PATH "${CMAKE_SOURCE_D
- 
- set (CMAKE_SUPPRESS_REGENERATION TRUE)
- 
--set (CMAKE_CONFIGURATION_TYPES Release Debug RelWithDebInfo CACHE INTERNAL "" FORCE)
-+set (CMAKE_CONFIGURATION_TYPES None Release Debug RelWithDebInfo CACHE INTERNAL "" FORCE)
- 
- # macro: include patched file if it exists
- macro (OCCT_INCLUDE_CMAKE_FILE BEING_INCLUDED_FILE)
diff --git a/srcpkgs/occt/patches/fix-install-dir.patch b/srcpkgs/occt/patches/fix-install-dir.patch
index 68b3ee4ef4fe..931587bef990 100644
--- a/srcpkgs/occt/patches/fix-install-dir.patch
+++ b/srcpkgs/occt/patches/fix-install-dir.patch
@@ -1,26 +1,12 @@
-# fix cmake install dir references
-# source: https://aur.archlinux.org/cgit/aur.git/commit/fix-install-dir-references.patch?h=opencascade7&id=a6a582af3688e26236cf0d4469f8f782908a9ff9
-
---- a/CMakeLists.txt	2016-11-25 11:50:18.000000000 +0100
-+++ b/CMakeLists.txt	2017-03-18 08:44:10.406668714 +0100
-@@ -906,7 +906,7 @@
- endforeach()
- # install OpenCASCADE config file with compile definitions and C/C++ flags ONLY for current configuration
- install (CODE "string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWER)")
--install (CODE "configure_file(\"${CMAKE_BINARY_DIR}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" \"${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" COPYONLY)")
-+install (CODE "configure_file(\"${CMAKE_BINARY_DIR}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" \"\$ENV{DESTDIR}${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" COPYONLY)")
+diff --color -upr occt-7.7.1.orig/adm/cmake/occt_macros.cmake occt-7.7.1/adm/cmake/occt_macros.cmake
+--- occt-7.7.1.orig/adm/cmake/occt_macros.cmake	2023-05-31 20:05:47.619869450 +0200
++++ occt-7.7.1/adm/cmake/occt_macros.cmake	2023-05-31 20:07:25.611036417 +0200
+@@ -592,7 +592,7 @@ macro (OCCT_UPDATE_TARGET_FILE)
  
- foreach (OCCT_MODULE ${OCCT_MODULES})
-   if (BUILD_MODULE_${OCCT_MODULE})
---- a/adm/cmake/occt_macros.cmake	2016-11-25 11:50:18.000000000 +0100
-+++ b/adm/cmake/occt_macros.cmake	2017-03-18 08:44:10.406668714 +0100
-@@ -558,7 +558,7 @@
-   "cmake_policy(PUSH)
-   cmake_policy(SET CMP0007 NEW)
-   string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWERCASE)
+   install (CODE
+   "string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWERCASE)
 -  file (GLOB ALL_OCCT_TARGET_FILES \"${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\")
 +  file (GLOB ALL_OCCT_TARGET_FILES \"\$ENV{DESTDIR}${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\")
    foreach(TARGET_FILENAME \${ALL_OCCT_TARGET_FILES})
      file (STRINGS \"\${TARGET_FILENAME}\" TARGET_FILE_CONTENT)
      file (REMOVE \"\${TARGET_FILENAME}\")
-<Paste>
diff --git a/srcpkgs/occt/patches/musl-fenv.patch b/srcpkgs/occt/patches/musl-fenv.patch
index 09da8d0afeae..a8a776ce29a9 100644
--- 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
index 4e5825bf1cb0..1ce5b16b793f 100644
--- 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
index 5f9ef2d060e4..296a52de5a1b 100644
--- 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.7.1
+revision=1
 _gittag="V${version//./_}"
 build_style=cmake
 # XXX: re-enable -DUSE_TBB=ON if possible when updating
@@ -17,8 +16,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=f413d30a8a06d6164e94860a652cbc96ea58fe262df36ce4eaa92a9e3561fd12
 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

From f219c92df4ec19ece9f056cc2aff54c495292aba Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Mon, 5 Jun 2023 11:48:53 +0200
Subject: [PATCH 2/7] freecad: rebuild for occt-7.7.1_1

---
 srcpkgs/freecad/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
index e301f32d3540..a4a3f5f76b29 100644
--- a/srcpkgs/freecad/template
+++ b/srcpkgs/freecad/template
@@ -1,7 +1,7 @@
 # Template file for 'freecad'
 pkgname=freecad
 version=0.20.2
-revision=4
+revision=5
 build_style=cmake
 
 _inst_prefix=/usr/lib/${pkgname}

From e09bdeea0f512bd9a5a4a6d5dfa0b1a76c1ae740 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 6 Oct 2022 09:55:54 +0200
Subject: [PATCH 3/7] gmsh: rebuild for occt-7.7.1_1

---
 srcpkgs/gmsh/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gmsh/template b/srcpkgs/gmsh/template
index ca44c92cf8e1..c3727d90e4c9 100644
--- 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
 build_style=cmake
 configure_args="-DENABLE_SYSTEM_CONTRIB=ON
  -DENABLE_HXT=$(vopt_if hxt ON OFF)

From 8b016c0d48f207bc47d2a3e3c6d84f41f2e91fd2 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Wed, 31 May 2023 23:13:52 +0200
Subject: [PATCH 4/7] horizon: rebuilt for occt-7.7.0_1

---
 srcpkgs/horizon/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/horizon/template b/srcpkgs/horizon/template
index 34b04ee11a99..4d7fe5cb44d9 100644
--- a/srcpkgs/horizon/template
+++ b/srcpkgs/horizon/template
@@ -1,7 +1,7 @@
 # Template file for 'horizon'
 pkgname=horizon
 version=2.4.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="GOLD="
 make_install_target="install install-man"

From 0f87923d732b7d750b1a4969ee5834ca5387bec5 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Wed, 31 May 2023 23:13:52 +0200
Subject: [PATCH 5/7] kicad: rebuilt for occt-7.7.1_1

---
 srcpkgs/kicad/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

From cebd97caa44df4e0fe7bd89126796b659e2f19a7 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Wed, 31 May 2023 23:13:53 +0200
Subject: [PATCH 6/7] python3-occ: update to 7.7.0.

---
 srcpkgs/python3-occ/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-occ/template b/srcpkgs/python3-occ/template
index 6e9967154c5c..1fd02e0b26a0 100644
--- 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=4
+version=7.7.0
+revision=1
 archs="i686* x86_64* armv7l* aarch64* ppc*"
 build_style=cmake
 configure_args="-DPYTHONOCC_BUILD_TYPE=None -DCMAKE_BUILD_TYPE=None"
@@ -13,4 +13,4 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="LGPL-3.0-or-later"
 homepage="http://pythonocc.org"
 distfiles="https://github.com/tpaviot/pythonocc-core/archive/${version}.tar.gz"
-checksum=6d62002244a0e7f4e5c1ad590d332a60601c44b2501ad017361443b54371e667
+checksum=9b27003b87799badfae04f8cacd03b8faa1309600c9de8021434d7511e718f82

From 837ef13178d59f5826a330d2728271b23c95a9c2 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 6 Oct 2022 11:46:51 +0200
Subject: [PATCH 7/7] PrusaSlicer: update to 2.5.2.

---
 .../PrusaSlicer/patches/cereal-is-header-only.patch   |  2 +-
 .../PrusaSlicer/patches/cmake-relax-dependency.patch  | 11 +++++++++++
 srcpkgs/PrusaSlicer/template                          |  8 ++++----
 3 files changed, 16 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/PrusaSlicer/patches/cmake-relax-dependency.patch

diff --git a/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch b/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch
index 10b9a29864ae..24897e503efb 100644
--- a/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch
+++ b/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch
@@ -20,9 +20,9 @@ Index: PrusaSlicer-2.4.2/src/CMakeLists.txt
  
 -target_link_libraries(PrusaSlicer libslic3r cereal)
 +target_link_libraries(PrusaSlicer libslic3r)
+
  if (APPLE)
  #    add_compile_options(-stdlib=libc++)
- #    add_definitions(-DBOOST_THREAD_DONT_USE_CHRONO -DBOOST_NO_CXX11_RVALUE_REFERENCES -DBOOST_THREAD_USES_MOVE)
 Index: PrusaSlicer-2.4.2/src/slic3r/CMakeLists.txt
 ===================================================================
 --- PrusaSlicer-2.4.2.orig/src/slic3r/CMakeLists.txt
diff --git a/srcpkgs/PrusaSlicer/patches/cmake-relax-dependency.patch b/srcpkgs/PrusaSlicer/patches/cmake-relax-dependency.patch
new file mode 100644
index 000000000000..b0f1448779a0
--- /dev/null
+++ 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 REQUIRED)
+ 
+ set(OCCT_LIBS
+     TKXDESTEP
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index e645926e76f7..47ec80940155 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,7 @@
 # Template file for 'PrusaSlicer'
 pkgname=PrusaSlicer
-version=2.4.2
-revision=5
+version=2.5.2
+revision=1
 build_style=cmake
 build_helper="qemu cmake-wxWidgets-gtk3"
 # Pre-Compiled Headers seems to be slower
@@ -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 mpfr-devel
- c-blosc-devel imath-devel libopenexr-devel wxWidgets-gtk3-devel"
+ c-blosc-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=e58278067b9d49a42dc9bb02b74307b3cb365bb737f28e246ca8c6f466095d6b
 
 post_extract() {
 	# Mark tests that fail on certain targets

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PR PATCH] [Merged]: Update PrusaSlicer-2.5.2 [ci skip]
  2023-05-31 21:34 [PR PATCH] Update PrusaSlicer-2.5.2 [ci skip] Gottox
                   ` (2 preceding siblings ...)
  2023-06-05  9:59 ` Gottox
@ 2023-06-05 10:01 ` Gottox
  3 siblings, 0 replies; 5+ messages in thread
From: Gottox @ 2023-06-05 10:01 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 955 bytes --]

There's a merged pull request on the void-packages repository

Update PrusaSlicer-2.5.2 [ci skip]
https://github.com/void-linux/void-packages/pull/44200

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)


^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2023-06-05 10:01 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-05-31 21:34 [PR PATCH] Update PrusaSlicer-2.5.2 [ci skip] Gottox
2023-05-31 22:23 ` [PR PATCH] [Updated] " Gottox
2023-06-05  9:53 ` Gottox
2023-06-05  9:59 ` Gottox
2023-06-05 10:01 ` [PR PATCH] [Merged]: " Gottox

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).