From 09351e78166b5e864197c4456ebae3f89dd0bed9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 22 Jan 2019 10:09:44 +0000 Subject: gentoo resync : 22.01.2019 --- sys-power/upower/Manifest | 3 + .../files/upower-0.99.9-pending-charge1.patch | 33 ++++++++ .../files/upower-0.99.9-pending-charge2.patch | 48 +++++++++++ sys-power/upower/upower-0.99.9-r1.ebuild | 98 ++++++++++++++++++++++ 4 files changed, 182 insertions(+) create mode 100644 sys-power/upower/files/upower-0.99.9-pending-charge1.patch create mode 100644 sys-power/upower/files/upower-0.99.9-pending-charge2.patch create mode 100644 sys-power/upower/upower-0.99.9-r1.ebuild (limited to 'sys-power/upower') diff --git a/sys-power/upower/Manifest b/sys-power/upower/Manifest index 9a472e058f31..f44b20b942c4 100644 --- a/sys-power/upower/Manifest +++ b/sys-power/upower/Manifest @@ -1,7 +1,10 @@ AUX upower-0.99.8-keyboard-backlight.patch 831 BLAKE2B 530ca1f8a4a7d9caf830813c99c9a1619b540a7a1e45384ab01a348e3830e34edd8972d313becc4cc0eb84ec3517a90a0d153ad05cdf80ee867936cc313105ec SHA512 43e33447769696c99a96cd801d4397ab21400814e5df40d1dfb22504b25caa0be2f0a28a54fa27cc579505b184fb29f29e161e54b568a600156b7e1ef2237d33 AUX upower-0.99.8-udev-events.patch 915 BLAKE2B 8f951b607bbe0237d71bec20d55310c227680f6df4035ac53c335215234c48d40a120bcd1ac2a992a280263525797981c7316bb3e269fcb3507292bf5cb7222d SHA512 9ed2522a45318c8c7b2fd4b9d6c10f029df0909c76625b553ba8f76f4a4af8018bef3f56a30913eb5eed53dc9bdf2d71486ec5930d00375e24597997f26cf2c8 +AUX upower-0.99.9-pending-charge1.patch 1351 BLAKE2B 719581956d7bed9efb148bb84a83b0b90cabadf1113fece846416b980c1919895bd1e85575bba0198d856d5a39209ab7c919e2142361ee2cf6361f631f312fc9 SHA512 f100c9cb06c8407fdb8cc2ea27651f3e1eb563e40b98b2a0d7589577652d5c14d824a4de3d503cb858fa5d4360993f63da49cd5f4c8caaec43fde4f20e075f47 +AUX upower-0.99.9-pending-charge2.patch 2016 BLAKE2B 87a3078acf6c95dd8237f894aa25dbf803d42f766682e3e53f5ec30fcd7725178ebab94111945fbf0b4d0e16b656e8723240b14358d1c6e5285086b30da541d2 SHA512 15aa04bcd892feec125508d6a9edb8df98cd5317fce27d9c8907994f1d735be32934c5010566f0a38221ef20b48d8faf73841df6e35447ef0efccdaab371fb0b DIST upower-0.99.8.tar.xz 448664 BLAKE2B e101e7d1b2aede77c1ed2da1fd23b87a95ccac8d901bd8d1f8bebcd5de7052a66f1840cf578a48453538e166aae56ef4bc6d3a2b85f7ba148ecac5cc0a486809 SHA512 dfd2960cae382195dfc7a703a02af298d9de55bc626cde2a1f97e7983842191ba9d99eb2044190214e792539e7d6c9d8e00b5aed17e5e86b04544e9ab90278b1 DIST upower-0.99.9.tar.xz 448408 BLAKE2B 5fa2436f33c94cffb736d8e3fad433acf58954cf06ccd403a0361214be5afc45d79ea279f3c5c48dcd58b92ccaf995777c95987d1749fd8c8c8958317e439570 SHA512 45eb587b0e5ffcce88bad8c56bc5efa30559748913016a55d58313280f5159378e5fbb4a9842c3a6409257bb97822d235f96b03704268b8471455c93eb05fe2f EBUILD upower-0.99.8-r1.ebuild 2372 BLAKE2B 05870dca284b3a0288fbd8bdaf1509fb7c099d56a6f5c55adf60046c1c80645e3e3aa08534fdb89ed5d3c480b61bac7291dff487fe5a8d831634b5c3053c878a SHA512 8997f794ece5ccd9ec617e8ba1747abecfa5d0273fb9a6c3dd82c357a12a545e6239c0fa1d6bd8f0a0936f0e9f9664ea4e97ac0162ca9209716f3763a6edecad +EBUILD upower-0.99.9-r1.ebuild 2360 BLAKE2B 15cf585d54d1826b14571c4a0f723d3a3836736d0d8a830dd303243e2cda0f61ddfe96860bc88e8a3e3077450da37ee768ecacf0479b09446f9861edcf7677b2 SHA512 31cbebe95a69271f104d10c61035cb51e18cf4fbf98c6d55c1c7930d84b6ee183e1b0b9c9d919e9531c752fead0caa31233b2abb2abe2a8fa3901af90a03a9aa EBUILD upower-0.99.9.ebuild 2174 BLAKE2B d2397d31fe8c5134f5eb2dbe20662de6e94428c3b59384ebf5797bf9042a37e6af1af74487a1d908199f4ad0de603bec0e7a0fd17d9d02bc98e6f7290ba2b2bd SHA512 327131fb34743dfc992fad6ca1144021afa3954dcc7b7f02bb483ead32a780d9bb5b9f693bdcd3fc47cd0a9079e1333ffc4df431d11d26a8188045e936d33f8a MISC metadata.xml 228 BLAKE2B 6b6559027915d8578c02e363cc855e812c338acf7716fe4108a8b85c09152a086cb578e7361f4613a44e8b550d7e205ff43aea39dd9488951fa18c6e15042278 SHA512 4f5e63f918a0f8790db49c5b12173c673f86935f00796a04acfed573f618379b73b05b1869941e11f881fe69d4958f5287ce815fd710eadb6ac9f2680894caae diff --git a/sys-power/upower/files/upower-0.99.9-pending-charge1.patch b/sys-power/upower/files/upower-0.99.9-pending-charge1.patch new file mode 100644 index 000000000000..9ce91c10a66e --- /dev/null +++ b/sys-power/upower/files/upower-0.99.9-pending-charge1.patch @@ -0,0 +1,33 @@ +From a074a5462ab9749ad4aaca52e0202602897660aa Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jo=C3=A3o=20Paulo=20Rechi=20Vita?= +Date: Thu, 1 Nov 2018 14:45:28 -0700 +Subject: [PATCH] daemon: Make comment more succinct + +This will help make it more clear when adding an extra state on the +following commit. It also makes the language consistent between the +different lines. There are no changes on the meaning of these lines nor +any functional changes on this commit. +--- + src/up-daemon.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/up-daemon.c b/src/up-daemon.c +index 1a5dddc..95fff6b 100644 +--- a/src/up-daemon.c ++++ b/src/up-daemon.c +@@ -209,9 +209,9 @@ up_daemon_update_display_battery (UpDaemon *daemon) + power_supply == FALSE) + continue; + +- /* If one battery is charging, then the composite is charging +- * If all batteries are discharging, then the composite is discharging +- * If all batteries are fully charged, then they're all fully charged ++ /* If one battery is charging, the composite is charging ++ * If all batteries are discharging, the composite is discharging ++ * If all batteries are fully charged, the composite is fully charged + * Everything else is unknown */ + if (state == UP_DEVICE_STATE_CHARGING) + state_total = UP_DEVICE_STATE_CHARGING; +-- +2.18.1 + diff --git a/sys-power/upower/files/upower-0.99.9-pending-charge2.patch b/sys-power/upower/files/upower-0.99.9-pending-charge2.patch new file mode 100644 index 000000000000..a79ebac7ed18 --- /dev/null +++ b/sys-power/upower/files/upower-0.99.9-pending-charge2.patch @@ -0,0 +1,48 @@ +From a074631c0b1748c8a791c4f0dad99da75805a328 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jo=C3=A3o=20Paulo=20Rechi=20Vita?= +Date: Mon, 15 Oct 2018 17:05:27 -0700 +Subject: [PATCH] daemon: Consider pending-charge when calculating the display + state + +Without this change if all batteries in the system are in the +pending-charge state, the display device state is set to unknown, and +its icon to battery-missing-symbolic. + +This change makes the pending-charge state be considered when +calculating the DisplayDevice state, setting it to pending-charge if at +least one battery in the system is pending-charge and no other is +charging or discharging. + +Closes: #81 +Closes: #19 +--- + src/up-daemon.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/up-daemon.c b/src/up-daemon.c +index 95fff6b..690f379 100644 +--- a/src/up-daemon.c ++++ b/src/up-daemon.c +@@ -210,14 +210,18 @@ up_daemon_update_display_battery (UpDaemon *daemon) + continue; + + /* If one battery is charging, the composite is charging +- * If all batteries are discharging, the composite is discharging ++ * If all batteries are discharging or pending-charge, the composite is discharging + * If all batteries are fully charged, the composite is fully charged ++ * If one battery is pending-charge and no other is charging or discharging, then the composite is pending-charge + * Everything else is unknown */ + if (state == UP_DEVICE_STATE_CHARGING) + state_total = UP_DEVICE_STATE_CHARGING; + else if (state == UP_DEVICE_STATE_DISCHARGING && + state_total != UP_DEVICE_STATE_CHARGING) + state_total = UP_DEVICE_STATE_DISCHARGING; ++ else if (state == UP_DEVICE_STATE_PENDING_CHARGE && ++ (state_total == UP_DEVICE_STATE_UNKNOWN || state_total == UP_DEVICE_STATE_PENDING_CHARGE)) ++ state_total = UP_DEVICE_STATE_PENDING_CHARGE; + else if (state == UP_DEVICE_STATE_FULLY_CHARGED && + state_total == UP_DEVICE_STATE_UNKNOWN) + state_total = UP_DEVICE_STATE_FULLY_CHARGED; +-- +2.18.1 + diff --git a/sys-power/upower/upower-0.99.9-r1.ebuild b/sys-power/upower/upower-0.99.9-r1.ebuild new file mode 100644 index 000000000000..c154b148365d --- /dev/null +++ b/sys-power/upower/upower-0.99.9-r1.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit systemd xdg-utils + +DESCRIPTION="D-Bus abstraction for enumerating power devices, querying history and statistics" +HOMEPAGE="https://upower.freedesktop.org/" + +# No tarball released, use the same commit as Fedora +#SRC_URI="https://${PN}.freedesktop.org/releases/${P}.tar.xz" +COMMIT="2282c7c0e53fb31816b824c9d1f547e8" +SRC_URI="https://gitlab.freedesktop.org/upower/upower/uploads/${COMMIT}/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0/3" # based on SONAME of libupower-glib.so +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" + +# gtk-doc files are not available as prebuilt in the tarball +IUSE="doc +introspection ios kernel_FreeBSD kernel_linux selinux" + +COMMON_DEPS=" + >=dev-libs/dbus-glib-0.100 + >=dev-libs/glib-2.34:2 + sys-apps/dbus:= + introspection? ( dev-libs/gobject-introspection:= ) + kernel_linux? ( + virtual/libusb:1 + virtual/libgudev:= + virtual/udev + ios? ( + >=app-pda/libimobiledevice-1:= + >=app-pda/libplist-1:= + ) + ) +" +RDEPEND=" + ${COMMON_DEPS} + selinux? ( sec-policy/selinux-devicekit ) +" +DEPEND="${COMMON_DEPS} + doc? ( dev-util/gtk-doc ) + dev-libs/libxslt + app-text/docbook-xsl-stylesheets + dev-util/intltool + >=sys-devel/gettext-0.17 + virtual/pkgconfig +" + +QA_MULTILIB_PATHS="usr/lib/${PN}/.*" + +DOCS=( AUTHORS HACKING NEWS README ) + +PATCHES=( + # daemon: Consider pending-charge when calculating the display state + # (from 'master') + "${FILESDIR}/${P}-pending-charge1.patch" + "${FILESDIR}/${P}-pending-charge2.patch" +) + +src_prepare() { + default + xdg_environment_reset + sed -i -e '/DISABLE_DEPRECATED/d' configure || die +} + +src_configure() { + local backend + + if use kernel_linux ; then + backend=linux + elif use kernel_FreeBSD ; then + backend=freebsd + else + backend=dummy + fi + + local myeconfargs=( + --disable-static + --disable-tests + --enable-man-pages + --libexecdir="${EPREFIX}"/usr/lib/${PN} + --localstatedir="${EPREFIX}"/var + --with-backend=${backend} + --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" + --with-systemdutildir="$(systemd_get_utildir)" + $(use_enable doc gtk-doc) + $(use_enable introspection) + $(use_with ios idevice) + ) + econf "${myeconfargs[@]}" +} + +src_install() { + default + find "${ED}" -name '*.la' -delete || die + keepdir /var/lib/upower #383091 +} -- cgit v1.2.3