git: 831181543f1d - main - cad/PrusaSlicer: Revert 2f27ce4f425b3d324a16b69a5c73ceb11b57046a "Try to fix libdbus"

The branch main has been updated by mr:

URL: https://cgit.FreeBSD.org/ports/commit/?id=831181543f1d9863425529d88be1e74584cf1453

commit 831181543f1d9863425529d88be1e74584cf1453
Author:     Michael Reifenberger <mr@FreeBSD.org>
AuthorDate: 2025-03-17 19:05:01 +0000
Commit:     Michael Reifenberger <mr@FreeBSD.org>
CommitDate: 2025-03-17 19:22:04 +0000

    cad/PrusaSlicer: Revert 2f27ce4f425b3d324a16b69a5c73ceb11b57046a "Try to fix libdbus"
    
    This reverts commit 2f27ce4f425b3d324a16b69a5c73ceb11b57046a.
    
    Should be unnecessary now after dbus got fixed.
    
    Reported by:    jhale@
---
 cad/PrusaSlicer/Makefile                              |  4 +---
 cad/PrusaSlicer/files/patch-CMakeLists.txt            | 19 +++----------------
 cad/PrusaSlicer/files/patch-src_CMakeLists.txt        | 11 +----------
 ...slic3r-arrange_include_arrange_DataStoreTraits.hpp | 10 ++++++++++
 4 files changed, 15 insertions(+), 29 deletions(-)

diff --git a/cad/PrusaSlicer/Makefile b/cad/PrusaSlicer/Makefile
index 57911f4861a9..f2940ab7b3db 100644
--- a/cad/PrusaSlicer/Makefile
+++ b/cad/PrusaSlicer/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	PrusaSlicer
 DISTVERSIONPREFIX=version_
 DISTVERSION=	2.9.0
-PORTREVISION=	1
 CATEGORIES=	cad
 DIST_SUBDIR=	PrusaSlicer
 
@@ -58,8 +57,7 @@ USE_GNOME=	gtk30 pango atk cairo gdkpixbuf glib20
 USE_WX=		3.2
 USE_XORG=	x11
 
-CMAKE_ARGS+=	-DCMAKE_FIND_DEBUG_MODE=TRUE \
-		-DwxWidgets_CONFIG_EXECUTABLE="${WX_CONFIG}" \
+CMAKE_ARGS+=	-DwxWidgets_CONFIG_EXECUTABLE="${WX_CONFIG}" \
 		-DSLIC3R_GTK=3 \
 		-DSLIC3R_FHS=1 \
 		-DSLIC3R_PCH=OFF \
diff --git a/cad/PrusaSlicer/files/patch-CMakeLists.txt b/cad/PrusaSlicer/files/patch-CMakeLists.txt
index 8c84aa8b960d..297a2a5d44b8 100644
--- a/cad/PrusaSlicer/files/patch-CMakeLists.txt
+++ b/cad/PrusaSlicer/files/patch-CMakeLists.txt
@@ -1,4 +1,4 @@
---- CMakeLists.txt.orig	2024-12-20 11:54:34 UTC
+--- CMakeLists.txt.orig	2025-02-14 18:17:10 UTC
 +++ CMakeLists.txt
 @@ -233,7 +233,7 @@ endif ()
      endif ()
@@ -9,20 +9,7 @@
      find_package(PkgConfig REQUIRED)
  
      if (CMAKE_VERSION VERSION_LESS "3.1")
-@@ -245,7 +245,11 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
-     set(THREADS_PREFER_PTHREAD_FLAG ON)
-     find_package(Threads REQUIRED)
- 
--    find_package(DBus1 REQUIRED)
-+   # find_package(DBus1 REQUIRED)
-+   pkg_check_modules(DBUS REQUIRED dbus-1)
-+   include_directories(${DBUS_INCLUDE_DIRS})
-+   link_directories(${DBUS_LIBRARY_DIRS})
-+
- endif()
- 
- if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUXX)
-@@ -635,8 +639,14 @@ elseif (SLIC3R_FHS)
+@@ -635,8 +635,14 @@ elseif (SLIC3R_FHS)
      install(DIRECTORY ${SLIC3R_RESOURCES_DIR}/ DESTINATION ${SLIC3R_FHS_RESOURCES}
          PATTERN "*/udev" EXCLUDE
      )
@@ -37,7 +24,7 @@
      foreach(SIZE 32 128 192)
          install(FILES ${SLIC3R_RESOURCES_DIR}/icons/PrusaSlicer_${SIZE}px.png
              DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/${SIZE}x${SIZE}/apps RENAME PrusaSlicer.png
-@@ -645,7 +655,10 @@ elseif (SLIC3R_FHS)
+@@ -645,7 +651,10 @@ elseif (SLIC3R_FHS)
              DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/${SIZE}x${SIZE}/apps RENAME PrusaSlicer-gcodeviewer.png
          )
      endforeach()
diff --git a/cad/PrusaSlicer/files/patch-src_CMakeLists.txt b/cad/PrusaSlicer/files/patch-src_CMakeLists.txt
index 63009ba196c6..e9a16c47e89d 100644
--- a/cad/PrusaSlicer/files/patch-src_CMakeLists.txt
+++ b/cad/PrusaSlicer/files/patch-src_CMakeLists.txt
@@ -1,4 +1,4 @@
---- src/CMakeLists.txt.orig	2024-12-20 11:54:34 UTC
+--- src/CMakeLists.txt.orig	2025-02-14 18:46:38 UTC
 +++ src/CMakeLists.txt
 @@ -48,7 +48,7 @@ if (SLIC3R_GUI)
      endif()
@@ -9,12 +9,3 @@
  
      string(REGEX MATCH "wxpng" WX_PNG_BUILTIN ${wxWidgets_LIBRARIES})
      if (PNG_FOUND AND NOT WX_PNG_BUILTIN)
-@@ -100,6 +100,8 @@ endif ()
- else ()
-     add_executable(PrusaSlicer PrusaSlicer.cpp PrusaSlicer.hpp)
- endif ()
-+
-+target_link_libraries(PrusaSlicer ${DBUS_LIBRARIES})
- 
- if (MINGW)
-     target_link_options(PrusaSlicer PUBLIC "-Wl,-allow-multiple-definition")
diff --git a/cad/PrusaSlicer/files/patch-src_slic3r-arrange_include_arrange_DataStoreTraits.hpp b/cad/PrusaSlicer/files/patch-src_slic3r-arrange_include_arrange_DataStoreTraits.hpp
new file mode 100644
index 000000000000..53673b209d6c
--- /dev/null
+++ b/cad/PrusaSlicer/files/patch-src_slic3r-arrange_include_arrange_DataStoreTraits.hpp
@@ -0,0 +1,10 @@
+--- src/slic3r-arrange/include/arrange/DataStoreTraits.hpp.orig 2025-03-14 14:06:59 UTC
++++ src/slic3r-arrange/include/arrange/DataStoreTraits.hpp
+@@ -71,7 +71,7 @@ void set_data(ArrItem &itm, const std::string &key, T 
+ template<class T, class ArrItem>
+ void set_data(ArrItem &itm, const std::string &key, T &&data)
+ {
+-    WritableDataStoreTraits<ArrItem>::template set(itm, key, std::forward<T>(data));
++    WritableDataStoreTraits<ArrItem>::template set<>(itm, key, std::forward<T>(data));
+ }
+