Date: Thursday, May 3, 2018 @ 19:29:10
Author: bgyorgy
Revision: 318886
archrelease: copy trunk to community-x86_64
Added:
psensor/repos/community-x86_64/PKGBUILD
(from rev 318885, psensor/trunk/PKGBUILD)
psensor/repos/community-x86_64/is_error.patch
(from rev 318885, psensor/trunk/is_error.patch)
Deleted:
psensor/repos/community-x86_64/PKGBUILD
psensor/repos/community-x86_64/is_error.patch
----------------+
PKGBUILD | 76 +++++++++++++++++++++++++++----------------------------
is_error.patch | 52 ++++++++++++++++++-------------------
2 files changed, 64 insertions(+), 64 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-05-03 19:29:04 UTC (rev 318885)
+++ PKGBUILD 2018-05-03 19:29:10 UTC (rev 318886)
@@ -1,38 +0,0 @@
-# Maintainer: Robin Broda <[email protected]>
-# Contributor: X0rg
-# Contributor: marlock <[email protected]>
-# Contributor: Diogo Leal <[email protected]>
-
-pkgname=psensor
-pkgver=1.2.0
-pkgrel=3
-pkgdesc='A graphical hardware temperature monitor for Linux'
-arch=('x86_64')
-url='https://wpitchoune.net/psensor'
-license=('GPL2')
-depends=('lm_sensors' 'dconf' 'gtk3' 'udisks2' 'curl' 'libgtop' 'libnotify'
- 'libappindicator3' 'libxnvctrl' 'json-c' 'libmicrohttpd')
-makedepends=('help2man')
-source=("https://wpitchoune.net/${pkgname}/files/${pkgname}-${pkgver}.tar.gz";
- 'is_error.patch')
-md5sums=('0d8ac0a1312e96f2101ecc7c684e2863'
- '04c45b3527e6cc4012fe60491751a0ac')
-
-prepare() {
- cd "${pkgname}-${pkgver}"
-
- patch -Np1 -i "${srcdir}/is_error.patch"
-}
-
-build() {
- cd "${pkgname}-${pkgver}"
-
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd "${pkgname}-${pkgver}"
-
- make DESTDIR="${pkgdir}/" install
-}
Copied: psensor/repos/community-x86_64/PKGBUILD (from rev 318885,
psensor/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-05-03 19:29:10 UTC (rev 318886)
@@ -0,0 +1,38 @@
+# Maintainer: Robin Broda <[email protected]>
+# Contributor: X0rg
+# Contributor: marlock <[email protected]>
+# Contributor: Diogo Leal <[email protected]>
+
+pkgname=psensor
+pkgver=1.2.0
+pkgrel=4
+pkgdesc='A graphical hardware temperature monitor for Linux'
+arch=('x86_64')
+url='https://wpitchoune.net/psensor'
+license=('GPL2')
+depends=('lm_sensors' 'dconf' 'gtk3' 'udisks2' 'curl' 'libgtop' 'libnotify'
+ 'libxnvctrl' 'json-c' 'libmicrohttpd')
+makedepends=('help2man')
+source=("https://wpitchoune.net/${pkgname}/files/${pkgname}-${pkgver}.tar.gz";
+ 'is_error.patch')
+md5sums=('0d8ac0a1312e96f2101ecc7c684e2863'
+ '04c45b3527e6cc4012fe60491751a0ac')
+
+prepare() {
+ cd "${pkgname}-${pkgver}"
+
+ patch -Np1 -i "${srcdir}/is_error.patch"
+}
+
+build() {
+ cd "${pkgname}-${pkgver}"
+
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd "${pkgname}-${pkgver}"
+
+ make DESTDIR="${pkgdir}/" install
+}
Deleted: is_error.patch
===================================================================
--- is_error.patch 2018-05-03 19:29:04 UTC (rev 318885)
+++ is_error.patch 2018-05-03 19:29:10 UTC (rev 318886)
@@ -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;
-
Copied: psensor/repos/community-x86_64/is_error.patch (from rev 318885,
psensor/trunk/is_error.patch)
===================================================================
--- is_error.patch (rev 0)
+++ is_error.patch 2018-05-03 19:29:10 UTC (rev 318886)
@@ -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;
+
