diff options
| author | Térence Clastres | 2019-11-04 16:09:29 +0100 |
|---|---|---|
| committer | Térence Clastres | 2019-11-04 16:09:29 +0100 |
| commit | e1bba798ddbc7d93a3685066b56e5b5369dd0d7f (patch) | |
| tree | 3b61b920c4a7ab72679c74fd38206973d96b4e27 | |
| parent | 3eb9f878308d84bddabdb25d5998c2376e907707 (diff) | |
| download | aur-e1bba798ddbc7d93a3685066b56e5b5369dd0d7f.tar.gz | |
Remove merged patch, update to abf3533
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 13 | ||||
| -rw-r--r-- | is_error.patch | 26 |
3 files changed, 4 insertions, 39 deletions
@@ -1,6 +1,6 @@ pkgbase = psensor-git pkgdesc = A graphical hardware temperature monitor for Linux - pkgver = v1.2.0.r70.gd9832db + pkgver = v1.2.0.r72.gabf3533 pkgrel = 1 url = https://gitlab.com/jeanfi/psensor arch = x86_64 @@ -18,9 +18,7 @@ pkgbase = psensor-git depends = libmicrohttpd conflicts = psensor source = psensor-git::git+https://gitlab.com/jeanfi/psensor.git - source = is_error.patch sha512sums = SKIP - sha512sums = fa1f0a8cdbd75fba2ad980a5beb1807e533ef12154db1f0cc97c9130080584cb0251e29a56068b0400f152e540f326a7b16749bf11b1e844d1d519d7bb0e71ed pkgname = psensor-git @@ -5,7 +5,7 @@ # Contributor: Diogo Leal <estranho@diogoleal.com> pkgname=psensor-git -pkgver=v1.2.0.r70.gd9832db +pkgver=v1.2.0.r72.gabf3533 pkgrel=1 pkgdesc='A graphical hardware temperature monitor for Linux' arch=('x86_64') @@ -15,10 +15,8 @@ depends=('lm_sensors' 'dconf' 'gtk3' 'udisks2' 'curl' 'libgtop' 'libnotify' 'libxnvctrl' 'json-c' 'libmicrohttpd') makedepends=('help2man') conflicts=("${pkgname%-git}") -source=("${pkgname}::git+${url}.git" - 'is_error.patch') -sha512sums=('SKIP' - 'fa1f0a8cdbd75fba2ad980a5beb1807e533ef12154db1f0cc97c9130080584cb0251e29a56068b0400f152e540f326a7b16749bf11b1e844d1d519d7bb0e71ed') +source=("${pkgname}::git+${url}.git") +sha512sums=('SKIP') pkgver() { @@ -26,11 +24,6 @@ pkgver() { git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g' } -prepare() { - cd "$pkgname" - - patch -Np1 -i "${srcdir}/is_error.patch" -} build() { cd "$pkgname" diff --git a/is_error.patch b/is_error.patch deleted file mode 100644 index 60aaa2d076eb..000000000000 --- a/is_error.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- 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; - |