| 1 |
ssuominen 10/11/04 14:59:43 |
| 2 |
|
| 3 |
Modified: xfwm4-4.7.1.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Block <libxfcegui4-4.7.0 to avoid conflict with function xfce_shortcuts_provider_set_shortcut. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha3/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 xfce-base/xfwm4/xfwm4-4.7.1.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/xfce-base/xfwm4/xfwm4-4.7.1.ebuild?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/xfce-base/xfwm4/xfwm4-4.7.1.ebuild?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/xfce-base/xfwm4/xfwm4-4.7.1.ebuild?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: xfwm4-4.7.1.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/xfce-base/xfwm4/xfwm4-4.7.1.ebuild,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- xfwm4-4.7.1.ebuild 3 Nov 2010 21:32:38 -0000 1.1 |
| 23 |
+++ xfwm4-4.7.1.ebuild 4 Nov 2010 14:59:43 -0000 1.2 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2010 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfwm4/xfwm4-4.7.1.ebuild,v 1.1 2010/11/03 21:32:38 ssuominen Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfwm4/xfwm4-4.7.1.ebuild,v 1.2 2010/11/04 14:59:43 ssuominen Exp $ |
| 29 |
|
| 30 |
EAPI=3 |
| 31 |
inherit xfconf |
| 32 |
@@ -31,7 +31,8 @@ |
| 33 |
startup-notification? ( x11-libs/startup-notification ) |
| 34 |
xcomposite? ( x11-libs/libXcomposite |
| 35 |
x11-libs/libXdamage |
| 36 |
- x11-libs/libXfixes )" |
| 37 |
+ x11-libs/libXfixes ) |
| 38 |
+ !<xfce-base/libxfcegui4-4.7.0" |
| 39 |
DEPEND="${RDEPEND} |
| 40 |
dev-util/intltool |
| 41 |
dev-util/pkgconfig |
| 42 |
|
| 43 |
|
| 44 |
|
| 45 |
1.153 xfce-base/xfwm4/ChangeLog |
| 46 |
|
| 47 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/xfce-base/xfwm4/ChangeLog?rev=1.153&view=markup |
| 48 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/xfce-base/xfwm4/ChangeLog?rev=1.153&content-type=text/plain |
| 49 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/xfce-base/xfwm4/ChangeLog?r1=1.152&r2=1.153 |
| 50 |
|
| 51 |
Index: ChangeLog |
| 52 |
=================================================================== |
| 53 |
RCS file: /var/cvsroot/gentoo-x86/xfce-base/xfwm4/ChangeLog,v |
| 54 |
retrieving revision 1.152 |
| 55 |
retrieving revision 1.153 |
| 56 |
diff -u -r1.152 -r1.153 |
| 57 |
--- ChangeLog 3 Nov 2010 21:32:38 -0000 1.152 |
| 58 |
+++ ChangeLog 4 Nov 2010 14:59:43 -0000 1.153 |
| 59 |
@@ -1,6 +1,10 @@ |
| 60 |
# ChangeLog for xfce-base/xfwm4 |
| 61 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 62 |
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfwm4/ChangeLog,v 1.152 2010/11/03 21:32:38 ssuominen Exp $ |
| 63 |
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfwm4/ChangeLog,v 1.153 2010/11/04 14:59:43 ssuominen Exp $ |
| 64 |
+ |
| 65 |
+ 04 Nov 2010; Samuli Suominen <ssuominen@g.o> xfwm4-4.7.1.ebuild: |
| 66 |
+ Block <libxfcegui4-4.7.0 to avoid conflict with function |
| 67 |
+ xfce_shortcuts_provider_set_shortcut. |
| 68 |
|
| 69 |
*xfwm4-4.7.1 (03 Nov 2010) |
Archives