Move context dependent destructors out of the headers into the

implementation and default them there.

5 files changed, 60 insertions, 1 deletions

diff --git a/cad/librecad/distinfo b/cad/librecad/distinfo
index 18deb029ef9..287201f296e 100644
--- a/cad/librecad/distinfo
+++ b/cad/librecad/distinfo
@@ -1,10 +1,14 @@
-$NetBSD: distinfo,v 1.7 2016/12/16 11:11:15 plunky Exp $
+$NetBSD: distinfo,v 1.8 2017/09/10 14:10:43 joerg Exp $
 
 SHA1 (LibreCAD-2.1.3.tar.gz) = eac60a4e7eadf2969d34f289059053cff4068309
 RMD160 (LibreCAD-2.1.3.tar.gz) = bbcc26997c907b445c43af323644141035cd5304
 SHA512 (LibreCAD-2.1.3.tar.gz) = 246cffcc1ea3389997b4a738ab5e3d78e8c1096817ecb1ca28f38d601bc5d1a95f60798ac82308914a34da7b5dbc302b8363cf8b58a97221fdc8ee63010adc6c
 Size (LibreCAD-2.1.3.tar.gz) = 22415288 bytes
 SHA1 (patch-librecad_src_lib_engine_rs__color.h) = f20d193e4fcdfd933d25430f66be71b4468ab2c3
+SHA1 (patch-librecad_src_lib_engine_rs__image.cpp) = 375c9454c549dcb16ca29195aec1f0f36a99bd2a
+SHA1 (patch-librecad_src_lib_engine_rs__image.h) = b10da3f1f4f68a15acd2363eae37e1b8644431b3
+SHA1 (patch-librecad_src_lib_engine_rs__polyline.cpp) = f922a1427204d8b3bbe3e76d4ff7ca4caac59565
+SHA1 (patch-librecad_src_lib_engine_rs__polyline.h) = 8c5991db6b71a7511ab0ddf5870b5014a18460e9
 SHA1 (patch-librecad_src_lib_engine_rs__system.cpp) = 8a31fb54946c06460b2328c8a3490ec26f60f33c
 SHA1 (patch-librecad_src_main_qc__applicationwindow.cpp) = cadee00f00d10d27c201375f06e14f8cd56a9cdc
 SHA1 (patch-scripts_postprocess-unix.sh) = e98c0a2d114e2730b2cb53eb6f137080253377a3
diff --git a/cad/librecad/patches/patch-librecad_src_lib_engine_rs__image.cpp b/cad/librecad/patches/patch-librecad_src_lib_engine_rs__image.cpp
new file mode 100644
index 00000000000..ce4b8436cb0
--- /dev/null
+++ b/cad/librecad/patches/patch-librecad_src_lib_engine_rs__image.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-librecad_src_lib_engine_rs__image.cpp,v 1.1 2017/09/10 14:10:43 joerg Exp $
+
+--- librecad/src/lib/engine/rs_image.cpp.orig	2017-09-10 10:54:08.660814636 +0000
++++ librecad/src/lib/engine/rs_image.cpp
+@@ -35,6 +35,8 @@
+ #include "rs_painterqt.h"
+ #include "rs_math.h"
+ 
++RS_ImageData::~RS_ImageData() = default;
++
+ RS_ImageData::RS_ImageData(int _handle,
+ 						   const RS_Vector& _insertionPoint,
+ 						   const RS_Vector& _uVector,
diff --git a/cad/librecad/patches/patch-librecad_src_lib_engine_rs__image.h b/cad/librecad/patches/patch-librecad_src_lib_engine_rs__image.h
new file mode 100644
index 00000000000..e5f53dd9875
--- /dev/null
+++ b/cad/librecad/patches/patch-librecad_src_lib_engine_rs__image.h
@@ -0,0 +1,14 @@
+$NetBSD: patch-librecad_src_lib_engine_rs__image.h,v 1.1 2017/09/10 14:10:43 joerg Exp $
+
+Default destructor can't be created in all instances, so make it explicit.
+
+--- librecad/src/lib/engine/rs_image.h.orig	2017-09-10 10:42:08.481789997 +0000
++++ librecad/src/lib/engine/rs_image.h
+@@ -39,6 +39,7 @@ struct RS_ImageData {
+      * Default constructor. Leaves the data object uninitialized.
+      */
+ 	RS_ImageData() = default;
++	~RS_ImageData();
+ 
+     RS_ImageData(int handle,
+                                 const RS_Vector& insertionPoint,
diff --git a/cad/librecad/patches/patch-librecad_src_lib_engine_rs__polyline.cpp b/cad/librecad/patches/patch-librecad_src_lib_engine_rs__polyline.cpp
new file mode 100644
index 00000000000..57b8f65a8e6
--- /dev/null
+++ b/cad/librecad/patches/patch-librecad_src_lib_engine_rs__polyline.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-librecad_src_lib_engine_rs__polyline.cpp,v 1.1 2017/09/10 14:10:43 joerg Exp $
+
+--- librecad/src/lib/engine/rs_polyline.cpp.orig	2017-09-10 10:39:08.690420563 +0000
++++ librecad/src/lib/engine/rs_polyline.cpp
+@@ -41,6 +41,8 @@ RS_PolylineData::RS_PolylineData():
+ {
+ }
+ 
++RS_PolylineData::~RS_PolylineData() = default;
++
+ RS_PolylineData::RS_PolylineData(const RS_Vector& _startpoint,
+ 				const RS_Vector& _endpoint,
+ 				bool _closed):
diff --git a/cad/librecad/patches/patch-librecad_src_lib_engine_rs__polyline.h b/cad/librecad/patches/patch-librecad_src_lib_engine_rs__polyline.h
new file mode 100644
index 00000000000..df80e265c3d
--- /dev/null
+++ b/cad/librecad/patches/patch-librecad_src_lib_engine_rs__polyline.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-librecad_src_lib_engine_rs__polyline.h,v 1.1 2017/09/10 14:10:43 joerg Exp $
+
+Default destructor can't be created in all instances, so make it explicit.
+
+--- librecad/src/lib/engine/rs_polyline.h.orig	2017-09-10 10:37:45.908701029 +0000
++++ librecad/src/lib/engine/rs_polyline.h
+@@ -38,7 +38,7 @@
+  */
+ struct RS_PolylineData : public RS_Flags {
+ 	RS_PolylineData();
+-	~RS_PolylineData()=default;
++	virtual ~RS_PolylineData();
+ 	RS_PolylineData(const RS_Vector& startpoint,
+                     const RS_Vector& endpoint,
+ 					bool closed);