<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/5cda041fc176e2bb665613853a817728620f1041">https://github.com/macports/macports-ports/commit/5cda041fc176e2bb665613853a817728620f1041</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 5cda041 oscar: new port
</span>5cda041 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 5cda041fc176e2bb665613853a817728620f1041
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Fri Feb 14 01:45:51 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> oscar: new port
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/60079
</span>---
aqua/oscar/Portfile | 45 +++++++++++++++++++++++++++++++++++++
aqua/oscar/files/patch-nullptr.diff | 41 +++++++++++++++++++++++++++++++++
2 files changed, 86 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/oscar/Portfile b/aqua/oscar/Portfile
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..07f84bf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/oscar/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,45 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- 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
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name oscar
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.0.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# please increase revision with new build_number
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set build_number 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://gitlab.com/pholy/OSCAR-code/-/tags for upload_tag associated with version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set upload_tag a102a85dbd18f2ed262dafab9960ab6ec354dc21
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories aqua
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license GPL-3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {mcalhoun @MarcusCalhoun-Lopez} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description a cross platform, opensource sleep tracking program for reviewing CPAP and Oximetry data
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description OSCAR is ${description}, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ which are devices used in the treatment of Sleep Disorders like Obstructive Sleep Apnea.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://www.sleepfiles.com/OSCAR/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites https://gitlab.com/pholy/OSCAR-code/-/archive/${upload_tag}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname ${name}-${version}-r-${build_number}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 bdc792a14e5aa55227a989be241a035902f93161 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 4fc578d6401de582a4bfb9c8532e00bb345d4fe58afc1414bbd9a1d10a03ff47 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 4700391
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+qt5.min_version 5.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://trac.macports.org/ticket/60079
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-nullptr.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:zlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+qt5.depends_component qtserialport
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${worksrcpath}/oscar/OSCAR.app ${destroot}${applications_dir}
</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;'>+livecheck.type regex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.url https://gitlab.com/pholy/OSCAR-code/-/tags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.version ${version}-Release-${build_number}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex {OSCAR-code-v(\d+(?:\.\d+)*-Release-\d+)}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/oscar/files/patch-nullptr.diff b/aqua/oscar/files/patch-nullptr.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..6b05e42
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/oscar/files/patch-nullptr.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,41 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- oscar/SleepLib/common.h.orig 2019-04-24 12:18:33.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ oscar/SleepLib/common.h 2020-02-14 01:00:27.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -121,11 +121,6 @@
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef nullptr
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define nullptr NULL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef TEST_BUILD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const QString STR_TestBuild = "-Testing";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- oscar/Graphs/glcommon.h.orig 2019-04-24 12:18:33.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ oscar/Graphs/glcommon.h 2020-02-14 01:00:37.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -11,10 +11,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <QColor>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef nullptr
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define nullptr NULL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //! \brief Returns the grayscale brightness (between 0 and 1) of a color
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ float brightness(QColor color);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- oscar/updateparser.cpp.orig 2019-04-24 12:18:33.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ oscar/updateparser.cpp 2020-02-14 01:00:47.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -11,11 +11,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "updateparser.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef nullptr
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define nullptr NULL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</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;'>+ Update::Update()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size = 0;
</span></pre><pre style='margin:0'>
</pre>