summaryrefslogtreecommitdiff
path: root/cad
diff options
context:
space:
mode:
authorkamil <kamil@pkgsrc.org>2019-10-26 12:23:01 +0000
committerkamil <kamil@pkgsrc.org>2019-10-26 12:23:01 +0000
commit189fbd1d7caaa9384ba84359082bf109de37d9b0 (patch)
tree55dd51f627b4db500269b37fb1490b2fed1587ea /cad
parent5eb8fe70583f1f4ee6fb486c334895d134880e61 (diff)
downloadpkgsrc-189fbd1d7caaa9384ba84359082bf109de37d9b0.tar.gz
librecad: Upgrade to 2.2.0 rc1
Exact changelog is unknown, but there is Qt4 -> Qt5 switch. Upstream changelog ================== 2.2.0 Release Candidate There were more than 250 commits since 2.2.0-alpha, thus it was overdue to get rid of the alpha in the tag now. With some more improvements in the last couple weeks, we switch directly to Release Candidate as the response from community is, that the master branch is stable. There are only some minor changes in the line before the final 2.2.0 release.
Diffstat (limited to 'cad')
-rw-r--r--cad/librecad/Makefile57
-rw-r--r--cad/librecad/PLIST22
-rw-r--r--cad/librecad/distinfo24
-rw-r--r--cad/librecad/patches/patch-librecad_src_lib_engine_rs__color.h14
-rw-r--r--cad/librecad/patches/patch-librecad_src_lib_engine_rs__image.cpp13
-rw-r--r--cad/librecad/patches/patch-librecad_src_lib_engine_rs__image.h14
-rw-r--r--cad/librecad/patches/patch-librecad_src_lib_engine_rs__polyline.cpp13
-rw-r--r--cad/librecad/patches/patch-librecad_src_lib_engine_rs__polyline.h15
-rw-r--r--cad/librecad/patches/patch-librecad_src_lib_engine_rs__system.cpp12
-rw-r--r--cad/librecad/patches/patch-librecad_src_main_qc__applicationwindow.cpp17
-rw-r--r--cad/librecad/patches/patch-librecad_src_ui_forms_qg__commandwidget.cpp14
-rw-r--r--cad/librecad/patches/patch-librecad_src_ui_generic_colorwizard.cpp14
-rw-r--r--cad/librecad/patches/patch-librecad_src_ui_generic_widgetcreator.cpp15
-rw-r--r--cad/librecad/patches/patch-scripts_postprocess-unix.sh9
14 files changed, 118 insertions, 135 deletions
diff --git a/cad/librecad/Makefile b/cad/librecad/Makefile
index 00ceecce882..5b5a3212298 100644
--- a/cad/librecad/Makefile
+++ b/cad/librecad/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.47 2019/08/22 12:22:52 ryoon Exp $
-#
+# $NetBSD: Makefile,v 1.48 2019/10/26 12:23:01 kamil Exp $
-DISTNAME= LibreCAD-2.1.3
+GITHUB_PROJECT= LibreCAD
+DISTNAME= LibreCAD-2.2.0.rc1
PKGNAME= ${DISTNAME:tl}
-PKGREVISION= 10
CATEGORIES= cad
MASTER_SITES= ${MASTER_SITE_GITHUB:=LibreCAD/}
+GITHUB_TAG= ${PKGVERSION_NOREV:C/.rc1/-rc1/}
MAINTAINER= ryoon@NetBSD.org
HOMEPAGE= http://librecad.org/
@@ -22,34 +22,42 @@ GCC_REQD+= 4.7
SUBST_CLASSES+= qtdir
SUBST_STAGE.qtdir= pre-configure
-SUBST_MESSAGE.qtdir= Set qt4/bin
+SUBST_MESSAGE.qtdir= Set qt5/bin
SUBST_FILES.qtdir+= scripts/postprocess-unix.sh
SUBST_VARS.qtdir+= QTDIR
+
SUBST_CLASSES+= prefix
SUBST_STAGE.prefix= pre-configure
SUBST_MESSAGE.prefix= Fix hardcoded path
SUBST_FILES.prefix+= librecad/src/lib/engine/rs_system.cpp
SUBST_VARS.prefix+= PREFIX
-AUTO_MKDIRS= yes
+.include "../../mk/compiler.mk"
+.if !empty(CC_VERSION:Mclang*)
+BUILDLINK_TRANSFORM+= rm:-fext-numeric-literals
+.endif
+
+INSTALLATION_DIRS+= bin
+INSTALLATION_DIRS+= share/applications
+INSTALLATION_DIRS+= ${PKGMANDIR}/man1
+INSTALLATION_DIRS+= share/${PKGBASE}
+INSTALLATION_DIRS+= lib/${PKGBASE}
+
+QMAKE_OPTIONS+= CONFIG+=release
+QMAKE_OPTIONS+= BOOST_DIR=${PREFIX}
+QMAKE_OPTIONS+= BOOST_LIBDIR=${PREFIX}/lib
+QMAKE_OPTIONS+= MUPARSER_DIR=${PREFIX}
+QMAKE_OPTIONS+= QMAKE_LFLAGS_RELEASE=
+QMAKE_OPTIONS+= DISABLE_POSTSCRIPT=true
-#
-# We disable long double math functions, because otherwise one of
-# the boost headers brings in a log1pl() function which was not
-# present (in NetBSD 7) causing compilation failure
-#
-# We configure the plugins directory separately so that we can use
-# make install below, which handles the libtooling of the shared
-# plugins automatically
-#
do-configure:
- cd ${WRKSRC} && ${QTDIR}/bin/qmake \
- QMAKE_CXXFLAGS=-DBOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS
- cd ${WRKSRC}/plugins && ${QTDIR}/bin/qmake \
- INSTALLS+=target target.path=${PREFIX}/lib/librecad/plugins
+ ${RUN} cd ${WRKSRC} && ${QTDIR}/bin/qmake ${QMAKE_OPTIONS:Q}
+ ${RUN} cd ${WRKSRC}/plugins && ${QTDIR}/bin/qmake \
+ INSTALLS+=target target.path=${PREFIX}/lib/librecad/plugins
do-install:
+ ${RUN} cd ${WRKSRC} && ./scripts/postprocess-unix.sh
${INSTALL_PROGRAM} ${WRKSRC}/unix/librecad \
${DESTDIR}${PREFIX}/bin
${INSTALL_PROGRAM} ${WRKSRC}/unix/ttf2lff \
@@ -60,18 +68,17 @@ do-install:
${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
${INSTALL_MAN} ${WRKSRC}/tools/ttf2lff/ttf2lff.1 \
${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
- cd ${WRKSRC}/plugins && \
+ ${RUN} cd ${WRKSRC}/plugins && \
${SETENV} ${MAKE_ENV} ${MAKE} INSTALL_ROOT=${DESTDIR} install
- cd ${WRKSRC}/unix/resources && ${PAX} -rwpm fonts \
+ ${RUN} cd ${WRKSRC}/unix/resources && ${PAX} -rwpm fonts \
${DESTDIR}${PREFIX}/lib/librecad
- cd ${WRKSRC}/unix/resources && ${PAX} -rwpm library patterns qm \
+ ${RUN} cd ${WRKSRC}/unix/resources && ${PAX} -rwpm library patterns qm \
${DESTDIR}${PREFIX}/share/librecad
+.include "../../x11/qt5-qtsvg/buildlink3.mk"
+.include "../../x11/qt5-qtbase/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../devel/boost-libs/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../math/muparser/buildlink3.mk"
-.include "../../x11/qt4-libs/buildlink3.mk"
-BUILDLINK_DEPMETHOD.qt4-tools= full
-.include "../../x11/qt4-tools/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/cad/librecad/PLIST b/cad/librecad/PLIST
index 0bd41c92079..d33058275b3 100644
--- a/cad/librecad/PLIST
+++ b/cad/librecad/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2016/09/05 21:13:21 plunky Exp $
+@comment $NetBSD: PLIST,v 1.3 2019/10/26 12:23:01 kamil Exp $
bin/librecad
bin/ttf2lff
lib/librecad/fonts/OpenGostTypeA-Regular.lff
@@ -47,15 +47,15 @@ lib/librecad/fonts/symbol_misc2.lff
lib/librecad/fonts/symeteo.lff
lib/librecad/fonts/symusic.lff
lib/librecad/fonts/unicode.lff
-lib/librecad/fonts/wqy-unicode.lff
-lib/librecad/plugins/libalign.la
-lib/librecad/plugins/libasciifile.la
-lib/librecad/plugins/libimportshp.la
-lib/librecad/plugins/liblist.la
-lib/librecad/plugins/libpicfile.la
-lib/librecad/plugins/libplotequation.la
-lib/librecad/plugins/libsameprop.la
-lib/librecad/plugins/libsample.la
+lib/librecad/plugins/libalign.so
+lib/librecad/plugins/libasciifile.so
+lib/librecad/plugins/libgear.so
+lib/librecad/plugins/libimportshp.so
+lib/librecad/plugins/liblist.so
+lib/librecad/plugins/libpicfile.so
+lib/librecad/plugins/libplotequation.so
+lib/librecad/plugins/libsameprop.so
+lib/librecad/plugins/libsample.so
man/man1/librecad.1
man/man1/ttf2lff.1
share/applications/librecad.desktop
@@ -1433,6 +1433,7 @@ share/librecad/qm/librecad_it.qm
share/librecad/qm/librecad_ja.qm
share/librecad/qm/librecad_ko.qm
share/librecad/qm/librecad_lv.qm
+share/librecad/qm/librecad_mk.qm
share/librecad/qm/librecad_nl.qm
share/librecad/qm/librecad_no.qm
share/librecad/qm/librecad_pa.qm
@@ -1490,6 +1491,7 @@ share/librecad/qm/plugins_it.qm
share/librecad/qm/plugins_ja.qm
share/librecad/qm/plugins_ko.qm
share/librecad/qm/plugins_lv.qm
+share/librecad/qm/plugins_mk.qm
share/librecad/qm/plugins_nl.qm
share/librecad/qm/plugins_no.qm
share/librecad/qm/plugins_pa.qm
diff --git a/cad/librecad/distinfo b/cad/librecad/distinfo
index 287201f296e..04bae1a701f 100644
--- a/cad/librecad/distinfo
+++ b/cad/librecad/distinfo
@@ -1,14 +1,12 @@
-$NetBSD: distinfo,v 1.8 2017/09/10 14:10:43 joerg Exp $
+$NetBSD: distinfo,v 1.9 2019/10/26 12:23:01 kamil 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
+SHA1 (LibreCAD-2.2.0.rc1.tar.gz) = 2bffa19ac39a18d9d79fde72e624d7aebbdfa236
+RMD160 (LibreCAD-2.2.0.rc1.tar.gz) = 1521ddedf187c4ce9081062edf88f3f39d5bbb7c
+SHA512 (LibreCAD-2.2.0.rc1.tar.gz) = c7baf28511f75b63382f6f7c508b2e244638a0ecbe4cf99f4854b1f628a6772b942d95c7cbbf9082d06e066cd9ab2a33961ac48bb1d0846f5c2d75f657e5d914
+Size (LibreCAD-2.2.0.rc1.tar.gz) = 13578543 bytes
+SHA1 (patch-librecad_src_lib_engine_rs__system.cpp) = 38ceb3cde81042a1eeb6c68ead874e1a3a3512bb
+SHA1 (patch-librecad_src_main_qc__applicationwindow.cpp) = 1234b3b4e087c651da76c1d8d7770bebaa71dddc
+SHA1 (patch-librecad_src_ui_forms_qg__commandwidget.cpp) = 97c40234eec588569a862387dc509cc911cb31dc
+SHA1 (patch-librecad_src_ui_generic_colorwizard.cpp) = db049f7bc948913ef215a1a8c2d7d94367b12f1b
+SHA1 (patch-librecad_src_ui_generic_widgetcreator.cpp) = 1533f373059b7068638eea9ebc32a614c997c13d
+SHA1 (patch-scripts_postprocess-unix.sh) = dfa529bff1251967764c1a21654976844cc7e19a
diff --git a/cad/librecad/patches/patch-librecad_src_lib_engine_rs__color.h b/cad/librecad/patches/patch-librecad_src_lib_engine_rs__color.h
deleted file mode 100644
index 126674642f9..00000000000
--- a/cad/librecad/patches/patch-librecad_src_lib_engine_rs__color.h
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-librecad_src_lib_engine_rs__color.h,v 1.1 2016/09/05 21:13:21 plunky Exp $
-
-add missing includes
-
---- librecad/src/lib/engine/rs_color.h.orig 2016-06-20 18:43:27.000000000 +0000
-+++ librecad/src/lib/engine/rs_color.h
-@@ -29,6 +29,7 @@
- #define RS_COLOR_H
-
- #include <QColor>
-+#include <ostream>
-
- #include "rs.h"
- #include "rs_flags.h"
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
deleted file mode 100644
index ce4b8436cb0..00000000000
--- a/cad/librecad/patches/patch-librecad_src_lib_engine_rs__image.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
deleted file mode 100644
index e5f53dd9875..00000000000
--- a/cad/librecad/patches/patch-librecad_src_lib_engine_rs__image.h
+++ /dev/null
@@ -1,14 +0,0 @@
-$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
deleted file mode 100644
index 57b8f65a8e6..00000000000
--- a/cad/librecad/patches/patch-librecad_src_lib_engine_rs__polyline.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
deleted file mode 100644
index df80e265c3d..00000000000
--- a/cad/librecad/patches/patch-librecad_src_lib_engine_rs__polyline.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$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);
diff --git a/cad/librecad/patches/patch-librecad_src_lib_engine_rs__system.cpp b/cad/librecad/patches/patch-librecad_src_lib_engine_rs__system.cpp
index ba291714d38..7e717394941 100644
--- a/cad/librecad/patches/patch-librecad_src_lib_engine_rs__system.cpp
+++ b/cad/librecad/patches/patch-librecad_src_lib_engine_rs__system.cpp
@@ -1,10 +1,10 @@
-$NetBSD: patch-librecad_src_lib_engine_rs__system.cpp,v 1.1 2016/09/05 21:13:21 plunky Exp $
+$NetBSD: patch-librecad_src_lib_engine_rs__system.cpp,v 1.2 2019/10/26 12:23:01 kamil Exp $
-Help LibreCAD find the installed files
+Fix pkgsrc PREFIX.
---- librecad/src/lib/engine/rs_system.cpp.orig 2016-09-04 20:35:17.219964268 +0000
+--- librecad/src/lib/engine/rs_system.cpp.orig 2018-02-15 20:54:45.000000000 +0000
+++ librecad/src/lib/engine/rs_system.cpp
-@@ -600,11 +600,8 @@ QStringList RS_System::getDirectoryList(
+@@ -573,11 +573,8 @@ QStringList RS_System::getDirectoryList(
}
}
@@ -13,8 +13,8 @@ Help LibreCAD find the installed files
-
- // Redhat style:
- dirList.append("/usr/share/" + appDirName + "/" + subDirectory);
-+ dirList.append("@PREFIX@/share/" + appDirName + "/" + subDirectory);
-+ dirList.append("@PREFIX@/lib/" + appDirName + "/" + subDirectory);
++ dirList.append("@PREFIX@/share/" + appDirName + "/" + subDirectory);
++ dirList.append("@PREFIX@/lib/" + appDirName + "/" + subDirectory);
// Others, RVT April 25, 2011 removed, doesn anybody use that still?
// dirList.append("/usr/X11R6/share/" + appDirName + "/" + subDirectory);
diff --git a/cad/librecad/patches/patch-librecad_src_main_qc__applicationwindow.cpp b/cad/librecad/patches/patch-librecad_src_main_qc__applicationwindow.cpp
index 0e6684bd4da..20ea7329b83 100644
--- a/cad/librecad/patches/patch-librecad_src_main_qc__applicationwindow.cpp
+++ b/cad/librecad/patches/patch-librecad_src_main_qc__applicationwindow.cpp
@@ -1,17 +1,18 @@
-$NetBSD: patch-librecad_src_main_qc__applicationwindow.cpp,v 1.1 2016/09/05 21:13:21 plunky Exp $
+$NetBSD: patch-librecad_src_main_qc__applicationwindow.cpp,v 1.2 2019/10/26 12:23:01 kamil Exp $
ignore files in the plugins directory that do not contain '.so', as
pkgsrc leaves some .la files there
---- librecad/src/main/qc_applicationwindow.cpp.orig 2016-06-20 18:43:27.000000000 +0000
+--- librecad/src/main/qc_applicationwindow.cpp.orig 2018-02-15 20:54:45.000000000 +0000
+++ librecad/src/main/qc_applicationwindow.cpp
-@@ -385,6 +385,9 @@ void QC_ApplicationWindow::loadPlugins()
- #ifdef Q_OS_MAC
+@@ -399,6 +399,10 @@ void QC_ApplicationWindow::loadPlugins()
if (!fileName.contains(".dylib"))
continue;
-+ #else if defined(Q_OS_UNIX)
+ #endif
++ #if defined(Q_OS_UNIX)
+ if (!fileName.contains(".so"))
+ continue;
- #endif
-
- if (loadedPluginFileNames.contains(fileName)) {
++ #endif
+ #ifdef Q_OS_WIN32
+ if (!fileName.contains(".dll"))
+ continue;
diff --git a/cad/librecad/patches/patch-librecad_src_ui_forms_qg__commandwidget.cpp b/cad/librecad/patches/patch-librecad_src_ui_forms_qg__commandwidget.cpp
new file mode 100644
index 00000000000..b0635c16f62
--- /dev/null
+++ b/cad/librecad/patches/patch-librecad_src_ui_forms_qg__commandwidget.cpp
@@ -0,0 +1,14 @@
+$NetBSD: patch-librecad_src_ui_forms_qg__commandwidget.cpp,v 1.1 2019/10/26 12:23:01 kamil Exp $
+
+Add missing include.
+
+--- librecad/src/ui/forms/qg_commandwidget.cpp.orig 2018-02-15 20:54:45.000000000 +0000
++++ librecad/src/ui/forms/qg_commandwidget.cpp
+@@ -27,6 +27,7 @@
+
+ #include <algorithm>
+
++#include <QAction>
+ #include <QKeyEvent>
+ #include <QFileDialog>
+ #include <QSettings>
diff --git a/cad/librecad/patches/patch-librecad_src_ui_generic_colorwizard.cpp b/cad/librecad/patches/patch-librecad_src_ui_generic_colorwizard.cpp
new file mode 100644
index 00000000000..8bb04d3c0f8
--- /dev/null
+++ b/cad/librecad/patches/patch-librecad_src_ui_generic_colorwizard.cpp
@@ -0,0 +1,14 @@
+$NetBSD: patch-librecad_src_ui_generic_colorwizard.cpp,v 1.1 2019/10/26 12:23:01 kamil Exp $
+
+Add missing include.
+
+--- librecad/src/ui/generic/colorwizard.cpp.orig 2018-02-15 20:54:45.000000000 +0000
++++ librecad/src/ui/generic/colorwizard.cpp
+@@ -27,6 +27,7 @@
+ #include "colorwizard.h"
+ #include "ui_colorwizard.h"
+
++#include <QAction>
+ #include <QColorDialog>
+ #include <QLineEdit>
+ #include <QListWidget>
diff --git a/cad/librecad/patches/patch-librecad_src_ui_generic_widgetcreator.cpp b/cad/librecad/patches/patch-librecad_src_ui_generic_widgetcreator.cpp
new file mode 100644
index 00000000000..e988b3c84f8
--- /dev/null
+++ b/cad/librecad/patches/patch-librecad_src_ui_generic_widgetcreator.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-librecad_src_ui_generic_widgetcreator.cpp,v 1.1 2019/10/26 12:23:01 kamil Exp $
+
+Add missing includes.
+
+--- librecad/src/ui/generic/widgetcreator.cpp.orig 2018-02-15 20:54:45.000000000 +0000
++++ librecad/src/ui/generic/widgetcreator.cpp
+@@ -27,6 +27,8 @@
+ #include "widgetcreator.h"
+ #include "ui_widgetcreator.h"
+
++#include <QAction>
++#include <QActionGroup>
+ #include <QSettings>
+ #include <QLineEdit>
+ #include <QPushButton>
diff --git a/cad/librecad/patches/patch-scripts_postprocess-unix.sh b/cad/librecad/patches/patch-scripts_postprocess-unix.sh
index 1b995aee9e5..b6c3b119c60 100644
--- a/cad/librecad/patches/patch-scripts_postprocess-unix.sh
+++ b/cad/librecad/patches/patch-scripts_postprocess-unix.sh
@@ -1,8 +1,8 @@
-$NetBSD: patch-scripts_postprocess-unix.sh,v 1.3 2016/09/05 21:13:21 plunky Exp $
+$NetBSD: patch-scripts_postprocess-unix.sh,v 1.4 2019/10/26 12:23:01 kamil Exp $
-* Set Qt tools path
+Fix QTDIR.
---- scripts/postprocess-unix.sh.orig 2016-06-20 18:43:27.000000000 +0000
+--- scripts/postprocess-unix.sh.orig 2018-02-15 20:54:45.000000000 +0000
+++ scripts/postprocess-unix.sh
@@ -8,7 +8,7 @@ APPDATADIR="${THISDIR}/unix/appdata"
TSDIRLC="${LCDIR}/ts"
@@ -10,5 +10,6 @@ $NetBSD: patch-scripts_postprocess-unix.sh,v 1.3 2016/09/05 21:13:21 plunky Exp
SPTDIR="${LCDIR}/support"
-LRELEASE="lrelease"
+LRELEASE="@QTDIR@/bin/lrelease"
-
+
cd "${THISDIR}"
+