pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/sysutils/upower
Module Name: pkgsrc
Committed By: vins
Date: Sun May 4 05:55:49 UTC 2025
Modified Files:
pkgsrc/sysutils/upower: Makefile PLIST buildlink3.mk distinfo
Added Files:
pkgsrc/sysutils/upower: options.mk
pkgsrc/sysutils/upower/patches: patch-etc_meson.build
patch-meson__options.txt patch-src_meson.build
Log Message:
sysutils/upower: update to 1.90.9
Catch up on the last 3 years of updates.
Packages tested against new version: wmbattery, lxqt-powermanagement
# pkgsrc changes
* Switch to build with meson.
* Requires pkgsrc gettext-tools.
* Optionally enable polkit support.
TODO: fix and test Linux backend after importing wip/libgudev
# upstream changes (since 0.99.13)
## 1.90.9
* Fix unstable OnBattery status (#306 #307)
## 1.90.8
* Fix the incorrect percentage value of a removed battery. (#292) (!246)
* Fix device type for the gaming device. (#296 #295) (!247)
* Determine the battery discharging status when connecting a low-power charger. (#276) (!244)
* Fix memory leak when refreshing battery info. (#305) (!261)
* Fix memory leak when getting device id. (!261)
## 1.90.7
* Find the correct parent id for input devices. (#268 #286)
* Fix race condition in test_sibling_priority_no_overwrite. (!240)
* Show charge-threshold-* status as yes/no. (!242)
* Add zsh-completions for CLI. (!241)
* Fix integration test. Extend the daemon stopping timeout to 10sec (#290)
* Added pre-commit test and fixed code spelling, markdown, and code style issues. (!248)
## 1.90.6
* Fractional battery percentage (!226)
* CI enhancement. (!236)
* Tweak the default battery charging threshold to 75-80. (!234)
* Fix g_object_weak_ref: assertion 'g_atomic_int_get (&object->ref_count) >= 1' failed (#281, !233)
## 1.90.5
* Suspend and Ignore as the CriticalPowerActions (!218 and !218)
* Support for battery charging threshold (!208)
* Tweak the device priority to make sure the device kind joystick
can be correctly shown. (#267)
## 1.90.4
* Update the information for version 1.90.3.
* Resolved high disk and CPU rate. (#256)
* Stop guessing the unknown battery as a power supply.
* Continue to support lid handling.
* Fix org.freedesktop.UPower: EnergyRate is a positive value. (#252)
* Fix uni-test python script. (!205)
## 1.90.3
* Resolved high disk and CPU rate.
* Update glib2 requirement to 2.66.0.
* Stop guessing the unknown battery as a power supply.
* Continue to support lid handling.
* Document fixes and bug fixes.
## 1.90.2
Note that this is the last release of UPower with lid handling. OS components
that rely on the lid status should get it from logind instead. See:
https://www.freedesktop.org/software/systemd/man/org.freedesktop.login1.html
* Fix wireless devices not disappearing from Settings when disconnected
* Require a newer libgudev to avoid bugs related to newline stripping
when reading sysfs attributes
* Add installed-tests files for use with gnome-desktop-testing
* Fix integration test to work with system installed upower binary and
under jhbuild
## 1.90.1
* Detect headsets with kernel batteries such as Logitech and
Steelseries headsets, and make them automatically disappear if
the headset is turned off (if the kernel driver supports the
wireless_status attribute)
* Hide duplicate Logitech Bluetooth devices (Bolt-compatible devices
connected through Bluetooth would show as 2 batteries)
* Hide duplicate Logitech wireless devices when they get connected
through USB as well
* Fix Bluetooth device names not synchronising, and use user-chosen
names when available
* Handle the "present" sysfs attribute changing
* Fix iDevices not appearing
* Fix reading capacity_level with newer libgudev
* Fix OpenBSD backend
## 1.90.0
Note that the version number bump was made to allow bugfixes for older
releases while also making new releases that contain with more in-depth
code changes. The old (soft) API/ABI guarantees are currently unchanged.
Changes:
* Refactor internal battery handling into separate classes
* Guess charging/discharging state based on energy rate (#196)
Bug fixes:
* Fix polling after resume (#198)
* Fix battery state guessing (#146)
* Reload history when battery ID changes
* Test fixes
## 0.99.20
Bug fixes:
* Ensure polling is resumed after suspend (#198)
* Bugfixes to state guessing code (#146)
* Stability improvements of automated tests
## 0.99.19
Changes:
* Move state guessing into DisplayDevice
* Always use 90% threshold to consider a battery full
* Various test improvements
Bug fixes:
* Fix mice showing up as keyboards (#189)
* Allow unit test inspector to fail (#187)
* Fix test cases when daemon shuts down too slowly (#188)
## 0.99.18
Changes:
* Remove broken wakeup DBus API
* Tag UPS hid devices using hwdb and update list from upstream
* Only permit Refresh method when in debug mode
* Refactor device polling
* Refactor udev device discovery and sibling detection
* Improved testing and CI
* Handle SIGTERM to trigger a clean shutdown
Bug fixes:
* Improve polling of batteries after line-power "online" status change
* Multiple wacom tablet detection fixes
* Fix updates after a BT hid power supply moves in sysfs
* Fix enumeration of "Whats Up!" devices on startup
* Accept USB power supplies without warning
* Allow building without gtk-doc
## 0.99.17
Bug fixes:
* Fix FD handling issues that may cause lid to not be detected
## 0.99.16
Bug fixes:
* Silence unnecessary udev event warnings
* Increase test timeout (#171)
* Explicitly link with plist
* Fix UpClient reference leak
* Fix DisplayDevice state on battery hotplug
* Fix critical action to work after it was cancelled (#172)
## 0.99.15
Bug fixes:
* Various build fixes
* Update bluetooth device alias when it changes (#169)
## 0.99.14
Changes:
* Port build system to meson
* New ChargeCycles D-Bus property (#152)
* New async GLib APIs (#121)
* lid related functions are now deprecated
* Refresh API is now deprecated
Bug fixes:
* Plenty of test suite fixes
* Fix leak of inhibitor lock (#160)
* Recognize USB power supplies (#148)
* Fix time compression of data points (#167)
* Fix disk write amplification when battery is low (#150)
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 pkgsrc/sysutils/upower/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/sysutils/upower/PLIST
cvs rdiff -u -r1.4 -r1.5 pkgsrc/sysutils/upower/buildlink3.mk
cvs rdiff -u -r1.10 -r1.11 pkgsrc/sysutils/upower/distinfo
cvs rdiff -u -r0 -r1.4 pkgsrc/sysutils/upower/options.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/upower/patches/patch-etc_meson.build \
pkgsrc/sysutils/upower/patches/patch-meson__options.txt \
pkgsrc/sysutils/upower/patches/patch-src_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.24 pkgsrc/sysutils/upower/Makefile:1.25
--- pkgsrc/sysutils/upower/Makefile:1.24 Sat Jul 22 08:39:26 2023
+++ pkgsrc/sysutils/upower/Makefile Sun May 4 05:55:49 2025
@@ -1,56 +1,77 @@
-# $NetBSD: Makefile,v 1.24 2023/07/22 08:39:26 nia Exp $
+# $NetBSD: Makefile,v 1.25 2025/05/04 05:55:49 vins Exp $
-DISTNAME= upower-0.99.13
-PKGREVISION= 1
+DISTNAME= upower-v1.90.9
+PKGNAME= ${DISTNAME:S/v//}
CATEGORIES= sysutils
-MASTER_SITES= https://gitlab.freedesktop.org/upower/upower/uploads/177df5b9f9b76f25a2ad9da41aa0c1fa/
-EXTRACT_SUFX= .tar.xz
+MASTER_SITES= https://gitlab.freedesktop.org/upower/upower/-/archive/v${PKGVERSION_NOREV}/
+EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= https://upower.freedesktop.org/
COMMENT= Power management system message bus service
LICENSE= gnu-gpl-v2
-USE_LIBTOOL= yes
-GNU_CONFIGURE= yes
-USE_TOOLS+= gmake pkg-config intltool xgettext msgmerge msgfmt
-BUILD_DEFS+= VARBASE PKG_SYSCONFBASE
+USE_CC_FEATURES= c11
+USE_TOOLS+= pkg-config intltool xgettext msgmerge msgfmt
-TOOL_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
+USE_PKGLOCALEDIR= yes
-CONFIGURE_ARGS+= --localstatedir=${VARBASE}
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
-CONFIGURE_ARGS+= --with-libintl-prefix=${BUILDLINK_PREFIX.gettext}
-CONFIGURE_ARGS+= --enable-introspection
+BUILD_DEFS+= VARBASE PKG_SYSCONFBASE
-# Real Linux backend requires gudev, which we lack in pkgsrc.
-CONFIGURE_ARGS.Linux+= --with-backend=dummy
+TOOL_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
PKG_SYSCONFSUBDIR= UPower
-INSTALL_MAKE_FLAGS+= configdir=${EGDIR} dbusconfdir=${EGDIR}
EGDIR= ${PREFIX}/share/examples/upower
CONF_FILES+= ${EGDIR}/UPower.conf ${PKG_SYSCONFDIR}/UPower.conf
CONF_FILES+= ${EGDIR}/org.freedesktop.UPower.conf \
${PKG_SYSCONFBASE}/dbus-1/system.d/org.freedesktop.UPower.conf
PKGCONFIG_OVERRIDE+= upower-glib.pc.in
-USE_PKGLOCALEDIR= yes
+
+.include "../../mk/bsd.prefs.mk"
+
+# Free/OpenBSD and Linux are officially supported.
+# However, the Linux backend requires gudev, which we lack in pkgsrc.
+.if ${OPSYS} == "OpenBSD" || ${OPSYS} == "FreeBSD"
+MESON_ARGS+= -Dos_backend=${LOWER_OPSYS}
+.else
+MESON_ARGS+= -Dos_backend=dummy
+.endif
+
+MESON_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR} \
+ --localedir=${PKGLOCALEDIR}/locale \
+ -Dstatedir=${VARBASE} \
+ -Dhistorydir=${VARBASE}/db/upower \
+ -Degdir=${EGDIR} \
+ -Dman=true \
+ -Dgtk-doc=false \
+ -Dudevrulesdir=disabled \
+ -Dudevhwdbdir=disabled \
+ -Dsystemdsystemunitdir=no \
+ -Didevice=disabled
+
+.include "options.mk"
BUILDLINK_TRANSFORM.Darwin+= rm:-Wl,--as-needed
BUILDLINK_TRANSFORM.Darwin+= rm:-Wl,--no-as-needed
BUILDLINK_TRANSFORM.SunOS+= opt:-Wl,--no-as-needed:-Wl,-zrecord
BUILDLINK_TRANSFORM.SunOS+= opt:-Wl,--as-needed:-Wl,-zignore
-TEST_TARGET= check
-
# with --nonet, xsltproc needs a helping hand finding some dtds
XSLTPROC_PATH= ${PREFIX}/share/doc/dbus
+# GNU msgfmt >=0.19.7 required to produce files of type: xml
+BUILDLINK_API_DEPENDS.gettext-tools+= gettext-tools>=0.19.7
+# Otherwise built-in msgfmt is used regardless of line above
+USE_BUILTIN.gettext= no
+.include "../../devel/gettext-tools/buildlink3.mk"
+
.include "../../devel/gettext-lib/buildlink3.mk"
+BUILDLINK_API_DEPENDS.glib2+= glib2>=2.66.0
.include "../../devel/glib2/buildlink3.mk"
-BUILDLINK_DEPMETHOD.gobject-introspection+= build
-.include "../../devel/gobject-introspection/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
.include "../../sysutils/dbus/buildlink3.mk"
.include "../../sysutils/dbus-glib/buildlink3.mk"
.include "../../textproc/libxslt/xsltproc-nonet.mk"
+.include "../../devel/meson/build.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/sysutils/upower/PLIST
diff -u pkgsrc/sysutils/upower/PLIST:1.6 pkgsrc/sysutils/upower/PLIST:1.7
--- pkgsrc/sysutils/upower/PLIST:1.6 Tue Jun 28 11:13:42 2022
+++ pkgsrc/sysutils/upower/PLIST Sun May 4 05:55:49 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2022/06/28 11:13:42 nia Exp $
+@comment $NetBSD: PLIST,v 1.7 2025/05/04 05:55:49 vins Exp $
bin/upower
include/libupower-glib/up-autocleanups.h
include/libupower-glib/up-client.h
@@ -7,11 +7,11 @@ include/libupower-glib/up-history-item.h
include/libupower-glib/up-stats-item.h
include/libupower-glib/up-types.h
include/libupower-glib/up-version.h
-include/libupower-glib/up-wakeup-item.h
-include/libupower-glib/up-wakeups.h
include/libupower-glib/upower.h
-lib/girepository-1.0/UPowerGlib-1.0.typelib
-lib/libupower-glib.la
+${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/pkgconfig/upower-glib.pc
libexec/upowerd
man/man1/upower.1
@@ -19,13 +19,15 @@ man/man7/UPower.7
man/man8/upowerd.8
share/dbus-1/interfaces/org.freedesktop.UPower.Device.xml
share/dbus-1/interfaces/org.freedesktop.UPower.KbdBacklight.xml
-share/dbus-1/interfaces/org.freedesktop.UPower.Wakeups.xml
share/dbus-1/interfaces/org.freedesktop.UPower.xml
share/dbus-1/system-services/org.freedesktop.UPower.service
share/examples/upower/UPower.conf
share/examples/upower/org.freedesktop.UPower.conf
-share/gir-1.0/UPowerGlib-1.0.gir
+${PLIST.introspection}share/gir-1.0/UPowerGlib-1.0.gir
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
+share/zsh/site-functions/_upower
Index: pkgsrc/sysutils/upower/buildlink3.mk
diff -u pkgsrc/sysutils/upower/buildlink3.mk:1.4 pkgsrc/sysutils/upower/buildlink3.mk:1.5
--- pkgsrc/sysutils/upower/buildlink3.mk:1.4 Wed Dec 8 16:02:40 2021
+++ pkgsrc/sysutils/upower/buildlink3.mk Sun May 4 05:55:49 2025
@@ -1,15 +1,23 @@
-# $NetBSD: buildlink3.mk,v 1.4 2021/12/08 16:02:40 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2025/05/04 05:55:49 vins Exp $
BUILDLINK_TREE+= upower
.if !defined(UPOWER_BUILDLINK3_MK)
UPOWER_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.upower+= upower>=0.99.8
-BUILDLINK_ABI_DEPENDS.upower?= upower>=0.99.13
+BUILDLINK_API_DEPENDS.upower+= upower>=1.90.9
+BUILDLINK_ABI_DEPENDS.upower?= upower>=1.90.9
BUILDLINK_PKGSRCDIR.upower?= ../../sysutils/upower
.include "../../devel/glib2/buildlink3.mk"
+
+pkgbase := upower
+.include "../../mk/pkg-build-options.mk"
+
+.if ${PKG_BUILD_OPTIONS.upower:Mpolkit}
+. include "../../security/polkit/buildlink3.mk"
+.endif
+
.endif # UPOWER_BUILDLINK3_MK
BUILDLINK_TREE+= -upower
Index: pkgsrc/sysutils/upower/distinfo
diff -u pkgsrc/sysutils/upower/distinfo:1.10 pkgsrc/sysutils/upower/distinfo:1.11
--- pkgsrc/sysutils/upower/distinfo:1.10 Tue Oct 26 11:20:20 2021
+++ pkgsrc/sysutils/upower/distinfo Sun May 4 05:55:49 2025
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.10 2021/10/26 11:20:20 nia Exp $
+$NetBSD: distinfo,v 1.11 2025/05/04 05:55:49 vins Exp $
-BLAKE2s (upower-0.99.13.tar.xz) = efbb4d9c07b6777757f22bd9a007185c4b5c15f2db30aa6c7479fb49c5b1a56d
-SHA512 (upower-0.99.13.tar.xz) = 5e72d3a67060e3053bc0753b5a2ab3b5fc5bc5e9d6e32165286c7d4c97d23441ef7c095af3af7a6f1f59841e63c1d46b2d90681abad22eb442047bd628d859d2
-Size (upower-0.99.13.tar.xz) = 448876 bytes
+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
+SHA1 (patch-meson__options.txt) = b99b5ef65c1b6f317425f1c46dc0063768b5f83c
+SHA1 (patch-src_meson.build) = 9e403a60db0acc78a8d5d6ebf267a88b8118045f
Added files:
Index: pkgsrc/sysutils/upower/options.mk
diff -u /dev/null pkgsrc/sysutils/upower/options.mk:1.4
--- /dev/null Sun May 4 05:55:49 2025
+++ pkgsrc/sysutils/upower/options.mk Sun May 4 05:55:49 2025
@@ -0,0 +1,33 @@
+# $NetBSD: options.mk,v 1.4 2025/05/04 05:55:49 vins Exp $
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.upower
+
+PKG_SUPPORTED_OPTIONS+= introspection polkit
+PKG_SUGGESTED_OPTIONS= introspection polkit
+
+PLIST_VARS+= introspection polkit
+
+.include "../../mk/bsd.options.mk"
+
+###
+### Build GObject Introspection data
+###
+.if !empty(PKG_OPTIONS:Mintrospection)
+BUILDLINK_DEPMETHOD.gobject-introspection+= build
+.include "../../devel/gobject-introspection/buildlink3.mk"
+MESON_ARGS+= -Dintrospection=enabled
+PLIST.introspection= yes
+.else
+MESON_ARGS+= -Dintrospection=disabled
+.endif
+
+###
+### Polkit support in UPower Daemon
+###
+.if !empty(PKG_OPTIONS:Mpolkit)
+. include "../../security/polkit/buildlink3.mk"
+MESON_ARGS+= -Dpolkit=enabled
+PLIST.polkit= yes
+.else
+MESON_ARGS+= -Dpolkit=disabled
+.endif
Index: pkgsrc/sysutils/upower/patches/patch-etc_meson.build
diff -u /dev/null pkgsrc/sysutils/upower/patches/patch-etc_meson.build:1.1
--- /dev/null Sun May 4 05:55:49 2025
+++ pkgsrc/sysutils/upower/patches/patch-etc_meson.build Sun May 4 05:55:49 2025
@@ -0,0 +1,9 @@
+$NetBSD: patch-etc_meson.build,v 1.1 2025/05/04 05:55:49 vins Exp $
+
+Install to EGDIR.
+
+--- etc/meson.build.orig 2025-05-03 17:01:48.903892228 +0000
++++ etc/meson.build
+@@ -1 +1 @@
+-install_data('UPower.conf', install_dir: get_option('sysconfdir') / 'UPower')
++install_data('UPower.conf', install_dir: get_option('egdir'))
Index: pkgsrc/sysutils/upower/patches/patch-meson__options.txt
diff -u /dev/null pkgsrc/sysutils/upower/patches/patch-meson__options.txt:1.1
--- /dev/null Sun May 4 05:55:49 2025
+++ pkgsrc/sysutils/upower/patches/patch-meson__options.txt Sun May 4 05:55:49 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-meson__options.txt,v 1.1 2025/05/04 05:55:49 vins Exp $
+
+Support EGDIR.
+
+--- meson_options.txt.orig 2025-05-03 17:11:16.376958008 +0000
++++ meson_options.txt
+@@ -27,6 +27,9 @@ option('statedir',
+ option('systemdsystemunitdir',
+ type : 'string',
+ description : 'Directory for systemd service files ("no" to disable)')
++option('egdir',
++ type : 'string',
++ description : 'Directory for upower sample configuration files')
+ option('os_backend',
+ type : 'combo',
+ choices : [ 'auto', 'linux', 'freebsd', 'openbsd', 'dummy'],
Index: pkgsrc/sysutils/upower/patches/patch-src_meson.build
diff -u /dev/null pkgsrc/sysutils/upower/patches/patch-src_meson.build:1.1
--- /dev/null Sun May 4 05:55:49 2025
+++ pkgsrc/sysutils/upower/patches/patch-src_meson.build Sun May 4 05:55:49 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_meson.build,v 1.1 2025/05/04 05:55:49 vins Exp $
+
+Install to EGDIR.
+
+--- src/meson.build.orig 2025-05-03 17:09:05.336647531 +0000
++++ src/meson.build
+@@ -100,7 +100,7 @@ configure_file(
+ configure_file(
+ input: 'org.freedesktop.UPower.conf.in',
+ output: 'org.freedesktop.UPower.conf',
+- install_dir: dbusdir / 'system.d',
++ install_dir: get_option('egdir'),
+ configuration: cdata,
+ )
+
Home |
Main Index |
Thread Index |
Old Index