diff options
| author |   Kacper Kowalik <xarthisius@gentoo.org> | 2011-05-27 07:01:36 +0000 |
|---|---|---|
| committer | Kacper Kowalik <xarthisius@gentoo.org> | 2011-05-27 07:01:36 +0000 |
| commit | 6419f83efadfe0d8ec7aed6b158c4fa1dba3888b (patch) | |
| tree | 59eacd817641de99d04e1bd85a70219b76348193 /sys-power | |
| parent | ppc stable wrt #368653 (diff) | |
| download | gentoo-2-6419f83efadfe0d8ec7aed6b158c4fa1dba3888b.tar.gz gentoo-2-6419f83efadfe0d8ec7aed6b158c4fa1dba3888b.tar.bz2 gentoo-2-6419f83efadfe0d8ec7aed6b158c4fa1dba3888b.zip | |
Version bump, remove patch that was applied upstream, drop old.
(Portage version: 2.2.0_alpha34/cvs/Linux x86_64)
Diffstat (limited to 'sys-power')
| -rw-r--r-- | sys-power/upower/ChangeLog | 8 | ||||
| -rw-r--r-- | sys-power/upower/files/0.9.10-glib.patch | 40 | ||||
| -rw-r--r-- | sys-power/upower/upower-0.9.11.ebuild (renamed from sys-power/upower/upower-0.9.10.ebuild) | 5 |
3 files changed, 9 insertions, 44 deletions
diff --git a/sys-power/upower/ChangeLog b/sys-power/upower/ChangeLog index ee81bd93d2b3..2498321a1cfe 100644 --- a/sys-power/upower/ChangeLog +++ b/sys-power/upower/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-power/upower # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/ChangeLog,v 1.46 2011/05/23 18:34:35 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/ChangeLog,v 1.47 2011/05/27 07:01:36 xarthisius Exp $ + +*upower-0.9.11 (27 May 2011) + + 27 May 2011; Kacper Kowalik <xarthisius@gentoo.org> -files/0.9.10-glib.patch, + -upower-0.9.10.ebuild, +upower-0.9.11.ebuild: + Version bump, remove patch that was applied upstream, drop old. 23 May 2011; Tomáš Chvátal <scarabeus@gentoo.org> +files/0.9.10-glib.patch, upower-0.9.10.ebuild: diff --git a/sys-power/upower/files/0.9.10-glib.patch b/sys-power/upower/files/0.9.10-glib.patch deleted file mode 100644 index 988d0229361f..000000000000 --- a/sys-power/upower/files/0.9.10-glib.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 2b42890480f21d55a2516de9126a9d83a54742da Mon Sep 17 00:00:00 2001 -From: Richard Hughes <richard@hughsie.com> -Date: Mon, 23 May 2011 08:42:38 +0000 -Subject: Only include glib-unix.h if the GLib version is >= 2.29.4 - -Many thanks to Takahiro HASHIMOTO for debugging the problem. Fixes fdo#37489 ---- -diff --git a/src/up-main.c b/src/up-main.c -index 2e35f9e..c1e490b 100644 ---- a/src/up-main.c -+++ b/src/up-main.c -@@ -41,7 +41,7 @@ - #include "up-kbd-backlight.h" - #include "up-wakeups.h" - --#if GLIB_CHECK_VERSION(2,28,7) -+#if GLIB_CHECK_VERSION(2,29,4) - #include <glib-unix.h> - #endif - -@@ -92,7 +92,7 @@ out: - return ret; - } - --#if GLIB_CHECK_VERSION(2,28,7) -+#if GLIB_CHECK_VERSION(2,29,4) - - /** - * up_main_sigint_cb: -@@ -201,7 +201,7 @@ main (gint argc, gchar **argv) - goto out; - } - --#if GLIB_CHECK_VERSION(2,28,7) -+#if GLIB_CHECK_VERSION(2,29,4) - /* do stuff on ctrl-c */ - g_unix_signal_add_watch_full (SIGINT, - G_PRIORITY_DEFAULT, --- -cgit v0.8.3-6-g21f6 diff --git a/sys-power/upower/upower-0.9.10.ebuild b/sys-power/upower/upower-0.9.11.ebuild index 6b0822d02ecd..019a16f4a1a7 100644 --- a/sys-power/upower/upower-0.9.10.ebuild +++ b/sys-power/upower/upower-0.9.11.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/upower-0.9.10.ebuild,v 1.2 2011/05/23 18:34:35 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/upower-0.9.11.ebuild,v 1.1 2011/05/27 07:01:36 xarthisius Exp $ EAPI=4 -inherit linux-info eutils +inherit linux-info DESCRIPTION="D-Bus abstraction for enumerating power devices and querying history and statistics" HOMEPAGE="http://upower.freedesktop.org/" @@ -49,7 +49,6 @@ pkg_setup() { src_prepare() { sed -i -e '/DISABLE_DEPRECATED/d' configure || die - epatch "${FILESDIR}/${PV}-glib.patch" } src_configure() { |