Attachment 248765 Details for Bug 277313 – Patch from Johannes Thyssen Tishman

[patch] Patch from Johannes Thyssen Tishman

patch-PrusaSlicer+OCCT-7.8.diff (text/plain), 2.30 KB, created by Thierry Thomas on 2024-02-26 17:58:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thierry Thomas

Created: 2024-02-26 17:58:15 UTC

Size: 2.30 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /cvs/ports/cad/prusaslicer/Makefile,v
>retrieving revision 1.6
>diff -u -p -r1.6 Makefile
>--- Makefile	20 Nov 2023 15:57:23 -0000	1.6
>+++ Makefile	1 Feb 2024 22:25:13 -0000
>@@ -20,10 +20,9 @@ MAINTAINER =	Renato Aguiar <renato@renat
> PERMIT_PACKAGE =	Yes
> 
> WANTLIB += ${COMPILER_LIBCXX} EGL GL GLEW TKBO TKBRep TKCAF TKCDF
>-WANTLIB += TKG2d TKG3d TKGeomAlgo TKGeomBase TKHLR TKLCAF TKMath
>-WANTLIB += TKMesh TKPrim TKSTEP TKSTEP209 TKSTEPAttr TKSTEPBase
>-WANTLIB += TKService TKShHealing TKTopAlgo TKV3d TKVCAF TKXCAF
>-WANTLIB += TKXDE TKXDESTEP TKXSBase TKernel X11 atk-1.0 boost_atomic-mt
>+WANTLIB += TKDE TKDESTEP TKG2d TKG3d TKGeomAlgo TKGeomBase TKHLR
>+WANTLIB += TKLCAF TKMath TKMesh TKPrim TKService TKShHealing TKTopAlgo
>+WANTLIB += TKV3d TKVCAF TKXCAF TKXSBase TKernel X11 atk-1.0 boost_atomic-mt
> WANTLIB += boost_chrono-mt boost_date_time-mt boost_filesystem-mt
> WANTLIB += boost_iostreams-mt boost_locale-mt boost_log-mt boost_log_setup-mt
> WANTLIB += boost_regex-mt boost_system-mt boost_thread-mt c cairo
>Index: patches/patch-src_occt_wrapper_CMakeLists_txt
>===================================================================
>RCS file: /cvs/ports/cad/prusaslicer/patches/patch-src_occt_wrapper_CMakeLists_txt,v
>retrieving revision 1.3
>diff -u -p -r1.3 patch-src_occt_wrapper_CMakeLists_txt
>--- patches/patch-src_occt_wrapper_CMakeLists_txt	31 Oct 2023 23:37:10 -0000	1.3
>+++ patches/patch-src_occt_wrapper_CMakeLists_txt	1 Feb 2024 22:25:13 -0000
>@@ -1,7 +1,7 @@
> Index: src/occt_wrapper/CMakeLists.txt
> --- src/occt_wrapper/CMakeLists.txt.orig
> +++ src/occt_wrapper/CMakeLists.txt
>-@@ -19,9 +19,11 @@ include(GenerateExportHeader)
>+@@ -19,14 +19,12 @@ include(GenerateExportHeader)
>  
>  generate_export_header(OCCTWrapper)
>  
>@@ -9,12 +9,18 @@ Index: src/occt_wrapper/CMakeLists.txt
> +find_package(OpenCASCADE REQUIRED)
>  
>  set(OCCT_LIBS
>+-    TKXDESTEP
>+-    TKSTEP
>+-    TKSTEP209
>+-    TKSTEPAttr
>+-    TKSTEPBase
> +    -L${CMAKE_INSTALL_PREFIX}/lib
> +    -L/usr/X11R6/lib
>-     TKXDESTEP
>-     TKSTEP
>-     TKSTEP209
>-@@ -58,5 +60,5 @@ target_link_libraries(OCCTWrapper ${OCCT_LIBS})
>++    TKDESTEP
>+     TKXCAF
>+     TKXSBase
>+     TKVCAF
>+@@ -58,5 +56,5 @@ target_link_libraries(OCCTWrapper ${OCCT_LIBS})
>  
>  include(GNUInstallDirs)
>

Flags:

thierry: maintainer-approval? (teodorsigaev)

Actions: View | Diff

Attachments on bug 277313: 248765