# HG changeset patch # User Christopher Rogers # Date 1334822749 0 # Node ID 13d730617dadbc0afcd0f4529829777cb28ca84e # Parent 32a88a6f5f4f6bcfd8e4941f8ecc8c9d168bd90f wxpython: Fixed package so we have python files. Some packages that build with wxpython need this in order to build. diff -r 32a88a6f5f4f -r 13d730617dad wxpython-dev/receipt --- a/wxpython-dev/receipt Thu Apr 19 08:01:45 2012 +0000 +++ b/wxpython-dev/receipt Thu Apr 19 08:05:49 2012 +0000 @@ -13,10 +13,6 @@ # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - mkdir -p $fs/usr/bin $fs/usr/lib $fs/usr/share - cp -a $_pkg/usr/bin/wx-config $fs/usr/bin - cp -a $_pkg/usr/lib/wx $fs/usr/lib + mkdir -p $fs/usr cp -a $_pkg/usr/include $fs/usr - cp -a $_pkg/usr/share/aclocal $fs/usr/share - cp -a $_pkg/usr/share/bakefile $fs/usr/share } diff -r 32a88a6f5f4f -r 13d730617dad wxpython/receipt --- a/wxpython/receipt Thu Apr 19 08:01:45 2012 +0000 +++ b/wxpython/receipt Thu Apr 19 08:05:49 2012 +0000 @@ -5,8 +5,8 @@ CATEGORY="x-window" SHORT_DESC="GUI toolkit for the Python programming language." MAINTAINER="pankso@slitaz.org" -DEPENDS="python gtk+" -BUILD_DEPENDS="python-dev gtk+-dev" +DEPENDS="python wxWidgets" +BUILD_DEPENDS="python-dev wxWidgets-dev mesa-dev" SOURCE="wxPython" TARBALL="$SOURCE-src-$VERSION.tar.bz2" WEB_SITE="http://www.wxpython.org/" @@ -16,17 +16,30 @@ compile_rules() { cd $src + mv wxPython/wx/tools/Editra/editra wxPython/wx/tools/Editra/Editra ./configure \ + --with-gtk=2 \ + --with-opengl \ + --enable-unicode \ + --with-regex=sys \ + --with-libpng=sys \ + --with-libxpm=sys \ + --with-libjpeg=sys \ + --with-libtiff=sys \ + --disable-precomp-headers \ --without-sdl \ $CONFIGURE_ARGS && - make $MAKEFLAGS && - make DESTDIR=$DESTDIR install + make $MAKEFLAGS + cd $src/wxPython + python -Np2 -i $stuff/wxpython-cairo.patch + python setup.py WXPORT=gtk2 UNICODE=1 build + python setup.py WXPORT=gtk2 UNICODE=1 install --root=$DESTDIR } # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - mkdir -p $fs/usr/bin $fs/usr/lib - cp -a $_pkg/usr/bin/wxrc* $fs/usr/bin - cp -a $_pkg/usr/lib/*.so* $fs/usr/lib + mkdir -p $fs/usr/lib + cp -a $_pkg/usr/bin $fs/usr + cp -a $_pkg/usr/lib/python* $fs/usr/lib } diff -r 32a88a6f5f4f -r 13d730617dad wxpython/stuff/wxpython-cairo.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wxpython/stuff/wxpython-cairo.patch Thu Apr 19 08:05:49 2012 +0000 @@ -0,0 +1,51 @@ +--- wxPython/trunk/wx/lib/wxcairo.py 2011/08/25 18:50:02 68894 ++++ wxPython/trunk/wx/lib/wxcairo.py 2011/09/22 00:30:25 69181 +@@ -401,6 +401,48 @@ + ctypes.py_object)), + ('Check_Status', ctypes.PYFUNCTYPE(ctypes.c_int, ctypes.c_int))] + ++ # This structure is known good with pycairo 1.10.0. The keep adding stuff ++ # to the middle of the structure instead of only adding to the end! ++ elif cairo.version_info < (1,11): ++ _fields_ = [ ++ ('Context_Type', ctypes.py_object), ++ ('Context_FromContext', ctypes.PYFUNCTYPE(ctypes.py_object, ++ ctypes.c_void_p, ++ ctypes.py_object, ++ ctypes.py_object)), ++ ('FontFace_Type', ctypes.py_object), ++ ('ToyFontFace_Type', ctypes.py_object), #** new in 1.8.4 ++ ('FontFace_FromFontFace', ctypes.PYFUNCTYPE(ctypes.py_object, ctypes.c_void_p)), ++ ('FontOptions_Type', ctypes.py_object), ++ ('FontOptions_FromFontOptions', ctypes.PYFUNCTYPE(ctypes.py_object, ctypes.c_void_p)), ++ ('Matrix_Type', ctypes.py_object), ++ ('Matrix_FromMatrix', ctypes.PYFUNCTYPE(ctypes.py_object, ctypes.c_void_p)), ++ ('Path_Type', ctypes.py_object), ++ ('Path_FromPath', ctypes.PYFUNCTYPE(ctypes.py_object, ctypes.c_void_p)), ++ ('Pattern_Type', ctypes.py_object), ++ ('SolidPattern_Type', ctypes.py_object), ++ ('SurfacePattern_Type', ctypes.py_object), ++ ('Gradient_Type', ctypes.py_object), ++ ('LinearGradient_Type', ctypes.py_object), ++ ('RadialGradient_Type', ctypes.py_object), ++ ('Pattern_FromPattern', ctypes.PYFUNCTYPE(ctypes.py_object, ctypes.c_void_p, ++ ctypes.py_object)), #** changed in 1.8.4 ++ ('ScaledFont_Type', ctypes.py_object), ++ ('ScaledFont_FromScaledFont', ctypes.PYFUNCTYPE(ctypes.py_object, ctypes.c_void_p)), ++ ('Surface_Type', ctypes.py_object), ++ ('ImageSurface_Type', ctypes.py_object), ++ ('PDFSurface_Type', ctypes.py_object), ++ ('PSSurface_Type', ctypes.py_object), ++ ('SVGSurface_Type', ctypes.py_object), ++ ('Win32Surface_Type', ctypes.py_object), ++ ('Win32PrintingSurface_Type', ctypes.py_object), ++ ('XCBSurface_Type', ctypes.py_object), ++ ('XlibSurface_Type', ctypes.py_object), ++ ('Surface_FromSurface', ctypes.PYFUNCTYPE(ctypes.py_object, ++ ctypes.c_void_p, ++ ctypes.py_object)), ++ ('Check_Status', ctypes.PYFUNCTYPE(ctypes.c_int, ctypes.c_int))] ++ + + def _loadPycairoAPI(): + global pycairoAPI