From ba7e640637fb9786d49b476ae856219847ad600c Mon Sep 17 00:00:00 2001 From: Bnyro Date: Mon, 31 Jul 2023 09:29:32 +0200 Subject: [PATCH] LibreCAD: update to 2.2.0.1. --- ...ild-issue-as-reported-in-1111-and-11.patch | 234 ------------------ srcpkgs/LibreCAD/patches/QPainterPath.patch | 20 -- .../LibreCAD/patches/fix-boost-tuple.patch | 29 --- srcpkgs/LibreCAD/patches/fix-ftbfs-qt5.patch | 10 - srcpkgs/LibreCAD/template | 6 +- 5 files changed, 3 insertions(+), 296 deletions(-) delete mode 100644 srcpkgs/LibreCAD/patches/0001-fix-for-GCC-9-build-issue-as-reported-in-1111-and-11.patch delete mode 100644 srcpkgs/LibreCAD/patches/QPainterPath.patch delete mode 100644 srcpkgs/LibreCAD/patches/fix-boost-tuple.patch delete mode 100644 srcpkgs/LibreCAD/patches/fix-ftbfs-qt5.patch diff --git a/srcpkgs/LibreCAD/patches/0001-fix-for-GCC-9-build-issue-as-reported-in-1111-and-11.patch b/srcpkgs/LibreCAD/patches/0001-fix-for-GCC-9-build-issue-as-reported-in-1111-and-11.patch deleted file mode 100644 index caea9024c1ab1..0000000000000 --- a/srcpkgs/LibreCAD/patches/0001-fix-for-GCC-9-build-issue-as-reported-in-1111-and-11.patch +++ /dev/null @@ -1,234 +0,0 @@ -From b9bfa0ab6e5152f9f8de8d91f7818a3eb3020e85 Mon Sep 17 00:00:00 2001 -From: Armin Stebich -Date: Mon, 10 Jun 2019 23:06:24 +0200 -Subject: [PATCH] fix for GCC 9 build issue, as reported in #1111 and #1117 - ---- - librecad/src/actions/rs_actiondrawcircletan1_2p.cpp | 5 ----- - librecad/src/actions/rs_actiondrawcircletan1_2p.h | 3 +++ - librecad/src/actions/rs_actiondrawcircletan2.cpp | 4 ---- - librecad/src/actions/rs_actiondrawcircletan2.h | 3 +++ - librecad/src/actions/rs_actiondrawcircletan2_1p.cpp | 4 ---- - librecad/src/actions/rs_actiondrawcircletan2_1p.h | 3 +++ - librecad/src/actions/rs_actiondrawcircletan3.cpp | 4 ---- - librecad/src/actions/rs_actiondrawcircletan3.h | 2 ++ - librecad/src/actions/rs_actiondrawlinerelangle.cpp | 5 ----- - librecad/src/actions/rs_actiondrawlinerelangle.h | 3 +++ - librecad/src/actions/rs_actiondrawlinetangent1.cpp | 6 ------ - librecad/src/actions/rs_actiondrawlinetangent1.h | 6 ++++++ - librecad/src/actions/rs_actiondrawlinetangent2.cpp | 4 ---- - librecad/src/actions/rs_actiondrawlinetangent2.h | 3 +++ - 14 files changed, 23 insertions(+), 32 deletions(-) - -diff --git librecad/src/actions/rs_actiondrawcircletan1_2p.cpp librecad/src/actions/rs_actiondrawcircletan1_2p.cpp -index c14da00e..f305408a 100644 ---- a/librecad/src/actions/rs_actiondrawcircletan1_2p.cpp -+++ b/librecad/src/actions/rs_actiondrawcircletan1_2p.cpp -@@ -36,11 +36,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - #include "rs_preview.h" - #include "rs_debug.h" - --namespace{ --//list of entity types supported by current action --auto enTypeList={RS2::EntityLine, RS2::EntityArc, RS2::EntityCircle}; --} -- - struct RS_ActionDrawCircleTan1_2P::Points { - std::vector points; - RS_CircleData cData; -diff --git librecad/src/actions/rs_actiondrawcircletan1_2p.h librecad/src/actions/rs_actiondrawcircletan1_2p.h -index a6f40a6e..b5976c9f 100644 ---- a/librecad/src/actions/rs_actiondrawcircletan1_2p.h -+++ b/librecad/src/actions/rs_actiondrawcircletan1_2p.h -@@ -79,6 +79,9 @@ protected: - private: - struct Points; - std::unique_ptr pPoints; -+ -+ //list of entity types supported by current action -+ const std::initializer_list enTypeList {RS2::EntityLine, RS2::EntityArc, RS2::EntityCircle}; - }; - - #endif -diff --git librecad/src/actions/rs_actiondrawcircletan2.cpp librecad/src/actions/rs_actiondrawcircletan2.cpp -index d0558f05..820e4226 100644 ---- a/librecad/src/actions/rs_actiondrawcircletan2.cpp -+++ b/librecad/src/actions/rs_actiondrawcircletan2.cpp -@@ -33,10 +33,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - #include "rs_preview.h" - #include "rs_debug.h" - --namespace { --auto enTypeList={RS2::EntityLine, RS2::EntityArc, RS2::EntityCircle}; --} -- - struct RS_ActionDrawCircleTan2::Points { - RS_CircleData cData; - RS_Vector coord; -diff --git librecad/src/actions/rs_actiondrawcircletan2.h librecad/src/actions/rs_actiondrawcircletan2.h -index bed56897..5b2040e9 100644 ---- a/librecad/src/actions/rs_actiondrawcircletan2.h -+++ b/librecad/src/actions/rs_actiondrawcircletan2.h -@@ -77,6 +77,9 @@ protected: - private: - struct Points; - std::unique_ptr pPoints; -+ -+ //list of entity types supported by current action -+ const std::initializer_list enTypeList {RS2::EntityLine, RS2::EntityArc, RS2::EntityCircle}; - }; - - #endif -diff --git librecad/src/actions/rs_actiondrawcircletan2_1p.cpp librecad/src/actions/rs_actiondrawcircletan2_1p.cpp -index 324c1668..51cd29a1 100644 ---- a/librecad/src/actions/rs_actiondrawcircletan2_1p.cpp -+++ b/librecad/src/actions/rs_actiondrawcircletan2_1p.cpp -@@ -35,10 +35,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - #include "rs_preview.h" - #include "rs_debug.h" - --namespace { --auto enTypeList={RS2::EntityLine, RS2::EntityArc, RS2::EntityCircle}; --} -- - struct RS_ActionDrawCircleTan2_1P::Points { - RS_Vector point; - RS_CircleData cData; -diff --git librecad/src/actions/rs_actiondrawcircletan2_1p.h librecad/src/actions/rs_actiondrawcircletan2_1p.h -index 40c23903..e44a56c3 100644 ---- a/librecad/src/actions/rs_actiondrawcircletan2_1p.h -+++ b/librecad/src/actions/rs_actiondrawcircletan2_1p.h -@@ -73,6 +73,9 @@ protected: - private: - struct Points; - std::unique_ptr pPoints; -+ -+ //list of entity types supported by current action -+ const std::initializer_list enTypeList {RS2::EntityLine, RS2::EntityArc, RS2::EntityCircle}; - }; - - #endif -diff --git librecad/src/actions/rs_actiondrawcircletan3.cpp librecad/src/actions/rs_actiondrawcircletan3.cpp -index 026ed30e..eaca13d6 100644 ---- a/librecad/src/actions/rs_actiondrawcircletan3.cpp -+++ b/librecad/src/actions/rs_actiondrawcircletan3.cpp -@@ -35,10 +35,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - #include "rs_preview.h" - #include "rs_debug.h" - --namespace { --auto enTypeList={RS2::EntityArc, RS2::EntityCircle, RS2::EntityLine, RS2::EntityPoint}; --} -- - struct RS_ActionDrawCircleTan3::Points { - std::vector circles; - std::shared_ptr cData{std::make_shared()}; -diff --git librecad/src/actions/rs_actiondrawcircletan3.h librecad/src/actions/rs_actiondrawcircletan3.h -index d0cabfa2..3201c5f8 100644 ---- a/librecad/src/actions/rs_actiondrawcircletan3.h -+++ b/librecad/src/actions/rs_actiondrawcircletan3.h -@@ -78,6 +78,8 @@ public: - struct Points; - std::unique_ptr pPoints; - -+ //list of entity types supported by current action -+ const std::initializer_list enTypeList {RS2::EntityArc, RS2::EntityCircle, RS2::EntityLine, RS2::EntityPoint}; - }; - - #endif -diff --git librecad/src/actions/rs_actiondrawlinerelangle.cpp librecad/src/actions/rs_actiondrawlinerelangle.cpp -index 8415dd60..b9ce996f 100644 ---- a/librecad/src/actions/rs_actiondrawlinerelangle.cpp -+++ b/librecad/src/actions/rs_actiondrawlinerelangle.cpp -@@ -38,11 +38,6 @@ - #include "rs_preview.h" - #include "rs_debug.h" - --namespace { --auto enTypeList={RS2::EntityLine, RS2::EntityArc, RS2::EntityCircle, -- RS2::EntityEllipse}; --} -- - RS_ActionDrawLineRelAngle::RS_ActionDrawLineRelAngle( - RS_EntityContainer& container, - RS_GraphicView& graphicView, -diff --git librecad/src/actions/rs_actiondrawlinerelangle.h librecad/src/actions/rs_actiondrawlinerelangle.h -index 1e102792..71e5185b 100644 ---- a/librecad/src/actions/rs_actiondrawlinerelangle.h -+++ b/librecad/src/actions/rs_actiondrawlinerelangle.h -@@ -110,6 +110,9 @@ private: - * Is the angle fixed? - */ - bool fixedAngle; -+ -+ //list of entity types supported by current action -+ const std::initializer_list enTypeList {RS2::EntityLine, RS2::EntityArc, RS2::EntityCircle,RS2::EntityEllipse}; - }; - - #endif -diff --git librecad/src/actions/rs_actiondrawlinetangent1.cpp librecad/src/actions/rs_actiondrawlinetangent1.cpp -index 197b0cb6..47a93c76 100644 ---- a/librecad/src/actions/rs_actiondrawlinetangent1.cpp -+++ b/librecad/src/actions/rs_actiondrawlinetangent1.cpp -@@ -36,12 +36,6 @@ - #include "rs_preview.h" - #include "rs_debug.h" - --namespace{ --auto circleType={RS2::EntityArc, RS2::EntityCircle, -- RS2::EntityEllipse, RS2::EntitySplinePoints -- }; --} -- - RS_ActionDrawLineTangent1::RS_ActionDrawLineTangent1( - RS_EntityContainer& container, - RS_GraphicView& graphicView) -diff --git librecad/src/actions/rs_actiondrawlinetangent1.h librecad/src/actions/rs_actiondrawlinetangent1.h -index 0f76b368..d20d302d 100644 ---- a/librecad/src/actions/rs_actiondrawlinetangent1.h -+++ b/librecad/src/actions/rs_actiondrawlinetangent1.h -@@ -66,6 +66,12 @@ private: - std::unique_ptr point; - /** Chosen entity */ - RS_Entity* circle; -+ -+ //list of entity types supported by current action -+ const std::initializer_list circleType { RS2::EntityArc, -+ RS2::EntityCircle, -+ RS2::EntityEllipse, -+ RS2::EntitySplinePoints }; - }; - - #endif -diff --git librecad/src/actions/rs_actiondrawlinetangent2.cpp librecad/src/actions/rs_actiondrawlinetangent2.cpp -index fed3545e..0f1600e5 100644 ---- a/librecad/src/actions/rs_actiondrawlinetangent2.cpp -+++ b/librecad/src/actions/rs_actiondrawlinetangent2.cpp -@@ -35,10 +35,6 @@ - #include "rs_preview.h" - #include "rs_debug.h" - --namespace{ --auto circleType={RS2::EntityArc, RS2::EntityCircle, RS2::EntityEllipse}; --} -- - RS_ActionDrawLineTangent2::RS_ActionDrawLineTangent2( - RS_EntityContainer& container, - RS_GraphicView& graphicView) -diff --git librecad/src/actions/rs_actiondrawlinetangent2.h librecad/src/actions/rs_actiondrawlinetangent2.h -index b0d884cd..95d82465 100644 ---- a/librecad/src/actions/rs_actiondrawlinetangent2.h -+++ b/librecad/src/actions/rs_actiondrawlinetangent2.h -@@ -68,6 +68,9 @@ private: - /** 2nd chosen entity */ - RS_Entity* circle2; - bool valid; -+ -+ //list of entity types supported by current action -+ const std::initializer_list circleType {RS2::EntityArc, RS2::EntityCircle, RS2::EntityEllipse}; - }; - - #endif --- -2.24.0 - diff --git a/srcpkgs/LibreCAD/patches/QPainterPath.patch b/srcpkgs/LibreCAD/patches/QPainterPath.patch deleted file mode 100644 index c482f11590956..0000000000000 --- a/srcpkgs/LibreCAD/patches/QPainterPath.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/librecad/src/lib/engine/lc_splinepoints.h 2016-09-23 07:34:43.000000000 +0200 -+++ b/librecad/src/lib/engine/lc_splinepoints.h 2020-10-26 19:40:13.317774271 +0100 -@@ -27,6 +27,7 @@ - - #include - #include "rs_atomicentity.h" -+#include - - class QPolygonF; - struct RS_LineTypePattern; ---- a/librecad/src/lib/gui/rs_painterqt.h 2016-09-23 07:34:43.000000000 +0200 -+++ b/librecad/src/lib/gui/rs_painterqt.h 2020-10-26 19:43:13.804763513 +0100 -@@ -29,6 +29,7 @@ - #define RS_PAINTERQT_H - - #include -+#include - - #include "rs_painter.h" - #include "rs_pen.h" diff --git a/srcpkgs/LibreCAD/patches/fix-boost-tuple.patch b/srcpkgs/LibreCAD/patches/fix-boost-tuple.patch deleted file mode 100644 index e2fc513a5454d..0000000000000 --- a/srcpkgs/LibreCAD/patches/fix-boost-tuple.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 1fd07fcd847659d518efa0897a9f603de83fe362 Mon Sep 17 00:00:00 2001 -From: Jiri Slaby -Date: Tue, 4 May 2021 09:25:03 +0200 -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 operator()(double const& z) const { - | ^~~~~ - -Fix this by including the proper boost header. ---- - librecad/src/lib/engine/rs_ellipse.cpp | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/librecad/src/lib/engine/rs_ellipse.cpp b/librecad/src/lib/engine/rs_ellipse.cpp -index 291f734ea6..d47bf6ca4a 100644 ---- a/librecad/src/lib/engine/rs_ellipse.cpp -+++ b/librecad/src/lib/engine/rs_ellipse.cpp -@@ -48,6 +48,9 @@ - #include - #include - #include -+#if BOOST_VERSION > 104500 -+#include -+#endif - #endif - - namespace{ diff --git a/srcpkgs/LibreCAD/patches/fix-ftbfs-qt5.patch b/srcpkgs/LibreCAD/patches/fix-ftbfs-qt5.patch deleted file mode 100644 index 9d6e104b550d2..0000000000000 --- a/srcpkgs/LibreCAD/patches/fix-ftbfs-qt5.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/librecad/src/ui/generic/widgetcreator.cpp -+++ b/librecad/src/ui/generic/widgetcreator.cpp -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - - WidgetCreator::WidgetCreator(QWidget* parent, - QMap& actions, diff --git a/srcpkgs/LibreCAD/template b/srcpkgs/LibreCAD/template index b5c9bbb12c011..927f3906a2306 100644 --- a/srcpkgs/LibreCAD/template +++ b/srcpkgs/LibreCAD/template @@ -1,7 +1,7 @@ # Template file for 'LibreCAD' pkgname=LibreCAD -version=2.1.3 -revision=6 +version=2.2.0.1 +revision=1 build_style=qmake hostmakedepends="qt5-qmake pkg-config ImageMagick qt5-host-tools" makedepends="qt5-devel qt5-svg-devel boost-devel muparser-devel librsvg-devel" @@ -10,7 +10,7 @@ maintainer="Orphaned " license="GPL-2.0-only" homepage="http://librecad.org" distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz" -checksum=74c4ede409b13d0365c65c0cd52dba04f1049530f6df706dc905443d5e60db06 +checksum=6edd106ee3af8e885d145385d7d550eaf48c7d234510fbc7c6b7c2ebf3b4aa48 if [ -n "$CROSS_BUILD" ]; then configure_args+=" BOOST_DIR=${XBPS_CROSS_BASE}/usr"