CVS commit: pkgsrc/sysutils/upower

["Paolo Vincenzo Olivo" <vins%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   vins
Date:           Thu Apr 30 16:24:02 UTC 2026

Modified Files:
        pkgsrc/sysutils/upower: Makefile PLIST buildlink3.mk distinfo
            options.mk
        pkgsrc/sysutils/upower/patches: patch-etc_meson.build
Added Files:
        pkgsrc/sysutils/upower/patches: patch-etc_UPower.conf.d_meson.build

Log Message:
sysutils/upower: update to 1.91.2

# upstream changes (since 1.90.9)

Version 1.91.2
--------------
Released: 2026-04-01

- Feature: Skip the systemd inhibitor when performing CriticalPowerAction (!309)
- Feature: Introduce "Auto" CriticalPowerAction using systemd-logind Sleep() (!309)
- Fix: Test CanPowerOff() availability before calling PowerOff() (!311)
- Fix: Add charge limit support for systems providing only charge_control_end_threshold (!310, #342, #285)

Version 1.91.1
--------------
Released: 2026-02-10

- Fix: a resource leak (!294)
- Fix: a NULL exception caused by a Non-NULL GError pointer (!295, #331)
- Fix client API: crashing when printing the error message from a NULL GError pointer (!304)
- Fix: ACPI reports -NaN capacity value (!306)
- Feature: Skip CriticalPowerAction when performing battery recalibration (!285, #312)
- Deprecate: capacity_level and luminosity property (!293, !297 )
- CI: Add a tartan LLVM static analysis (!300)
- Feature: History supports voltage item (!299)

Version 1.91.0
--------------
Released: 2025-11-25

- New feature: Support multiple keyboard backlight LED control. (#291 !203)
- Make installation of tests optional (!202)
- Support conf.d style config file (!286)
- Deprecate CapacityLevel property (!290 #333)

Version 1.90.10
--------------
Released: 2025-08-26

- Fix wrong model name of the devices (!267, #309)
- Switch charge_types to "Custom" when charging threshold is enabled (!268, #275)
- Fix invalid command line arguments (!269)
- Fix leak when reporting daemon usage error (!270)
- OpenBSD: support battery status from qcpas (!272)
- Fix history progression (!274, #316)
- Add a battery filter to the upower command line (!275)
- Change the charging behaviors using charge_types (!276, !46, #275)
- Fix integration tests issues, including floating point value and race between umockdev and upower (!277, !278)
- Rework upower command (!280)
- Propagate charge-threshold-enabled to display device (!281)


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 pkgsrc/sysutils/upower/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/sysutils/upower/PLIST
cvs rdiff -u -r1.6 -r1.7 pkgsrc/sysutils/upower/buildlink3.mk
cvs rdiff -u -r1.11 -r1.12 pkgsrc/sysutils/upower/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/sysutils/upower/options.mk
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/upower/patches/patch-etc_UPower.conf.d_meson.build
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/upower/patches/patch-etc_meson.build

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/upower/Makefile
diff -u pkgsrc/sysutils/upower/Makefile:1.30 pkgsrc/sysutils/upower/Makefile:1.31
--- pkgsrc/sysutils/upower/Makefile:1.30        Thu Oct 23 20:39:28 2025
+++ pkgsrc/sysutils/upower/Makefile     Thu Apr 30 16:24:01 2026
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2025/10/23 20:39:28 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2026/04/30 16:24:01 vins Exp $
 
-DISTNAME=      upower-v1.90.9
+DISTNAME=      upower-v1.91.2
 PKGNAME=       ${DISTNAME:S/v//}
-PKGREVISION=   4
 CATEGORIES=    sysutils
 MASTER_SITES=  https://gitlab.freedesktop.org/upower/upower/-/archive/v${PKGVERSION_NOREV}/
 EXTRACT_SUFX=  .tar.bz2
@@ -46,7 +45,6 @@ MESON_ARGS+=  --sysconfdir=${PKG_SYSCONFB
                -Degdir=${EGDIR} \
                -Dzshcompletiondir=${PREFIX}/share/zsh/site-functions \
                -Dman=true \
-               -Dgtk-doc=false \
                -Didevice=disabled
 
 .if ${OPSYS} =="Linux"
@@ -72,6 +70,9 @@ BUILDLINK_TRANSFORM.Darwin+=  rm:-Wl,--no
 BUILDLINK_TRANSFORM.SunOS+=    opt:-Wl,--no-as-needed:-Wl,-zrecord
 BUILDLINK_TRANSFORM.SunOS+=    opt:-Wl,--as-needed:-Wl,-zignore
 
+PKGCONFIG_OVERRIDE_STAGE=      pre-install
+PKGCONFIG_OVERRIDE+=           output/meson-private/upower-glib.pc
+
 # with --nonet, xsltproc needs a helping hand finding some dtds
 XSLTPROC_PATH= ${PREFIX}/share/doc/dbus
 

Index: pkgsrc/sysutils/upower/PLIST
diff -u pkgsrc/sysutils/upower/PLIST:1.7 pkgsrc/sysutils/upower/PLIST:1.8
--- pkgsrc/sysutils/upower/PLIST:1.7    Sun May  4 05:55:49 2025
+++ pkgsrc/sysutils/upower/PLIST        Thu Apr 30 16:24:01 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2025/05/04 05:55:49 vins Exp $
+@comment $NetBSD: PLIST,v 1.8 2026/04/30 16:24:01 vins Exp $
 bin/upower
 include/libupower-glib/up-autocleanups.h
 include/libupower-glib/up-client.h
@@ -11,7 +11,7 @@ include/libupower-glib/upower.h
 ${PLIST.introspection}lib/girepository-1.0/UPowerGlib-1.0.typelib
 lib/libupower-glib.so
 lib/libupower-glib.so.3
-lib/libupower-glib.so.3.1.0
+lib/libupower-glib.so.3.1.2
 lib/pkgconfig/upower-glib.pc
 libexec/upowerd
 man/man1/upower.1
@@ -21,13 +21,43 @@ share/dbus-1/interfaces/org.freedesktop.
 share/dbus-1/interfaces/org.freedesktop.UPower.KbdBacklight.xml
 share/dbus-1/interfaces/org.freedesktop.UPower.xml
 share/dbus-1/system-services/org.freedesktop.UPower.service
+share/doc/UPower/README.md
 share/examples/upower/UPower.conf
 share/examples/upower/org.freedesktop.UPower.conf
 ${PLIST.introspection}share/gir-1.0/UPowerGlib-1.0.gir
+${PLIST.doc}share/gtk-doc/html/UPower/Device.html
+${PLIST.doc}share/gtk-doc/html/UPower/KbdBacklight.html
+${PLIST.doc}share/gtk-doc/html/UPower/UPower-up-types.html
+${PLIST.doc}share/gtk-doc/html/UPower/UPower.7.html
+${PLIST.doc}share/gtk-doc/html/UPower/UPower.devhelp2
+${PLIST.doc}share/gtk-doc/html/UPower/UPower.html
+${PLIST.doc}share/gtk-doc/html/UPower/UpClient.html
+${PLIST.doc}share/gtk-doc/html/UPower/UpDevice.html
+${PLIST.doc}share/gtk-doc/html/UPower/UpHistoryItem.html
+${PLIST.doc}share/gtk-doc/html/UPower/UpStatsItem.html
+${PLIST.doc}share/gtk-doc/html/UPower/annotation-glossary.html
+${PLIST.doc}share/gtk-doc/html/UPower/home.png
+${PLIST.doc}share/gtk-doc/html/UPower/index.html
+${PLIST.doc}share/gtk-doc/html/UPower/ix01.html
+${PLIST.doc}share/gtk-doc/html/UPower/left-insensitive.png
+${PLIST.doc}share/gtk-doc/html/UPower/left.png
+${PLIST.doc}share/gtk-doc/html/UPower/libupower-glib-helpers.html
+${PLIST.doc}share/gtk-doc/html/UPower/libupower-glib.html
+${PLIST.doc}share/gtk-doc/html/UPower/license.html
+${PLIST.doc}share/gtk-doc/html/UPower/ref-dbus.html
+${PLIST.doc}share/gtk-doc/html/UPower/right-insensitive.png
+${PLIST.doc}share/gtk-doc/html/UPower/right.png
+${PLIST.doc}share/gtk-doc/html/UPower/style.css
+${PLIST.doc}share/gtk-doc/html/UPower/tools-fileformats.html
+${PLIST.doc}share/gtk-doc/html/UPower/up-insensitive.png
+${PLIST.doc}share/gtk-doc/html/UPower/up.png
+${PLIST.doc}share/gtk-doc/html/UPower/upower.1.html
+${PLIST.doc}share/gtk-doc/html/UPower/upowerd.8.html
 share/locale/fr/LC_MESSAGES/upower.mo
 share/locale/it/LC_MESSAGES/upower.mo
 share/locale/ka/LC_MESSAGES/upower.mo
 share/locale/pl/LC_MESSAGES/upower.mo
 share/locale/sv/LC_MESSAGES/upower.mo
 ${PLIST.polkit}share/polkit-1/actions/org.freedesktop.upower.policy
+${PLIST.polkit}share/polkit-1/rules.d/org.freedesktop.upower.rules
 share/zsh/site-functions/_upower

Index: pkgsrc/sysutils/upower/buildlink3.mk
diff -u pkgsrc/sysutils/upower/buildlink3.mk:1.6 pkgsrc/sysutils/upower/buildlink3.mk:1.7
--- pkgsrc/sysutils/upower/buildlink3.mk:1.6    Thu Oct 23 20:39:28 2025
+++ pkgsrc/sysutils/upower/buildlink3.mk        Thu Apr 30 16:24:01 2026
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2025/10/23 20:39:28 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2026/04/30 16:24:01 vins Exp $
 
 BUILDLINK_TREE+=       upower
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        upower
 UPOWER_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.upower+= upower>=1.90.9
-BUILDLINK_ABI_DEPENDS.upower?= upower>=1.90.9nb4
+BUILDLINK_ABI_DEPENDS.upower?= upower>=1.91.2
 BUILDLINK_PKGSRCDIR.upower?=   ../../sysutils/upower
 
 .include "../../devel/glib2/buildlink3.mk"

Index: pkgsrc/sysutils/upower/distinfo
diff -u pkgsrc/sysutils/upower/distinfo:1.11 pkgsrc/sysutils/upower/distinfo:1.12
--- pkgsrc/sysutils/upower/distinfo:1.11        Sun May  4 05:55:49 2025
+++ pkgsrc/sysutils/upower/distinfo     Thu Apr 30 16:24:01 2026
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.11 2025/05/04 05:55:49 vins Exp $
+$NetBSD: distinfo,v 1.12 2026/04/30 16:24:01 vins Exp $
 
-BLAKE2s (upower-v1.90.9.tar.bz2) = 6dc6fa5fb37914fb9c66059b8da90272d02c106a6a7fbca19a03691906ceb961
-SHA512 (upower-v1.90.9.tar.bz2) = 7308e03125a5a888242253f9260f68283f5b53677c08dbc4d7e4d48cc6f600f50f8ab161d100f152138208d5119acddc90f0f19742aa8cca58e3a0ec54975110
-Size (upower-v1.90.9.tar.bz2) = 154756 bytes
-SHA1 (patch-etc_meson.build) = 45108a898e21f4107bf3e994f63a9ca46e49d571
+BLAKE2s (upower-v1.91.2.tar.bz2) = 1f21dd30f91dfafba1690b59ecd441fe6952541dd946bb23c382f26fdf7b2148
+SHA512 (upower-v1.91.2.tar.bz2) = 4855b0a6dc297b047ce19ec7faae3b285a72035df21a45b9efb57cd2a4714d1eb12f1ce31881f231973aaca2886c76771361ecfc34ff5fc84cf8205d827c5217
+Size (upower-v1.91.2.tar.bz2) = 168795 bytes
+SHA1 (patch-etc_UPower.conf.d_meson.build) = 18433cc092c74636592ae5bf335c68d8e6e3ddf5
+SHA1 (patch-etc_meson.build) = 1b2475347af7c961f8e027063ed891418d9fbccb
 SHA1 (patch-meson__options.txt) = b99b5ef65c1b6f317425f1c46dc0063768b5f83c
 SHA1 (patch-src_meson.build) = 9e403a60db0acc78a8d5d6ebf267a88b8118045f

Index: pkgsrc/sysutils/upower/options.mk
diff -u pkgsrc/sysutils/upower/options.mk:1.4 pkgsrc/sysutils/upower/options.mk:1.5
--- pkgsrc/sysutils/upower/options.mk:1.4       Sun May  4 05:55:49 2025
+++ pkgsrc/sysutils/upower/options.mk   Thu Apr 30 16:24:01 2026
@@ -1,14 +1,25 @@
-# $NetBSD: options.mk,v 1.4 2025/05/04 05:55:49 vins Exp $
+# $NetBSD: options.mk,v 1.5 2026/04/30 16:24:01 vins Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.upower
 
-PKG_SUPPORTED_OPTIONS+=        introspection polkit
+PKG_SUPPORTED_OPTIONS+=        doc introspection polkit
 PKG_SUGGESTED_OPTIONS= introspection polkit
 
-PLIST_VARS+=           introspection polkit
+PLIST_VARS+=           doc introspection polkit
 
 .include "../../mk/bsd.options.mk"
 
+##
+## Build developer documentation
+##
+.if !empty(PKG_OPTIONS:Mdoc)
+TOOL_DEPENDS+= gtk-doc-[0-9]*:../../textproc/gtk-doc
+MESON_ARGS+=   -Dgtk-doc=true
+PLIST.doc=     yes
+.else
+MESON_ARGS+=   -Dgtk-doc=false
+.endif
+
 ###
 ### Build GObject Introspection data
 ###

Index: pkgsrc/sysutils/upower/patches/patch-etc_meson.build
diff -u pkgsrc/sysutils/upower/patches/patch-etc_meson.build:1.1 pkgsrc/sysutils/upower/patches/patch-etc_meson.build:1.2
--- pkgsrc/sysutils/upower/patches/patch-etc_meson.build:1.1    Sun May  4 05:55:49 2025
+++ pkgsrc/sysutils/upower/patches/patch-etc_meson.build        Thu Apr 30 16:24:02 2026
@@ -1,9 +1,10 @@
-$NetBSD: patch-etc_meson.build,v 1.1 2025/05/04 05:55:49 vins Exp $
+$NetBSD: patch-etc_meson.build,v 1.2 2026/04/30 16:24:02 vins Exp $
 
 Install to EGDIR.
 
---- etc/meson.build.orig       2025-05-03 17:01:48.903892228 +0000
+--- etc/meson.build.orig       2026-04-01 08:20:02.000000000 +0000
 +++ etc/meson.build
-@@ -1 +1 @@
+@@ -1,2 +1,2 @@
+ subdir('UPower.conf.d')
 -install_data('UPower.conf', install_dir: get_option('sysconfdir') / 'UPower')
 +install_data('UPower.conf', install_dir: get_option('egdir'))

Added files:

Index: pkgsrc/sysutils/upower/patches/patch-etc_UPower.conf.d_meson.build
diff -u /dev/null pkgsrc/sysutils/upower/patches/patch-etc_UPower.conf.d_meson.build:1.1
--- /dev/null   Thu Apr 30 16:24:02 2026
+++ pkgsrc/sysutils/upower/patches/patch-etc_UPower.conf.d_meson.build  Thu Apr 30 16:24:01 2026
@@ -0,0 +1,13 @@
+$NetBSD: patch-etc_UPower.conf.d_meson.build,v 1.1 2026/04/30 16:24:01 vins Exp $
+
+Install to doc dir.
+
+--- etc/UPower.conf.d/meson.build.orig 2026-04-30 15:21:03.158090371 +0000
++++ etc/UPower.conf.d/meson.build
+@@ -1,5 +1,5 @@
+ install_data(
+     'README.md',
+     install_tag: 'doc',
+-    install_dir: get_option('sysconfdir') / 'UPower' / 'UPower.conf.d',
++    install_dir: get_option('datadir') / 'doc' / 'UPower',
+ )