diff --git a/package/tsa/wxpython/wxpython.conf b/package/tsa/wxpython/wxpython.conf index b08f2981d..7bef35150 100644 --- a/package/tsa/wxpython/wxpython.conf +++ b/package/tsa/wxpython/wxpython.conf @@ -20,6 +20,9 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- +custmain="build_wxpython" +createdocs=0 + build_wxpython() { if pkginstalled gtk+ ; then @@ -28,13 +31,11 @@ build_wxpython() { WXPORT=gtk fi - # we only want the wxpython stuff, so we'll just build in this subdir + WX_CONFIG=/usr/bin/wx-config + echo "Building wxPython.." cd wxPython - python setup.py WXPORT=$WXPORT BUILD_GLCANVAS=0 build install - + python setup.py WXPORT=$WXPORT WX_CONFIG=$WX_CONFIG build_ext --inplace + python setup.py WXPORT=$WXPORT WX_CONFIG=$WX_CONFIG install } -custmain="build_wxpython" -createdocs=0 - diff --git a/package/tsa/wxpython/wxpython.desc b/package/tsa/wxpython/wxpython.desc index a489f8d56..e8b52335c 100644 --- a/package/tsa/wxpython/wxpython.desc +++ b/package/tsa/wxpython/wxpython.desc @@ -37,8 +37,8 @@ [L] LGPL [S] Stable -[V] 2.6.0.0 +[V] 2.6.3.3 [P] X -?---5---9 147.000 -[D] 3177762676 wxPython-src-2.6.0.0.tar.gz http://dl.sourceforge.net/wxpython/ +[D] 4166151896 wxPython-src-2.6.3.3.tar.bz2 http://mesh.dl.sourceforge.net/sourceforge/wxpython/ diff --git a/package/tsa/wxwidgets/wxwidgets.conf b/package/tsa/wxwidgets/wxwidgets.conf index e4f719b8a..257f1e50a 100644 --- a/package/tsa/wxwidgets/wxwidgets.conf +++ b/package/tsa/wxwidgets/wxwidgets.conf @@ -20,26 +20,28 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -var_append confopt ' ' '--enable-monolithic' -var_append confopt ' ' '--enable-optimise' -var_append confopt ' ' '--enable-shared' -var_append confopt ' ' '--enable-xrc' -var_append confopt ' ' '--enable-largefile' +# var_append extraconfopt ' ' '--enable-monolithic' +var_append extraconfopt ' ' '--enable-optimize' +var_append extraconfopt ' ' '--enable-debug_flag' +var_append extraconfopt ' ' '--enable-shared' +var_append extraconfopt ' ' '--enable-xrc' +var_append extraconfopt ' ' '--enable-largefile' +var_append extraconfopt ' ' '--enable-unicode' if pkginstalled gtk+ ; then - var_append confopt ' ' '--with-gtk' + var_append extraconfopt ' ' '--with-gtk' elif pkginstalled gtk+12 ; then - var_append confopt ' ' '--with-gtk --disable-gtk2' + var_append extraconfopt ' ' '--with-gtk --disable-gtk2' else - var_append confopt ' ' '--disable-gui' + var_append extraconfopt ' ' '--disable-gui' fi pkginstalled libsdl && \ - var_append confopt ' ' '--with-sdl' + var_append extraconfopt ' ' '--with-sdl' # FIXME: how to do this right? if [ -f $root/usr/lib/libGL.so ] ; then - var_append confopt ' ' '--with-opengl' + var_append extraconfopt ' ' '--with-opengl' hook_add inmake 10 'make -C contrib/src/ogl CXXFLAGS="-DwxUSE_DEPRECATED=0"' hook_add postmake 10 'make -C contrib/src/ogl CXXFLAGS="-DwxUSE_DEPRECATED=0" install' fi