summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGelatinousSlime2018-08-19 12:23:28 -0400
committerGelatinousSlime2018-08-19 12:23:28 -0400
commit86c8fc8a41c349b54c508e2735dbf053333cffcb (patch)
tree43eb6c3fc5827be8b399c7d6c4862610c096068e
parent46a225dd30014a2a9e423cea432cd22587a2e909 (diff)
downloadaur-86c8fc8a41c349b54c508e2735dbf053333cffcb.tar.gz
update to 8e6968fb6dfea4ac1e87097f2253594e032f0c8d
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD14
-rw-r--r--Qt-5.8.patch97
-rw-r--r--moduleupdates.patch12
4 files changed, 4 insertions, 127 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 94692936341..36a89df1981 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 = 3
+ pkgver = 1.1.0.8e6968fb6
+ pkgrel = 1
url = http://sleepyhead.jedimark.net
arch = i686
arch = x86_64
@@ -13,12 +13,8 @@ pkgbase = sleepyhead-git
provides = sleepyhead
conflicts = sleepyhead
source = git+https://gitlab.com/sleepyhead/sleepyhead-code.git
- source = moduleupdates.patch
- source = Qt-5.8.patch
source = sleepyhead.desktop
sha256sums = SKIP
- sha256sums = af1390195fc4a5f2aa0cced24b1ce1a629dbd608a40d10dc319cfcbd959bec02
- sha256sums = b2783268ae56ad7698ce78c4e72b58557da36d2cf24cf7a680e19ef200d2f350
sha256sums = a15100d6bf1e1136d41a36f59613cd20776f0709c74c2e2d1b46f03271e08c3c
pkgname = sleepyhead-git
diff --git a/PKGBUILD b/PKGBUILD
index 8bc21a44ab9..fd22b819092 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
# Contributor: Jason Lenz <Jason@Lenzplace.org>
_pkgname=sleepyhead
pkgname=$_pkgname-git
-pkgver=1.0.0.2.g0e04bd99
-pkgrel=3
+pkgver=1.1.0.8e6968fb6
+pkgrel=1
pkgdesc="Open-source, cross platform, sleep tracking software with a focus on monitoring CPAP treatment."
arch=('i686' 'x86_64')
url="http://sleepyhead.jedimark.net"
@@ -18,21 +18,11 @@ provides=("$_pkgname")
conflicts=('sleepyhead')
source=(
"git+https://gitlab.com/sleepyhead/sleepyhead-code.git"
- 'moduleupdates.patch'
- 'Qt-5.8.patch'
'sleepyhead.desktop'
)
sha256sums=('SKIP'
- 'af1390195fc4a5f2aa0cced24b1ce1a629dbd608a40d10dc319cfcbd959bec02'
- 'b2783268ae56ad7698ce78c4e72b58557da36d2cf24cf7a680e19ef200d2f350'
'a15100d6bf1e1136d41a36f59613cd20776f0709c74c2e2d1b46f03271e08c3c')
-prepare() {
- cd sleepyhead-code
- patch -Np1 -i "$srcdir/moduleupdates.patch"
- patch -Np1 -i "$srcdir/Qt-5.8.patch"
-}
-
pkgver() {
cd sleepyhead-code
_major=$(sed -rn 's/.*major_version = ([0-9]+).*/\1/p' < sleepyhead/version.h)
diff --git a/Qt-5.8.patch b/Qt-5.8.patch
deleted file mode 100644
index 59966df9cff..00000000000
--- a/Qt-5.8.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-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
-
diff --git a/moduleupdates.patch b/moduleupdates.patch
deleted file mode 100644
index 78435431054..00000000000
--- a/moduleupdates.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -aur sleepyhead-code/sleepyhead/sleepyhead.pro sleepyhead-code2/sleepyhead/sleepyhead.pro
---- sleepyhead-code/sleepyhead/sleepyhead.pro 2014-09-27 08:22:20.940889023 -0500
-+++ sleepyhead-code2/sleepyhead/sleepyhead.pro 2014-09-27 08:23:12.687558557 -0500
-@@ -7,7 +7,7 @@
- QT += core gui network xml serialport
-
- greaterThan(QT_MAJOR_VERSION,4) {
-- QT += widgets webkitwidgets
-+ QT += widgets webkitwidgets printsupport
- } else { # qt4
- QT += webkit
- }