pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

librecad: WIP upgrade to LibreCAD-2.2.0.rc1

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Sat Oct 26 01:10:15 2019 +0200
Changeset:	6086652b376a799034c7793cedda932031b28514

Modified Files:
	librecad/Makefile
	librecad/PLIST
	librecad/distinfo
	librecad/patches/patch-librecad_src_lib_engine_rs__system.cpp
	librecad/patches/patch-librecad_src_main_qc__applicationwindow.cpp
	librecad/patches/patch-scripts_postprocess-unix.sh
Added Files:
	librecad/patches/patch-librecad_src_ui_forms_qg__commandwidget.cpp
	librecad/patches/patch-librecad_src_ui_generic_colorwizard.cpp
	librecad/patches/patch-librecad_src_ui_generic_widgetcreator.cpp
Removed Files:
	librecad/patches/patch-librecad_src_lib_engine_rs__color.h
	librecad/patches/patch-librecad_src_lib_engine_rs__image.cpp
	librecad/patches/patch-librecad_src_lib_engine_rs__image.h
	librecad/patches/patch-librecad_src_lib_engine_rs__polyline.cpp
	librecad/patches/patch-librecad_src_lib_engine_rs__polyline.h

Log Message:
librecad: WIP upgrade to LibreCAD-2.2.0.rc1

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

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

diffstat:
 librecad/Makefile                                  | 49 +++++++++++++++-------
 librecad/PLIST                                     | 21 +++++-----
 librecad/distinfo                                  | 22 +++++-----
 .../patch-librecad_src_lib_engine_rs__color.h      | 14 -------
 .../patch-librecad_src_lib_engine_rs__image.cpp    | 13 ------
 .../patch-librecad_src_lib_engine_rs__image.h      | 14 -------
 .../patch-librecad_src_lib_engine_rs__polyline.cpp | 13 ------
 .../patch-librecad_src_lib_engine_rs__polyline.h   | 15 -------
 .../patch-librecad_src_lib_engine_rs__system.cpp   | 12 +++---
 ...tch-librecad_src_main_qc__applicationwindow.cpp | 20 ++++-----
 ...tch-librecad_src_ui_forms_qg__commandwidget.cpp | 12 ++++++
 .../patch-librecad_src_ui_generic_colorwizard.cpp  | 12 ++++++
 ...patch-librecad_src_ui_generic_widgetcreator.cpp | 13 ++++++
 librecad/patches/patch-scripts_postprocess-unix.sh | 11 +++--
 14 files changed, 112 insertions(+), 129 deletions(-)

diffs:
diff --git a/librecad/Makefile b/librecad/Makefile
index 00ceecce88..e23ae63b24 100644
--- a/librecad/Makefile
+++ b/librecad/Makefile
@@ -1,11 +1,11 @@
 # $NetBSD: Makefile,v 1.47 2019/08/22 12:22:52 ryoon 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@localhost
 HOMEPAGE=	http://librecad.org/
@@ -22,18 +22,17 @@ 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
-
 #
 # We disable long double math functions, because otherwise one of
 # the boost headers brings in a log1pl() function which was not
@@ -42,14 +41,37 @@ AUTO_MKDIRS=	yes
 # We configure the plugins directory separately so that we can use
 # make install below, which handles the libtooling of the shared
 # plugins automatically
-#
+##
+
+.include "../../mk/compiler.mk"
+.if !empty(CC_VERSION:Mclang*)
+BUILDLINK_TRANSFORM+=   rm:-fext-numeric-literals
+.endif
+
+INSTALLATION_DIRS+=	lib/${PKGBASE}/plugins
+INSTALLATION_DIRS+=	bin
+INSTALLATION_DIRS+=	share/applications
+INSTALLATION_DIRS+=	share/data/pixmaps
+INSTALLATION_DIRS+=	share/data/mime/packages
+INSTALLATION_DIRS+=	${PKGMANDIR}/man1
+INSTALLATION_DIRS+=	include/${PKGBASE}
+INSTALLATION_DIRS+=	share/data/${PKGBASE}/fonts
+INSTALLATION_DIRS+=	share/data/${PKGBASE}/qm
+INSTALLATION_DIRS+=	share/data/${PKGBASE}/library
+INSTALLATION_DIRS+=	share/data/${PKGBASE}/patterns
+
+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
+
 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}
 
 do-install:
+	${RUN} cd ${WRKSRC} && ./scripts/postprocess-unix.sh
 	${INSTALL_PROGRAM} ${WRKSRC}/unix/librecad \
 	    ${DESTDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/unix/ttf2lff \
@@ -67,11 +89,10 @@ do-install:
 	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/librecad/PLIST b/librecad/PLIST
index 0bd41c9207..5d14ab1948 100644
--- a/librecad/PLIST
+++ b/librecad/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2016/09/05 21:13:21 plunky Exp $
+@comment $NetBSD$
 bin/librecad
 bin/ttf2lff
 lib/librecad/fonts/OpenGostTypeA-Regular.lff
@@ -47,15 +47,6 @@ 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
 man/man1/librecad.1
 man/man1/ttf2lff.1
 share/applications/librecad.desktop
@@ -1433,6 +1424,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 +1482,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
@@ -1507,3 +1500,11 @@ share/librecad/qm/plugins_tr.qm
 share/librecad/qm/plugins_uk.qm
 share/librecad/qm/plugins_zh_cn.qm
 share/librecad/qm/plugins_zh_tw.qm
+@pkgdir share/data/pixmaps
+@pkgdir share/data/mime/packages
+@pkgdir share/data/librecad/qm
+@pkgdir share/data/librecad/patterns
+@pkgdir share/data/librecad/library
+@pkgdir share/data/librecad/fonts
+@pkgdir lib/librecad/plugins
+@pkgdir include/librecad
diff --git a/librecad/distinfo b/librecad/distinfo
index 287201f296..65029b6ce2 100644
--- a/librecad/distinfo
+++ b/librecad/distinfo
@@ -1,14 +1,12 @@
 $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
+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) = b7f97e24c90dd6aea1f90a7dd786ad63a7cbb216
+SHA1 (patch-librecad_src_main_qc__applicationwindow.cpp) = c4ea36a88cbf749cd9e212ca37106ae00bdbb361
+SHA1 (patch-librecad_src_ui_forms_qg__commandwidget.cpp) = fd9e14becf06a56973d57911c52c1598bb7a80a4
+SHA1 (patch-librecad_src_ui_generic_colorwizard.cpp) = 849b3392ba01449f24e9056b57d5b1f692f6d6b6
+SHA1 (patch-librecad_src_ui_generic_widgetcreator.cpp) = 9102805b8b9fb5faef051f85b6665899ed6284be
+SHA1 (patch-scripts_postprocess-unix.sh) = 9946bdade1463d4daeef081b738c29773d62f712
diff --git a/librecad/patches/patch-librecad_src_lib_engine_rs__color.h b/librecad/patches/patch-librecad_src_lib_engine_rs__color.h
deleted file mode 100644
index 126674642f..0000000000
--- a/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/librecad/patches/patch-librecad_src_lib_engine_rs__image.cpp b/librecad/patches/patch-librecad_src_lib_engine_rs__image.cpp
deleted file mode 100644
index ce4b8436cb..0000000000
--- a/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/librecad/patches/patch-librecad_src_lib_engine_rs__image.h b/librecad/patches/patch-librecad_src_lib_engine_rs__image.h
deleted file mode 100644
index e5f53dd987..0000000000
--- a/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/librecad/patches/patch-librecad_src_lib_engine_rs__polyline.cpp b/librecad/patches/patch-librecad_src_lib_engine_rs__polyline.cpp
deleted file mode 100644
index 57b8f65a8e..0000000000
--- a/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/librecad/patches/patch-librecad_src_lib_engine_rs__polyline.h b/librecad/patches/patch-librecad_src_lib_engine_rs__polyline.h
deleted file mode 100644
index df80e265c3..0000000000
--- a/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/librecad/patches/patch-librecad_src_lib_engine_rs__system.cpp b/librecad/patches/patch-librecad_src_lib_engine_rs__system.cpp
index ba291714d3..66b2bc2ba2 100644
--- a/librecad/patches/patch-librecad_src_lib_engine_rs__system.cpp
+++ b/librecad/patches/patch-librecad_src_lib_engine_rs__system.cpp
@@ -1,10 +1,8 @@
-$NetBSD: patch-librecad_src_lib_engine_rs__system.cpp,v 1.1 2016/09/05 21:13:21 plunky Exp $
+$NetBSD$
 
-Help LibreCAD find the installed files
-
---- 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 +11,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/librecad/patches/patch-librecad_src_main_qc__applicationwindow.cpp b/librecad/patches/patch-librecad_src_main_qc__applicationwindow.cpp
index 0e6684bd4d..eb2ab5ffc1 100644
--- a/librecad/patches/patch-librecad_src_main_qc__applicationwindow.cpp
+++ b/librecad/patches/patch-librecad_src_main_qc__applicationwindow.cpp
@@ -1,17 +1,15 @@
-$NetBSD: patch-librecad_src_main_qc__applicationwindow.cpp,v 1.1 2016/09/05 21:13:21 plunky Exp $
+$NetBSD$
 
-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/librecad/patches/patch-librecad_src_ui_forms_qg__commandwidget.cpp b/librecad/patches/patch-librecad_src_ui_forms_qg__commandwidget.cpp
new file mode 100644
index 0000000000..d0fe391912
--- /dev/null
+++ b/librecad/patches/patch-librecad_src_ui_forms_qg__commandwidget.cpp
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- 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/librecad/patches/patch-librecad_src_ui_generic_colorwizard.cpp b/librecad/patches/patch-librecad_src_ui_generic_colorwizard.cpp
new file mode 100644
index 0000000000..9301a2d171
--- /dev/null
+++ b/librecad/patches/patch-librecad_src_ui_generic_colorwizard.cpp
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- 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/librecad/patches/patch-librecad_src_ui_generic_widgetcreator.cpp b/librecad/patches/patch-librecad_src_ui_generic_widgetcreator.cpp
new file mode 100644
index 0000000000..7fcf7addb9
--- /dev/null
+++ b/librecad/patches/patch-librecad_src_ui_generic_widgetcreator.cpp
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- 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/librecad/patches/patch-scripts_postprocess-unix.sh b/librecad/patches/patch-scripts_postprocess-unix.sh
index 1b995aee9e..fd991db6b0 100644
--- a/librecad/patches/patch-scripts_postprocess-unix.sh
+++ b/librecad/patches/patch-scripts_postprocess-unix.sh
@@ -1,14 +1,13 @@
-$NetBSD: patch-scripts_postprocess-unix.sh,v 1.3 2016/09/05 21:13:21 plunky Exp $
+$NetBSD$
 
-* Set Qt tools path
-
---- 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"
  TSDIRPI="${PIDIR}/ts"
  SPTDIR="${LCDIR}/support"
 -LRELEASE="lrelease"
-+LRELEASE="@QTDIR@/bin/lrelease"
-
++LRELEASE="/usr/pkg/qt5/bin/lrelease"
+ 
  cd "${THISDIR}"
+
Home | Main Index | Thread Index | Old Index