<pre style='margin:0'>
Mark Anderson (markemer) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/598cf71ab49b7bd92d9c1f648b019eb58592a43a">https://github.com/macports/macports-ports/commit/598cf71ab49b7bd92d9c1f648b019eb58592a43a</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 598cf71ab49 oscar: update to 1.5.3 (#25654)
</span>598cf71ab49 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 598cf71ab49b7bd92d9c1f648b019eb58592a43a
</span>Author: Mark Anderson <mark@macports.org>
AuthorDate: Mon Sep 9 19:16:28 2024 -0400
<span style='display:block; white-space:pre;color:#404040;'> oscar: update to 1.5.3 (#25654)
</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/64603
</span>---
aqua/oscar/Portfile | 22 ++++++++++---------
aqua/oscar/files/patch-nullptr.diff | 41 -----------------------------------
aqua/oscar/files/patch-oscar.pro.diff | 41 +++++++++++++++++++++++++++++++++++
3 files changed, 53 insertions(+), 51 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/oscar/Portfile b/aqua/oscar/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8166b492ee5..111ed064499 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/oscar/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/oscar/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,16 +4,17 @@ PortSystem 1.0
</span> PortGroup qmake5 1.0
name oscar
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.0.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.5.3
</span> revision 0
# please increase revision with new build_number
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set build_number 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set build_number 0
</span> # see https://gitlab.com/pholy/OSCAR-code/-/tags for upload_tag associated with version
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set upload_tag a102a85dbd18f2ed262dafab9960ab6ec354dc21
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set upload_tag 7267dafa46a871449bf4c5131f4a7998baf769c0
</span> categories aqua
license GPL-3
maintainers {mcalhoun @MarcusCalhoun-Lopez} openmaintainer
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> description a cross platform, opensource sleep tracking program for reviewing CPAP and Oximetry data
long_description OSCAR is ${description}, \
which are devices used in the treatment of Sleep Disorders like Obstructive Sleep Apnea.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,16 +24,17 @@ master_sites https://gitlab.com/pholy/OSCAR-code/-/archive/${uplo
</span>
distname ${name}-${version}-r-${build_number}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 bdc792a14e5aa55227a989be241a035902f93161 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 4fc578d6401de582a4bfb9c8532e00bb345d4fe58afc1414bbd9a1d10a03ff47 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 4700391
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 7c0e8c469a9ff1c712a33986f1ada1beec4218fd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 decd7fbbcbb1ee2fa2cfc135bc312ab8804a14707ecd9e3a841cf97668f677c7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 7868784
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-qt5.min_version 5.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+qt5.min_version 5.13
</span>
worksrcdir OSCAR-code-${upload_tag}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# see https://trac.macports.org/ticket/60079
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-nullptr.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-oscar.pro.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append ${worksrcpath}/oscar/oscar.pro
</span>
qt5.depends_build_component qttools
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,7 +42,7 @@ depends_lib-append port:zlib
</span> qt5.depends_component qtserialport
destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${worksrcpath}/oscar/OSCAR.app ${destroot}${applications_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${worksrcpath}/OSCAR.app ${destroot}${applications_dir}
</span> }
livecheck.type regex
<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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 6b05e427d03..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/oscar/files/patch-nullptr.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,41 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- oscar/SleepLib/common.h.orig 2019-04-24 12:18:33.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ oscar/SleepLib/common.h 2020-02-14 01:00:27.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -121,11 +121,6 @@
</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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef nullptr
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define nullptr NULL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef TEST_BUILD
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const QString STR_TestBuild = "-Testing";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- oscar/Graphs/glcommon.h.orig 2019-04-24 12:18:33.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ oscar/Graphs/glcommon.h 2020-02-14 01:00:37.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -11,10 +11,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <QColor>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef nullptr
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define nullptr NULL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- //! \brief Returns the grayscale brightness (between 0 and 1) of a color
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- float brightness(QColor color);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- oscar/updateparser.cpp.orig 2019-04-24 12:18:33.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ oscar/updateparser.cpp 2020-02-14 01:00:47.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -11,11 +11,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "updateparser.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef nullptr
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define nullptr NULL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</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;'>- Update::Update()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size = 0;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/oscar/files/patch-oscar.pro.diff b/aqua/oscar/files/patch-oscar.pro.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..80e40393a8f
</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-oscar.pro.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/oscar.pro 2024-04-14 07:40:39
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ oscar/oscar.pro 2024-09-07 13:45:32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -540,10 +540,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;'>+ message("CXXFLAGS pre-mods $$QMAKE_CXXFLAGS ")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# Always treat warnings as errors, even (especially!) in release
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-QMAKE_CFLAGS += -Werror
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-QMAKE_CXXFLAGS += -Werror
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gcc | clang {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COMPILER_VERSION = $$system($$QMAKE_CXX " -dumpversion")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -594,11 +590,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_CFLAGS += -Wno-error=deprecated-copy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_CXXFLAGS += -Wno-error=deprecated-copy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ !win32 { # add memory checking on Linux and macOS debug builds
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- QMAKE_CFLAGS += -g -Werror -fsanitize=address -fno-omit-frame-pointer -fno-common -fsanitize-address-use-after-scope
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QMAKE_CFLAGS += -g -fsanitize=address -fno-omit-frame-pointer -fno-common -fsanitize-address-use-after-scope
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lessThan(QT_MAJOR_VERSION,5)|lessThan(QT_MINOR_VERSION,9) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_CFLAGS -= -fsanitize-address-use-after-scope
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- QMAKE_CXXFLAGS += -g -Werror -fsanitize=address -fno-omit-frame-pointer -fno-common -fsanitize-address-use-after-scope
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QMAKE_CXXFLAGS += -g -fsanitize=address -fno-omit-frame-pointer -fno-common -fsanitize-address-use-after-scope
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lessThan(QT_MAJOR_VERSION,5)|lessThan(QT_MINOR_VERSION,9) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_CXXFLAGS -= -fsanitize-address-use-after-scope
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -616,11 +612,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CONFIG += console debug
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CONFIG -= app_bundle
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ !win32 { # add memory checking on Linux and macOS test builds
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- QMAKE_CFLAGS += -Werror -fsanitize=address -fno-omit-frame-pointer -fno-common -fsanitize-address-use-after-scope
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QMAKE_CFLAGS += -fsanitize=address -fno-omit-frame-pointer -fno-common -fsanitize-address-use-after-scope
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lessThan(QT_MAJOR_VERSION,5)|lessThan(QT_MINOR_VERSION,9) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_CFLAGS -= -fsanitize-address-use-after-scope
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- QMAKE_CXXFLAGS += -Werror -fsanitize=address -fno-omit-frame-pointer -fno-common -fsanitize-address-use-after-scope
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QMAKE_CXXFLAGS += -fsanitize=address -fno-omit-frame-pointer -fno-common -fsanitize-address-use-after-scope
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lessThan(QT_MAJOR_VERSION,5)|lessThan(QT_MINOR_VERSION,9) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_CXXFLAGS -= -fsanitize-address-use-after-scope
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span></pre><pre style='margin:0'>
</pre>