From: Mike Gilbert Date: Mon, 28 May 2018 18:45:54 +0000 (-0400) Subject: media-gfx/fontforge: fix python3.6 compat X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=1a3bd54dd8283bae00506af7336bd048c1542f82;p=gentoo.git media-gfx/fontforge: fix python3.6 compat Closes: https://bugs.gentoo.org/646278 Package-Manager: Portage-2.3.40_p4, Repoman-2.3.9_p236 --- diff --git a/media-gfx/fontforge/files/20170731-PyMem_Free.patch b/media-gfx/fontforge/files/20170731-PyMem_Free.patch new file mode 100644 index 000000000000..48301dabb2f1 --- /dev/null +++ b/media-gfx/fontforge/files/20170731-PyMem_Free.patch @@ -0,0 +1,197 @@ +From b6089f11bd7534c9aa38b875ef1e830fc3b898b4 Mon Sep 17 00:00:00 2001 +From: Jeremy Tan +Date: Wed, 13 Sep 2017 17:22:18 +0800 +Subject: [PATCH] python: Use PyMem_Free wherever PyArg_ParseTuple+es is used + +https://docs.python.org/2.0/ext/parseTuple.html + +diff --git a/fontforge/python.c b/fontforge/python.c +index 5d6820c40..c6d7aca2b 100644 +--- a/fontforge/python.c ++++ b/fontforge/python.c +@@ -607,7 +607,13 @@ return( NULL ); + } + } + +- if ( !SetPrefs((char *) prefname,&val,NULL)) { ++ bool succeeded = SetPrefs((char *) prefname,&val,NULL); ++ if (val.type == v_str && val.u.sval) { ++ PyMem_Free(val.u.sval); ++ val.u.sval = NULL; ++ } ++ ++ if (!succeeded) { + PyErr_Format(PyExc_NameError, "Unknown preference item in SetPrefs: %s", prefname ); + return( NULL ); + } +@@ -728,7 +734,7 @@ static PyObject *PyFF_UnicodeFromName(PyObject *UNUSED(self), PyObject *args) { + return( NULL ); + + ret = Py_BuildValue("i", UniFromName((char *) name, ui_none,&custom)); +- free(name); ++ PyMem_Free(name); + return( ret ); + } + +@@ -1361,12 +1367,14 @@ Py_RETURN_NONE; /* Well, that was pointless */ + if ( import==Py_None ) + import=NULL; + else if ( !PyCallable_Check(import) ) { ++ PyMem_Free(name); + PyErr_Format(PyExc_TypeError, "First argument is not callable" ); + return( NULL ); + } + if ( export==Py_None ) + export=NULL; + else if ( !PyCallable_Check(export) ) { ++ PyMem_Free(name); + PyErr_Format(PyExc_TypeError, "Second argument is not callable" ); + return( NULL ); + } +@@ -1472,7 +1480,7 @@ static PyObject *PyFF_logError(PyObject *UNUSED(self), PyObject *args) { + if ( !PyArg_ParseTuple(args,"es","UTF-8", &msg) ) + return( NULL ); + LogError(msg); +- free(msg); ++ PyMem_Free(msg); + Py_RETURN_NONE; + } + +@@ -1486,6 +1494,8 @@ static PyObject *PyFF_postError(PyObject *UNUSED(self), PyObject *args) { + return( NULL ); + if( showPythonErrors ) + ff_post_error(title,msg); /* Prints to stderr if no ui */ ++ PyMem_Free(title); ++ PyMem_Free(msg); + Py_RETURN_NONE; + } + +@@ -1494,6 +1504,8 @@ static PyObject *PyFF_postNotice(PyObject *UNUSED(self), PyObject *args) { + if ( !PyArg_ParseTuple(args,"eses","UTF-8", &title, "UTF-8", &msg) ) + return( NULL ); + ff_post_notice(title,msg); /* Prints to stderr if no ui */ ++ PyMem_Free(title); ++ PyMem_Free(msg); + Py_RETURN_NONE; + } + +@@ -1511,8 +1523,8 @@ return( NULL ); + return( NULL ); + + ret = ff_open_filename(title,def,filter); +- free(title); +- free(def); ++ PyMem_Free(title); ++ PyMem_Free(def); + if ( ret==NULL ) + Py_RETURN_NONE; + reto = DECODE_UTF8(ret,strlen(ret),NULL); +@@ -1534,8 +1546,8 @@ return( NULL ); + return( NULL ); + + ret = ff_save_filename(title,def,filter); +- free(title); +- free(def); ++ PyMem_Free(title); ++ PyMem_Free(def); + if ( ret==NULL ) + Py_RETURN_NONE; + reto = DECODE_UTF8(ret,strlen(ret),NULL); +@@ -1558,8 +1570,8 @@ return( NULL ); + return( NULL ); + if ( !PySequence_Check(answero) || STRING_CHECK(answero)) { + PyErr_Format(PyExc_TypeError, "Expected a tuple of strings for the third argument"); +- free(title); +- free(quest); ++ PyMem_Free(title); ++ PyMem_Free(quest); + return( NULL ); + } + cnt = PySequence_Size(answero); +@@ -1568,16 +1580,16 @@ return( NULL ); + cancel = cnt-1; + if ( cancel<0 || cancel>=cnt || def<0 || def>=cnt ) { + PyErr_Format(PyExc_ValueError, "Value out of bounds for 4th or 5th argument"); +- free(title); +- free(quest); ++ PyMem_Free(title); ++ PyMem_Free(quest); + free(answers); + return( NULL ); + } + for ( i=0; i=cnt ) { + PyErr_Format(PyExc_ValueError, "Value out of bounds for 4th argument"); +- free(title); +- free(quest); ++ PyMem_Free(title); ++ PyMem_Free(quest); + return( NULL ); + } + for ( i=0; i=net-libs/czmq-2.2.0:0= +# >=net-libs/zeromq-4.0.4:0= +# ) + +S="${WORKDIR}/fontforge-2.0.${PV}" + +PATCHES=( + "${FILESDIR}"/20170731-startnoui-FindOrMakeEncoding.patch + "${FILESDIR}"/20170731-tilepath.patch + "${FILESDIR}"/20170731-gethex-unaligned.patch + "${FILESDIR}"/20170731-PyMem_Free.patch +) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_configure() { + local myeconfargs=( + --disable-static + $(use_enable truetype-debugger freetype-debugger "${EPREFIX}/usr/include/freetype2/internal4fontforge") + $(use_enable gtk gtk2-use) + $(use_enable python python-extension) + $(use_enable python python-scripting) + --enable-tile-path + --enable-gb12345 + $(use_with cairo) + $(use_with gif giflib) + $(use_with jpeg libjpeg) + $(use_with png libpng) + $(use_with readline libreadline) + --without-libspiro + $(use_with tiff libtiff) + $(use_with unicode libuninameslist) + #$(use_with zeromq libzmq) + --without-libzmq + $(use_with X x) + ) + econf "${myeconfargs[@]}" +} + +src_compile() { + # Build system deps are broken + emake -C plugins + emake +} + +src_install() { + default + find "${D}" -name '*.la' -delete || die +} + +pkg_postrm() { + gnome2_icon_cache_update + xdg_desktop_database_update + xdg_mimeinfo_database_update +} + +pkg_postinst() { + gnome2_icon_cache_update + xdg_desktop_database_update + xdg_mimeinfo_database_update +}