packages: fontforge/fontforge.spec, fontforge/fontforge-python2.7.patch (NE...

[baggins]

Author: baggins                      Date: Thu Jul 22 12:29:01 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix building with python 2.7

---- Files affected:
packages/fontforge:
   fontforge.spec (1.22 -> 1.23) , fontforge-python2.7.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/fontforge/fontforge.spec
diff -u packages/fontforge/fontforge.spec:1.22 packages/fontforge/fontforge.spec:1.23
--- packages/fontforge/fontforge.spec:1.22	Thu Jul 22 14:15:09 2010
+++ packages/fontforge/fontforge.spec	Thu Jul 22 14:28:56 2010
@@ -9,6 +9,7 @@
 Source0:	http://dl.sourceforge.net/fontforge/%{name}_full-%{version}.tar.bz2
 # Source0-md5:	5f3d20d645ec1aa2b7b4876386df8717
 Patch0:		%{name}-sonames.patch
+Patch1:		%{name}-python2.7.patch
 URL:		http://fontforge.sourceforge.net/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -51,6 +52,7 @@
 %setup -q
 # hardcoded in code is +- same as hardcoded at compile time
 #%patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}
@@ -101,6 +103,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.23  2010/07/22 12:28:56  baggins
+- fix building with python 2.7
+
 Revision 1.22  2010/07/22 12:15:09  baggins
 - 20100501
 

================================================================
Index: packages/fontforge/fontforge-python2.7.patch
diff -u /dev/null packages/fontforge/fontforge-python2.7.patch:1.1
--- /dev/null	Thu Jul 22 14:29:01 2010
+++ packages/fontforge/fontforge-python2.7.patch	Thu Jul 22 14:28:56 2010
@@ -0,0 +1,11 @@
+--- fontforge-20100501/fontforge/ffpython.h~	2010-04-05 22:10:26.000000000 +0200
++++ fontforge-20100501/fontforge/ffpython.h	2010-07-22 14:27:51.998839706 +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
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/fontforge/fontforge.spec?r1=1.22&r2=1.23&f=u