1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-03 06:04:53 +00:00

sysutils/upower: update to 1.90.1

- Remove unneeded patch

While here also regenerate patches to silence portlint warning.

PR:		272389
This commit is contained in:
Olivier Duchateau 2023-07-06 10:13:39 +02:00 committed by Guido Falsi
parent a666fe7b2c
commit 97de0fdbc3
6 changed files with 12 additions and 40 deletions

View File

@ -1,5 +1,5 @@
PORTNAME= upower
DISTVERSION= 1.90.0
DISTVERSION= 1.90.1
CATEGORIES= sysutils
MAINTAINER= desktop@FreeBSD.org
@ -14,7 +14,7 @@ LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib
USES= compiler:c11 gettext gnome localbase meson pkgconfig
USE_GITLAB= yes
GL_SITE= https://gitlab.freedesktop.org/
GL_COMMIT= d4259c009b3ca1169dfd19231a040c233fc3b58d
GL_COMMIT= 96c34a3bb9167a204afc7b9d00086325169a7586
USE_GNOME= glib20 introspection:build
USE_LDCONFIG= yes
MESON_ARGS= -Dgtk-doc=false \

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1665859956
SHA256 (upower-upower-d4259c009b3ca1169dfd19231a040c233fc3b58d_GL0.tar.gz) = 896302382e01322d9a87c7f4cc4b51092aca428090469db1c143853fd9cd9b84
SIZE (upower-upower-d4259c009b3ca1169dfd19231a040c233fc3b58d_GL0.tar.gz) = 170265
TIMESTAMP = 1688576882
SHA256 (upower-upower-96c34a3bb9167a204afc7b9d00086325169a7586_GL0.tar.gz) = d62155c0df1c136c8f637c5e7b9b6f9b4f6c1ce7797f1f4db10715b41e23256f
SIZE (upower-upower-96c34a3bb9167a204afc7b9d00086325169a7586_GL0.tar.gz) = 180133

View File

@ -1,6 +1,6 @@
--- meson.build.orig 2022-03-09 17:46:34 UTC
--- meson.build.orig 2023-07-04 13:51:22 UTC
+++ meson.build
@@ -105,7 +105,7 @@ subdir('etc')
@@ -111,7 +111,7 @@ subdir('etc')
config_h = configure_file(output: 'config.h', configuration: cdata)
subdir('etc')

View File

@ -1,6 +1,6 @@
--- src/freebsd/up-devd.c.orig 2013-09-15 13:08:35.000000000 -0400
+++ src/freebsd/up-devd.c 2013-09-15 13:10:13.000000000 -0400
@@ -195,7 +195,7 @@ up_devd_event_cb (GIOChannel *source, GI
--- src/freebsd/up-devd.c.orig 2023-07-04 13:51:22 UTC
+++ src/freebsd/up-devd.c
@@ -195,7 +195,7 @@ up_devd_event_cb (GIOChannel *source, GIOCondition con
event[terminator] = 0;
up_devd_process_event(event, user_data);
g_free(event);

View File

@ -1,6 +1,6 @@
--- src/freebsd/up-device-supply.c.orig 2021-06-17 09:36:39 UTC
--- src/freebsd/up-device-supply.c.orig 2023-07-04 13:51:22 UTC
+++ src/freebsd/up-device-supply.c
@@ -273,7 +273,8 @@ up_device_supply_battery_set_properties (UpDevice *dev
@@ -250,7 +250,8 @@ up_device_supply_battery_set_properties (UpDevice *dev
"energy", cap,
"energy-full", lastfull,
"energy-full-design", dcap,

View File

@ -1,28 +0,0 @@
--- src/up-device-battery.c.orig 2022-07-21 09:06:49 UTC
+++ src/up-device-battery.c
@@ -19,6 +19,7 @@
*/
#include <string.h>
+#include <math.h>
#include "up-constants.h"
#include "up-config.h"
@@ -125,7 +126,7 @@ up_device_battery_estimate_power (UpDeviceBattery *sel
continue;
/* Stop searching if the new reference is further away from the long timeout. */
- if (abs(UP_DAEMON_LONG_TIMEOUT * G_USEC_PER_SEC - abs (td)) > abs(UP_DAEMON_SHORT_TIMEOUT * G_USEC_PER_SEC - ref_td))
+ if (labs(UP_DAEMON_LONG_TIMEOUT * G_USEC_PER_SEC - labs (td)) > labs(UP_DAEMON_SHORT_TIMEOUT * G_USEC_PER_SEC - ref_td))
break;
ref_td = td;
@@ -155,7 +156,7 @@ up_device_battery_estimate_power (UpDeviceBattery *sel
*/
if (cur->state == UP_DEVICE_STATE_UNKNOWN) {
/* Consider a rate of 0.5W as "no change", otherwise set CHARGING/DISCHARGING */
- if (abs(energy_rate) < 0.5)
+ if (fabs(energy_rate) < 0.5)
return;
else if (energy_rate < 0.0)
cur->state = UP_DEVICE_STATE_DISCHARGING;