diff options
| author |   Daniel Ostrow <dostrow@gentoo.org> | 2005-11-06 00:48:14 +0000 |
|---|---|---|
| committer | Daniel Ostrow <dostrow@gentoo.org> | 2005-11-06 00:48:14 +0000 |
| commit | 00eb2a299087dc4a0458eae0f7958ed654af7f1f (patch) | |
| tree | ecc5a7b5cc1083497601c204671b9c2b64d61f00 | |
| parent | version bump (diff) | |
| download | gentoo-2-00eb2a299087dc4a0458eae0f7958ed654af7f1f.tar.gz gentoo-2-00eb2a299087dc4a0458eae0f7958ed654af7f1f.tar.bz2 gentoo-2-00eb2a299087dc4a0458eae0f7958ed654af7f1f.zip | |
Add fix for composite version for modular X.
(Portage version: 2.0.53_rc6)
| -rw-r--r-- | xfce-base/xfwm4/ChangeLog | 6 | ||||
| -rw-r--r-- | xfce-base/xfwm4/files/x-modular-composite-version.patch | 11 | ||||
| -rw-r--r-- | xfce-base/xfwm4/xfwm4-4.2.2-r1.ebuild | 21 |
3 files changed, 33 insertions, 5 deletions
diff --git a/xfce-base/xfwm4/ChangeLog b/xfce-base/xfwm4/ChangeLog index 665af182c9b1..a75ee85d2c75 100644 --- a/xfce-base/xfwm4/ChangeLog +++ b/xfce-base/xfwm4/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for xfce-base/xfwm4 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfwm4/ChangeLog,v 1.57 2005/10/06 06:44:05 bcowan Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfwm4/ChangeLog,v 1.58 2005/11/06 00:48:14 dostrow Exp $ + + 06 Nov 2005; Daniel Ostrow <dostrow@gentoo.org> + +files/x-modular-composite-version.patch, xfwm4-4.2.2-r1.ebuild: + Add fix for composite version for modular X. *xfwm4-4.2.2-r1 (06 Oct 2005) diff --git a/xfce-base/xfwm4/files/x-modular-composite-version.patch b/xfce-base/xfwm4/files/x-modular-composite-version.patch new file mode 100644 index 000000000000..9cdc183810b0 --- /dev/null +++ b/xfce-base/xfwm4/files/x-modular-composite-version.patch @@ -0,0 +1,11 @@ +--- xfwm4-4.2.2.orig/configure.ac 2005-05-15 04:43:29.000000000 -0400 ++++ xfwm4-4.2.2/configure.ac 2005-10-05 23:30:40.527185680 -0400 +@@ -92,7 +92,7 @@ + + if test x"$enable_compositor" = x"yes"; then + if $PKG_CONFIG --exists xcomposite xfixes xdamage xrender 2> /dev/null; then +- PKG_CHECK_MODULES(COMPOSITOR, xcomposite >= 1.0 xfixes xdamage xrender) ++ PKG_CHECK_MODULES(COMPOSITOR, xcomposite >= 0.2 xfixes xdamage xrender) + AC_DEFINE([HAVE_COMPOSITOR], [1], [Define to enable compositor]) + ENABLE_COMPOSITOR="--enable-compositor" + fi diff --git a/xfce-base/xfwm4/xfwm4-4.2.2-r1.ebuild b/xfce-base/xfwm4/xfwm4-4.2.2-r1.ebuild index 2dfd48590726..4e462f18f17e 100644 --- a/xfce-base/xfwm4/xfwm4-4.2.2-r1.ebuild +++ b/xfce-base/xfwm4/xfwm4-4.2.2-r1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfwm4/xfwm4-4.2.2-r1.ebuild,v 1.3 2005/10/07 19:35:16 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfwm4/xfwm4-4.2.2-r1.ebuild,v 1.4 2005/11/06 00:48:14 dostrow Exp $ -inherit xfce42 +inherit xfce42 eutils DESCRIPTION="Xfce 4 window manager" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" @@ -24,7 +24,20 @@ DEPEND="${RDEPEND} || ( ( x11-proto/xproto x11-proto/xextproto x11-libs/libXt ) - virtual/x11 )" + virtual/x11 ) + sys-devel/autoconf" XFCE_CONFIG="--enable-randr --enable-compositor" -core_package
\ No newline at end of file +core_package + +src_unpack() { + unpack ${A} + cd ${S} + epatch ${FILESDIR}/x-modular-composite-version.patch +} + +src_compile() { + autoconf || die "autoconf failed" + econf ${XFCE_CONFIG} || die + emake ${JOBS} || die +} |