diff options
| author | Markus Hartung | 2022-02-19 02:45:00 +0100 |
|---|---|---|
| committer | Markus Hartung | 2022-02-19 02:45:00 +0100 |
| commit | e1535fb400b8c187c0d1901a889392c35dfbeab0 (patch) | |
| tree | 7919f48969aaeba38d3981f9a81346d11d652962 | |
| parent | 8dc3c3acc8d55c13bcbd5d9116c4298250b28fad (diff) | |
| download | aur-e1535fb400b8c187c0d1901a889392c35dfbeab0.tar.gz | |
Issue 52 fixed in upstream
| -rw-r--r-- | .SRCINFO | 2 | ||||
| -rw-r--r-- | PKGBUILD | 2 | ||||
| -rw-r--r-- | odr-fix.patch | 14 |
3 files changed, 2 insertions, 16 deletions
@@ -1,6 +1,6 @@ pkgbase = oscar-git pkgdesc = Open-source, cross platform, sleep tracking software with a focus on monitoring CPAP treatment. Fork of the sleepyhead project. - pkgver = ..r4010.df17e279 + pkgver = ..r4012.acf04f4b pkgrel = 1 url = https://gitlab.com/pholy/OSCAR-code arch = i686 @@ -3,7 +3,7 @@ # Contributor: Jason Lenz <Jason@Lenzplace.org> _pkgname=oscar pkgname=oscar-git -pkgver=..r4010.df17e279 +pkgver=..r4012.acf04f4b pkgrel=1 pkgdesc="Open-source, cross platform, sleep tracking software with a focus on monitoring CPAP treatment. Fork of the sleepyhead project." arch=('i686' 'x86_64') diff --git a/odr-fix.patch b/odr-fix.patch deleted file mode 100644 index d595d1ba198e..000000000000 --- a/odr-fix.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/oscar/oscar.pro b/oscar/oscar.pro -index ed8195e5..116ec8b9 100644 ---- a/oscar/oscar.pro -+++ b/oscar/oscar.pro -@@ -546,6 +546,9 @@ gcc | clang { - QMAKE_CFLAGS += -Wno-error=deprecated-declarations - QMAKE_CXXFLAGS += -Wno-error=deprecated-declarations - -+# Ignore ODR-violations until fixed in upstream: https://gitlab.com/pholy/OSCAR-code/-/issues/52 -+QMAKE_CXXFLAGS += -Wno-error=odr -+ - lessThan(QT_MAJOR_VERSION,5)|lessThan(QT_MINOR_VERSION,9) { - QMAKE_CFLAGS += -Wno-error=strict-aliasing - QMAKE_CXXFLAGS += -Wno-error=strict-aliasing |