git: 7901ed9a4ae4 - main - sysutils/upower: update to 0.99.12

[Adriaan de Groot]

The branch main has been updated by adridg:

URL: https://cgit.FreeBSD.org/ports/commit/?id=7901ed9a4ae43961ca01b7b8643a3b42b6d9aa28

commit 7901ed9a4ae43961ca01b7b8643a3b42b6d9aa28
Author:     Olivier Duchateau <duchateau.olivier at gmail.com>
AuthorDate: 2021-06-28 20:59:03 +0000
Commit:     Adriaan de Groot <adridg at FreeBSD.org>
CommitDate: 2021-06-28 21:41:39 +0000

    sysutils/upower: update to 0.99.12
    
    The patch added here has been submitted upstream (by gregV)
    but isn't accepted there yet.
    
    PR:             256735
---
 sysutils/upower/Makefile                                   |  5 ++---
 sysutils/upower/distinfo                                   |  6 +++---
 sysutils/upower/files/patch-src_freebsd_up-device-supply.c | 12 ++++++++++++
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/sysutils/upower/Makefile b/sysutils/upower/Makefile
index 466377d549f7..a7496e26c5ad 100644
--- a/sysutils/upower/Makefile
+++ b/sysutils/upower/Makefile
@@ -1,10 +1,9 @@
 # Created by: Joe Marcus Clarke <marcus at FreeBSD.org>
 
 PORTNAME=	upower
-PORTVERSION=	0.99.11
-PORTREVISION=	1
+PORTVERSION=	0.99.12
 CATEGORIES=	sysutils
-MASTER_SITES=	http://upower.freedesktop.org/releases/
+MASTER_SITES=	https://gitlab.freedesktop.org/upower/upower/uploads/244f5966c58773bbd3b4c507c549560f/
 
 MAINTAINER=	desktop at FreeBSD.org
 COMMENT=	D-Bus daemon for simplifying power management tasks
diff --git a/sysutils/upower/distinfo b/sysutils/upower/distinfo
index 735acc480ed9..9752606b0779 100644
--- a/sysutils/upower/distinfo
+++ b/sysutils/upower/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1574185561
-SHA256 (upower-0.99.11.tar.xz) = 64b5ffbfccd5bdb15d925777979a4dbee1a957f9eaeb158dc76175267eddbdef
-SIZE (upower-0.99.11.tar.xz) = 430128
+TIMESTAMP = 1624209883
+SHA256 (upower-0.99.12.tar.xz) = 201d211e13a4887d97824fabe8119950230446732a8ed61682e89850f4bb135f
+SIZE (upower-0.99.12.tar.xz) = 423640
diff --git a/sysutils/upower/files/patch-src_freebsd_up-device-supply.c b/sysutils/upower/files/patch-src_freebsd_up-device-supply.c
new file mode 100644
index 000000000000..e6984ea5da0f
--- /dev/null
+++ b/sysutils/upower/files/patch-src_freebsd_up-device-supply.c
@@ -0,0 +1,12 @@
+--- src/freebsd/up-device-supply.c.orig	2021-06-17 09:36:39 UTC
++++ src/freebsd/up-device-supply.c
+@@ -273,7 +273,8 @@ up_device_supply_battery_set_properties (UpDevice *dev
+ 		      "energy", cap,
+ 		      "energy-full", lastfull,
+ 		      "energy-full-design", dcap,
+-		      "energy-rate", rate,
++		      "energy-rate",
++              (battinfo.battinfo.state & ACPI_BATT_STAT_CHARGING) ? -rate : rate,
+ 		      "energy-empty", lcap,
+ 		      "voltage", volt,
+ 		      "capacity", capacity,