summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <spyderous@gentoo.org>2006-03-24 09:47:56 +0000
committerDonnie Berkholz <spyderous@gentoo.org>2006-03-24 09:47:56 +0000
commit352e62ff47ced6bc434cf9d3d2898b0b0c378377 (patch)
tree3f7ea67b6dc8fdca1afb1ab0fc055f2120930c12 /x11-base
parentInitial import. Closes bug #124014 (diff)
downloadgentoo-2-352e62ff47ced6bc434cf9d3d2898b0b0c378377.tar.gz
gentoo-2-352e62ff47ced6bc434cf9d3d2898b0b0c378377.tar.bz2
gentoo-2-352e62ff47ced6bc434cf9d3d2898b0b0c378377.zip
Add deps on compositeproto 0.3 and fixesproto 4.0, otherwise build may break with overlay window patch.
(Portage version: 2.1_pre6-r5)
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xorg-server/ChangeLog7
-rw-r--r--x11-base/xorg-server/xorg-server-1.0.2-r1.ebuild6
2 files changed, 9 insertions, 4 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 10831ec59190..6dbabac5f9aa 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for x11-base/xorg-server
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.92 2006/03/24 01:17:14 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.93 2006/03/24 09:47:56 spyderous Exp $
+
+ 24 Mar 2006; Donnie Berkholz <spyderous@gentoo.org>;
+ xorg-server-1.0.2-r1.ebuild:
+ Add deps on compositeproto 0.3 and fixesproto 4.0, otherwise build may break
+ with overlay window patch.
*xorg-server-1.0.2-r1 (24 Mar 2006)
diff --git a/x11-base/xorg-server/xorg-server-1.0.2-r1.ebuild b/x11-base/xorg-server/xorg-server-1.0.2-r1.ebuild
index 2be04bcaee0d..ed8ef2f20e5e 100644
--- a/x11-base/xorg-server/xorg-server-1.0.2-r1.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.0.2-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.0.2-r1.ebuild,v 1.1 2006/03/24 01:17:14 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.0.2-r1.ebuild,v 1.2 2006/03/24 09:47:56 spyderous Exp $
# Must be before x-modular eclass is inherited
# Hack to make sure autoreconf gets run
@@ -65,7 +65,7 @@ RDEPEND="x11-libs/libXfont
DEPEND="${RDEPEND}
x11-proto/randrproto
x11-proto/renderproto
- x11-proto/fixesproto
+ >=x11-proto/fixesproto-4
x11-proto/damageproto
x11-proto/xextproto
x11-proto/xproto
@@ -74,7 +74,7 @@ DEPEND="${RDEPEND}
x11-proto/xf86rushproto
x11-proto/xf86vidmodeproto
x11-proto/xf86bigfontproto
- x11-proto/compositeproto
+ >=x11-proto/compositeproto-0.3
x11-proto/recordproto
x11-proto/resourceproto
x11-proto/videoproto