Date: Tuesday, August 31, 2010 @ 12:27:15 Author: remy Revision: 89420
Commit missing file. Added: fontforge/trunk/python27-compat.patch -----------------------+ python27-compat.patch | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) Added: python27-compat.patch =================================================================== --- python27-compat.patch (rev 0) +++ python27-compat.patch 2010-08-31 16:27:15 UTC (rev 89420) @@ -0,0 +1,33 @@ +diff -ur fontforge-20100501/fontforge/ffpython.h fontforge-20100501.new/fontforge/ffpython.h +--- fontforge-20100501/fontforge/ffpython.h 2010-04-05 22:10:26.000000000 +0200 ++++ fontforge-20100501.new/fontforge/ffpython.h 2010-08-31 18:18:07.915888604 +0200 +@@ -43,7 +43,7 @@ + + #define STRING_CHECK PyBytes_Check + #define STRING_TO_PY PyBytes_FromString +-#define DECODE_UTF8(s, size, errors) PyBytes_Decode(s, size, "UTF-8", errors) ++#define DECODE_UTF8(s, size, errors) PyString_Decode(s, size, "UTF-8", errors) + #define PYBYTES_UTF8(str) PyString_AsEncodedObject(str, "UTF-8", NULL) + #define STRING_FROM_FORMAT PyBytes_FromFormat + +diff -ur fontforge-20100501/Makefile.dynamic.in fontforge-20100501.new/Makefile.dynamic.in +--- fontforge-20100501/Makefile.dynamic.in 2008-11-14 06:31:07.000000000 +0100 ++++ fontforge-20100501.new/Makefile.dynamic.in 2010-08-31 18:10:00.824156613 +0200 +@@ -130,7 +130,7 @@ + sh -c "if test -d fontforge/FontForge.app >/dev/null ; then rm -rf /Applications/FontForge.app ; mv fontforge/FontForge.app /Applications ; ln -s /usr/local/bin/fontforge /Applications/FontForge.app/Contents/MacOS/FontForge ; fi" + sh < systemspecific + #we don't always create a setup.py +- -(cd pyhook ; if test -r setup.py ; then python setup.py install --prefix=$(prefix) --root=$(DESTDIR); for dir in * ; do if test -d $$dir -a "$$dir" != "CVS" ; then rm -rf $$dir ; fi; done ; fi ) ++ -(cd pyhook ; if test -r setup.py ; then python2 setup.py install --prefix=$(prefix) --root=$(DESTDIR); for dir in * ; do if test -d $$dir -a "$$dir" != "CVS" ; then rm -rf $$dir ; fi; done ; fi ) + + install_py: $(DESTDIR)$(sharedir) all install_libs install_incs install_po install_prog install_pycontrib + # You may need to be root to do the install +@@ -138,7 +138,7 @@ + sh -c "if test -d $(srcdir)/htdocs >/dev/null ; then $(MAKE) install_docs ; for dir in * ; do if test -d $$dir ; then rm -rf $$dir ; fi; done ; fi" + sh -c "if test -d fontforge/FontForge.app >/dev/null ; then rm -rf /Applications/FontForge.app ; mv fontforge/FontForge.app /Applications ; ln -s /usr/local/bin/fontforge /Applications/FontForge.app/Contents/MacOS/FontForge ; fi" + sh < systemspecific +- -(cd pyhook ; python setup.py bdist --formats=gztar ; cp dist/fontforge-*.tar.gz $(DESTDIR)/tmp; for dir in * ; do if test -d $$dir -a "$$dir" != "CVS" ; then rm -rf $$dir ; fi; done ) ++ -(cd pyhook ; python2 setup.py bdist --formats=gztar ; cp dist/fontforge-*.tar.gz $(DESTDIR)/tmp; for dir in * ; do if test -d $$dir -a "$$dir" != "CVS" ; then rm -rf $$dir ; fi; done ) + + install_gtk: fontforgegtk + (cd gtkui ; $(MAKE) install )
