Skip to content
Permalink
Browse files

librecad* : fix default destructor

the default destructor is not automatically created in all cases

also allow built on darwin10 now that qt5 is available there
  • Loading branch information
kencu committed Apr 27, 2019
1 parent d513bd8 commit 5802d6f29ef37c272b74a5fdc2fcf615352ae64a
@@ -22,6 +22,11 @@ if {${subport} eq "${name}"} {
reinplace "s|lrelease|${qt_bins_dir}/lrelease|g" scripts/postprocess-osx.sh
}

# the default destructor cannot be created in all cases
# see https://marc.info/?l=pkgsrc-changes&m=150505264620416&w=2
patchfiles-append patch-librecad-add-default-destructor-rsimage.diff


} elseif {${subport} eq "${name}-devel"} {

conflicts LibreCAD
@@ -34,10 +39,14 @@ if {${subport} eq "${name}"} {

patchfiles qt511.patch
patch.pre_args -p1

# the default destructor cannot be created in all cases
# see https://marc.info/?l=pkgsrc-changes&m=150505264620416&w=2
patchfiles-append patch-librecad-devel-add-default-destructor-rsimage.diff
}

pre-fetch {
if {${os.platform} eq "darwin" && ${os.major} < 11} {
if {${os.platform} eq "darwin" && ${os.major} < 10} {
ui_error "${name} ${version} requires an OS supporting qt5 to function."
return -code error "incompatible OS X version"
}
@@ -0,0 +1,25 @@
diff --git librecad/src/lib/engine/rs_image.cpp librecad/src/lib/engine/rs_image.cpp
index 1b39cbd..3f4ea16 100644
--- librecad/src/lib/engine/rs_image.cpp
+++ 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 librecad/src/lib/engine/rs_image.h librecad/src/lib/engine/rs_image.h
index 12d7802..fa0f6f3 100644
--- librecad/src/lib/engine/rs_image.h
+++ 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,
@@ -0,0 +1,25 @@
diff --git a/librecad/src/lib/engine/rs_image.cpp b/librecad/src/lib/engine/rs_image.cpp
index 1b39cbd..3f4ea16 100644
--- a/librecad/src/lib/engine/rs_image.cpp
+++ b/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/librecad/src/lib/engine/rs_image.h b/librecad/src/lib/engine/rs_image.h
index 12d7802..fa0f6f3 100644
--- a/librecad/src/lib/engine/rs_image.h
+++ b/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,

0 comments on commit 5802d6f

Please sign in to comment.
You can’t perform that action at this time.