Solve fontforge 20170731 build fails with python3.8
This commit is contained in:
parent
a02d25a48d
commit
35acb4b6a6
25
Solve-fontforge-20170731-build-fails-with-python-3.8.patch
Normal file
25
Solve-fontforge-20170731-build-fails-with-python-3.8.patch
Normal file
@ -0,0 +1,25 @@
|
||||
From f9474602e7dbdf1901187406862ef23810f38f6f Mon Sep 17 00:00:00 2001
|
||||
From: lyn1001 <thistleslyn@163.com>
|
||||
Date: Mon, 22 Jun 2020 09:55:08 +0800
|
||||
Subject: [PATCH] fontforge-20170731-python-3.8-pkg-config
|
||||
|
||||
---
|
||||
fontforge-20170731/m4/fontforge_arg_enable.m4 | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/m4/fontforge_arg_enable.m4 b/m4/fontforge_arg_enable.m4
|
||||
index 661c557..6b87dc4 100644
|
||||
--- a/m4/fontforge_arg_enable.m4
|
||||
+++ b/m4/fontforge_arg_enable.m4
|
||||
@@ -35,7 +35,7 @@ AC_ARG_ENABLE([python-scripting],
|
||||
[i_do_have_python_scripting=yes])
|
||||
if test x"${i_do_have_python_scripting}" = xyes; then
|
||||
AM_PATH_PYTHON([2.7])
|
||||
- PKG_CHECK_MODULES([PYTHON],[python-"${PYTHON_VERSION}"],,[i_do_have_python_scripting=no; force_off_python_extension=yes])
|
||||
+ PKG_CHECK_MODULES([PYTHON],[python-"${PYTHON_VERSION}"-embed],,[i_do_have_python_scripting=no; force_off_python_extension=yes])
|
||||
fi
|
||||
if test x"${i_do_have_python_scripting}" != xyes; then
|
||||
AC_DEFINE([_NO_PYTHON],1,[Define if not using Python.])
|
||||
--
|
||||
2.23.0
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
Name: fontforge
|
||||
Version: 20170731
|
||||
Release: 12
|
||||
Release: 13
|
||||
Summary: Outline and bitmap font editor
|
||||
|
||||
License: GPLv3+
|
||||
@ -9,7 +9,7 @@ Source0: https://github.com/fontforge/fontforge/archive/20170731.tar.gz#/
|
||||
Source1: http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=snapshot;h=b324052;sf=tgz;name=gnulib-b324052.tar.gz
|
||||
Patch0000: fontforge-20140813-use-system-uthash.patch
|
||||
Patch0001: Add-python3-support.patch
|
||||
|
||||
Patch0002: Solve-fontforge-20170731-build-fails-with-python-3.8.patch
|
||||
Requires: xdg-utils hicolor-icon-theme
|
||||
|
||||
BuildRequires: gcc git libjpeg-devel libtiff-devel libpng-devel giflib-devel libxml2-devel freetype-devel
|
||||
@ -103,6 +103,9 @@ chmod 644 $RPM_BUILD_ROOT%{_datadir}/fontforge/python/gdraw/_gdraw.py
|
||||
%{_mandir}/man1/*.1*
|
||||
|
||||
%changelog
|
||||
* Mon Jun 22 2020 yanan li <liyanan032@huawei.com> - 20170731-13
|
||||
- Solve fontforge 20170731 build fails with python 3.8.
|
||||
|
||||
* Thu Apr 3 2020 zhujunhao <zhujunhao5@huawei.com> - 20170731-12
|
||||
- Modify build option
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user