summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Hadaway <raker@gentoo.org>2002-09-13 18:38:19 +0000
committerNick Hadaway <raker@gentoo.org>2002-09-13 18:38:19 +0000
commit8e9082dd3bac18a1f0fd576e1d9cf1afa5f19520 (patch)
tree18382dbf458162ab884cfd2bce1a317ee5cb96fe /dev-python
parentcommit wrong ebuild before (diff)
downloadgentoo-2-8e9082dd3bac18a1f0fd576e1d9cf1afa5f19520.tar.gz
gentoo-2-8e9082dd3bac18a1f0fd576e1d9cf1afa5f19520.tar.bz2
gentoo-2-8e9082dd3bac18a1f0fd576e1d9cf1afa5f19520.zip
Migrated glcanvas patch from -r1 as glcanvas wasn't being completely
disabled by passing GLCANVAS=0 to the build. Should fix bug #7777
Diffstat (limited to 'dev-python')
-rw-r--r--dev-python/wxPython/ChangeLog6
-rw-r--r--dev-python/wxPython/wxPython-2.3.2.1-r2.ebuild3
2 files changed, 7 insertions, 2 deletions
diff --git a/dev-python/wxPython/ChangeLog b/dev-python/wxPython/ChangeLog
index c8511e1dbf9e..98dfc2da5a5e 100644
--- a/dev-python/wxPython/ChangeLog
+++ b/dev-python/wxPython/ChangeLog
@@ -1,9 +1,13 @@
# ChangeLog for dev-python/wxPython
# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wxPython/ChangeLog,v 1.7 2002/09/11 15:06:40 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxPython/ChangeLog,v 1.8 2002/09/13 18:38:19 raker Exp $
*wxPython-2.3.2.1-r2 (29 Aug 2002)
+ 13 Sep 2002; Nick Hadaway <raker@gentoo.org> wxPython-2.3.2.1-r2.ebuild :
+ Moved glcanvas patch from -r1 as specifying GLCANVAS=0 doesn't disable
+ the opengl portion of the build fully. Should fix bug #7777.
+
11 Sep 2002; Nick Hadaway <raker@gentoo.org> wxPython-2.3.2.1-r2.ebuild :
tightened wxGTK dependancy to wxGTK-2.3.2*
diff --git a/dev-python/wxPython/wxPython-2.3.2.1-r2.ebuild b/dev-python/wxPython/wxPython-2.3.2.1-r2.ebuild
index e7eb317938f6..f7ef5d4bbb4d 100644
--- a/dev-python/wxPython/wxPython-2.3.2.1-r2.ebuild
+++ b/dev-python/wxPython/wxPython-2.3.2.1-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2002 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wxPython/wxPython-2.3.2.1-r2.ebuild,v 1.3 2002/09/11 15:06:40 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxPython/wxPython-2.3.2.1-r2.ebuild,v 1.4 2002/09/13 18:38:19 raker Exp $
S=${WORKDIR}/${P}
@@ -43,6 +43,7 @@ src_compile() {
myconf="${myconf} BUILD_GLCANVAS=1"
else
myconf="${myconf} BUILD_GLCANVAS=0"
+ patch -p1 < ${FILESDIR}/noglcanvas.diff || die "patch failed"
fi
python setup.py ${myconf} build || die