summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorharre2020-01-28 22:16:08 +0100
committerharre2020-01-28 22:16:08 +0100
commitb7a025a3e213505df7ac35e67ad7f2f5e777c436 (patch)
treeb1f8af6a715fa4f9842eafd4358b97621b5561f5
parent72fa91812136efc1195b942e4b2427127074109b (diff)
downloadaur-b7a025a3e213505df7ac35e67ad7f2f5e777c436.tar.gz
Fix compile and add translation and help files, it still doesn't load language still though :(
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD17
-rw-r--r--permissive.patch3
3 files changed, 17 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9939d57d277..c944c62ba9c 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 = 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
diff --git a/PKGBUILD b/PKGBUILD
index 134949e9f15..5dceaf64ee1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -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 8d806a0defc..c6ab799377b 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