Modify permissive patch to work for updated file

3 files changed, 10 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c944c62ba9c8..61837de97890 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 5dceaf64ee11..3e107c8ff865 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 c6ab799377b2..61ea5c889025 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