Update of /cvsroot/fink/experimental/babayoshihiko/finkinfo In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv6531
Modified Files: qgis20-py.info Log Message: python33 MethodType TypeError Index: qgis20-py.info =================================================================== RCS file: /cvsroot/fink/experimental/babayoshihiko/finkinfo/qgis20-py.info,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- qgis20-py.info 19 Jul 2013 21:35:47 -0000 1.7 +++ qgis20-py.info 21 Jul 2013 09:43:43 -0000 1.8 @@ -90,6 +90,7 @@ # 2.0 if [[ %type_pkg[python] > 30 ]]; then + perl -pi -e "s|cStringIO|io|g" src/python/qgspythonutilsimpl.cpp %p/bin/2to3-${PY_VER} -w python/utils.py %p/bin/2to3-${PY_VER} -w python/console/__init__.py %p/bin/2to3-${PY_VER} -w python/console/console.py @@ -108,6 +109,8 @@ %p/bin/2to3-${PY_VER} -w python/pyplugin_installer/unzip.py %p/bin/2to3-${PY_VER} -w python/pyplugin_installer/version_compare.py perl -pi -e "s|except ImportError, e|except ImportError as e|g" %b/cmake/FindQsci.py + perl -pi -e "s|cStringIO|io|g" python/plugins/fTools/tools/doPointDistance.py + perl -pi -e "s|cStringIO|io|g" python/sextante/algs/ftools/PointDistance.py perl -pi -e "s|PyString_AS_STRING|PyUnicode_AsUTF8|g" src/python/qgspythonutilsimpl.cpp #perl -pi -e "s|return QString\( PyString_AsString\(\(\( PyClassObject\* \)obj \)->cl_name \) \);|return QString( PyString_AsString((( PyClassObject* )obj )->cl_name\"utf-8\",\"Error ~\" ) );|g" src/python/qgspythonutilsimpl.cpp #perl -pi -e "s|PyString_AsString\(([^\)]*)\)|PyUnicode_AsEncodedString(\1, \"utf-8\",\"Error ~\")|g" src/python/qgspythonutilsimpl.cpp @@ -130,6 +133,7 @@ perl -pi -e "s|PyString_AsString|PyUnicode_AsUTF8|g" python/core/qgsapplication.sip perl -pi -e "s|PyString_FromString|PyUnicode_FromString|g" python/core/qgsfeature.sip perl -pi -e "s|PyString_FromString|PyUnicode_FromString|g" python/core/qgsgeometry.sip + perl -pi -e "s|PyInt_|PyLong_|g" analysis/network/qgsgraphanalyzer.sip QGIS_PYTHON_OPTIONS=" -D PYTHON_INCLUDE_PATH=%p/include/python${PY_VER}m -D PYTHON_LIBRARY=%p/lib/python${PY_VER}/config-${PY_VER}m/libpython${PY_VER}m.dylib -D PYTHON_EXECUTABLE=%p/bin/python${PY_VER}m ------------------------------------------------------------------------------ See everything from the browser to the database with AppDynamics Get end-to-end visibility with application monitoring from AppDynamics Isolate bottlenecks and diagnose root cause in seconds. Start your free trial of AppDynamics Pro today! http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs