librecad: Update to 2.2.0.rc2. Fixed build with latest boost.

"More than 280 commits since 2.2.0-rc1 and too much delay, but here it is,
the next big step to final 2.2.0 release.  We fixed some really serious
bugs with DWG reading, what hopefully leads to much less issues and crashes
when opening DWG files.  There may be still some issues with DWG we want to
address and fix for the final 2.2.0 release."

9 files changed, 39 insertions, 89 deletions

diff --git a/cad/librecad/Makefile b/cad/librecad/Makefile
index d2bb98ab9b0..8f3d3070b3b 100644
--- a/cad/librecad/Makefile
+++ b/cad/librecad/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.62 2021/04/21 13:24:24 adam Exp $
+# $NetBSD: Makefile,v 1.63 2021/05/22 10:18:23 nia Exp $
 
-GITHUB_PROJECT=	LibreCAD
-DISTNAME=	LibreCAD-2.2.0.rc1
-PKGNAME=	${DISTNAME:tl}
-PKGREVISION=	12
+DISTNAME=	LibreCAD-2.2.0-rc2
+PKGNAME=	${DISTNAME:tl:S/-rc2/.rc2/g}
 CATEGORIES=	cad
 MASTER_SITES=	${MASTER_SITE_GITHUB:=LibreCAD/}
-GITHUB_TAG=	${PKGVERSION_NOREV:C/.rc1/-rc1/}
+GITHUB_PROJECT=	LibreCAD
+GITHUB_TAG=	${DISTNAME:S/LibreCAD-//g}
 
 MAINTAINER=	ryoon@NetBSD.org
 HOMEPAGE=	https://librecad.org/
diff --git a/cad/librecad/PLIST b/cad/librecad/PLIST
index d33058275b3..cf8d8a38e2e 100644
--- a/cad/librecad/PLIST
+++ b/cad/librecad/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2019/10/26 12:23:01 kamil Exp $
+@comment $NetBSD: PLIST,v 1.4 2021/05/22 10:18:23 nia Exp $
 bin/librecad
 bin/ttf2lff
 lib/librecad/fonts/OpenGostTypeA-Regular.lff
@@ -49,6 +49,7 @@ lib/librecad/fonts/symusic.lff
 lib/librecad/fonts/unicode.lff
 lib/librecad/plugins/libalign.so
 lib/librecad/plugins/libasciifile.so
+lib/librecad/plugins/libdivide.so
 lib/librecad/plugins/libgear.so
 lib/librecad/plugins/libimportshp.so
 lib/librecad/plugins/liblist.so
@@ -1381,6 +1382,7 @@ share/librecad/patterns/hound.dxf
 share/librecad/patterns/iso03w100.dxf
 share/librecad/patterns/iso03w100a.dxf
 share/librecad/patterns/kerpele.dxf
+share/librecad/patterns/millstone.dxf
 share/librecad/patterns/misc01.dxf
 share/librecad/patterns/misc02.dxf
 share/librecad/patterns/misc03.dxf
diff --git a/cad/librecad/distinfo b/cad/librecad/distinfo
index a43819782d2..602bc48a2de 100644
--- a/cad/librecad/distinfo
+++ b/cad/librecad/distinfo
@@ -1,14 +1,10 @@
-$NetBSD: distinfo,v 1.10 2020/06/16 14:43:17 mef Exp $
+$NetBSD: distinfo,v 1.11 2021/05/22 10:18:23 nia Exp $
 
-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_lc__splinepoints.cpp) = f29eae212caf267b8c62f9392abdab419c85be06
+SHA1 (LibreCAD-2.2.0-rc2.tar.gz) = da8ef6ad80db6bc94fa36b48edee35bb9394f88c
+RMD160 (LibreCAD-2.2.0-rc2.tar.gz) = bbbe7b332f992a82d657c8f812f0014f3a59a626
+SHA512 (LibreCAD-2.2.0-rc2.tar.gz) = e4f6041ea9685f57d08a2e33f7202341f31698e7faa860b2710109ad650be4a3f93f368044d5d7175dedd852e2a81d4de2a5d4949b559d74e41ecc9ad502b652
+Size (LibreCAD-2.2.0-rc2.tar.gz) = 13561381 bytes
+SHA1 (patch-librecad_src_lib_engine_rs__ellipse.cpp) = 0d236bb0047007bb994d93399360ed8dcdc33f3f
 SHA1 (patch-librecad_src_lib_engine_rs__system.cpp) = 38ceb3cde81042a1eeb6c68ead874e1a3a3512bb
-SHA1 (patch-librecad_src_lib_gui_rs__painterqt.h) = 21f2aa2f4265690dcd9b8db0c882237e0671841d
 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_lc__splinepoints.cpp b/cad/librecad/patches/patch-librecad_src_lib_engine_lc__splinepoints.cpp
deleted file mode 100644
index bf6c768dde4..00000000000
--- a/cad/librecad/patches/patch-librecad_src_lib_engine_lc__splinepoints.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-librecad_src_lib_engine_lc__splinepoints.cpp,v 1.1 2020/06/16 14:43:17 mef Exp $
-
-Adapt for boost update
-
---- librecad/src/lib/engine/lc_splinepoints.cpp.orig	2018-02-15 20:54:45.000000000 +0000
-+++ librecad/src/lib/engine/lc_splinepoints.cpp
-@@ -22,6 +22,8 @@ Foundation, Inc., 51 Franklin Street, Fi
- **********************************************************************/
- 
- #include <QPolygonF>
-+#include <QPainterPath>
-+
- #include "lc_splinepoints.h"
- 
- #include "rs_circle.h"
diff --git a/cad/librecad/patches/patch-librecad_src_lib_engine_rs__ellipse.cpp b/cad/librecad/patches/patch-librecad_src_lib_engine_rs__ellipse.cpp
new file mode 100644
index 00000000000..054f696128e
--- /dev/null
+++ b/cad/librecad/patches/patch-librecad_src_lib_engine_rs__ellipse.cpp
@@ -0,0 +1,25 @@
+$NetBSD: patch-librecad_src_lib_engine_rs__ellipse.cpp,v 1.1 2021/05/22 10:18:23 nia Exp $
+
+Subject: [PATCH] add boost tuple include to fix build
+
+With boost 1.76, we see:
+lib/engine/rs_ellipse.cpp:70:15: error: 'tuple' in namespace 'boost::math' does not name a template type
+   70 |  boost::math::tuple<double, double, double> operator()(double const& z) const {
+      |               ^~~~~
+
+Fix this by including the proper boost header.
+
+https://github.com/LibreCAD/LibreCAD/pull/1345
+
+--- librecad/src/lib/engine/rs_ellipse.cpp.orig	2020-12-29 23:31:50.000000000 +0000
++++ librecad/src/lib/engine/rs_ellipse.cpp
+@@ -48,6 +48,9 @@
+ #include <boost/version.hpp>
+ #include <boost/math/tools/roots.hpp>
+ #include <boost/math/special_functions/ellint_2.hpp>
++#if BOOST_VERSION > 104500
++#include <boost/math/tools/tuple.hpp>
++#endif
+ #endif
+ 
+ namespace{
diff --git a/cad/librecad/patches/patch-librecad_src_lib_gui_rs__painterqt.h b/cad/librecad/patches/patch-librecad_src_lib_gui_rs__painterqt.h
deleted file mode 100644
index 004557527c0..00000000000
--- a/cad/librecad/patches/patch-librecad_src_lib_gui_rs__painterqt.h
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-librecad_src_lib_gui_rs__painterqt.h,v 1.1 2020/06/16 14:43:17 mef Exp $
-
-Adapt for boost update
-
---- librecad/src/lib/gui/rs_painterqt.h.orig	2018-02-15 20:54:45.000000000 +0000
-+++ librecad/src/lib/gui/rs_painterqt.h
-@@ -29,6 +29,7 @@
- #define RS_PAINTERQT_H
- 
- #include <QPainter>
-+#include <QPainterPath>
- 
- #include "rs_painter.h"
- #include "rs_pen.h"
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
deleted file mode 100644
index b0635c16f62..00000000000
--- a/cad/librecad/patches/patch-librecad_src_ui_forms_qg__commandwidget.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-$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
deleted file mode 100644
index 8bb04d3c0f8..00000000000
--- a/cad/librecad/patches/patch-librecad_src_ui_generic_colorwizard.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-$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
deleted file mode 100644
index e988b3c84f8..00000000000
--- a/cad/librecad/patches/patch-librecad_src_ui_generic_widgetcreator.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$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>