public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: sys-power/upower/files/, sys-power/upower/
@ 2017-06-18  9:30 Pacho Ramos
  0 siblings, 0 replies; 6+ messages in thread
From: Pacho Ramos @ 2017-06-18  9:30 UTC (permalink / raw
  To: gentoo-commits

commit:     32b0ec2c6ae435577dfcd98fdc3ac27f6c8d0eaa
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 18 09:28:45 2017 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Jun 18 09:30:37 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32b0ec2c

sys-power/upower: Fix critical battery action being ignored (#618038 by Alex Guzman), not rely on /proc/timer_stats (#621090 by Maxim Britov).

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 .../upower/files/upower-0.99.4-copy-paste.patch    | 28 +++++++
 .../upower/files/upower-0.99.4-timer-stats.patch   | 42 ++++++++++
 sys-power/upower/upower-0.99.4-r1.ebuild           | 95 ++++++++++++++++++++++
 3 files changed, 165 insertions(+)

diff --git a/sys-power/upower/files/upower-0.99.4-copy-paste.patch b/sys-power/upower/files/upower-0.99.4-copy-paste.patch
new file mode 100644
index 00000000000..6afe9b7a983
--- /dev/null
+++ b/sys-power/upower/files/upower-0.99.4-copy-paste.patch
@@ -0,0 +1,28 @@
+From 28cee8e2845b094488c337c4ecfa84ada0b6be60 Mon Sep 17 00:00:00 2001
+From: Martin Pitt <martin.pitt@ubuntu.com>
+Date: Tue, 23 Feb 2016 09:51:07 +0100
+Subject: daemon: fix get_critical_action()
+
+Fix copy&paste error from e7e9156f that called the wrong _complete_ function
+for up_daemon_get_critical_action().
+
+https://bugs.freedesktop.org/show_bug.cgi?id=94262
+
+diff --git a/src/up-daemon.c b/src/up-daemon.c
+index be14cbe..e95f904 100644
+--- a/src/up-daemon.c
++++ b/src/up-daemon.c
+@@ -435,8 +435,8 @@ up_daemon_get_critical_action (UpExportedDaemon *skeleton,
+ 			       GDBusMethodInvocation *invocation,
+ 			       UpDaemon *daemon)
+ {
+-	up_exported_daemon_complete_get_display_device (skeleton, invocation,
+-							up_backend_get_critical_action (daemon->priv->backend));
++	up_exported_daemon_complete_get_critical_action (skeleton, invocation,
++							 up_backend_get_critical_action (daemon->priv->backend));
+ 	return TRUE;
+ }
+ 
+-- 
+cgit v0.10.2
+

diff --git a/sys-power/upower/files/upower-0.99.4-timer-stats.patch b/sys-power/upower/files/upower-0.99.4-timer-stats.patch
new file mode 100644
index 00000000000..2ac44205459
--- /dev/null
+++ b/sys-power/upower/files/upower-0.99.4-timer-stats.patch
@@ -0,0 +1,42 @@
+From 798588a480eaae50368bed75fc78f8314523b2a3 Mon Sep 17 00:00:00 2001
+From: Richard Hughes <richard@hughsie.com>
+Date: Sun, 23 Apr 2017 20:22:02 +0100
+Subject: Do not spin in a loop when /proc/timer_stats cannot be written
+
+Only set up the polling once the write has succeeded.
+
+Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=100626
+
+diff --git a/src/up-wakeups.c b/src/up-wakeups.c
+index 1bc3c7b..99433dd 100644
+--- a/src/up-wakeups.c
++++ b/src/up-wakeups.c
+@@ -626,6 +626,13 @@ up_wakeups_timerstats_enable (UpWakeups *wakeups)
+ 
+ 	g_debug ("enabling timer stats");
+ 
++	/* enable timer stats */
++	file = fopen (UP_WAKEUPS_SOURCE_USERSPACE, "w");
++	if (file == NULL)
++		return FALSE;
++	fprintf (file, "1\n");
++	fclose (file);
++
+ 	/* setup polls */
+ 	wakeups->priv->poll_kernel_id =
+ 		g_timeout_add_seconds (UP_WAKEUPS_POLL_INTERVAL_KERNEL,
+@@ -637,11 +644,6 @@ up_wakeups_timerstats_enable (UpWakeups *wakeups)
+ 				       (GSourceFunc) up_wakeups_poll_userspace_cb, wakeups);
+ 	g_source_set_name_by_id (wakeups->priv->poll_userspace_id, "[upower] up_wakeups_poll_userspace_cb");
+ 
+-	file = fopen (UP_WAKEUPS_SOURCE_USERSPACE, "w");
+-	if (file == NULL)
+-		return FALSE;
+-	fprintf (file, "1\n");
+-	fclose (file);
+ 	wakeups->priv->polling_enabled = TRUE;
+ 	return TRUE;
+ }
+-- 
+cgit v0.10.2
+

diff --git a/sys-power/upower/upower-0.99.4-r1.ebuild b/sys-power/upower/upower-0.99.4-r1.ebuild
new file mode 100644
index 00000000000..3d9123df0d9
--- /dev/null
+++ b/sys-power/upower/upower-0.99.4-r1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit ltprune systemd
+
+DESCRIPTION="D-Bus abstraction for enumerating power devices, querying history and statistics"
+HOMEPAGE="https://upower.freedesktop.org/"
+SRC_URI="https://${PN}.freedesktop.org/releases/${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=(
+	# Fix calling the wrong _complete_ function for up_daemon_get_critical_action()
+	# (from 'master')
+	"${FILESDIR}"/${P}-copy-paste.patch
+
+	# Do not spin in a loop when /proc/timer_stats cannot be written
+	# (from 'master')
+	"${FILESDIR}"/${P}-timer-stats.patch
+)
+
+src_prepare() {
+	default
+	sed -i -e '/DISABLE_DEPRECATED/d' configure || die
+}
+
+src_configure() {
+	local backend myconf
+
+	if use kernel_linux; then
+		backend=linux
+	elif use kernel_FreeBSD; then
+		backend=freebsd
+	else
+		backend=dummy
+	fi
+
+	econf \
+		$(use_enable doc gtk-doc) \
+		--libexecdir="${EPREFIX}"/usr/lib/${PN} \
+		--localstatedir="${EPREFIX}"/var \
+		$(use_enable introspection) \
+		--disable-static \
+		${myconf} \
+		--enable-man-pages \
+		--disable-tests \
+		--with-backend=${backend} \
+		$(use_with ios idevice) \
+		--with-systemdutildir="$(systemd_get_utildir)" \
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+}
+
+src_install() {
+	default
+	keepdir /var/lib/upower #383091
+	prune_libtool_files
+}


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-power/upower/files/, sys-power/upower/
@ 2018-03-07 11:37 Michael Palimaka
  0 siblings, 0 replies; 6+ messages in thread
From: Michael Palimaka @ 2018-03-07 11:37 UTC (permalink / raw
  To: gentoo-commits

commit:     e1abeb2227734f962443a5a217d75eb773f8da1d
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Mar  7 11:37:06 2018 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Mar  7 11:37:32 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1abeb22

sys-power/upower: remove 0.99.4 and 0.99.6

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 sys-power/upower/Manifest                          |  2 -
 .../upower/files/upower-0.99.4-copy-paste.patch    | 28 -------
 .../upower/files/upower-0.99.4-timer-stats.patch   | 42 ----------
 sys-power/upower/upower-0.99.4-r1.ebuild           | 95 ----------------------
 sys-power/upower/upower-0.99.4.ebuild              | 84 -------------------
 sys-power/upower/upower-0.99.6.ebuild              | 86 --------------------
 6 files changed, 337 deletions(-)

diff --git a/sys-power/upower/Manifest b/sys-power/upower/Manifest
index 67de54da3f1..3ab9abf0de4 100644
--- a/sys-power/upower/Manifest
+++ b/sys-power/upower/Manifest
@@ -1,4 +1,2 @@
-DIST upower-0.99.4.tar.xz 426292 BLAKE2B 2a574fc9e8ad9d92c65b4159a9861afdccdb53f07506440374b10f7ad31aa31d1c1c964efa80d3d0fdb81ea0524021982da0359115eeacd3ccf1e16158ade553 SHA512 b3fdee5ccf5f4d0c69e227f543272f6952119132814e27bc8f112716b8d36b5e07741a87bcf02203e80ef910cad9ddffa1adecb338c9a9aaa5e1038b62be07f3
 DIST upower-0.99.5.tar.xz 432344 BLAKE2B 048471cee61e57ee673e2ba2e2f826ef1770291ca5b7a02adcce11acd78f96a3aa443b5f66abc595ce6578ca59a15a940b0c4924b443babc798fa54f4f629564 SHA512 2fb06bea69455f538146576665e36c5b91eb18b119fa77e29d383fcb2a86ea58650b82e258f157d03c40147ecb12ea545997199580f0e24847ac6ea04d46e5ea
-DIST upower-0.99.6.tar.xz 432056 BLAKE2B 7e62a2649806ac6bd59547aedd04572080ec9ba9700c2dd80287127f099b79aedcf206e4813ff8c6e68417eddaf79b881b69a80fc6fcbca4f276cc908c90d185 SHA512 7e7256491ecb5d3f04abf41f05a761b79761c8868a1aedadfc5085c3b9cf15f6099c1494596e6a24b0951511bc7cac074e93ebb2b84abb9fb7a4374483052d3f
 DIST upower-0.99.7.tar.xz 447832 BLAKE2B 3342f38552a5eb6abffc6b15803db0e8a24e6a3345fe1007f3a5fa66dd06ddebacf2352a751f7a3adf7ee0fe28797d7a1c5b3ec27cd190aabed17e2c7070a438 SHA512 a1ad200e715284eae815580bba3faad480f7f13401f6ff1a2e7446172796a2413990ce2b553de713ddc530849b2dff1f0ddc12fbd2fd9b55510bbb644d2340a4

diff --git a/sys-power/upower/files/upower-0.99.4-copy-paste.patch b/sys-power/upower/files/upower-0.99.4-copy-paste.patch
deleted file mode 100644
index 6afe9b7a983..00000000000
--- a/sys-power/upower/files/upower-0.99.4-copy-paste.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 28cee8e2845b094488c337c4ecfa84ada0b6be60 Mon Sep 17 00:00:00 2001
-From: Martin Pitt <martin.pitt@ubuntu.com>
-Date: Tue, 23 Feb 2016 09:51:07 +0100
-Subject: daemon: fix get_critical_action()
-
-Fix copy&paste error from e7e9156f that called the wrong _complete_ function
-for up_daemon_get_critical_action().
-
-https://bugs.freedesktop.org/show_bug.cgi?id=94262
-
-diff --git a/src/up-daemon.c b/src/up-daemon.c
-index be14cbe..e95f904 100644
---- a/src/up-daemon.c
-+++ b/src/up-daemon.c
-@@ -435,8 +435,8 @@ up_daemon_get_critical_action (UpExportedDaemon *skeleton,
- 			       GDBusMethodInvocation *invocation,
- 			       UpDaemon *daemon)
- {
--	up_exported_daemon_complete_get_display_device (skeleton, invocation,
--							up_backend_get_critical_action (daemon->priv->backend));
-+	up_exported_daemon_complete_get_critical_action (skeleton, invocation,
-+							 up_backend_get_critical_action (daemon->priv->backend));
- 	return TRUE;
- }
- 
--- 
-cgit v0.10.2
-

diff --git a/sys-power/upower/files/upower-0.99.4-timer-stats.patch b/sys-power/upower/files/upower-0.99.4-timer-stats.patch
deleted file mode 100644
index 2ac44205459..00000000000
--- a/sys-power/upower/files/upower-0.99.4-timer-stats.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 798588a480eaae50368bed75fc78f8314523b2a3 Mon Sep 17 00:00:00 2001
-From: Richard Hughes <richard@hughsie.com>
-Date: Sun, 23 Apr 2017 20:22:02 +0100
-Subject: Do not spin in a loop when /proc/timer_stats cannot be written
-
-Only set up the polling once the write has succeeded.
-
-Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=100626
-
-diff --git a/src/up-wakeups.c b/src/up-wakeups.c
-index 1bc3c7b..99433dd 100644
---- a/src/up-wakeups.c
-+++ b/src/up-wakeups.c
-@@ -626,6 +626,13 @@ up_wakeups_timerstats_enable (UpWakeups *wakeups)
- 
- 	g_debug ("enabling timer stats");
- 
-+	/* enable timer stats */
-+	file = fopen (UP_WAKEUPS_SOURCE_USERSPACE, "w");
-+	if (file == NULL)
-+		return FALSE;
-+	fprintf (file, "1\n");
-+	fclose (file);
-+
- 	/* setup polls */
- 	wakeups->priv->poll_kernel_id =
- 		g_timeout_add_seconds (UP_WAKEUPS_POLL_INTERVAL_KERNEL,
-@@ -637,11 +644,6 @@ up_wakeups_timerstats_enable (UpWakeups *wakeups)
- 				       (GSourceFunc) up_wakeups_poll_userspace_cb, wakeups);
- 	g_source_set_name_by_id (wakeups->priv->poll_userspace_id, "[upower] up_wakeups_poll_userspace_cb");
- 
--	file = fopen (UP_WAKEUPS_SOURCE_USERSPACE, "w");
--	if (file == NULL)
--		return FALSE;
--	fprintf (file, "1\n");
--	fclose (file);
- 	wakeups->priv->polling_enabled = TRUE;
- 	return TRUE;
- }
--- 
-cgit v0.10.2
-

diff --git a/sys-power/upower/upower-0.99.4-r1.ebuild b/sys-power/upower/upower-0.99.4-r1.ebuild
deleted file mode 100644
index 3d9123df0d9..00000000000
--- a/sys-power/upower/upower-0.99.4-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit ltprune systemd
-
-DESCRIPTION="D-Bus abstraction for enumerating power devices, querying history and statistics"
-HOMEPAGE="https://upower.freedesktop.org/"
-SRC_URI="https://${PN}.freedesktop.org/releases/${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=(
-	# Fix calling the wrong _complete_ function for up_daemon_get_critical_action()
-	# (from 'master')
-	"${FILESDIR}"/${P}-copy-paste.patch
-
-	# Do not spin in a loop when /proc/timer_stats cannot be written
-	# (from 'master')
-	"${FILESDIR}"/${P}-timer-stats.patch
-)
-
-src_prepare() {
-	default
-	sed -i -e '/DISABLE_DEPRECATED/d' configure || die
-}
-
-src_configure() {
-	local backend myconf
-
-	if use kernel_linux; then
-		backend=linux
-	elif use kernel_FreeBSD; then
-		backend=freebsd
-	else
-		backend=dummy
-	fi
-
-	econf \
-		$(use_enable doc gtk-doc) \
-		--libexecdir="${EPREFIX}"/usr/lib/${PN} \
-		--localstatedir="${EPREFIX}"/var \
-		$(use_enable introspection) \
-		--disable-static \
-		${myconf} \
-		--enable-man-pages \
-		--disable-tests \
-		--with-backend=${backend} \
-		$(use_with ios idevice) \
-		--with-systemdutildir="$(systemd_get_utildir)" \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-}
-
-src_install() {
-	default
-	keepdir /var/lib/upower #383091
-	prune_libtool_files
-}

diff --git a/sys-power/upower/upower-0.99.4.ebuild b/sys-power/upower/upower-0.99.4.ebuild
deleted file mode 100644
index 76b2424c803..00000000000
--- a/sys-power/upower/upower-0.99.4.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils systemd
-
-DESCRIPTION="D-Bus abstraction for enumerating power devices, querying history and statistics"
-HOMEPAGE="https://upower.freedesktop.org/"
-SRC_URI="https://${PN}.freedesktop.org/releases/${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"
-
-src_prepare() {
-	sed -i -e '/DISABLE_DEPRECATED/d' configure || die
-}
-
-src_configure() {
-	local backend myconf
-
-	if use kernel_linux; then
-		backend=linux
-	elif use kernel_FreeBSD; then
-		backend=freebsd
-	else
-		backend=dummy
-	fi
-
-	econf \
-		$(use_enable doc gtk-doc) \
-		--libexecdir="${EPREFIX}"/usr/lib/${PN} \
-		--localstatedir="${EPREFIX}"/var \
-		$(use_enable introspection) \
-		--disable-static \
-		${myconf} \
-		--enable-man-pages \
-		--disable-tests \
-		--with-backend=${backend} \
-		$(use_with ios idevice) \
-		"$(systemd_with_utildir)" \
-		"$(systemd_with_unitdir)"
-}
-
-src_install() {
-	default
-	keepdir /var/lib/upower #383091
-	prune_libtool_files
-}

diff --git a/sys-power/upower/upower-0.99.6.ebuild b/sys-power/upower/upower-0.99.6.ebuild
deleted file mode 100644
index a884fe3466c..00000000000
--- a/sys-power/upower/upower-0.99.6.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit ltprune systemd
-
-DESCRIPTION="D-Bus abstraction for enumerating power devices, querying history and statistics"
-HOMEPAGE="https://upower.freedesktop.org/"
-SRC_URI="https://${PN}.freedesktop.org/releases/${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 )
-
-src_prepare() {
-	default
-	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
-	keepdir /var/lib/upower #383091
-	prune_libtool_files
-}


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-power/upower/files/, sys-power/upower/
@ 2018-10-13  9:06 Pacho Ramos
  0 siblings, 0 replies; 6+ messages in thread
From: Pacho Ramos @ 2018-10-13  9:06 UTC (permalink / raw
  To: gentoo-commits

commit:     71d8682c51b91e629fff6cb3bddbca9378650406
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 13 09:04:46 2018 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Oct 13 09:06:30 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71d8682c

sys-power/upower: Apply important fixes from upstream

- Fix upower not having access to udev events (#668084)
- Fix upower's keyboard backlight support

Thanks-to: Peter Tworek
Closes: https://bugs.gentoo.org/668084
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 .../files/upower-0.99.8-keyboard-backlight.patch   | 30 +++++++
 .../upower/files/upower-0.99.8-udev-events.patch   | 32 +++++++
 sys-power/upower/upower-0.99.8-r1.ebuild           | 99 ++++++++++++++++++++++
 3 files changed, 161 insertions(+)

diff --git a/sys-power/upower/files/upower-0.99.8-keyboard-backlight.patch b/sys-power/upower/files/upower-0.99.8-keyboard-backlight.patch
new file mode 100644
index 00000000000..07b1731ad2c
--- /dev/null
+++ b/sys-power/upower/files/upower-0.99.8-keyboard-backlight.patch
@@ -0,0 +1,30 @@
+From 0a9d9ab4949effb20e77aa52e7b4ee07e776fc0d Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Tue, 4 Sep 2018 09:58:21 +0200
+Subject: daemon: Fix upower's keyboard backlight support
+
+Disabling kernel tunables blocked us from accessing /sys, meaning we
+couldn't change keyboard backlight levels.
+
+Closes: #73
+---
+ src/upower.service.in | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/upower.service.in b/src/upower.service.in
+index 8838655..4566ad3 100644
+--- a/src/upower.service.in
++++ b/src/upower.service.in
+@@ -10,7 +10,8 @@ Restart=on-failure
+ 
+ # Filesystem lockdown
+ ProtectSystem=strict
+-ProtectKernelTunables=true
++# Needed by keyboard backlight support
++ProtectKernelTunables=false
+ ProtectControlGroups=true
+ ReadWritePaths=@historydir@
+ ProtectHome=true
+-- 
+cgit v1.1
+

diff --git a/sys-power/upower/files/upower-0.99.8-udev-events.patch b/sys-power/upower/files/upower-0.99.8-udev-events.patch
new file mode 100644
index 00000000000..d164824b735
--- /dev/null
+++ b/sys-power/upower/files/upower-0.99.8-udev-events.patch
@@ -0,0 +1,32 @@
+From fe356951a9d45fee73036aaa72661f0319dffba3 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Tue, 21 Aug 2018 13:30:44 +0200
+Subject: daemon: Fix upower not having access to udev events
+
+PrivateNetwork=true will cut off upower from the udev netlink socket, so
+it's not what we want to use, as we want those events.
+
+See https://lists.freedesktop.org/archives/systemd-devel/2018-July/041000.html
+
+Closes: #68
+---
+ src/upower.service.in | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/upower.service.in b/src/upower.service.in
+index 835529a..8838655 100644
+--- a/src/upower.service.in
++++ b/src/upower.service.in
+@@ -17,7 +17,8 @@ ProtectHome=true
+ PrivateTmp=true
+ 
+ # Network
+-PrivateNetwork=true
++# PrivateNetwork=true would block udev's netlink socket
++RestrictAddressFamilies=AF_UNIX AF_NETLINK
+ 
+ # Execute Mappings
+ MemoryDenyWriteExecute=true
+-- 
+cgit v1.1
+

diff --git a/sys-power/upower/upower-0.99.8-r1.ebuild b/sys-power/upower/upower-0.99.8-r1.ebuild
new file mode 100644
index 00000000000..0fa1a0d4d9b
--- /dev/null
+++ b/sys-power/upower/upower-0.99.8-r1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+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="9125ab7ee96fdc4ecc68cfefb50c1cab"
+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: Fix upower not having access to udev events
+	"${FILESDIR}"/${P}-udev-events.patch
+
+	# daemon: Fix upower's keyboard backlight support
+	"${FILESDIR}"/${P}-keyboard-backlight.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 "${D}" -name '*.la' -delete || die
+	keepdir /var/lib/upower #383091
+}


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-power/upower/files/, sys-power/upower/
@ 2019-01-20 13:40 Pacho Ramos
  0 siblings, 0 replies; 6+ messages in thread
From: Pacho Ramos @ 2019-01-20 13:40 UTC (permalink / raw
  To: gentoo-commits

commit:     ef11ee8b619f1317a8063d404cba5ee4edbd16d1
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 20 13:36:50 2019 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Jan 20 13:40:34 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef11ee8b

sys-power/upower: Consider pending-charge when calculating

Thanks-to: Maik
Closes: https://bugs.gentoo.org/671570
Package-Manager: Portage-2.3.55, Repoman-2.3.12
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>

 .../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 ++++++++++++++++++++++
 3 files changed, 179 insertions(+)

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 00000000000..9ce91c10a66
--- /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?= <jprvita@endlessm.com>
+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 00000000000..a79ebac7ed1
--- /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?= <jprvita@endlessm.com>
+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 00000000000..c154b148365
--- /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
+}


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-power/upower/files/, sys-power/upower/
@ 2019-05-04  9:50 Pacho Ramos
  0 siblings, 0 replies; 6+ messages in thread
From: Pacho Ramos @ 2019-05-04  9:50 UTC (permalink / raw
  To: gentoo-commits

commit:     c61bddfa34ad3bf59d52fb72175c1d4db7030da6
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat May  4 09:48:41 2019 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat May  4 09:48:41 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c61bddfa

sys-power/upower: Drop old

Package-Manager: Portage-2.3.64, Repoman-2.3.12
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>

 sys-power/upower/Manifest                          |  1 -
 .../files/upower-0.99.8-keyboard-backlight.patch   | 30 -------
 .../upower/files/upower-0.99.8-udev-events.patch   | 32 -------
 sys-power/upower/upower-0.99.8-r1.ebuild           | 99 ----------------------
 4 files changed, 162 deletions(-)

diff --git a/sys-power/upower/Manifest b/sys-power/upower/Manifest
index cc2e9525678..1993b98248c 100644
--- a/sys-power/upower/Manifest
+++ b/sys-power/upower/Manifest
@@ -1,2 +1 @@
-DIST upower-0.99.8.tar.xz 448664 BLAKE2B e101e7d1b2aede77c1ed2da1fd23b87a95ccac8d901bd8d1f8bebcd5de7052a66f1840cf578a48453538e166aae56ef4bc6d3a2b85f7ba148ecac5cc0a486809 SHA512 dfd2960cae382195dfc7a703a02af298d9de55bc626cde2a1f97e7983842191ba9d99eb2044190214e792539e7d6c9d8e00b5aed17e5e86b04544e9ab90278b1
 DIST upower-0.99.9.tar.xz 448408 BLAKE2B 5fa2436f33c94cffb736d8e3fad433acf58954cf06ccd403a0361214be5afc45d79ea279f3c5c48dcd58b92ccaf995777c95987d1749fd8c8c8958317e439570 SHA512 45eb587b0e5ffcce88bad8c56bc5efa30559748913016a55d58313280f5159378e5fbb4a9842c3a6409257bb97822d235f96b03704268b8471455c93eb05fe2f

diff --git a/sys-power/upower/files/upower-0.99.8-keyboard-backlight.patch b/sys-power/upower/files/upower-0.99.8-keyboard-backlight.patch
deleted file mode 100644
index 07b1731ad2c..00000000000
--- a/sys-power/upower/files/upower-0.99.8-keyboard-backlight.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 0a9d9ab4949effb20e77aa52e7b4ee07e776fc0d Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Tue, 4 Sep 2018 09:58:21 +0200
-Subject: daemon: Fix upower's keyboard backlight support
-
-Disabling kernel tunables blocked us from accessing /sys, meaning we
-couldn't change keyboard backlight levels.
-
-Closes: #73
----
- src/upower.service.in | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/upower.service.in b/src/upower.service.in
-index 8838655..4566ad3 100644
---- a/src/upower.service.in
-+++ b/src/upower.service.in
-@@ -10,7 +10,8 @@ Restart=on-failure
- 
- # Filesystem lockdown
- ProtectSystem=strict
--ProtectKernelTunables=true
-+# Needed by keyboard backlight support
-+ProtectKernelTunables=false
- ProtectControlGroups=true
- ReadWritePaths=@historydir@
- ProtectHome=true
--- 
-cgit v1.1
-

diff --git a/sys-power/upower/files/upower-0.99.8-udev-events.patch b/sys-power/upower/files/upower-0.99.8-udev-events.patch
deleted file mode 100644
index d164824b735..00000000000
--- a/sys-power/upower/files/upower-0.99.8-udev-events.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From fe356951a9d45fee73036aaa72661f0319dffba3 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Tue, 21 Aug 2018 13:30:44 +0200
-Subject: daemon: Fix upower not having access to udev events
-
-PrivateNetwork=true will cut off upower from the udev netlink socket, so
-it's not what we want to use, as we want those events.
-
-See https://lists.freedesktop.org/archives/systemd-devel/2018-July/041000.html
-
-Closes: #68
----
- src/upower.service.in | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/upower.service.in b/src/upower.service.in
-index 835529a..8838655 100644
---- a/src/upower.service.in
-+++ b/src/upower.service.in
-@@ -17,7 +17,8 @@ ProtectHome=true
- PrivateTmp=true
- 
- # Network
--PrivateNetwork=true
-+# PrivateNetwork=true would block udev's netlink socket
-+RestrictAddressFamilies=AF_UNIX AF_NETLINK
- 
- # Execute Mappings
- MemoryDenyWriteExecute=true
--- 
-cgit v1.1
-

diff --git a/sys-power/upower/upower-0.99.8-r1.ebuild b/sys-power/upower/upower-0.99.8-r1.ebuild
deleted file mode 100644
index 21fa3ae9362..00000000000
--- a/sys-power/upower/upower-0.99.8-r1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-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="9125ab7ee96fdc4ecc68cfefb50c1cab"
-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: Fix upower not having access to udev events
-	"${FILESDIR}"/${P}-udev-events.patch
-
-	# daemon: Fix upower's keyboard backlight support
-	"${FILESDIR}"/${P}-keyboard-backlight.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 "${D}" -name '*.la' -delete || die
-	keepdir /var/lib/upower #383091
-}


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-power/upower/files/, sys-power/upower/
@ 2022-03-20 22:38 Matt Turner
  0 siblings, 0 replies; 6+ messages in thread
From: Matt Turner @ 2022-03-20 22:38 UTC (permalink / raw
  To: gentoo-commits

commit:     f105cddfadecc651eef8c45ee1576d5ee80c4385
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 20 22:37:23 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Mar 20 22:37:57 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f105cddf

sys-power/upower: Fix build with USE=-doc

Closes: https://bugs.gentoo.org/835696
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 ...eson-Don-t-search-for-gtk-doc-if-disabled.patch | 60 ++++++++++++++++++++++
 sys-power/upower/upower-0.99.17.ebuild             |  4 ++
 2 files changed, 64 insertions(+)

diff --git a/sys-power/upower/files/upower-0.99.17-meson-Don-t-search-for-gtk-doc-if-disabled.patch b/sys-power/upower/files/upower-0.99.17-meson-Don-t-search-for-gtk-doc-if-disabled.patch
new file mode 100644
index 000000000000..ead41d2e64c8
--- /dev/null
+++ b/sys-power/upower/files/upower-0.99.17-meson-Don-t-search-for-gtk-doc-if-disabled.patch
@@ -0,0 +1,60 @@
+https://gitlab.freedesktop.org/upower/upower/-/merge_requests/123
+
+From 1003d5c2a69e6c28dcf68adf10181b5180b5defa Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Sun, 20 Mar 2022 15:32:55 -0700
+Subject: [PATCH] meson: Don't search for gtk-doc if disabled
+
+---
+ doc/meson.build | 38 ++++++++++++++++++++------------------
+ 1 file changed, 20 insertions(+), 18 deletions(-)
+
+diff --git a/doc/meson.build b/doc/meson.build
+index dc93a16..5fc253c 100644
+--- a/doc/meson.build
++++ b/doc/meson.build
+@@ -27,21 +27,23 @@ version_xml = configure_file(
+     input: 'version.xml.in',
+     configuration: cdata)
+ 
+-gnome.gtkdoc('UPower',
+-    main_xml: 'upower-docs.xml',
+-    src_dir: meson.source_root() / 'libupower-glib',
+-    dependencies: [ libupower_glib_dep ],
+-    scan_args: ['--rebuild-types', '--rebuild-sections'],
+-    content_files: [
+-        version_xml,
+-        ifaces_refs,
+-        'man/UPower.xml',
+-        'man/upowerd.xml',
+-        'man/upower.xml',
+-        '../COPYING',
+-    ],
+-    ignore_headers: [
+-        'config.h',
+-    ],
+-    install: get_option('gtk-doc')
+-)
++if get_option('gtk-doc')
++  gnome.gtkdoc('UPower',
++      main_xml: 'upower-docs.xml',
++      src_dir: meson.source_root() / 'libupower-glib',
++      dependencies: [ libupower_glib_dep ],
++      scan_args: ['--rebuild-types', '--rebuild-sections'],
++      content_files: [
++          version_xml,
++          ifaces_refs,
++          'man/UPower.xml',
++          'man/upowerd.xml',
++          'man/upower.xml',
++          '../COPYING',
++      ],
++      ignore_headers: [
++          'config.h',
++      ],
++      install: true
++  )
++endif
+-- 
+2.34.1
+

diff --git a/sys-power/upower/upower-0.99.17.ebuild b/sys-power/upower/upower-0.99.17.ebuild
index 6a7dbc6a0d03..6dba8fb1854a 100644
--- a/sys-power/upower/upower-0.99.17.ebuild
+++ b/sys-power/upower/upower-0.99.17.ebuild
@@ -44,6 +44,10 @@ S="${WORKDIR}/${PN}-v${PV}"
 
 QA_MULTILIB_PATHS="usr/lib/${PN}/.*"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-meson-Don-t-search-for-gtk-doc-if-disabled.patch
+)
+
 src_prepare() {
 	default
 	xdg_environment_reset


^ permalink raw reply related	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-03-20 22:38 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-03-20 22:38 [gentoo-commits] repo/gentoo:master commit in: sys-power/upower/files/, sys-power/upower/ Matt Turner
  -- strict thread matches above, loose matches on Subject: below --
2019-05-04  9:50 Pacho Ramos
2019-01-20 13:40 Pacho Ramos
2018-10-13  9:06 Pacho Ramos
2018-03-07 11:37 Michael Palimaka
2017-06-18  9:30 Pacho Ramos

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox