File project.diff of Package PrusaSlicer

Overview Repositories Revisions Requests Users Attributes Meta

File project.diff of Package PrusaSlicer (Revision c953aec21af34613e9a0a372812ba7ce)

Currently displaying revision c953aec21af34613e9a0a372812ba7ce , Show latest

--- PrusaSlicer.spec.orig
+++ PrusaSlicer.spec
@@ -24,14 +24,20 @@ License:        AGPL-3.0-only
 Group:          Hardware/Printing
 URL:            https://www.prusa3d.com/prusaslicer/
 Source0:        https://github.com/prusa3d/PrusaSlicer/archive/version_%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Patch10:        fix-6396.patch
 BuildRequires:  blosc-devel
 BuildRequires:  cereal-devel
 BuildRequires:  cgal-devel >= 4.13.2
 BuildRequires:  cmake
+BuildRequires:  dbus-1-devel
 BuildRequires:  eigen3-devel >= 3
 BuildRequires:  expat
 BuildRequires:  fdupes
+%if 0%{?suse_version} <= 1550
+BuildRequires:  gcc10-c++
+%else
 BuildRequires:  gcc-c++
+%endif
 # For now, use bundled GLEW because of gh#prusa3d/PrusaSlicer#6396
 #!BuildIgnore:  glew-devel
 BuildRequires:  gtest >= 1.7
@@ -55,7 +61,6 @@ BuildRequires:  tbb-devel
 BuildRequires:  update-desktop-files
 BuildRequires:  wxGTK3-devel >= 3.1
 BuildRequires:  pkgconfig(libudev)
-Requires:       noto-sans-fonts
 
 %description
 PrusaSlicer takes 3D models (STL, OBJ, AMF) and converts them into G-code
@@ -86,6 +91,10 @@ rm resources/udev/90-3dconnexion.rules
   export CXXFLAGS="$CFLAGS"
 %endif
 %cmake \
+%if 0%{?suse_version} <= 1550
+  -DCMAKE_CXX_COMPILER=g++-10 \
+  -DCMAKE_C_COMPILER=gcc-10 \
+%endif
   -DSLIC3R_FHS=1 \
   -DSLIC3R_GTK=3 \
   -DOPENVDB_FIND_MODULE_PATH=%{_libdir}/cmake/OpenVDB
@@ -94,12 +103,9 @@ rm resources/udev/90-3dconnexion.rules
 %install
 %cmake_install
 
-%suse_update_desktop_file -r PrusaSlicer Graphics 3DGraphics Science Engineering
+%suse_update_desktop_file -r PrusaSlicer Graphics 3DGraphics
 %suse_update_desktop_file -r PrusaGcodeviewer Graphics 3DGraphics
 
-#remove stray font file
-rm -rf %{buildroot}%{_datadir}/%{name}/fonts
-
 # Copied and adapted from Fedora package:
 # https://src.fedoraproject.org/rpms/prusa-slicer
 # Upstream installs the translation source files when they probably shouldn't
@@ -133,13 +139,13 @@ find %{buildroot}%{_datadir}/%{name}/loc
 %fdupes %{buildroot}%{_datadir}
 
 %check
-%ctest --timeout 600
+%ctest
 
 %files -f lang-files
 %{_bindir}/prusa-slicer
 %{_bindir}/prusa-gcodeviewer
 %dir %{_datadir}/%{name}/
-%{_datadir}/%{name}/{icons,models,profiles,shaders,udev,data,shapes}/
+%{_datadir}/%{name}/{fonts,icons,models,profiles,shaders,udev,data,shapes}/
 %{_datadir}/icons/hicolor/32x32/apps/%{name}.png
 %{_datadir}/icons/hicolor/128x128/apps/%{name}.png
 %{_datadir}/icons/hicolor/192x192/apps/%{name}.png

Places

File project.diff of Package PrusaSlicer (Revision c953aec21af34613e9a0a372812ba7ce)

Places