Update of /cvsroot/fink/experimental/babayoshihiko/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv8873
Modified Files:
qgis20-py.info
Log Message:
py33 (not buildable)
Index: qgis20-py.info
===================================================================
RCS file: /cvsroot/fink/experimental/babayoshihiko/finkinfo/qgis20-py.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- qgis20-py.info 3 Jul 2013 08:28:33 -0000 1.4
+++ qgis20-py.info 19 Jul 2013 00:52:26 -0000 1.5
@@ -1,7 +1,7 @@
Info2: <<
Package: qgis20-py%type_pkg[python]
-Type: python (2.7 2.6)
+Type: python (3.3 2.7 2.6)
Architecture: powerpc, i386, x86_64
Version: 2.0.0
@@ -88,6 +88,20 @@
export CC=gcc-fsf-4.6
fi
+ # 2.0
+ if [[ %type_pkg[python] > 30 ]]; then
+ 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
+ perl -pi -e "s|PyString_AsString|PyUnicode_AsUTF8|g"
src/python/qgspythonutilsimpl.cpp
+ perl -pi -e "s|PyString_Check|PyUnicode_Check|g"
src/python/qgspythonutilsimpl.cpp
+ perl -pi -e "s|PyObject_Unicode|PyObject_Str|g"
src/python/qgspythonutilsimpl.cpp
+ perl -pi -e "s|PyClass_Check|PyType_Check|g"
src/python/qgspythonutilsimpl.cpp
+ perl -pi -e "s|PyClassObject|PyTypeObject|g"
src/python/qgspythonutilsimpl.cpp
+ perl -pi -e "s|PyUnicode_AsUTF8\(\(\(|((|"
src/python/qgspythonutilsimpl.cpp
+ perl -pi -e "s|cl_name \)|tp_name|" src/python/qgspythonutilsimpl.cpp
+ fi
+
QGIS_OPTIONS=" -D CMAKE_C_COMPILER=gcc
-D QGIS_APP_NAME=QGIS-py-%v
-D CMAKE_PREFIX_PATH=%p
@@ -139,7 +153,7 @@
# 1.8.0 Workaround from MacPorts
echo "install_name_tool -change
@executable_path/../Frameworks/qgis_core.framework/Versions/$QGIS_VER/qgis_core
@executable_path/../lib/qgis_core.framework/Versions/$QGIS_VER/qgis_core
../../output/bin/crssync" >> src/crssync/CMakeFiles/crssync.dir/link.txt
- make VERBOSE=1
+ make VERBOSE=1 -j1
make install CMAKE_INSTALL_PREFIX=%b SIP_MAC_PATH=%p/bin
popd
------------------------------------------------------------------------------
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
