| 1 |
dirtyepic 07/12/04 04:23:45 |
| 2 |
|
| 3 |
Added: wxmozilla-0.5.7-wxversion.patch |
| 4 |
Log: |
| 5 |
Fix configure to find wxpython-2.6 install instead of highest version |
| 6 |
available. |
| 7 |
(Portage version: 2.1.4_rc7) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 x11-libs/wxmozilla/files/wxmozilla-0.5.7-wxversion.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxmozilla/files/wxmozilla-0.5.7-wxversion.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxmozilla/files/wxmozilla-0.5.7-wxversion.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: wxmozilla-0.5.7-wxversion.patch |
| 16 |
=================================================================== |
| 17 |
diff -Naur wxMozilla-orig/configure.in wxMozilla/configure.in |
| 18 |
--- wxMozilla-orig/configure.in 2006-11-15 08:19:06.000000000 -0600 |
| 19 |
+++ wxMozilla/configure.in 2007-12-03 22:03:09.000000000 -0600 |
| 20 |
@@ -287,7 +287,7 @@ |
| 21 |
if test "$wxrelease" = 2.4 ; then |
| 22 |
WXPYTHONDIR="$pythondir" |
| 23 |
else |
| 24 |
- wxpyvername=`$PYTHON -c "from wx.build.config import getExtraPath; print getExtraPath(addOpts=1)"` |
| 25 |
+ wxpyvername=`$PYTHON -c "import wxversion; wxversion.select('2.6'); from wx.build.config import getExtraPath; print getExtraPath(addOpts=1)"` |
| 26 |
WXPYTHONDIR="$pythondir/$wxpyvername" |
| 27 |
fi |
| 28 |
|
| 29 |
@@ -295,7 +295,7 @@ |
| 30 |
AC_MSG_RESULT([$WXPYTHONDIR]) |
| 31 |
|
| 32 |
AC_MSG_CHECKING([whether wxPython is >= 2.6.3]) |
| 33 |
- wxpyverok=`$PYTHON -c "import wx; print wx.__version__ > '2.6.3'"` |
| 34 |
+ wxpyverok=`$PYTHON -c "import wxversion; wxversion.select('2.6'); import wx; print wx.__version__ > '2.6.3'"` |
| 35 |
if test "$wxpyverok" = "True" ; then |
| 36 |
AC_MSG_RESULT([yes]) |
| 37 |
else |
| 38 |
|
| 39 |
|
| 40 |
|
| 41 |
-- |
| 42 |
gentoo-commits@g.o mailing list |
Archives