From ee0ada2a7e781a6c2c1c51c0f9705f52d96e931c Mon Sep 17 00:00:00 2001 From: Parag A Nemade Date: Jul 31 2017 07:33:42 +0000 Subject: Update to 20170731 --- diff --git a/.gitignore b/.gitignore index 285a444..1ccdc96 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ fontforge_full-20100501.tar.bz2 /fontforge-20161004.tar.gz /fontforge-20161005.tar.gz /fontforge-20161012.tar.gz +/fontforge-20170731.tar.gz diff --git a/fontforge-20161012-fix-free-call-to-PyMem_Free.patch b/fontforge-20161012-fix-free-call-to-PyMem_Free.patch deleted file mode 100644 index 0b74ca3..0000000 --- a/fontforge-20161012-fix-free-call-to-PyMem_Free.patch +++ /dev/null @@ -1,121 +0,0 @@ -diff -urN fontforge-20161012.old/fontforge/python.c fontforge-20161012/fontforge/python.c ---- fontforge-20161012.old/fontforge/python.c 2016-10-11 06:59:29.000000000 +0530 -+++ fontforge-20161012/fontforge/python.c 2017-03-09 20:16:23.539059197 +0530 -@@ -1010,7 +1010,7 @@ - if ( !PyArg_ParseTuple(args,"es|i", "UTF-8", &filename, &openflags )) - return( NULL ); - locfilename = utf82def_copy(filename); -- free(filename); -+ PyMem_Free(filename); - - /* The actual filename opened may be different from the one passed - * to LoadSplineFont, so we can't report the filename on an -@@ -1037,7 +1037,7 @@ - if ( !PyArg_ParseTuple(args,"es","UTF-8",&filename) ) - return( NULL ); - locfilename = utf82def_copy(filename); -- free(filename); -+ PyMem_Free(filename); - ret = GetFontNames(locfilename, 1); - free(locfilename); - cnt = 0; -@@ -4093,7 +4093,7 @@ - if ( !PyArg_ParseTuple(args,"es","UTF-8",&filename) ) - return( NULL ); - locfilename = utf82def_copy(filename); -- free(filename); -+ PyMem_Free(filename); - - pt = strrchr(locfilename,'.'); - if ( pt==NULL ) pt=locfilename; -@@ -7750,7 +7750,7 @@ - if ( !PyArg_ParseTuple(args,"es|O","UTF-8",&filename, &flags) ) - return( NULL ); - locfilename = utf82def_copy(filename); -- free(filename); -+ PyMem_Free(filename); - - /* Check if the file exists and is readable */ - if ( access(locfilename,R_OK)!=0 ) { -@@ -7819,7 +7819,7 @@ - if ( !PyArg_ParseTuple(args,"es|OO","UTF-8",&filename,&foo,&bar) ) - return( NULL ); - locfilename = utf82def_copy(filename); -- free(filename); -+ PyMem_Free(filename); - - pt = strrchr(locfilename,'.'); - if ( pt==NULL ) pt=locfilename; -@@ -13514,7 +13514,7 @@ - &to_background) ) - return( NULL ); - locfilename = utf82def_copy(filename); -- free(filename); -+ PyMem_Free(filename); - - ext = strrchr(locfilename,'.'); - if ( ext==NULL ) { -@@ -13588,7 +13588,7 @@ - if ( !PyArg_ParseTuple(args,"OesO", &other, "UTF-8", &filename, &flagstuple )) - return( NULL ); - locfilename = utf82def_copy(filename); -- free(filename); -+ PyMem_Free(filename); - - if ( !PyType_IsSubtype(&PyFF_FontType, Py_TYPE(other)) ) { - PyErr_Format(PyExc_TypeError,"First argument must be a fontforge font"); -@@ -15655,7 +15655,7 @@ - } - } - locfilename = utf82def_copy(filename); -- free(filename); -+ PyMem_Free(filename); - if ( !GenerateScript(fv->sf,locfilename,bitmaptype,iflags,resolution,subfontdirectory, - NULL,fv->normal==NULL?fv->map:fv->normal,rename_to,layer) ) { - PyErr_Format(PyExc_EnvironmentError, "Font generation failed"); -@@ -15811,7 +15811,7 @@ - } - - locfilename = utf82def_copy(filename); -- free(filename); -+ PyMem_Free(filename); - - if ( !WriteTTC(locfilename,head,ff_ttc,bf,iflags,layer,ittcflags)) { - PyErr_Format(PyExc_EnvironmentError, "Font generation failed"); -@@ -15839,7 +15839,7 @@ - if ( !PyArg_ParseTuple(args,"es|s","UTF-8",&filename,&lookup_name) ) - return( NULL ); - locfilename = utf82def_copy(filename); -- free(filename); -+ PyMem_Free(filename); - - if ( lookup_name!=NULL ) { - otl = SFFindLookup(fv->sf,lookup_name); -@@ -15879,7 +15879,8 @@ - if ( !PyArg_ParseTuple(args,"es","UTF-8",&filename) ) - return( NULL ); - locfilename = utf82def_copy(filename); -- free(filename); -+ PyMem_Free(filename); -+ - if ( !LoadKerningDataFromMetricsFile(fv->sf,locfilename,fv->map)) { - PyErr_Format(PyExc_EnvironmentError, "No metrics data found"); - return( NULL ); -@@ -15903,7 +15904,7 @@ - &preserveCrossFontKerning, &openflags) ) - return( NULL ); - locfilename = utf82def_copy(filename); -- free(filename); -+ PyMem_Free(filename); - sf = LoadSplineFont(locfilename,openflags); - if ( sf==NULL ) { - PyErr_Format(PyExc_EnvironmentError, "No font found in file \"%s\"", locfilename); -@@ -15931,7 +15932,7 @@ - if ( !PyArg_ParseTuple(args,"des|i",&fraction,"UTF-8",&filename, &openflags) ) - return( NULL ); - locfilename = utf82def_copy(filename); -- free(filename); -+ PyMem_Free(filename); - sf = LoadSplineFont(locfilename,openflags); - if ( sf==NULL ) { - PyErr_Format(PyExc_EnvironmentError, "No font found in file \"%s\"", locfilename); diff --git a/fontforge.spec b/fontforge.spec index 7f76102..420543a 100644 --- a/fontforge.spec +++ b/fontforge.spec @@ -1,10 +1,10 @@ %global gettext_package FontForge %global gnulib_githead 2bf7326 -%global gittag0 20161012 +%global gittag0 20170731 Name: fontforge Version: %{gittag0} -Release: 7%{?dist} +Release: 1%{?dist} Summary: Outline and bitmap font editor License: GPLv3+ @@ -16,8 +16,6 @@ Source1: http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=snapshot;h=%{ Patch0: fontforge-20140813-use-system-uthash.patch # Fedora specific patch to have python3 support only Patch1: Add-python3-support.patch -# https://github.com/fontforge/fontforge/issues/3042 -Patch2: fontforge-20161012-fix-free-call-to-PyMem_Free.patch Requires: xdg-utils Requires: autotrace @@ -171,6 +169,9 @@ fi %doc htdocs %changelog +* Mon Jul 31 2017 Parag Nemade - 20170731-1 +- Update to 20170731 + * Wed Jul 26 2017 Fedora Release Engineering - 20161012-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild diff --git a/sources b/sources index 3528662..150830b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -d7e3cfc8097808e5bfbee44749f30808 fontforge-20161012.tar.gz -149162d1d21a0dfc705a31916f4b0cd0 gnulib-2bf7326.tar.gz +SHA512 (fontforge-20170731.tar.gz) = 756b80cf1b0416dbb649838f98e24ba696f0064d4d66720776e52c236fe9339c752cfac629b1c288fdce25fa6790be0e8d186f60291edf1736081fe76a2c5d7e +SHA512 (gnulib-2bf7326.tar.gz) = c0ceeb941f840ca6fefcab3fe19e73e748a8a3a9ad7a86a773e0103ce4a412e8b0135032da2bda962c65daeea5636f28fda4dd492ba48da1c5ee023c57581eeb