ssuominen 14/07/09 06:56:14 Modified: xfce4-session-4.11.0-r2.ebuild ChangeLog Log: 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)
Revision Changes Path 1.2 xfce-base/xfce4-session/xfce4-session-4.11.0-r2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/xfce-base/xfce4-session/xfce4-session-4.11.0-r2.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/xfce-base/xfce4-session/xfce4-session-4.11.0-r2.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/xfce-base/xfce4-session/xfce4-session-4.11.0-r2.ebuild?r1=1.1&r2=1.2 Index: xfce4-session-4.11.0-r2.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/xfce4-session-4.11.0-r2.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xfce4-session-4.11.0-r2.ebuild 8 Jul 2014 13:58:39 -0000 1.1 +++ xfce4-session-4.11.0-r2.ebuild 9 Jul 2014 06:56:14 -0000 1.2 @@ -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 @@ 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 ) } 1.217 xfce-base/xfce4-session/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/xfce-base/xfce4-session/ChangeLog?rev=1.217&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/xfce-base/xfce4-session/ChangeLog?rev=1.217&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/xfce-base/xfce4-session/ChangeLog?r1=1.216&r2=1.217 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/ChangeLog,v retrieving revision 1.216 retrieving revision 1.217 diff -u -r1.216 -r1.217 --- ChangeLog 8 Jul 2014 13:59:22 -0000 1.216 +++ ChangeLog 9 Jul 2014 06:56:14 -0000 1.217 @@ -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 <ssuomi...@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 <ssuomi...@gentoo.org> -files/xfce4-session-4.11.0-upower-0.99.patch,
