summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Lewis2017-04-15 15:56:02 -0400
committerKevin Lewis2017-04-15 16:00:10 -0400
commit3858ecae4c0460d5e322bed35462b70c2b2d05c2 (patch)
treecc6a2c89e741f3d89f8076bcd027f83b09215a4b
parentf84a9435fc53597657bd7fe79193433ddc135c72 (diff)
downloadaur-3858ecae4c0460d5e322bed35462b70c2b2d05c2.tar.gz
Patch to fix compiler errors due to a new ambiguous function signature added in Qt 5.8.
-rw-r--r--.SRCINFO5
-rw-r--r--.gitignore1
-rw-r--r--PKGBUILD11
-rw-r--r--Qt-5.8.patch97
4 files changed, 109 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e4388207b15..a7350ca1068 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = sleepyhead-git
pkgdesc = Open-source, cross platform, sleep tracking software with a focus on monitoring CPAP treatment.
pkgver = 1.0.0.2.g0e04bd99
- pkgrel = 1
+ pkgrel = 2
url = http://sleepyhead.jedimark.net
arch = i686
arch = x86_64
@@ -11,11 +11,14 @@ pkgbase = sleepyhead-git
depends = qt5-serialport
depends = qt5-webkit
depends = glu
+ provides = sleepyhead
conflicts = sleepyhead
source = git+https://gitlab.com/sleepyhead/sleepyhead-code.git
source = moduleupdates.patch
+ source = Qt-5.8.patch
sha256sums = SKIP
sha256sums = af1390195fc4a5f2aa0cced24b1ce1a629dbd608a40d10dc319cfcbd959bec02
+ sha256sums = b2783268ae56ad7698ce78c4e72b58557da36d2cf24cf7a680e19ef200d2f350
pkgname = sleepyhead-git
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000000..72e8ffc0db8
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+*
diff --git a/PKGBUILD b/PKGBUILD
index 09f627d9068..dcec535e8a2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,9 @@
-# Maintainer: Jason Lenz <Jason@Lenzplace.org>
+# Maintainer: Kevin Lewis <aur AT kevin DOT oakaged DOT io>
+# Contributor: Jason Lenz <Jason@Lenzplace.org>
_pkgname=sleepyhead
pkgname=$_pkgname-git
pkgver=1.0.0.2.g0e04bd99
-pkgrel=1
+pkgrel=2
pkgdesc="Open-source, cross platform, sleep tracking software with a focus on monitoring CPAP treatment."
arch=('i686' 'x86_64')
url="http://sleepyhead.jedimark.net"
@@ -11,23 +12,25 @@ depends=(
'qt5-base'
'qt5-serialport'
'qt5-webkit'
- 'glu'
)
makedepends=('git')
-provides=()
+provides=("$_pkgname")
conflicts=('sleepyhead')
source=(
"git+https://gitlab.com/sleepyhead/sleepyhead-code.git"
'moduleupdates.patch'
+ 'Qt-5.8.patch'
)
sha256sums=(
'SKIP'
af1390195fc4a5f2aa0cced24b1ce1a629dbd608a40d10dc319cfcbd959bec02 #moduleupdates.patch
+ b2783268ae56ad7698ce78c4e72b58557da36d2cf24cf7a680e19ef200d2f350 #Qt-5.8.patch
)
prepare() {
cd sleepyhead-code
patch -Np1 -i "$srcdir/moduleupdates.patch"
+ patch -Np1 -i "$srcdir/Qt-5.8.patch"
}
pkgver() {
diff --git a/Qt-5.8.patch b/Qt-5.8.patch
new file mode 100644
index 00000000000..59966df9cff
--- /dev/null
+++ b/Qt-5.8.patch
@@ -0,0 +1,97 @@
+diff --git a/sleepyhead/updateparser.cpp b/sleepyhead/updateparser.cpp
+index 4b002948..42fad337 100644
+--- a/sleepyhead/updateparser.cpp
++++ b/sleepyhead/updateparser.cpp
+@@ -250,7 +250,7 @@ void UpdatesParser::readUpdates()
+ Q_ASSERT(xml.isStartElement() && xml.name() == "Updates");
+
+ while (xml.readNextStartElement()) {
+- if (xml.name().compare("PackageUpdate",Qt::CaseInsensitive)==0) {
++ if (xml.name().compare(QLatin1String("PackageUpdate"),Qt::CaseInsensitive)==0) {
+ readPackageUpdate();
+ } else {
+ qDebug() << "Skipping Updates.xml tag" << xml.name();
+@@ -262,52 +262,52 @@ void UpdatesParser::readUpdates()
+
+ void UpdatesParser::readPackageUpdate()
+ {
+- Q_ASSERT(xml.isStartElement() && (xml.name().compare("PackageUpdate",Qt::CaseInsensitive)==0));
++ Q_ASSERT(xml.isStartElement() && (xml.name().compare(QLatin1String("PackageUpdate"),Qt::CaseInsensitive)==0));
+ package = PackageUpdate();
+
+ while (xml.readNextStartElement()) {
+- if (xml.name().compare("Name",Qt::CaseInsensitive)==0) {
++ if (xml.name().compare(QLatin1String("Name"),Qt::CaseInsensitive)==0) {
+ package.name = xml.readElementText().toLower();
+- } else if (xml.name().compare("DisplayName",Qt::CaseInsensitive)==0) {
++ } else if (xml.name().compare(QLatin1String("DisplayName"),Qt::CaseInsensitive)==0) {
+ package.displayName = xml.readElementText();
+- } else if (xml.name().compare("Description",Qt::CaseInsensitive)==0) {
++ } else if (xml.name().compare(QLatin1String("Description"),Qt::CaseInsensitive)==0) {
+ package.description = xml.readElementText();
+- } else if (xml.name().compare("Version",Qt::CaseInsensitive)==0) {
++ } else if (xml.name().compare(QLatin1String("Version"),Qt::CaseInsensitive)==0) {
+ package.versionString = xml.readElementText();
+- } else if (xml.name().compare("ReleaseDate",Qt::CaseInsensitive)==0) {
++ } else if (xml.name().compare(QLatin1String("ReleaseDate"),Qt::CaseInsensitive)==0) {
+ package.releaseDate = QDate().fromString(xml.readElementText(), "yyyy-MM-dd");
+- } else if (xml.name().compare("Default",Qt::CaseInsensitive)==0) {
++ } else if (xml.name().compare(QLatin1String("Default"),Qt::CaseInsensitive)==0) {
+ package.defaultInstall = xml.readElementText().compare("true") == 0;
+- } else if (xml.name().compare("ForcedInstallation",Qt::CaseInsensitive)==0) {
++ } else if (xml.name().compare(QLatin1String("ForcedInstallation"),Qt::CaseInsensitive)==0) {
+ package.forcedInstall = xml.readElementText().compare("true") == 0;
+- } else if (xml.name().compare("Script",Qt::CaseInsensitive)==0) {
++ } else if (xml.name().compare(QLatin1String("Script"),Qt::CaseInsensitive)==0) {
+ package.script = xml.readElementText();
+- } else if (xml.name().compare("Dependencies",Qt::CaseInsensitive)==0) {
++ } else if (xml.name().compare(QLatin1String("Dependencies"),Qt::CaseInsensitive)==0) {
+ package.dependencies = xml.readElementText().split(",");
+- } else if (xml.name().compare("UpdateFile",Qt::CaseInsensitive)==0) {
++ } else if (xml.name().compare(QLatin1String("UpdateFile"),Qt::CaseInsensitive)==0) {
+ for (int i=0; i<xml.attributes().size(); ++i) {
+ const QXmlStreamAttribute & at = xml.attributes().at(i);
+- if (at.name().compare("CompressedSize", Qt::CaseInsensitive)==0) {
++ if (at.name().compare(QLatin1String("CompressedSize"), Qt::CaseInsensitive)==0) {
+ package.compressedSize = at.value().toLong();
+- } else if (at.name().compare("UncompressedSize",Qt::CaseInsensitive)==0) {
++ } else if (at.name().compare(QLatin1String("UncompressedSize"),Qt::CaseInsensitive)==0) {
+ package.uncompressedSize = at.value().toLong();
+- } else if (at.name().compare("OS",Qt::CaseInsensitive)==0) {
++ } else if (at.name().compare(QLatin1String("OS"),Qt::CaseInsensitive)==0) {
+ package.os = at.value().toString();
+ }
+ }
+ xml.skipCurrentElement();
+- } else if (xml.name().compare("DownloadableArchives")==0) {
++ } else if (xml.name().compare(QLatin1String("DownloadableArchives"))==0) {
+ package.downloadArchives = xml.readElementText().split(",");
+- } else if (xml.name().compare("Licenses",Qt::CaseInsensitive)==0) {
++ } else if (xml.name().compare(QLatin1String("Licenses"),Qt::CaseInsensitive)==0) {
+ while (xml.readNextStartElement()) {
+- if (xml.name().compare("License",Qt::CaseInsensitive)==0) {
++ if (xml.name().compare(QLatin1String("License"),Qt::CaseInsensitive)==0) {
+ QString name;
+ QString file;
+ for (int i=0; i<xml.attributes().size(); ++i) {
+ const QXmlStreamAttribute & at = xml.attributes().at(i);
+- if (at.name().compare("name", Qt::CaseInsensitive)==0) {
++ if (at.name().compare(QLatin1String("name"), Qt::CaseInsensitive)==0) {
+ name = at.value().toString();
+- } else if (at.name().compare("file",Qt::CaseInsensitive)==0) {
++ } else if (at.name().compare(QLatin1String("file"),Qt::CaseInsensitive)==0) {
+ file = at.value().toString();
+ }
+ }
+@@ -319,7 +319,7 @@ void UpdatesParser::readPackageUpdate()
+ xml.skipCurrentElement();
+ }
+ }
+- } else if (xml.name().compare("SHA1",Qt::CaseInsensitive)==0) {
++ } else if (xml.name().compare(QLatin1String("SHA1"),Qt::CaseInsensitive)==0) {
+ package.sha1 = xml.readElementText();
+ } else {
+ qDebug() << "UP Skipping Updates.xml tag" << xml.name();
+--
+2.12.2
+