[arch-commits] Commit in prusa-slicer/repos (3 files)

[Bruno Pagani]

    Date: Tuesday, March 15, 2022 @ 23:22:19
  Author: archange
Revision: 1155222

archrelease: copy trunk to community-testing-x86_64

Added:
  prusa-slicer/repos/community-testing-x86_64/
  prusa-slicer/repos/community-testing-x86_64/PKGBUILD
    (from rev 1155221, prusa-slicer/trunk/PKGBUILD)
  prusa-slicer/repos/community-testing-x86_64/use-system-catch2.patch
    (from rev 1155221, prusa-slicer/trunk/use-system-catch2.patch)

-------------------------+
 PKGBUILD                |   55 ++++++++++++++++++++++++++++++++++++++++++++++
 use-system-catch2.patch |   40 +++++++++++++++++++++++++++++++++
 2 files changed, 95 insertions(+)

Copied: prusa-slicer/repos/community-testing-x86_64/PKGBUILD (from rev 1155221, prusa-slicer/trunk/PKGBUILD)
===================================================================
--- community-testing-x86_64/PKGBUILD	                        (rev 0)
+++ community-testing-x86_64/PKGBUILD	2022-03-15 23:22:19 UTC (rev 1155222)
@@ -0,0 +1,55 @@
+# Maintainer: Bruno Pagani <archange at archlinux.org>
+
+pkgname=prusa-slicer
+pkgver=2.4.1
+pkgrel=1
+pkgdesc="G-code generator for 3D printers (Prusa fork of Slic3r)"
+arch=(x86_64)
+url="https://github.com/prusa3d/PrusaSlicer"
+license=(AGPL3)
+depends=(boost-libs curl glew intel-tbb mpfr nlopt wxgtk3 qhull openvdb)
+makedepends=(cmake boost cereal cgal eigen expat gtest libpng systemd)
+checkdepends=(catch2)
+replaces=(slic3r-prusa3d)
+source=(${url}/archive/version_${pkgver}/${pkgname}-${pkgver}.tar.gz
+        ${pkgname}-fix-lcereal-p1.patch::${url}/commit/0ffcfd8393457fd035576436752267c9a1e6bbcc.patch
+        ${pkgname}-fix-lcereal-p2.patch::${url}/commit/cc788ebb643b6d4048f3550235ac3e9d3697ada0.patch
+        use-system-catch2.patch)
+sha256sums=('a0ba9de6f7c8159d033ea69a2c5ebd6172a97f29902303e9897249447ce5e498'
+            'e110c3ca7cd8034f878b22e4992c442cc200a7c001d570dc2c9eef8a6af41786'
+            'eb5bce1cb5b3970a1aa92fd9b7fe1943da4d7bb2c9908890811090914fef91c4'
+            '3639dc2d290dc9a7d16259e0b421f8d21f16fb4abe46bbb3fab9328930fc5758')
+
+prepare() {
+  cd PrusaSlicer-version_${pkgver}
+  patch -p1 < ../use-system-catch2.patch # Borrowed from Debian
+  patch -p1 < ../${pkgname}-fix-lcereal-p1.patch
+  patch -p1 < ../${pkgname}-fix-lcereal-p2.patch
+}
+
+build() {
+  cmake -B build -S PrusaSlicer-version_${pkgver} \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=lib \
+    -DOPENVDB_FIND_MODULE_PATH=/usr/lib/cmake/OpenVDB \
+    -DSLIC3R_FHS=ON \
+    -DSLIC3R_PCH=OFF \
+    -DSLIC3R_WX_STABLE=ON \
+    -DSLIC3R_GTK=3 \
+    -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-gtk3
+  make -C build
+}
+
+check() {
+  cd build
+  ctest -v
+}
+
+package() {
+  make -C build DESTDIR="${pkgdir}" install
+
+  # Desktop icons
+  mkdir -p "${pkgdir}"/usr/share/icons/hicolor/scalable/apps/
+  ln -s /usr/share/PrusaSlicer/icons/PrusaSlicer.svg "${pkgdir}"/usr/share/icons/hicolor/scalable/apps/PrusaSlicer.svg
+  ln -s /usr/share/PrusaSlicer/icons/PrusaSlicer-gcodeviewer.svg "${pkgdir}"/usr/share/icons/hicolor/scalable/apps/PrusaSlicer-gcodeviewer.svg
+}

Copied: prusa-slicer/repos/community-testing-x86_64/use-system-catch2.patch (from rev 1155221, prusa-slicer/trunk/use-system-catch2.patch)
===================================================================
--- community-testing-x86_64/use-system-catch2.patch	                        (rev 0)
+++ community-testing-x86_64/use-system-catch2.patch	2022-03-15 23:22:19 UTC (rev 1155222)
@@ -0,0 +1,40 @@
+From: Tobias Frost <tobi at debian.org>
+Date: Mon, 20 Dec 2021 02:29:22 +0800
+Subject: Use packaged catch2 library
+
+Bug-Debian: https://bugs.debian.org/979826
+---
+ tests/CMakeLists.txt | 13 +++----------
+ 1 file changed, 3 insertions(+), 10 deletions(-)
+
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index b91f75b..1322cab 100644
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -4,15 +4,8 @@
+ set(TEST_DATA_DIR ${CMAKE_CURRENT_SOURCE_DIR}/data)
+ file(TO_NATIVE_PATH "${TEST_DATA_DIR}" TEST_DATA_DIR)
+ 
+-add_library(Catch2 INTERFACE)
+-list (APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/modules/Catch2)
+-target_include_directories(Catch2 INTERFACE ${CMAKE_CURRENT_LIST_DIR})
+-add_library(Catch2::Catch2 ALIAS Catch2)
+-if (APPLE)
+-	# OSX builds targeting OSX 10.9 do not support new std::uncought_exception()
+-	# see https://github.com/catchorg/Catch2/issues/1218
+-	target_compile_definitions(Catch2 INTERFACE -DCATCH_CONFIG_NO_CPP17_UNCAUGHT_EXCEPTIONS)
+-endif()
++find_package(Catch2 REQUIRED)
++
+ include(Catch)
+ 
+ set(CATCH_EXTRA_ARGS "" CACHE STRING "Extra arguments for catch2 test suites.")
+@@ -20,7 +13,7 @@ set(CATCH_EXTRA_ARGS "" CACHE STRING "Extra arguments for catch2 test suites.")
+ add_library(test_common INTERFACE)
+ target_compile_definitions(test_common INTERFACE TEST_DATA_DIR=R"\(${TEST_DATA_DIR}\)" CATCH_CONFIG_FAST_COMPILE)
+ target_link_libraries(test_common INTERFACE Catch2::Catch2)
+-
++target_include_directories(test_common INTERFACE ${CMAKE_CURRENT_LIST_DIR})
+ if (APPLE)
+     target_link_libraries(test_common INTERFACE "-liconv -framework IOKit" "-framework CoreFoundation" -lc++)
+ endif()