diff --git a/extra-repos/systemd/upower/0001-fix-race-test-bluetooth-mouse.patch b/extra-repos/systemd/upower/0001-fix-race-test-bluetooth-mouse.patch deleted file mode 100644 index 022953dfb..000000000 --- a/extra-repos/systemd/upower/0001-fix-race-test-bluetooth-mouse.patch +++ /dev/null @@ -1,32 +0,0 @@ -Patch-Source: https://gitlab.freedesktop.org/upower/upower/-/merge_requests/252 ---- -From 0074161eb7318ef851f34a3d36e4d53851a2ad5c Mon Sep 17 00:00:00 2001 -From: fossdd -Date: Fri, 10 Jan 2025 17:42:14 +0100 -Subject: [PATCH] Fix test race in test_bluetooth_hidpp_mouse - -We ship the proposed patch already since Oct 2024 in Alpine Linux and is -working for us correctly and fixes the test. - -Closes https://gitlab.freedesktop.org/upower/upower/-/issues/228 - -Co-Authored-By: Bastien Nocera ---- - src/linux/integration-test.py | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/linux/integration-test.py b/src/linux/integration-test.py -index 020e6b7d..7ddd975b 100755 ---- a/src/linux/integration-test.py -+++ b/src/linux/integration-test.py -@@ -4082,6 +4082,7 @@ class Tests(dbusmock.DBusTestCase): - bat0_up = devs[0] - - # Check we have the Bluetooth name -+ self.assertEventually(lambda: self.get_dbus_dev_property(bat0_up, 'Model'), value=alias) - self.assertEqual(self.get_dbus_dev_property(bat0_up, "Model"), alias) - # Check we have the kernel percentage - self.assertEqual(self.get_dbus_dev_property(bat0_up, "Percentage"), 30) --- -GitLab - diff --git a/extra-repos/systemd/upower/0002-fix-self-test-sleep-duration.patch b/extra-repos/systemd/upower/0001-fix-self-test-sleep-duration.patch similarity index 100% rename from extra-repos/systemd/upower/0002-fix-self-test-sleep-duration.patch rename to extra-repos/systemd/upower/0001-fix-self-test-sleep-duration.patch diff --git a/extra-repos/systemd/upower/APKBUILD b/extra-repos/systemd/upower/APKBUILD index 6c277404d..6683c1461 100644 --- a/extra-repos/systemd/upower/APKBUILD +++ b/extra-repos/systemd/upower/APKBUILD @@ -2,8 +2,8 @@ pkgname=upower pkgver=9999 -_pkgver=1.90.7 -pkgrel=6 +_pkgver=1.90.8 +pkgrel=7 pkgdesc="Power Management Services" url="https://upower.freedesktop.org" arch="all" @@ -29,8 +29,7 @@ checkdepends=" " subpackages="$pkgname-dev $pkgname-lang $pkgname-doc $pkgname-systemd $pkgname-zsh-completion" source="https://gitlab.freedesktop.org/upower/upower/-/archive/v$_pkgver/upower-v$_pkgver.tar.bz2 - 0001-fix-race-test-bluetooth-mouse.patch - 0002-fix-self-test-sleep-duration.patch + 0001-fix-self-test-sleep-duration.patch " builddir="$srcdir/$pkgname-v$_pkgver" @@ -62,7 +61,6 @@ package() { } sha512sums=" -2ef7412c26b2c3a9be533a53f579669b532e321196886725bd4333b54c0c7fbe307ce84776ed5cbfdf82a9822979fc0906f62ea7c5d42171ac6819b3e4c77b97 upower-v1.90.7.tar.bz2 -11eb9ad65ed7055b4a9ce6ba97c849d7cd08510ec56d9f7826f43a666aa3c6c980a1a6c92df6c479947d1f439c64afa77eb650351f4d2e59b724ed9c9665c07e 0001-fix-race-test-bluetooth-mouse.patch -1b582f31660b82444682b6786913a6eb4e8e13c8370205b31da1bf9328e0d2e62c2596bfb4e82faf25e658f379ddb92d7f3f97ec8ddfdb512339d4d3d663f708 0002-fix-self-test-sleep-duration.patch +529e0963df6b01576d72abc259148a0303609881ee4aa88e5b9a1cdef11c10b7ab802a5c1c85430ca335f5a54a1114453b0a80eec83fdbf444ed0d34353ceff1 upower-v1.90.8.tar.bz2 +1b582f31660b82444682b6786913a6eb4e8e13c8370205b31da1bf9328e0d2e62c2596bfb4e82faf25e658f379ddb92d7f3f97ec8ddfdb512339d4d3d663f708 0001-fix-self-test-sleep-duration.patch "