Hello community,
here is the log from the commit of package fontforge for openSUSE:Factory
checked in at Mon Sep 6 17:49:44 CEST 2010.
--------
--- fontforge/fontforge.changes 2010-04-08 10:13:13.000000000 +0200
+++ fontforge/fontforge.changes 2010-09-06 10:55:12.000000000 +0200
@@ -1,0 +2,10 @@
+Mon Sep 6 08:54:57 UTC 2010 - coolo@novell.com
+
+- adapt to python 2.7
+
+-------------------------------------------------------------------
+Thu Apr 8 10:56:13 CEST 2010 - tiwai@suse.de
+
+- fix build with older distros before libpng 1.4
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
fontforge.py27.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ fontforge.spec ++++++
--- /var/tmp/diff_new_pack.OXsPh9/_old 2010-09-06 17:49:18.000000000 +0200
+++ /var/tmp/diff_new_pack.OXsPh9/_new 2010-09-06 17:49:18.000000000 +0200
@@ -26,7 +26,7 @@
Obsoletes: PfaEdit
Provides: PfaEdit
Version: 20090923
-Release: 1
+Release: 4
Url: http://fontforge.sourceforge.net/
Source0: http://dfn.dl.sourceforge.net/sourceforge/fontforge/fontforge_full-%{version}.tar.bz2
Source1: http://surfnet.dl.sourceforge.net/sourceforge/fontforge/fontforge_htdocs-200...
@@ -38,6 +38,7 @@
Patch2: fontforge-missing-closedir.diff
Patch3: fontforge-20090622-fdleak.patch
Patch4: libpng14.diff
+Patch5: fontforge.py27.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: A Font Editor
@@ -63,7 +64,12 @@
%patch1 -p1
%patch2 -p1
%patch3
+%if %suse_version > 1120
%patch4 -p1
+%endif
+%if %suse_version > 1130
+%patch5 -p1
+%endif
mkdir docs
tar jxvf %{S:1} -C docs
tar jxvf %{S:2} -C docs
++++++ fontforge.py27.diff ++++++
diff -ru fontforge-20090923.orig/fontforge/ffpython.h fontforge-20090923/fontforge/ffpython.h
--- fontforge-20090923.orig/fontforge/ffpython.h 2009-08-06 01:33:51.000000000 +0200
+++ fontforge-20090923/fontforge/ffpython.h 2010-09-06 10:51:46.003385009 +0200
@@ -60,11 +60,11 @@
#define _PyBytes_Eq _PyString_Eq
#define PyBytes_Format PyString_Format
#define _PyBytes_FormatLong _PyString_FormatLong
-#define PyBytes_DecodeEscape PyString_DecodeEscape
+#define PyString_DecodeEscape PyString_DecodeEscape
#define _PyBytes_Join _PyString_Join
-#define PyBytes_Decode PyString_Decode
+#define PyString_Decode PyString_Decode
#define PyBytes_Encode PyString_Encode
-#define PyBytes_AsEncodedObject PyString_AsEncodedObject
+#define PyString_AsEncodedObject PyString_AsEncodedObject
#define PyBytes_AsEncodedString PyString_AsEncodedString
#define PyBytes_AsDecodedObject PyString_AsDecodedObject
#define PyBytes_AsDecodedString PyString_AsDecodedString
diff -ru fontforge-20090923.orig/fontforge/python.c fontforge-20090923/fontforge/python.c
--- fontforge-20090923.orig/fontforge/python.c 2009-09-12 14:43:32.000000000 +0200
+++ fontforge-20090923/fontforge/python.c 2010-09-06 10:51:46.062259025 +0200
@@ -742,7 +742,7 @@
Py_XINCREF(glyph);
PyTuple_SetItem(arglist,0,py_ie[ie_index].data);
PyTuple_SetItem(arglist,1,glyph);
- PyTuple_SetItem(arglist,2,PyBytes_Decode(filename,strlen(filename),"UTF-8",NULL));
+ PyTuple_SetItem(arglist,2,PyString_Decode(filename,strlen(filename),"UTF-8",NULL));
PyTuple_SetItem(arglist,3,Py_BuildValue("i",toback));
result = PyEval_CallObject(py_ie[ie_index].import, arglist);
Py_DECREF(arglist);
@@ -765,7 +765,7 @@
Py_XINCREF(glyph);
PyTuple_SetItem(arglist,0,py_ie[ie_index].data);
PyTuple_SetItem(arglist,1,glyph);
- PyTuple_SetItem(arglist,2,PyBytes_Decode(filename,strlen(filename),"UTF-8",NULL));
+ PyTuple_SetItem(arglist,2,PyString_Decode(filename,strlen(filename),"UTF-8",NULL));
result = PyEval_CallObject(py_ie[ie_index].export, arglist);
Py_DECREF(arglist);
Py_XDECREF(result);
@@ -882,7 +882,7 @@
free(def);
if ( ret==NULL )
Py_RETURN_NONE;
- reto = PyBytes_Decode(ret,strlen(ret),"UTF-8",NULL);
+ reto = PyString_Decode(ret,strlen(ret),"UTF-8",NULL);
free(ret);
return( reto );
}
@@ -905,7 +905,7 @@
free(def);
if ( ret==NULL )
Py_RETURN_NONE;
- reto = PyBytes_Decode(ret,strlen(ret),"UTF-8",NULL);
+ reto = PyString_Decode(ret,strlen(ret),"UTF-8",NULL);
free(ret);
return( reto );
}
@@ -937,7 +937,7 @@
return( NULL );
}
for ( i=0; i