diff options
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | PKGBUILD | 13 | ||||
| -rw-r--r-- | is_error.patch | 26 |
4 files changed, 41 insertions, 6 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Sun Feb 5 09:07:14 UTC 2017 +# Fri Jan 5 18:37:28 UTC 2018 pkgbase = psensor pkgdesc = A graphical hardware temperature monitor for Linux pkgver = 1.2.0 - pkgrel = 1 + pkgrel = 2 url = http://wpitchoune.net/psensor arch = i686 arch = x86_64 @@ -22,7 +22,9 @@ pkgbase = psensor optdepends = libgtop: required for CPU usage options = !makeflags source = http://wpitchoune.net/psensor/files/psensor-1.2.0.tar.gz + source = is_error.patch md5sums = 0d8ac0a1312e96f2101ecc7c684e2863 + md5sums = 04c45b3527e6cc4012fe60491751a0ac pkgname = psensor diff --git a/.gitignore b/.gitignore index e17873ce1470..d643161be327 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,4 @@ !.gitignore !.SRCINFO !PKGBUILD -!libappindicator2.patch +!is_error.patch @@ -4,7 +4,7 @@ pkgname=psensor pkgver=1.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="A graphical hardware temperature monitor for Linux" arch=('i686' 'x86_64') url="http://wpitchoune.net/psensor" @@ -18,10 +18,17 @@ optdepends=('asciidoc: required to produce the HTML version of the FAQ' 'json-c: required for remote monitoring' 'curl: required for remote monitoring' 'libgtop: required for CPU usage') -source=("http://wpitchoune.net/$pkgname/files/$pkgname-$pkgver.tar.gz") -md5sums=('0d8ac0a1312e96f2101ecc7c684e2863') +source=("http://wpitchoune.net/$pkgname/files/$pkgname-$pkgver.tar.gz" + "is_error.patch") +md5sums=('0d8ac0a1312e96f2101ecc7c684e2863' + '04c45b3527e6cc4012fe60491751a0ac') options=('!makeflags') # Parallel build seems broken in some case +prepare() { + cd "$srcdir/$pkgname-$pkgver" + patch -Np1 -i "$srcdir/is_error.patch" +} + build() { cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr diff --git a/is_error.patch b/is_error.patch new file mode 100644 index 000000000000..60aaa2d076eb --- /dev/null +++ b/is_error.patch @@ -0,0 +1,26 @@ +--- a/src/rsensor.c 2016-12-20 00:39:54.000000000 +0100 ++++ b/src/rsensor.c 2018-01-05 19:30:09.089759050 +0100 +@@ -133,7 +133,7 @@ + + obj = get_json_object(url); + +- if (obj && !is_error(obj)) { ++ if (obj && (obj != NULL)) { + n = json_object_array_length(obj); + sensors = malloc((n + 1) * sizeof(struct psensor *)); + +@@ -168,12 +168,12 @@ + + obj = get_json_object(get_url(s)); + +- if (obj && !is_error(obj)) { ++ if (obj && (obj != NULL)) { + json_object *om; + + json_object_object_get_ex(obj, "last_measure", &om); + +- if (!is_error(obj)) { ++ if (obj != NULL) { + json_object *ov, *ot; + struct timeval tv; + |