Date: Saturday, December 19, 2020 @ 11:24:24
Author: arojas
Revision: 779955
archrelease: copy trunk to community-x86_64
Added:
psensor/repos/community-x86_64/PKGBUILD
(from rev 779954, psensor/trunk/PKGBUILD)
Deleted:
psensor/repos/community-x86_64/PKGBUILD
psensor/repos/community-x86_64/is_error.patch
----------------+
PKGBUILD | 72 +++++++++++++++++++++++++------------------------------
is_error.patch | 26 -------------------
2 files changed, 34 insertions(+), 64 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-12-19 11:24:14 UTC (rev 779954)
+++ PKGBUILD 2020-12-19 11:24:24 UTC (rev 779955)
@@ -1,38 +0,0 @@
-# Maintainer: Robin Broda <ro...@broda.me>
-# Contributor: X0rg
-# Contributor: marlock <marloc...@hotmail.com>
-# Contributor: Diogo Leal <estra...@diogoleal.com>
-
-pkgname=psensor
-pkgver=1.2.0
-pkgrel=7
-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')
-sha512sums=('274928190a53f3603f7db4ea81057497bfa01b9d0f8b4eb2f5f5094fd944ee384aff8f9c21b9c85ea001cbe877e7dc020963c0570f000ef42b302cb54b038e4d'
-
'fa1f0a8cdbd75fba2ad980a5beb1807e533ef12154db1f0cc97c9130080584cb0251e29a56068b0400f152e540f326a7b16749bf11b1e844d1d519d7bb0e71ed')
-
-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 779954,
psensor/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-12-19 11:24:24 UTC (rev 779955)
@@ -0,0 +1,34 @@
+# Maintainer: Robin Broda <ro...@broda.me>
+# Contributor: X0rg
+# Contributor: marlock <marloc...@hotmail.com>
+# Contributor: Diogo Leal <estra...@diogoleal.com>
+
+pkgname=psensor
+pkgver=1.2.1
+pkgrel=1
+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";)
+sha512sums=('931b8ab654cd708d128e0a659e94049fa69dd33dc354b17ef08e05b8da65588f5c5c1c2a4a42f7341a7990f999152c9aebf3c58484eea38e476034d60ac2ff41')
+
+prepare() {
+ find $pkgname-$pkgver -name Makefile* | xargs sed -e 's|-Werror||g' -i #
Kill -Werror
+}
+
+build() {
+ cd "${pkgname}-${pkgver}"
+
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd "${pkgname}-${pkgver}"
+
+ make DESTDIR="${pkgdir}/" install
+}
Deleted: is_error.patch
===================================================================
--- is_error.patch 2020-12-19 11:24:14 UTC (rev 779954)
+++ is_error.patch 2020-12-19 11:24:24 UTC (rev 779955)
@@ -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;
-
