Gentoo Archives: gentoo-commits

From: "Samuli Suominen (ssuominen)" <ssuominen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in xfce-base/xfce4-session: xfce4-session-4.11.0-r2.ebuild ChangeLog
Date: Wed, 09 Jul 2014 06:56:19
Message-Id: 20140709065614.4F5D62004E@flycatcher.gentoo.org
1 ssuominen 14/07/09 06:56:14
2
3 Modified: xfce4-session-4.11.0-r2.ebuild ChangeLog
4 Log:
5 Fix building without UPower headers wrt http://bugzilla.xfce.org/show_bug.cgi?id=9952#c23. Thanks to mgorny for reporting.
6
7 (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
8
9 Revision Changes Path
10 1.2 xfce-base/xfce4-session/xfce4-session-4.11.0-r2.ebuild
11
12 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
13 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
14 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
15
16 Index: xfce4-session-4.11.0-r2.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/xfce4-session-4.11.0-r2.ebuild,v
19 retrieving revision 1.1
20 retrieving revision 1.2
21 diff -u -r1.1 -r1.2
22 --- xfce4-session-4.11.0-r2.ebuild 8 Jul 2014 13:58:39 -0000 1.1
23 +++ xfce4-session-4.11.0-r2.ebuild 9 Jul 2014 06:56:14 -0000 1.2
24 @@ -1,6 +1,6 @@
25 # Copyright 1999-2014 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $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 $
28 +# $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 $
29
30 EAPI=5
31 EAUTORECONF=1
32 @@ -43,19 +43,19 @@
33 virtual/pkgconfig"
34
35 pkg_setup() {
36 - PATCHES=(
37 - "${FILESDIR}"/${PN}-4.10.1-alock_support_to_xflock4.patch
38 - "${FILESDIR}"/${P}-upower-0.99.0.patch
39 - )
40 + PATCHES=( "${FILESDIR}"/${PN}-4.10.1-alock_support_to_xflock4.patch )
41 +
42 + use udev && PATCHES+=( "${FILESDIR}"/${P}-upower-0.99.0.patch )
43
44 XFCONF=(
45 --docdir="${EPREFIX}"/usr/share/doc/${PF}
46 - $(use_enable udev upower)
47 $(use_enable systemd)
48 --with-xsession-prefix="${EPREFIX}"/usr
49 $(xfconf_use_debug)
50 )
51
52 + use udev && XFCONF+=( --enable-upower )
53 +
54 DOCS=( AUTHORS BUGS ChangeLog NEWS README TODO )
55 }
56
57
58
59
60 1.217 xfce-base/xfce4-session/ChangeLog
61
62 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/xfce-base/xfce4-session/ChangeLog?rev=1.217&view=markup
63 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/xfce-base/xfce4-session/ChangeLog?rev=1.217&content-type=text/plain
64 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/xfce-base/xfce4-session/ChangeLog?r1=1.216&r2=1.217
65
66 Index: ChangeLog
67 ===================================================================
68 RCS file: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/ChangeLog,v
69 retrieving revision 1.216
70 retrieving revision 1.217
71 diff -u -r1.216 -r1.217
72 --- ChangeLog 8 Jul 2014 13:59:22 -0000 1.216
73 +++ ChangeLog 9 Jul 2014 06:56:14 -0000 1.217
74 @@ -1,6 +1,12 @@
75 # ChangeLog for xfce-base/xfce4-session
76 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
77 -# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/ChangeLog,v 1.216 2014/07/08 13:59:22 ssuominen Exp $
78 +# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/ChangeLog,v 1.217 2014/07/09 06:56:14 ssuominen Exp $
79 +
80 + 09 Jul 2014; Samuli Suominen <ssuominen@g.o>
81 + xfce4-session-4.11.0-r2.ebuild:
82 + Fix building without UPower headers wrt
83 + http://bugzilla.xfce.org/show_bug.cgi?id=9952#c23. Thanks to mgorny for
84 + reporting.
85
86 08 Jul 2014; Samuli Suominen <ssuominen@g.o>
87 -files/xfce4-session-4.11.0-upower-0.99.patch,