psensor: update to 1.2.1.
Also: - add changelog - import build fixes from digitalagedragon Closes: #31218 [via git-merge-pr]
This commit is contained in:
parent
bdd8730b20
commit
08bfdac40e
2 changed files with 13 additions and 31 deletions
|
@ -1,26 +0,0 @@
|
||||||
--- src/rsensor.c 2016-12-20 00:39:54.000000000 +0100
|
|
||||||
+++ 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;
|
|
||||||
|
|
|
@ -1,14 +1,22 @@
|
||||||
# Template file for 'psensor'
|
# Template file for 'psensor'
|
||||||
pkgname=psensor
|
pkgname=psensor
|
||||||
version=1.2.0
|
version=1.2.1
|
||||||
revision=2
|
revision=1
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
hostmakedepends="pkg-config help2man glib-devel"
|
hostmakedepends="pkg-config glib-devel"
|
||||||
makedepends="gtk+3-devel udisks2-devel libgtop-devel json-c-devel libsensors-devel libatasmart-devel libcurl-devel libnotify-devel libappindicator-devel libmicrohttpd-devel"
|
makedepends="gtk+3-devel udisks2-devel libgtop-devel json-c-devel
|
||||||
|
libsensors-devel libatasmart-devel libcurl-devel libnotify-devel
|
||||||
|
libappindicator-devel libmicrohttpd-devel"
|
||||||
depends="lm_sensors"
|
depends="lm_sensors"
|
||||||
short_desc="Graphical hardware temperature monitor for Linux"
|
short_desc="Graphical hardware temperature monitor for Linux"
|
||||||
maintainer="Foxlet <foxlet@furcode.co>"
|
maintainer="Foxlet <foxlet@furcode.co>"
|
||||||
license="GPL-2.0-only"
|
license="GPL-2.0-only"
|
||||||
homepage="https://wpitchoune.net/psensor"
|
homepage="https://wpitchoune.net/psensor"
|
||||||
|
changelog="https://gitlab.com/jeanfi/psensor/-/raw/master/NEWS"
|
||||||
distfiles="https://wpitchoune.net/${pkgname}/files/${pkgname}-${version}.tar.gz"
|
distfiles="https://wpitchoune.net/${pkgname}/files/${pkgname}-${version}.tar.gz"
|
||||||
checksum=99708b313be2cf2d997aacfb6ab13288384c8c3f76266825093013bf568babea
|
checksum=084f785d169f533d3010e50c5933436ed427afc70d41740b762f1db5034833ab
|
||||||
|
disable_parallel_build=yes
|
||||||
|
|
||||||
|
if [ -z "$CROSS_BUILD" ]; then
|
||||||
|
hostmakedepends+=" help2man"
|
||||||
|
fi
|
||||||
|
|
Loading…
Reference in a new issue