git: 428ac18297f5 - 2022Q4 - cad/librecad: Fix orthogonal and rel angle tools
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 28 Oct 2022 02:35:09 UTC
The branch 2022Q4 has been updated by jhale:
URL: https://cgit.FreeBSD.org/ports/commit/?id=428ac18297f52d61ac3019c78ed07a3cf1f5df4e
commit 428ac18297f52d61ac3019c78ed07a3cf1f5df4e
Author: Jason E. Hale <jhale@FreeBSD.org>
AuthorDate: 2022-10-28 01:37:21 +0000
Commit: Jason E. Hale <jhale@FreeBSD.org>
CommitDate: 2022-10-28 02:32:51 +0000
cad/librecad: Fix orthogonal and rel angle tools
When using Tools > Line > Orthogonal or Tools > Line > Relative angle,
it is not possible to select the base entity.
Apparently, the code works with GCC, but Clang warns:
In file included from actions/rs_actiondrawlinerelangle.cpp:27:
actions/rs_actiondrawlinerelangle.h:116:53: warning: array backing local initializer list 'enTypeList' will be destroyed at the end of the full-expression [-Wdangling]
const EntityTypeList enTypeList = EntityTypeList{RS2::EntityLine, RS2::EntityArc, RS2::EntityCircle,RS2::EntityEllipse};
actions/rs_actiondrawlinerelangle.cpp:41:28: warning: backing array for 'std::initializer_list' member 'enTypeList' is a temporary object whose lifetime is shorter than the lifetime of the constructed object [-Wdangling-field]
RS_ActionDrawLineRelAngle::RS_ActionDrawLineRelAngle(
Patch reverts upstream commits eb2e146 [1] and d0a0ef2 [2] which were
intended to fix the build with the now unsupported GCC 9.
[1] https://github.com/LibreCAD/LibreCAD/commit/eb2e1465bb6186de155fc1b68e4aa5580e6990dc
[2] https://github.com/LibreCAD/LibreCAD/commit/d0a0ef284b7fcc5c0d65b92c30855f62b637653f
Reported by: slovkam u sebi <slovkamusebi@protonmail.com> (via private mail)
(cherry picked from commit 9fe9575a924774bdd1ee00b08ae0d91d412b4af9)
---
cad/librecad/Makefile | 4 ++++
cad/librecad/distinfo | 4 +++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/cad/librecad/Makefile b/cad/librecad/Makefile
index 8d5f5dbedb29..699687c17d17 100644
--- a/cad/librecad/Makefile
+++ b/cad/librecad/Makefile
@@ -1,7 +1,11 @@
PORTNAME= librecad
DISTVERSION= 2.2.0-rc4
+PORTREVISION= 1
CATEGORIES= cad
+PATCH_SITES= https://github.com/BSDKaffee/LibreCAD/commit/
+PATCHFILES= d81cd49db2421bb4ca9a283638500ebf1c7d02e5.patch:-p1 # Fix ortho tool with Clang
+
MAINTAINER= jhale@FreeBSD.org
COMMENT= 2D CAD system
WWW= https://librecad.org/
diff --git a/cad/librecad/distinfo b/cad/librecad/distinfo
index 2cf73a900cf5..aa56dce7ca53 100644
--- a/cad/librecad/distinfo
+++ b/cad/librecad/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1663002361
+TIMESTAMP = 1666920763
SHA256 (LibreCAD-LibreCAD-2.2.0-rc4_GH0.tar.gz) = f34c295cdb22bb4fca021a7cb95a648365e52b97b651a645ae5f78cd7a53e4d4
SIZE (LibreCAD-LibreCAD-2.2.0-rc4_GH0.tar.gz) = 13833398
+SHA256 (d81cd49db2421bb4ca9a283638500ebf1c7d02e5.patch) = 55ec8409b6dfd83364655afae0f44f4aa8beb1f449d03c55505628f9111d94da
+SIZE (d81cd49db2421bb4ca9a283638500ebf1c7d02e5.patch) = 9814