Unverified Commit c4ebbcbc authored by Gaétan Lepage's avatar Gaétan Lepage Committed by GitHub
Browse files

orca-slicer: 2.3.0 -> 2.3.1 (#446943)

parents 8ea360ac de6c4e47

pkgs/by-name/or/orca-slicer/package.nix

+6 −5
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
  gtk3,

  hicolor-icon-theme,

  ilmbase,

  libsecret,

  libpng,

  mpfr,

  nlopt,
@@ -57,13 +58,13 @@ let 
in

stdenv.mkDerivation (finalAttrs: {

  pname = "orca-slicer";

  version = "v2.3.0";

  version = "v2.3.1";



  src = fetchFromGitHub {

    owner = "SoftFever";

    repo = "OrcaSlicer";

    tag = finalAttrs.version;

    hash = "sha256-MEa57jFBJkqwoAkqI7wXOn1X1zxgLQt3SNeanfD88kU=";

    hash = "sha256-RdMBx/onLq58oI1sL0cHmF2SGDfeI9KkPPCbjyMqECI=";

  };



  nativeBuildInputs = [
@@ -105,6 +106,7 @@ stdenv.mkDerivation (finalAttrs: { 
    gtk3

    hicolor-icon-theme

    ilmbase

    libsecret

    libpng

    mpfr

    nlopt
@@ -126,8 +128,6 @@ stdenv.mkDerivation (finalAttrs: { 
    ./patches/0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch

    # Link opencv_core and opencv_imgproc instead of opencv_world

    ./patches/dont-link-opencv-world-orca.patch

    # Don't link osmesa

    ./patches/no-osmesa.patch

    # The changeset from https://github.com/SoftFever/OrcaSlicer/pull/7650, can be removed when that PR gets merged

    # Allows disabling the update nag screen

    (fetchpatch {
@@ -181,6 +181,7 @@ stdenv.mkDerivation (finalAttrs: { 
  prePatch = ''

    sed -i 's|nlopt_cxx|nlopt|g' cmake/modules/FindNLopt.cmake

    sed -i 's|"libnoise/noise.h"|"noise/noise.h"|' src/libslic3r/PerimeterGenerator.cpp

    sed -i 's|"libnoise/noise.h"|"noise/noise.h"|' src/libslic3r/Feature/FuzzySkin/FuzzySkin.cpp

  '';



  cmakeFlags = [
@@ -203,7 +204,7 @@ stdenv.mkDerivation (finalAttrs: { 
  ];



  # Generate translation files

  postBuild = "( cd .. && ./run_gettext.sh )";

  postBuild = "( cd .. && ./scripts/run_gettext.sh )";



  preFixup = ''

    gappsWrapperArgs+=(

pkgs/by-name/or/orca-slicer/patches/0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch

+4 −21
Original line number Diff line number Diff line 
From 7eed499898226222a949a792e0400ec10db4a1c9 Mon Sep 17 00:00:00 2001

From: Zhaofeng Li <hello@zhaofeng.li>

Date: Tue, 22 Nov 2022 13:00:39 -0700

Subject: [PATCH] [not for upstream] CMakeLists: Link against webkit2gtk in

 libslic3r_gui



WebView.cpp uses symbols from webkitgtk directly. Upstream setup

links wxGTK statically so webkitgtk is already pulled in.



> /nix/store/039g378vc3pc3dvi9dzdlrd0i4q93qwf-binutils-2.39/bin/ld: slic3r/liblibslic3r_gui.a(WebView.cpp.o): undefined reference to symbol 'webkit_web_view_run_javascript_finish'

> /nix/store/039g378vc3pc3dvi9dzdlrd0i4q93qwf-binutils-2.39/bin/ld: /nix/store/8yvy428jy2nwq4dhmrcs7gj5r27a2pv6-webkitgtk-2.38.2+abi=4.0/lib/libwebkit2gtk-4.0.so.37: error adding symbols: DSO missing from command line

---

 src/CMakeLists.txt | 5 +++++

 1 file changed, 5 insertions(+)



diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt

index 9c5cb96..e92a0e3 100644

index 33cf83734..03bc82235 100644

--- a/src/CMakeLists.txt

+++ b/src/CMakeLists.txt

@@ -175,6 +175,11 @@ if (WIN32)

     target_link_libraries(BambuStudio_app_gui PRIVATE boost_headeronly)

@@ -179,6 +179,11 @@ if (WIN32)

     target_link_libraries(OrcaSlicer_app_gui PRIVATE boost_headeronly)

 endif ()

 

+# We link against webkit2gtk symbols in src/slic3r/GUI/Widgets/WebView.cpp
@@ -29,5 +14,3 @@ index 9c5cb96..e92a0e3 100644 
 # Link the resources dir to where Slic3r GUI expects it

 set(output_dlls_Release "")

 set(output_dlls_Debug "")
 
--

2.38.1

pkgs/by-name/or/orca-slicer/patches/dont-link-opencv-world-orca.patch

+11 −11
Original line number Diff line number Diff line 
diff --git a/src/libslic3r/CMakeLists.txt b/src/libslic3r/CMakeLists.txt

index 64e0a9e87..e14f29488 100644

index d85c65fd5..07914f69f 100644

--- a/src/libslic3r/CMakeLists.txt

+++ b/src/libslic3r/CMakeLists.txt

@@ -576,7 +576,8 @@ target_link_libraries(libslic3r

     mcut

     JPEG::JPEG

     qoi

@@ -557,7 +557,8 @@ target_link_libraries(libslic3r

         libigl

         libnest2d

         miniz

-        opencv_world

+        opencv_core

+        opencv_imgproc

     noise::noise

     )

 
     PRIVATE

         ${CMAKE_DL_LIBS}

         ${EXPAT_LIBRARIES}

pkgs/by-name/or/orca-slicer/patches/no-osmesa.patch

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line 
diff --git a/src/slic3r/CMakeLists.txt b/src/slic3r/CMakeLists.txt

index e695acd48..174e233e6 100644

--- a/src/slic3r/CMakeLists.txt

+++ b/src/slic3r/CMakeLists.txt

@@ -587,7 +587,7 @@ elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux")

     FIND_LIBRARY(WAYLAND_EGL_LIBRARIES    NAMES wayland-egl)

     FIND_LIBRARY(WAYLAND_CLIENT_LIBRARIES NAMES wayland-client)

     find_package(CURL REQUIRED)

-    target_link_libraries(libslic3r_gui ${DBUS_LIBRARIES} OSMesa)

+    target_link_libraries(libslic3r_gui ${DBUS_LIBRARIES})

     target_link_libraries(libslic3r_gui

         OpenGL::EGL

         ${WAYLAND_SERVER_LIBRARIES}