summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorharre2020-02-09 23:33:08 +0100
committerharre2020-02-09 23:33:08 +0100
commit7e32de7db7a7e5036a905186f66a78502ad06c9f (patch)
treed953bedecc0c8a65b1bd5763fbbc3636cf49692f
parentb7a025a3e213505df7ac35e67ad7f2f5e777c436 (diff)
downloadaur-7e32de7db7a7e5036a905186f66a78502ad06c9f.tar.gz
Modify permissive patch to work for updated file
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD2
-rw-r--r--permissive.patch14
3 files changed, 10 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c944c62ba9c..61837de9789 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -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 = ..r3113.94e39c27
+ pkgver = ..r3202.1b105c15
pkgrel = 1
url = https://gitlab.com/pholy/OSCAR-code
arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index 5dceaf64ee1..3e107c8ff86 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
# Contributor: Jason Lenz <Jason@Lenzplace.org>
_pkgname=oscar
pkgname=oscar-git
-pkgver=..r3113.94e39c27
+pkgver=..r3202.1b105c15
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/permissive.patch b/permissive.patch
index c6ab799377b..61ea5c88902 100644
--- a/permissive.patch
+++ b/permissive.patch
@@ -1,13 +1,15 @@
diff --git a/oscar/oscar.pro b/oscar/oscar.pro
-index cd228b00..18199837 100644
+index 24a68f10..dc223c87 100644
--- a/oscar/oscar.pro
+++ b/oscar/oscar.pro
-@@ -471,6 +471,8 @@ QMAKE_CXXFLAGS += -Werror
+@@ -488,6 +488,10 @@ QMAKE_CXXFLAGS += -Werror
+ # Make deprecation warnings just warnings
QMAKE_CFLAGS += -Wno-error=deprecated-declarations
QMAKE_CXXFLAGS += -Wno-error=deprecated-declarations
-
++
+# Make g++ more permissive
+QMAKE_CXXFLAGS += -fpermissive
-
- # Create a debug GUI build by adding "CONFIG+=memdebug" to your qmake command
- memdebug {
++
+ lessThan(QT_MAJOR_VERSION,5)|lessThan(QT_MINOR_VERSION,9) {
+ QMAKE_CFLAGS += -Wno-error=strict-aliasing
+ QMAKE_CXXFLAGS += -Wno-error=strict-aliasing