diff options
-rw-r--r-- | .SRCINFO | 3 | ||||
-rw-r--r-- | PKGBUILD | 17 | ||||
-rw-r--r-- | permissive.patch | 3 |
3 files changed, 17 insertions, 6 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 = 1.1.r3041.3be691f2 + pkgver = ..r3113.94e39c27 pkgrel = 1 url = https://gitlab.com/pholy/OSCAR-code arch = i686 @@ -8,6 +8,7 @@ pkgbase = oscar-git license = GPL makedepends = git makedepends = glu + depends = qt5-tools depends = qt5-serialport provides = oscar source = git+https://gitlab.com/pholy/OSCAR-code.git @@ -3,13 +3,14 @@ # Contributor: Jason Lenz <Jason@Lenzplace.org> _pkgname=oscar pkgname=oscar-git -pkgver=1.1.r3041.3be691f2 +pkgver=..r3113.94e39c27 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') url="https://gitlab.com/pholy/OSCAR-code" license=('GPL') depends=( + 'qt5-tools' 'qt5-serialport' ) makedepends=( @@ -43,8 +44,18 @@ package() { install -D $srcdir/OSCAR-code/oscar/OSCAR $pkgdir/usr/bin/oscar install -Dm644 $srcdir/OSCAR-code/oscar/icons/logo-lg.png $pkgdir/usr/share/oscar/icon.png install -Dm644 $srcdir/oscar.desktop $pkgdir/usr/share/applications/oscar.desktop -# Where to put translations? -# install -dDm644 $srcdir/OSCAR-code/Translations $pkgdir/Translations + +cp -dpr --no-preserve=ownership $srcdir/OSCAR-code/oscar/Html $pkgdir/usr/share/oscar +cp -dpr --no-preserve=ownership $srcdir/OSCAR-code/oscar/Translations $pkgdir/usr/share/oscar + +# find $srcdir/OSCAR-code/oscar/Html -type d -exec install -d {,$pkgdir/usr/share/oscar/Html/}{} \; +# find $srcdir/OSCAR-code/oscar/Html -type f -exec install -D -m 644 {,$pkgdir/usr/share/oscar/Html/}{} \; + +# find $srcdir/OSCAR-code/oscar/Help -type d -exec install -d {,$pkgdir/usr/share/oscar/Help/}{} \; +# find $srcdir/OSCAR-code/oscar/Help -type f -exec install -D -m 644 {,$pkgdir/usr/share/oscar/Help/}{} \; +# +# find $srcdir/OSCAR-code/oscar/Translations -type d -exec install -d {,$pkgdir/usr/share/oscar/Translations/}{} \; +# find $srcdir/OSCAR-code/oscar/Translations -type f -exec install -D -m 644 {,$pkgdir/usr/share/oscar/Translations/}{} \; } # vim:set ts=2 sw=2 et: diff --git a/permissive.patch b/permissive.patch index 8d806a0defcb..c6ab799377b2 100644 --- a/permissive.patch +++ b/permissive.patch @@ -2,12 +2,11 @@ diff --git a/oscar/oscar.pro b/oscar/oscar.pro index cd228b00..18199837 100644 --- a/oscar/oscar.pro +++ b/oscar/oscar.pro -@@ -471,6 +471,9 @@ QMAKE_CXXFLAGS += -Werror +@@ -471,6 +471,8 @@ QMAKE_CXXFLAGS += -Werror QMAKE_CFLAGS += -Wno-error=deprecated-declarations QMAKE_CXXFLAGS += -Wno-error=deprecated-declarations +# Make g++ more permissive -+QMAKE_CFLAGS += -fpermissive +QMAKE_CXXFLAGS += -fpermissive # Create a debug GUI build by adding "CONFIG+=memdebug" to your qmake command |