From nobody Thu Jul 6 08:14:34 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QxTpM15XZz4mFLd; Thu, 6 Jul 2023 08:14:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QxTpM0bNQz3G4m; Thu, 6 Jul 2023 08:14:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688631275; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y9DVXUjSfll74gHtBlFCw1HaTlFbzjKOHPdeyXLAgMo=; b=TEfJYUJfaFp7j5uOjluoeWo4sh7GOFShqV0TnShkC9scZig+iAWTKQHQnnRGWEsTdndU1z XS2HfbmC9hxtHykL9iPlmcJE8dwrA2H2dVihm6SogMfAccer94Kcebwoba72PS/AzLElim T1l3YrON6+ijNoC9PFOWHLepiHBscVNEIndatRswrbgyEVUEZc0hxqodPWmqyqtimUhu+s gEijpqbhAGKjW/1YZX+uOUYIrAvrNFLodzYZXQzLe6WVW4LvXMCmcuSvjRO7W4Fgmpv+sI VgxrlYHs/zNEfAn2MgZpZl7DqhTmM69OkBJQQw9fyRMpyLiZkXvDgxe6SHUnTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688631275; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y9DVXUjSfll74gHtBlFCw1HaTlFbzjKOHPdeyXLAgMo=; b=BdNPik5TfZCE03on2vaEyesCzs8b3yChtcGVGnWh0dObyzTwh9qKMOyakiHfSAOK2XFiAH XKCrsClUyA2p+zQPA4YaeibHOt5O7wOnpoOJXYiDvJZn1DaAD8F0EpEtI/khNVn3a53V7Q y2Q7FQCA82T2aDA7aq+xXjxwuQd9YPTuGZvaT0Wd0ksgJfkEcWHN2IjNwetTpPmq0k0gGY ZT0qqKgNchIt1HsHbARHX1CUxav7Lux7K70kWhv3JD2ZEv+Q6txhRhY33/0wpp82hwhJcn YOfbUKVKiD6KR55s7tdQgpsybzA8kVRpBG/URThjh9tqC9i19CUXBtnoNZCatQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688631275; a=rsa-sha256; cv=none; b=SeWGNfO2mR8gKhzX8AvAvZR8q1Bvmt25Kr306ZK+tIoVuPkVnvUHPlLuyLDwZBFhUrmYlW xloF4h4c25TNTi7EU55jRTcG7YFDp2m5t/njT9TXOA/ePUN4vKQHThgHCeF5vHJagMi0j8 SkFXUufi/6XxSE5NLIZAmoUJCBRnbtY/2ATC5q/KTLlSHtyt82NIHZRCvsXDdofbH0fKMz WjA8f0JDsaAlV2JzAv3CCkNig9ie3ISMIlhdPhZRhVdsvgpKwo7hGYo8A45vdp82hRCVVh XC4NnhAX5mO6Y3atqKwLV7zrCYoRr4dMdcyQw27U1w3tTMTE0vrKNl8u7WPgYw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QxTpL6nM9zpxH; Thu, 6 Jul 2023 08:14:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3668EY76072062; Thu, 6 Jul 2023 08:14:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3668EYNG072061; Thu, 6 Jul 2023 08:14:34 GMT (envelope-from git) Date: Thu, 6 Jul 2023 08:14:34 GMT Message-Id: <202307060814.3668EYNG072061@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Guido Falsi Subject: git: 97de0fdbc30d - main - sysutils/upower: update to 1.90.1 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: madpilot X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 97de0fdbc30dd2327263a8d8384f352791dbc997 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=97de0fdbc30dd2327263a8d8384f352791dbc997 commit 97de0fdbc30dd2327263a8d8384f352791dbc997 Author: Olivier Duchateau AuthorDate: 2023-07-06 08:13:39 +0000 Commit: Guido Falsi CommitDate: 2023-07-06 08:13:39 +0000 sysutils/upower: update to 1.90.1 - Remove unneeded patch While here also regenerate patches to silence portlint warning. PR: 272389 --- sysutils/upower/Makefile | 4 ++-- sysutils/upower/distinfo | 6 ++--- sysutils/upower/files/patch-meson.build | 4 ++-- sysutils/upower/files/patch-src_freebsd_up-devd.c | 6 ++--- .../files/patch-src_freebsd_up-device-supply.c | 4 ++-- .../upower/files/patch-src_up-device-battery.c | 28 ---------------------- 6 files changed, 12 insertions(+), 40 deletions(-) diff --git a/sysutils/upower/Makefile b/sysutils/upower/Makefile index 01eb42ac9b76..379e19851366 100644 --- a/sysutils/upower/Makefile +++ b/sysutils/upower/Makefile @@ -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 \ diff --git a/sysutils/upower/distinfo b/sysutils/upower/distinfo index 6435360c5b78..6fb69c91ed42 100644 --- a/sysutils/upower/distinfo +++ b/sysutils/upower/distinfo @@ -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 diff --git a/sysutils/upower/files/patch-meson.build b/sysutils/upower/files/patch-meson.build index e1258e52df16..2d0d0539a2be 100644 --- a/sysutils/upower/files/patch-meson.build +++ b/sysutils/upower/files/patch-meson.build @@ -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') diff --git a/sysutils/upower/files/patch-src_freebsd_up-devd.c b/sysutils/upower/files/patch-src_freebsd_up-devd.c index 873b6ea92dbb..54baabd6d6b6 100644 --- a/sysutils/upower/files/patch-src_freebsd_up-devd.c +++ b/sysutils/upower/files/patch-src_freebsd_up-devd.c @@ -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); diff --git a/sysutils/upower/files/patch-src_freebsd_up-device-supply.c b/sysutils/upower/files/patch-src_freebsd_up-device-supply.c index e6984ea5da0f..0bd611dd1be2 100644 --- a/sysutils/upower/files/patch-src_freebsd_up-device-supply.c +++ b/sysutils/upower/files/patch-src_freebsd_up-device-supply.c @@ -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, diff --git a/sysutils/upower/files/patch-src_up-device-battery.c b/sysutils/upower/files/patch-src_up-device-battery.c deleted file mode 100644 index d6a2f2579b44..000000000000 --- a/sysutils/upower/files/patch-src_up-device-battery.c +++ /dev/null @@ -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 -+#include - - #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;