wip/PrusaSlicer: Allow use of stable track x11/wxGTK30.

[Paul Ripke <stix%stix.id.au@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Paul Ripke <stix%stix.id.au@localhost>
Pushed By:	stix
Date:		Wed Oct 14 14:19:37 2020 +1100
Changeset:	c2d664f4f6180f4f1f763b1b32f6ed546ca13ea9

Modified Files:
	PrusaSlicer/Makefile
	PrusaSlicer/distinfo
	PrusaSlicer/patches/patch-src_CMakeLists_txt
Added Files:
	PrusaSlicer/patches/patch-src_avrdude_arduino.c

Log Message:
wip/PrusaSlicer: Allow use of stable track x11/wxGTK30.

In testing, I see missing labels and other UI corruption with wxGTK30, so
we'll stick to the dev branch wip/wxGTK31 for now.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=c2d664f4f6180f4f1f763b1b32f6ed546ca13ea9

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 PrusaSlicer/Makefile                            | 10 +++++++---
 PrusaSlicer/distinfo                            |  3 ++-
 PrusaSlicer/patches/patch-src_CMakeLists_txt    | 15 +++++++++++++++
 PrusaSlicer/patches/patch-src_avrdude_arduino.c | 14 ++++++++++++++
 4 files changed, 38 insertions(+), 4 deletions(-)

diffs:
diff --git a/PrusaSlicer/Makefile b/PrusaSlicer/Makefile
index 24b8532966..1c68825c3a 100644
--- a/PrusaSlicer/Makefile
+++ b/PrusaSlicer/Makefile
@@ -18,8 +18,13 @@ ONLY_FOR_PLATFORM=	*-*-aarch64 *-*-x86_64 *-*-earmv6 *-*-earmv7 *-*-i386
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	cmake gmake
 USE_CMAKE=	yes
-#BUILD_TARGET=	default
-#TEST_TARGET=	test
+
+.if 0
+CMAKE_ARGS+=	-DSLIC3R_WX_STABLE=1
+.include "../../x11/wxGTK30/buildlink3.mk"
+.else
+.include "../../wip/wxGTK31/buildlink3.mk"
+.endif
 
 .include "../../mk/bsd.prefs.mk"
 .include "../../comms/libhidapi/buildlink3.mk"
@@ -34,7 +39,6 @@ USE_CMAKE=	yes
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../wip/cereal/buildlink3.mk"
 .include "../../wip/openvdb/buildlink3.mk"
-.include "../../wip/wxGTK31/buildlink3.mk"
 .include "../../wip/threadingbuildingblocks/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 
diff --git a/PrusaSlicer/distinfo b/PrusaSlicer/distinfo
index 9616a857d8..f4f9c69906 100644
--- a/PrusaSlicer/distinfo
+++ b/PrusaSlicer/distinfo
@@ -4,8 +4,9 @@ SHA1 (PrusaSlicer-2.2.0.tar.gz) = 6ce58ebc8b786484374ff735bc783b66b9a58099
 RMD160 (PrusaSlicer-2.2.0.tar.gz) = 2a151b3e488fa26c2a3af2e67996b5954b801966
 SHA512 (PrusaSlicer-2.2.0.tar.gz) = 5c8dc5b581e04208a1ae53771ef2607da189ee85aadf501ce1480008f5a6ddb10bb528ddc2608d3f04acd26c583ff895ad4148d6a1397f002292e20098971e1d
 Size (PrusaSlicer-2.2.0.tar.gz) = 30811929 bytes
-SHA1 (patch-src_CMakeLists_txt) = fcff54df2484c2bbf9ed4c2da62fe6fe8b6329df
+SHA1 (patch-src_CMakeLists_txt) = 1ec421e911ef96ae412643216080e1f26e5282c4
 SHA1 (patch-src_PrusaSlicer.cpp) = ab61fc3ed6b99c9686c26a0dcc978c819783a27f
 SHA1 (patch-src_admesh_stlinit.cpp) = db72a9660045de06db58188227767aefd84ad829
+SHA1 (patch-src_avrdude_arduino.c) = ff02a4cab1c2d8c82ec7b22c7447ed5ec360ac57
 SHA1 (patch-src_avrdude_libavrdude.h) = 414cf7c6c23f7eed61319f8580c1dd7218ac4337
 SHA1 (patch-src_slic3r_GUI_Mouse3DController.hpp) = 4e3d61385da6e31d09a740160bac66e77108b74d
diff --git a/PrusaSlicer/patches/patch-src_CMakeLists_txt b/PrusaSlicer/patches/patch-src_CMakeLists_txt
index 7357a734ca..c0ce918ff8 100644
--- a/PrusaSlicer/patches/patch-src_CMakeLists_txt
+++ b/PrusaSlicer/patches/patch-src_CMakeLists_txt
@@ -2,6 +2,7 @@ $NetBSD$
 
 Use libhidapi from pkgsrc.
 Only use libdl on Linux.
+Allow use of stable track wxWidgets on NetBSD.
 
 --- src/CMakeLists.txt.orig	2020-03-21 10:55:51.000000000 +0000
 +++ src/CMakeLists.txt
@@ -14,6 +15,20 @@ Only use libdl on Linux.
  
      if(WIN32)
          message(STATUS "WXWIN environment set to: $ENV{WXWIN}")
+@@ -37,10 +35,10 @@ if (SLIC3R_GUI)
+         endif()
+     endif()
+ 
+-    if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
+-        set (wxWidgets_CONFIG_OPTIONS "--toolkit=gtk${SLIC3R_GTK}")
++    if (CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "NetBSD")
++        # set (wxWidgets_CONFIG_OPTIONS "--toolkit=gtk${SLIC3R_GTK}")
+         if (SLIC3R_WX_STABLE)
+-            find_package(wxWidgets 3.0 REQUIRED COMPONENTS base core adv html gl)
++            find_package(wxWidgets 3.0 QUIET COMPONENTS base core adv html gl)
+         else ()
+             find_package(wxWidgets 3.1 QUIET COMPONENTS base core adv html gl)
+ 
 @@ -113,8 +111,10 @@ target_link_libraries(PrusaSlicer libsli
          target_link_libraries(PrusaSlicer ws2_32 uxtheme setupapi)
      elseif (APPLE)
diff --git a/PrusaSlicer/patches/patch-src_avrdude_arduino.c b/PrusaSlicer/patches/patch-src_avrdude_arduino.c
new file mode 100644
index 0000000000..806f25bd49
--- /dev/null
+++ b/PrusaSlicer/patches/patch-src_avrdude_arduino.c
@@ -0,0 +1,14 @@
+$NetBSD$
+
+alloca requires stdlib.h.
+
+--- src/avrdude/arduino.c.orig	2020-03-21 10:55:51.000000000 +0000
++++ src/avrdude/arduino.c
+@@ -28,6 +28,7 @@
+ #include "ac_cfg.h"
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
+