diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2013-07-14 18:45:52 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2013-07-14 18:45:52 +0000 |
| commit | 84930f34b5f7c2554a36e06dd2d4854a596d014e (patch) | |
| tree | 5c8bf6128f7da16848eca2c00832f96c7a315ae0 /gnome-base | |
| parent | Restore the previous stable ebuild as well. (diff) | |
| download | gentoo-2-84930f34b5f7c2554a36e06dd2d4854a596d014e.tar.gz gentoo-2-84930f34b5f7c2554a36e06dd2d4854a596d014e.tar.bz2 gentoo-2-84930f34b5f7c2554a36e06dd2d4854a596d014e.zip | |
Apply patches from gnome-3.8 branch, systemd needed for power and session management, bug #464944
(Portage version: 2.1.12.13/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
Diffstat (limited to 'gnome-base')
| -rw-r--r-- | gnome-base/gnome-settings-daemon/ChangeLog | 9 | ||||
| -rw-r--r-- | gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.8.3-r1.ebuild (renamed from gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.8.2.ebuild) | 12 |
2 files changed, 17 insertions, 4 deletions
diff --git a/gnome-base/gnome-settings-daemon/ChangeLog b/gnome-base/gnome-settings-daemon/ChangeLog index 4cda39ce24e4..50d8a61a85a8 100644 --- a/gnome-base/gnome-settings-daemon/ChangeLog +++ b/gnome-base/gnome-settings-daemon/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for gnome-base/gnome-settings-daemon # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.119 2013/06/09 19:10:38 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.120 2013/07/14 18:45:52 pacho Exp $ + +*gnome-settings-daemon-3.8.3-r1 (14 Jul 2013) + + 14 Jul 2013; Pacho Ramos <pacho@gentoo.org> + +gnome-settings-daemon-3.8.3-r1.ebuild, -gnome-settings-daemon-3.8.2.ebuild: + Apply patches from gnome-3.8 branch, systemd needed for power and session + management, bug #464944 *gnome-settings-daemon-3.8.3 (09 Jun 2013) diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.8.2.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.8.3-r1.ebuild index 93052eb20d53..73331393d9d5 100644 --- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.8.2.ebuild +++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.8.3-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.8.2.ebuild,v 1.1 2013/05/15 07:32:27 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.8.3-r1.ebuild,v 1.1 2013/07/14 18:45:52 pacho Exp $ EAPI="5" GCONF_DEBUG="no" @@ -11,6 +11,8 @@ inherit autotools eutils gnome2 virtualx DESCRIPTION="Gnome Settings Daemon" HOMEPAGE="https://git.gnome.org/browse/gnome-settings-daemon" +SRC_URI="${SRC_URI} http://dev.gentoo.org/~pacho/gnome/${P}-patches.tar.xz" + LICENSE="GPL-2+" SLOT="0" IUSE="+colord +cups debug +i18n input_devices_wacom packagekit policykit +short-touchpad-timeout smartcard +udev" @@ -57,8 +59,10 @@ COMMON_DEPEND=" # Themes needed by g-s-d, gnome-shell, gtk+:3 apps to work properly # <gnome-color-manager-3.1.1 has file collisions with g-s-d-3.1.x # <gnome-power-manager-3.1.3 has file collisions with g-s-d-3.1.x +# systemd needed for power and session management, bug #464944 RDEPEND="${COMMON_DEPEND} gnome-base/dconf + sys-apps/systemd >=x11-themes/gnome-themes-standard-2.91 >=x11-themes/gnome-icon-theme-2.91 >=x11-themes/gnome-icon-theme-symbolic-2.91 @@ -90,14 +94,16 @@ src_prepare() { # Make colord and wacom optional; requires eautoreconf epatch "${FILESDIR}/${PN}-3.7.90-optional-color-wacom.patch" + # Apply patches from gnome-3.8 branch + epatch "${WORKDIR}"/${P}-patches/*.patch + + epatch_user eautoreconf gnome2_src_prepare } src_configure() { - # README is empty - DOCS="AUTHORS NEWS ChangeLog MAINTAINERS" gnome2_src_configure \ --disable-static \ --enable-man \ |