diff options
| author | Markus Hartung | 2023-08-30 01:20:16 +0200 |
|---|---|---|
| committer | Markus Hartung | 2023-08-30 01:20:16 +0200 |
| commit | c158a460bb64334e46259419723e9adf451fa222 (patch) | |
| tree | 2453d478b3104d2b3ea487079b929b382449084d | |
| parent | e1535fb400b8c187c0d1901a889392c35dfbeab0 (diff) | |
| download | aur-oscar-git.tar.gz | |
Ignore ODR until fixed upstream
| -rw-r--r-- | .SRCINFO | 2 | ||||
| -rw-r--r-- | PKGBUILD | 2 | ||||
| -rw-r--r-- | odr-fix.patch | 14 |
3 files changed, 16 insertions, 2 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 = ..r4012.acf04f4b + pkgver = ..r4286.32bef5b8 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=..r4012.acf04f4b +pkgver=..r4286.32bef5b8 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 new file mode 100644 index 000000000000..00799c1a5fec --- /dev/null +++ b/odr-fix.patch @@ -0,0 +1,14 @@ +diff --git a/oscar/oscar.pro b/oscar/oscar.pro +index 0f01e066..1675d00b 100644 +--- a/oscar/oscar.pro ++++ b/oscar/oscar.pro +@@ -561,6 +561,9 @@ gcc:!clang { + #} + } + ++# Ignore ODR-violations until fixed in upstream: https://gitlab.com/pholy/OSCAR-code/-/issues/87 ++QMAKE_CXXFLAGS += -Wno-error=odr ++ + clang { + message("Building for $$QMAKE_HOST.os") + # this section removedi. all deprecated-copy errors have been removed |