<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/20d5b17416b8f4cd736a969013bb092cfd5c8c55">https://github.com/macports/macports-ports/commit/20d5b17416b8f4cd736a969013bb092cfd5c8c55</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 20d5b17416b LibreCAD: fix build with newer Qt
</span>20d5b17416b is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 20d5b17416b8f4cd736a969013bb092cfd5c8c55
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Sun Jun 21 11:38:41 2020 -0400

<span style='display:block; white-space:pre;color:#404040;'>    LibreCAD: fix build with newer Qt
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/59032
</span>---
 cad/LibreCAD/Portfile                             |  5 +++-
 cad/LibreCAD/files/patch-build-with-newer-Qt.diff | 29 +++++++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)

<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 05d7059adab..8f2eb1d64e4 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;'>@@ -16,7 +16,7 @@ if {${subport} eq "${name}"} {
</span>     checksums           rmd160  2f50b879e95c0ecc019dd5b7f6a218f62744cc1b \
                         sha256  5d0bc37efa1006742785c06ec30737c7866b0366048553c5560e06a3e442f7b3 \
                         size    22416015
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>     post-extract {
         reinplace "s|lrelease|${qt_bins_dir}/lrelease|g" scripts/postprocess-osx.sh
     }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,6 +36,9 @@ if {${subport} eq "${name}"} {
</span> # see https://marc.info/?l=pkgsrc-changes&m=150505264620416&w=2
 patchfiles-append   patch-librecad-add-default-destructor-rsimage.diff
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# fix build with newer Qt versions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append   patch-build-with-newer-Qt.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {${os.platform} eq "darwin" && ${os.major} < 10} {
     known_fail          yes
     pre-fetch {
<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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..b02970bb713
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/cad/LibreCAD/files/patch-build-with-newer-Qt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,29 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Upstream's patch, can be removed with next update.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+See:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/LibreCAD/LibreCAD/commit/6c392e903e162b9283e88f53006e929663f2e883
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://www.mail-archive.com/bug-guix@gnu.org/msg09231.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- 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:#e0ffe0;'>++++ librecad/src/ui/forms/qg_commandwidget.cpp     2020-06-21 11:33:08.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24,6 +24,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ **
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ **********************************************************************/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "qg_commandwidget.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QAction>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <QKeyEvent>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <algorithm>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- librecad/src/ui/generic/widgetcreator.cpp.orig 2020-06-21 11:34:38.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ librecad/src/ui/generic/widgetcreator.cpp      2020-06-21 11:34:54.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -27,6 +27,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "widgetcreator.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "ui_widgetcreator.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QAction>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QActionGroup>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <QSettings>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <QLineEdit>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <QPushButton>
</span></pre><pre style='margin:0'>

</pre>