rpms/fontforge
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Add patch to build with python 2.7

Browse Source
This commit is contained in:
kevin 2010-07-29 15:13:03 -06:00
parent 33d7dd61ff
commit 38e424d069
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fontforge-20100501-python27.patch Normal file
View File

@ -0,0 +1,12 @@
diff -Nur fontforge-20100501.orig/fontforge/ffpython.h fontforge-20100501/fontforge/ffpython.h
--- fontforge-20100501.orig/fontforge/ffpython.h 2010-04-05 14:10:26.000000000 -0600
+++ fontforge-20100501/fontforge/ffpython.h 2010-07-28 12:07:25.000000000 -0600
@@ -25,7 +25,7 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#if PY_MAJOR_VERSION >= 3
+#if PY_MAJOR_VERSION >= 3 || (PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION > 6)
#define PyInt_Check PyLong_Check
#define PyInt_AsLong PyLong_AsLong

9
fontforge.spec
View File

@ -5,7 +5,7 @@
Name: fontforge Name: fontforge
Version: 20100501 Version: 20100501
Release: 3%{?dist} Release: 4%{?dist}
Summary: Outline and bitmap font editor Summary: Outline and bitmap font editor
Group: Applications/Publishing Group: Applications/Publishing
@ -18,6 +18,7 @@ Source3: fontforge.xml
Patch1: fontforge-20090224-pythondl.patch Patch1: fontforge-20090224-pythondl.patch
# See Bug https://bugzilla.redhat.com/show_bug.cgi?id=536920 # See Bug https://bugzilla.redhat.com/show_bug.cgi?id=536920
Patch2: fontforge-20100501-splinesets.patch Patch2: fontforge-20100501-splinesets.patch
Patch3: fontforge-20100501-python27.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: xdg-utils Requires: xdg-utils
@ -60,6 +61,7 @@ to compile applications against fontforge.
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1
mkdir htdocs mkdir htdocs
tar xjf %{SOURCE2} -C htdocs tar xjf %{SOURCE2} -C htdocs
@ -139,7 +141,7 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
%{_datadir}/pixmaps/fontforge.png %{_datadir}/pixmaps/fontforge.png
%{_mandir}/man1/*.1* %{_mandir}/man1/*.1*
%{_datadir}/mime/packages/fontforge.xml %{_datadir}/mime/packages/fontforge.xml
%{python_sitearch}/fontforge-1.0-py2.6.egg-info %{python_sitearch}/fontforge-1.0-py2.7.egg-info
%{python_sitearch}/fontforge.so %{python_sitearch}/fontforge.so
%{python_sitearch}/psMat.so %{python_sitearch}/psMat.so
@ -150,6 +152,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
%{_libdir}/pkgconfig/*.pc %{_libdir}/pkgconfig/*.pc
%changelog %changelog
* Wed Jul 28 2010 Kevin Fenzi <kevin@tummy.com> - 20100501-4
- Add patch to build with python 2.7
* Wed Jul 21 2010 David Malcolm <dmalcolm@redhat.com> - 20100501-3 * Wed Jul 21 2010 David Malcolm <dmalcolm@redhat.com> - 20100501-3
- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild