cad/librecad: Update to 2.2.0-rc2

6 files changed, 6 insertions, 73 deletions

diff --git a/cad/librecad/Makefile b/cad/librecad/Makefile
index efe5ea4059a7..48c358607017 100644
--- a/cad/librecad/Makefile
+++ b/cad/librecad/Makefile
@@ -1,15 +1,9 @@
 # $FreeBSD$
 
 PORTNAME=	librecad
-DISTVERSION=	2.2.0-rc1
-PORTREVISION=	11
+DISTVERSION=	2.2.0-rc2
 CATEGORIES=	cad
 
-PATCH_SITES_gcc= https://github.com/LibreCAD/LibreCAD/commit/
-PATCH_SITES=	${PATCH_SITES_${CHOSEN_COMPILER_TYPE}}
-PATCHFILES_gcc=	d0a0ef284b7fcc5c0d65b92c30855f62b637653f.patch:-p1
-PATCHFILES=	${PATCHFILES_${CHOSEN_COMPILER_TYPE}}
-
 MAINTAINER=	jhale@FreeBSD.org
 COMMENT=	2D CAD system
 
diff --git a/cad/librecad/distinfo b/cad/librecad/distinfo
index 0893ef513f90..9afcfcd00b82 100644
--- a/cad/librecad/distinfo
+++ b/cad/librecad/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1572051336
-SHA256 (LibreCAD-LibreCAD-2.2.0-rc1_GH0.tar.gz) = 2c937a9423ecf501902ef74c722ec413562e47c45125ac87257f02942d0676ea
-SIZE (LibreCAD-LibreCAD-2.2.0-rc1_GH0.tar.gz) = 13578543
-SHA256 (d0a0ef284b7fcc5c0d65b92c30855f62b637653f.patch) = b421d35f1c8deec8b66adbcad36db9ca12fb73fb943ab241704a8ab8c04cec7f
-SIZE (d0a0ef284b7fcc5c0d65b92c30855f62b637653f.patch) = 9651
+TIMESTAMP = 1611031013
+SHA256 (LibreCAD-LibreCAD-2.2.0-rc2_GH0.tar.gz) = d576abc6cd96ee8fbdd4ebd1c286a2ee5fedf9d08367fc261c5ad8393bfcee28
+SIZE (LibreCAD-LibreCAD-2.2.0-rc2_GH0.tar.gz) = 13561381
diff --git a/cad/librecad/files/patch-git_6c392e9 b/cad/librecad/files/patch-git_6c392e9
deleted file mode 100644
index 07133e28e01a..000000000000
--- a/cad/librecad/files/patch-git_6c392e9
+++ /dev/null
@@ -1,41 +0,0 @@
-From 6c392e903e162b9283e88f53006e929663f2e883 Mon Sep 17 00:00:00 2001
-From: Jiri Slaby <jslaby@suse.cz>
-Date: Mon, 11 Jun 2018 10:44:00 +0200
-Subject: [PATCH] fix build with Qt 5.11
-
-The new Qt removed some implicit inclusions of headers. To avoid build
-errors, add explicit includes of those we use in the sources.
-
-Signed-off-by: Jiri Slaby <jslaby@suse.cz>
-
---- librecad/src/ui/forms/qg_commandwidget.cpp.orig	2018-02-15 20:54:45 UTC
-+++ librecad/src/ui/forms/qg_commandwidget.cpp
-@@ -27,6 +27,7 @@
- 
- #include <algorithm>
- 
-+#include <QAction>
- #include <QKeyEvent>
- #include <QFileDialog>
- #include <QSettings>
---- librecad/src/ui/generic/colorwizard.cpp.orig	2018-02-15 20:54:45 UTC
-+++ 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>
---- librecad/src/ui/generic/widgetcreator.cpp.orig	2018-02-15 20:54:45 UTC
-+++ 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/files/patch-librecad_src_lib_engine_lc__splinepoints.cpp b/cad/librecad/files/patch-librecad_src_lib_engine_lc__splinepoints.cpp
deleted file mode 100644
index 1d72e763ab72..000000000000
--- a/cad/librecad/files/patch-librecad_src_lib_engine_lc__splinepoints.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- librecad/src/lib/engine/lc_splinepoints.cpp.orig	2020-05-21 10:23:28 UTC
-+++ librecad/src/lib/engine/lc_splinepoints.cpp
-@@ -22,6 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Bos
- **********************************************************************/
- 
- #include <QPolygonF>
-+#include <QPainterPath>
- #include "lc_splinepoints.h"
- 
- #include "rs_circle.h"
diff --git a/cad/librecad/files/patch-librecad_src_lib_gui_rs__painterqt.cpp b/cad/librecad/files/patch-librecad_src_lib_gui_rs__painterqt.cpp
deleted file mode 100644
index 61326d595ee1..000000000000
--- a/cad/librecad/files/patch-librecad_src_lib_gui_rs__painterqt.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- librecad/src/lib/gui/rs_painterqt.cpp.orig	2020-05-21 10:23:28 UTC
-+++ librecad/src/lib/gui/rs_painterqt.cpp
-@@ -25,6 +25,7 @@
- **********************************************************************/
- 
- #include<cmath>
-+#include<QPainterPath>
- #include "rs_painterqt.h"
- #include "rs_math.h"
- #include "rs_debug.h"
diff --git a/cad/librecad/pkg-plist b/cad/librecad/pkg-plist
index 3178220a21d4..1f39c30c40e1 100644
--- a/cad/librecad/pkg-plist
+++ b/cad/librecad/pkg-plist
@@ -1369,6 +1369,7 @@ share/applications/librecad.desktop
 %%DATADIR%%/patterns/iso03w100.dxf
 %%DATADIR%%/patterns/iso03w100a.dxf
 %%DATADIR%%/patterns/kerpele.dxf
+%%DATADIR%%/patterns/millstone.dxf
 %%DATADIR%%/patterns/misc01.dxf
 %%DATADIR%%/patterns/misc02.dxf
 %%DATADIR%%/patterns/misc03.dxf
@@ -1383,6 +1384,7 @@ share/applications/librecad.desktop
 %%DATADIR%%/patterns/triangle_b.dxf
 %%DATADIR%%/plugins/libalign.so
 %%DATADIR%%/plugins/libasciifile.so
+%%DATADIR%%/plugins/libdivide.so
 %%DATADIR%%/plugins/libgear.so
 %%DATADIR%%/plugins/libimportshp.so
 %%DATADIR%%/plugins/liblist.so