pool/sensors
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1194254 from Base:System

Browse Source 
Drop lm_sensors-revert-6b5a19b708.patch because the previously incompatible types have been changed in the callee in package rrdtool instead.

OBS-URL: https://build.opensuse.org/request/show/1194254
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sensors?expand=0&rev=113
This commit is contained in:
Dominique Leuenberger 2024-08-17 10:40:49 +00:00 committed by Git OBS Bridge
commit a38f9f853b
3 changed files with 9 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
lm_sensors-revert-6b5a19b708.patch
View File

@ -1,35 +0,0 @@
From: Martin Jambor <mjambor@suse.cz>
Date: Mon, 25 Dec 2023 18:45:35 +0100
Subject: Revert: [PATCH] rrd: drop useless cast
Revert upstream 6b5a19b70867941b3841eb879ebd33e491a67c25
The revert may look useless but prevents buildgint the package with
GCC 14.
---
prog/sensord/rrd.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/prog/sensord/rrd.c b/prog/sensord/rrd.c
index a531362bd..263d89fdb 100644
--- b/prog/sensord/rrd.c
+++ a/prog/sensord/rrd.c
@@ -299,7 +299,7 @@
argv[argc++] = rraBuff;
argv[argc] = NULL;
- ret = rrd_create(argc, argv);
+ ret = rrd_create(argc, (char**) argv);
if (ret == -1) {
sensorLog(LOG_ERR, "Error creating RRD file: %s: %s",
sensord_args.rrdFile, rrd_get_error());
@@ -455,7 +455,7 @@
const char *argv[] = {
"sensord", sensord_args.rrdFile, rrdBuff, NULL
};
- if ((ret = rrd_update(3, /* WEAK */ argv))) {
+ if ((ret = rrd_update(3, (char **) /* WEAK */ argv))) {
sensorLog(LOG_ERR, "Error updating RRD file: %s: %s",
sensord_args.rrdFile, rrd_get_error());
}

9
sensors.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Mon Aug 12 15:38:13 UTC 2024 - Martin Jambor <mjambor@suse.com>
- Drop lm_sensors-revert-6b5a19b708.patch because the previously
incompatible types have been changed in the callee in package
rrdtool too, which means that there is a type incompatibility again.
Because the other change reportedly makes more sense, I'm dropping
this one.
-------------------------------------------------------------------
Mon Jul 22 15:07:44 UTC 2024 - Martin Jambor <mjambor@suse.com>

1
sensors.spec
View File

@ -39,7 +39,6 @@ Patch2: lm_sensors-3.0.0-sensord-separate.patch
Patch3: lm_sensors-3.0.0-sysconfig_metadata.patch
Patch4: lm_sensors-3.0.3-hint-at-kernel-extra-package.patch
Patch8: lm_sensors-3.5.0-libsensors-fix-soname.patch
Patch9: lm_sensors-revert-6b5a19b708.patch
BuildRequires: bison
BuildRequires: flex
BuildRequires: perl-Test-Cmd