<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4653b5a9a8c26986c4ee2cd72c0c5264403960ca">https://github.com/macports/macports-ports/commit/4653b5a9a8c26986c4ee2cd72c0c5264403960ca</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 4653b5a9a8c LibreCAD: update to 2.2.0.2
</span>4653b5a9a8c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 4653b5a9a8c26986c4ee2cd72c0c5264403960ca
</span>Author: Herby Gillot <herby.gillot@gmail.com>
AuthorDate: Thu Jun 8 05:43:43 2023 -0400
<span style='display:block; white-space:pre;color:#404040;'> LibreCAD: update to 2.2.0.2
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - assume maintainership
</span><span style='display:block; white-space:pre;color:#404040;'> - use the latest Boost available (1.81)
</span><span style='display:block; white-space:pre;color:#404040;'> - update librecad-devel to 2.2.1_alpha
</span><span style='display:block; white-space:pre;color:#404040;'> - remove "use_xcode yes" to resolve "Could not resolve SDK Path" - https://trac.macports.org/ticket/65293
</span>---
cad/LibreCAD/Portfile | 54 ++++++++++-------------
cad/LibreCAD/files/patch-build-with-newer-Qt.diff | 29 ------------
cad/LibreCAD/files/patch-qpainterpath.diff | 11 -----
3 files changed, 24 insertions(+), 70 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/cad/LibreCAD/Portfile b/cad/LibreCAD/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 121bb959174..a21a961c74d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/cad/LibreCAD/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/cad/LibreCAD/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,18 +1,14 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup qmake5 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup boost 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup qmake5 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup boost 1.0
</span>
name LibreCAD
subport LibreCAD-devel {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-categories cad
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license GPL-2+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://librecad.org
</span>
description LibreCAD is a free Open Source CAD application.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,11 +18,11 @@ long_description LibreCAD is a free Open Source CAD application for \
</span> contributors and developers. You, too, can also get \
involved!
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://librecad.org/
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Fix allowing QT to find the macOS SDK
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# See: https://trac.macports.org/ticket/65519
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_xcode yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories cad
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license GPL-2+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {gmail.com:herby.gillot @herbygillot} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ openmaintainer
</span>
# Needed for Boost
compiler.thread_local_storage \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,19 +33,14 @@ qt5.depends_component qtsvg qttranslations qttools
</span> if {${subport} eq "${name}"} {
conflicts LibreCAD-devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup LibreCAD LibreCAD 2.1.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 2f50b879e95c0ecc019dd5b7f6a218f62744cc1b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 5d0bc37efa1006742785c06ec30737c7866b0366048553c5560e06a3e442f7b3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 22416015
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup LibreCAD LibreCAD 2.2.0.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.tarball_from archive
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 2092675c79c2da85ba66319f08c3c0f017aa4da8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 fcb888a550f1f515ef6a2f7af2dd02605dd5c6da8a23f6c3a52479f8532ac109 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 13645528
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- boost.version 1.71
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # fix build with newer Qt versions
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-build-with-newer-Qt.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # fix missing include for QPainterPath; fixed in devel release
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-qpainterpath.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ boost.version 1.81
</span>
post-extract {
reinplace "s|lrelease|${qt_bins_dir}/lrelease|g" scripts/postprocess-osx.sh
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,15 +49,15 @@ if {${subport} eq "${name}"} {
</span> } elseif {${subport} eq "${name}-devel"} {
conflicts LibreCAD
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup LibreCAD LibreCAD 07128e130d1b76797835accadb0f116bf2db3eab
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 2.2.0-20220607-RC4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup LibreCAD LibreCAD 2.2.1_alpha
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.tarball_from archive
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span>
boost.version 1.81
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 e83b5e08e577215078daa67231a2cba097568015 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 7ebf2bc49591bd7611c868fbedb1b1ace2f5266907305cdce55398a5578d628d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 13833024
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 85605cb0cf0b082b8939911460603ba0d7b59712 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 ac91396da5823e5b58efacbbeed6bf5f669477df7a6755615a8f9290d9cd3a9d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 13840866
</span> }
# the default destructor cannot be created in all cases
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -94,3 +85,6 @@ destroot {
</span>
copy ${worksrcpath}/LibreCAD.app ${destroot}${applications_dir}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.livecheck.regex \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {([0-9.]+)}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/cad/LibreCAD/files/patch-build-with-newer-Qt.diff b/cad/LibreCAD/files/patch-build-with-newer-Qt.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b02970bb713..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/cad/LibreCAD/files/patch-build-with-newer-Qt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,29 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Upstream's patch, can be removed with next update.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-See:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/LibreCAD/LibreCAD/commit/6c392e903e162b9283e88f53006e929663f2e883
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-and
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://www.mail-archive.com/bug-guix@gnu.org/msg09231.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- librecad/src/ui/forms/qg_commandwidget.cpp.orig 2020-06-21 11:32:28.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ librecad/src/ui/forms/qg_commandwidget.cpp 2020-06-21 11:33:08.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -24,6 +24,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- **
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- **********************************************************************/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "qg_commandwidget.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <QAction>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <QKeyEvent>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <algorithm>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- librecad/src/ui/generic/widgetcreator.cpp.orig 2020-06-21 11:34:38.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ librecad/src/ui/generic/widgetcreator.cpp 2020-06-21 11:34:54.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -27,6 +27,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "widgetcreator.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "ui_widgetcreator.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <QAction>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <QActionGroup>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <QSettings>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <QLineEdit>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <QPushButton>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/cad/LibreCAD/files/patch-qpainterpath.diff b/cad/LibreCAD/files/patch-qpainterpath.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 2fea19e7581..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/cad/LibreCAD/files/patch-qpainterpath.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- librecad/src/lib/gui/rs_painter.h 2016-09-23 01:34:43.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ librecad/src/lib/gui/rs_painter.h.new 2021-06-09 13:22:10.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -28,6 +28,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef RS_PAINTER_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define RS_PAINTER_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <QPainterPath>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "rs_vector.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- class RS_Color;
</span></pre><pre style='margin:0'>
</pre>