diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2014-07-09 06:56:14 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2014-07-09 06:56:14 +0000 |
| commit | 68bd5a983206d7da73fff5d36005f79d4f453aad (patch) | |
| tree | f2671c755bb6cc73b8ae78a9b517ec09cc9dd5d2 /xfce-base/xfce4-session | |
| parent | drop py2.6, switch SRC_URI to pypi, drop IUSE examples, doc due to absence of... (diff) | |
| download | gentoo-2-68bd5a983206d7da73fff5d36005f79d4f453aad.tar.gz gentoo-2-68bd5a983206d7da73fff5d36005f79d4f453aad.tar.bz2 gentoo-2-68bd5a983206d7da73fff5d36005f79d4f453aad.zip | |
Fix building without UPower headers wrt http://bugzilla.xfce.org/show_bug.cgi?id=9952#c23. Thanks to mgorny for reporting.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'xfce-base/xfce4-session')
| -rw-r--r-- | xfce-base/xfce4-session/ChangeLog | 8 | ||||
| -rw-r--r-- | xfce-base/xfce4-session/xfce4-session-4.11.0-r2.ebuild | 12 |
2 files changed, 13 insertions, 7 deletions
diff --git a/xfce-base/xfce4-session/ChangeLog b/xfce-base/xfce4-session/ChangeLog index 986988676a8f..ddda77f38945 100644 --- a/xfce-base/xfce4-session/ChangeLog +++ b/xfce-base/xfce4-session/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for xfce-base/xfce4-session # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/ChangeLog,v 1.216 2014/07/08 13:59:22 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/ChangeLog,v 1.217 2014/07/09 06:56:14 ssuominen Exp $ + + 09 Jul 2014; Samuli Suominen <ssuominen@gentoo.org> + xfce4-session-4.11.0-r2.ebuild: + Fix building without UPower headers wrt + http://bugzilla.xfce.org/show_bug.cgi?id=9952#c23. Thanks to mgorny for + reporting. 08 Jul 2014; Samuli Suominen <ssuominen@gentoo.org> -files/xfce4-session-4.11.0-upower-0.99.patch, diff --git a/xfce-base/xfce4-session/xfce4-session-4.11.0-r2.ebuild b/xfce-base/xfce4-session/xfce4-session-4.11.0-r2.ebuild index 15f249cd441e..9bd8a452f76f 100644 --- a/xfce-base/xfce4-session/xfce4-session-4.11.0-r2.ebuild +++ b/xfce-base/xfce4-session/xfce4-session-4.11.0-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/xfce4-session-4.11.0-r2.ebuild,v 1.1 2014/07/08 13:58:39 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/xfce4-session-4.11.0-r2.ebuild,v 1.2 2014/07/09 06:56:14 ssuominen Exp $ EAPI=5 EAUTORECONF=1 @@ -43,19 +43,19 @@ DEPEND="${COMMON_DEPEND} virtual/pkgconfig" pkg_setup() { - PATCHES=( - "${FILESDIR}"/${PN}-4.10.1-alock_support_to_xflock4.patch - "${FILESDIR}"/${P}-upower-0.99.0.patch - ) + PATCHES=( "${FILESDIR}"/${PN}-4.10.1-alock_support_to_xflock4.patch ) + + use udev && PATCHES+=( "${FILESDIR}"/${P}-upower-0.99.0.patch ) XFCONF=( --docdir="${EPREFIX}"/usr/share/doc/${PF} - $(use_enable udev upower) $(use_enable systemd) --with-xsession-prefix="${EPREFIX}"/usr $(xfconf_use_debug) ) + use udev && XFCONF+=( --enable-upower ) + DOCS=( AUTHORS BUGS ChangeLog NEWS README TODO ) } |