From f929ae2a085b68d4b25dbe8ffa30a91f13d3aaf0 Mon Sep 17 00:00:00 2001
From: Marc Ferland <marc.ferland@sonatest.com>
Date: Thu, 12 Dec 2024 14:40:45 -0500
Subject: upower: bump to 1.90.6

Signed-off-by: Marc Ferland <marc.ferland@sonatest.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta-oe/recipes-support/upower/upower_0.99.17.bb | 45 ---------------------
 meta-oe/recipes-support/upower/upower_1.90.6.bb  | 51 ++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 45 deletions(-)
 delete mode 100644 meta-oe/recipes-support/upower/upower_0.99.17.bb
 create mode 100644 meta-oe/recipes-support/upower/upower_1.90.6.bb

diff --git a/meta-oe/recipes-support/upower/upower_0.99.17.bb b/meta-oe/recipes-support/upower/upower_0.99.17.bb
deleted file mode 100644
index 5e2f04f312..0000000000
--- a/meta-oe/recipes-support/upower/upower_0.99.17.bb
+++ /dev/null
@@ -1,45 +0,0 @@
-SUMMARY = "UPower is an abstraction for enumerating power devices"
-DESCRIPTION = "UPower is an abstraction for enumerating power devices, listening to device events and querying history and statistics."
-LICENSE = "GPL-2.0-or-later"
-LIC_FILES_CHKSUM = "file://COPYING;md5=0de8fbf1d97a140d1d93b9f14dcfbf08"
-
-DEPENDS = " \
-    intltool-native \
-    libusb1 \
-    libgudev \
-    glib-2.0 \
-    dbus-glib \
-"
-
-SRC_URI = "https://gitlab.freedesktop.org/${BPN}/${BPN}/-/archive/v${PV}/${BPN}-v${PV}.tar.bz2"
-SRC_URI[sha256sum] = "de7177deb2ee23d9c505046c74a856564acab8fd1d39aa1541d123af5a99ca8d"
-S = "${WORKDIR}/${BPN}-v${PV}"
-
-UPSTREAM_CHECK_URI = "https://gitlab.freedesktop.org/${BPN}/${BPN}/-/tags"
-UPSTREAM_CHECK_REGEX = "v(?P<pver>\d+(\.\d+)+)"
-
-GIR_MESON_ENABLE_FLAG = "enabled"
-GIR_MESON_DISABLE_FLAG = "disabled"
-GTKDOC_MESON_OPTION = "gtk-doc"
-
-inherit meson pkgconfig gtk-doc gettext gobject-introspection systemd
-
-PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
-PACKAGECONFIG[idevice] = "-Didevice=enabled,-Didevice=disabled,libimobiledevice libplist"
-PACKAGECONFIG[systemd] = "-Dsystemdsystemunitdir=${systemd_system_unitdir},-Dsystemdsystemunitdir=no -Dudevrulesdir=${base_libdir}/udev/rules.d,systemd"
-
-EXTRA_OEMESON = " \
-    -Dos_backend=linux \
-    -Dman=false \
-"
-
-SYSTEMD_SERVICE:${PN} = "upower.service"
-# don't start on boot by default - dbus does that on demand
-SYSTEMD_AUTO_ENABLE = "disable"
-
-RDEPENDS:${PN} += "dbus"
-RRECOMMENDS:${PN} += "pm-utils"
-FILES:${PN} += " \
-    ${datadir}/dbus-1/ \
-    ${base_libdir}/udev/* \
-"
diff --git a/meta-oe/recipes-support/upower/upower_1.90.6.bb b/meta-oe/recipes-support/upower/upower_1.90.6.bb
new file mode 100644
index 0000000000..2cffdc14f6
--- /dev/null
+++ b/meta-oe/recipes-support/upower/upower_1.90.6.bb
@@ -0,0 +1,51 @@
+SUMMARY = "UPower is an abstraction for enumerating power devices"
+DESCRIPTION = "UPower is an abstraction for enumerating power devices, listening to device events and querying history and statistics."
+LICENSE = "GPL-2.0-or-later"
+LIC_FILES_CHKSUM = "file://COPYING;md5=0de8fbf1d97a140d1d93b9f14dcfbf08"
+
+DEPENDS = " \
+    intltool-native \
+    libusb1 \
+    libgudev \
+    glib-2.0 \
+    dbus-glib \
+"
+
+SRC_URI = "https://gitlab.freedesktop.org/${BPN}/${BPN}/-/archive/v${PV}/${BPN}-v${PV}.tar.bz2"
+SRC_URI[sha256sum] = "aed4e42a21307512ad236ad58d7ee4e0196670c8524a168a0edccdc32964ea0c"
+S = "${WORKDIR}/${BPN}-v${PV}"
+
+UPSTREAM_CHECK_URI = "https://gitlab.freedesktop.org/${BPN}/${BPN}/-/tags"
+UPSTREAM_CHECK_REGEX = "v(?P<pver>\d+(\.\d+)+)"
+
+GIR_MESON_ENABLE_FLAG = "enabled"
+GIR_MESON_DISABLE_FLAG = "disabled"
+GTKDOC_MESON_OPTION = "gtk-doc"
+
+inherit meson pkgconfig gtk-doc gettext gobject-introspection systemd
+
+PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
+PACKAGECONFIG[idevice] = "-Didevice=enabled,-Didevice=disabled,libimobiledevice libplist"
+PACKAGECONFIG[systemd] = "-Dsystemdsystemunitdir=${systemd_system_unitdir},-Dsystemdsystemunitdir=no -Dudevrulesdir=${base_libdir}/udev/rules.d,systemd"
+
+EXTRA_OEMESON = " \
+    -Dos_backend=linux \
+    -Dman=false \
+"
+
+SYSTEMD_SERVICE:${PN} = "upower.service"
+# don't start on boot by default - dbus does that on demand
+SYSTEMD_AUTO_ENABLE = "disable"
+
+RDEPENDS:${PN} += "dbus"
+RRECOMMENDS:${PN} += "pm-utils"
+FILES:${PN} += " \
+    ${datadir}/dbus-1/ \
+    ${base_libdir}/udev/* \
+"
+
+do_install:append() {
+    # remove integration tests scripts
+    rm -rf ${D}${datadir}/installed-tests
+    rm -rf ${D}${libexecdir}/upower
+}
-- 
cgit v1.2.3-54-g00ecf