summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Phillips2018-05-02 17:27:33 +1200
committerDavid Phillips2018-05-02 17:28:40 +1200
commitc12f02852e7acf9caccec4bd22dc1e909bf95093 (patch)
tree136647af34122a89501cffe4c01041baaa2de376
parent7c6ccd0c4dd483d5906f226bc7538470d26e57a0 (diff)
downloadaur-c12f02852e7acf9caccec4bd22dc1e909bf95093.tar.gz
Add patch to cover upstream bug with newer toolchain
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD13
-rw-r--r--return-false.diff11
3 files changed, 26 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1e9a5a656d1f..f7696d4f2b58 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,18 @@
+# Generated by mksrcinfo v8
+# Wed May 2 05:25:39 UTC 2018
pkgbase = qbrew
pkgdesc = Homebrewer's beer recipe calculator
pkgver = 0.4.1
- pkgrel = 5
+ pkgrel = 6
url = http://www.usermode.org/code.html
arch = i686
arch = x86_64
license = BSD
depends = qt4
source = http://www.usermode.org/code/qbrew-0.4.1.tar.gz
+ source = return-false.diff
sha512sums = 9910c9070129b14bb4bd0f2d0356e07f53bbc2d1750e9eece8cbb668ee9eb8bd534fd0641f0cf8be4194f5f470b8b7d193d413c59aa0b69cc6d87d6453f247a4
+ sha512sums = f062ea0d3ab7fd01617549a8d4121d95e3689190aaf50cf74a664f7b87d09106704f8167ca6faad6cae501f5470746549ef1317ee86eb4c33c2faf09c4159cdb
pkgname = qbrew
diff --git a/PKGBUILD b/PKGBUILD
index e8841ddbdffa..ff8f2e14f9e3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,14 +4,21 @@
_qt=qt4
pkgname=qbrew
pkgver=0.4.1
-pkgrel=5
+pkgrel=6
pkgdesc="Homebrewer's beer recipe calculator"
arch=('i686' 'x86_64')
url="http://www.usermode.org/code.html"
license=('BSD')
depends=(${_qt})
-source=("http://www.usermode.org/code/${pkgname}-${pkgver}.tar.gz")
-sha512sums=('9910c9070129b14bb4bd0f2d0356e07f53bbc2d1750e9eece8cbb668ee9eb8bd534fd0641f0cf8be4194f5f470b8b7d193d413c59aa0b69cc6d87d6453f247a4')
+source=("http://www.usermode.org/code/${pkgname}-${pkgver}.tar.gz"
+ 'return-false.diff')
+sha512sums=('9910c9070129b14bb4bd0f2d0356e07f53bbc2d1750e9eece8cbb668ee9eb8bd534fd0641f0cf8be4194f5f470b8b7d193d413c59aa0b69cc6d87d6453f247a4'
+ 'f062ea0d3ab7fd01617549a8d4121d95e3689190aaf50cf74a664f7b87d09106704f8167ca6faad6cae501f5470746549ef1317ee86eb4c33c2faf09c4159cdb')
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -Np1 -i "${srcdir}/return-false.diff"
+}
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/return-false.diff b/return-false.diff
new file mode 100644
index 000000000000..f3fff861047c
--- /dev/null
+++ b/return-false.diff
@@ -0,0 +1,11 @@
+--- a/src/beerxmlreader.cpp 2018-05-02 17:07:05.326205523 +1200
++++ b/src/beerxmlreader.cpp 2018-05-02 17:06:47.596074348 +1200
+@@ -254,7 +254,7 @@
+ }
+ if (hasError()) {
+ raiseError("Problem reading recipe");
+- return false;
++ return NULL;
+ }
+
+ // set grain use according to recipe type