From e4daed4fe031fd865aff115e76de58e411985273 Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Wed, 13 May 2020 19:37:17 -0400 Subject: media-gfx/fontforge: remove old Signed-off-by: Mike Gilbert --- media-gfx/fontforge/Manifest | 2 - .../fontforge/files/20170731-PyMem_Free.patch | 197 --------------------- .../files/20170731-gethex-unaligned.patch | 22 --- .../20170731-startnoui-FindOrMakeEncoding.patch | 22 --- media-gfx/fontforge/files/20170731-tilepath.patch | 16 -- media-gfx/fontforge/fontforge-20170731-r5.ebuild | 122 ------------- media-gfx/fontforge/fontforge-20190801.ebuild | 104 ----------- 7 files changed, 485 deletions(-) delete mode 100644 media-gfx/fontforge/files/20170731-PyMem_Free.patch delete mode 100644 media-gfx/fontforge/files/20170731-gethex-unaligned.patch delete mode 100644 media-gfx/fontforge/files/20170731-startnoui-FindOrMakeEncoding.patch delete mode 100644 media-gfx/fontforge/files/20170731-tilepath.patch delete mode 100644 media-gfx/fontforge/fontforge-20170731-r5.ebuild delete mode 100644 media-gfx/fontforge/fontforge-20190801.ebuild diff --git a/media-gfx/fontforge/Manifest b/media-gfx/fontforge/Manifest index 663096d134cc..d5e989988676 100644 --- a/media-gfx/fontforge/Manifest +++ b/media-gfx/fontforge/Manifest @@ -1,3 +1 @@ -DIST fontforge-20190801.tar.gz 20766334 BLAKE2B c3206e77da4a966b9e513c41c90e19522f3d1aad990cd3035d7c8a8cc009239811743c12c02df3b02fd91fa5a7738913dba43df14523a738a2232cd2d1a91700 SHA512 78f3e1e94e38e26dcf52c6a0e038753033dc47052b7492f0ac0aaf1b8962e4e4bbf07c2550ef6014ea7290a6429bf669acb0691735efe0aee368480b4b7e6236 DIST fontforge-20200314.tar.xz 13850076 BLAKE2B 5e6ae3b7940a5b3b08811abdfc9d151f231e6d457b219eb0c666e1b831db815b696f345eda0d4d423b7e340f56fca67205734ae19903b3815381080d34b5e95c SHA512 09f5dc93f87ca63668d72d108690604489d6b3cec7eedff1c07ad6d1ce5eae442ab60e79e71ae8b99e9808f3551011788025a86ffc3a9738518d99761d849975 -DIST fontforge-dist-20170731.tar.xz 13985256 BLAKE2B 7bc49a3b7747de419e4fafb445062873cf9bf56aa73fd7499509b787a1c0fd6c47b0b5d7bfeb2a69d9237f9f66f989af968b0d00e9d5e57030906394f042f29c SHA512 26f7a40714460716a24dd0229fdb027f3766bcc48db64b8993436ddcb6277898f9f3b67ad4fc0be515b2b38e01370d1c7d9ee3c6ece1be862b7d8c9882411f11 diff --git a/media-gfx/fontforge/files/20170731-PyMem_Free.patch b/media-gfx/fontforge/files/20170731-PyMem_Free.patch deleted file mode 100644 index 48301dabb2f1..000000000000 --- a/media-gfx/fontforge/files/20170731-PyMem_Free.patch +++ /dev/null @@ -1,197 +0,0 @@ -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 -Date: Sat, 9 Sep 2017 08:03:57 +0800 -Subject: [PATCH] startnoui.c: Include header that defines FindOrMakeEncoding - -Failure to include this was causing an implicit pointer to int conversion -which results in an invalid pointer address on 64-bit builds. - -Fixes #3145. - -diff --git a/fontforgeexe/startnoui.c b/fontforgeexe/startnoui.c -index ab8388539..7a188b7a2 100644 ---- a/fontforgeexe/startnoui.c -+++ b/fontforgeexe/startnoui.c -@@ -27,6 +27,7 @@ - #include "fontforgevw.h" - #include "scripting.h" - #include "start.h" -+#include "encoding.h" - - #ifndef _NO_LIBUNICODENAMES - #include /* need to open a database when we start */ diff --git a/media-gfx/fontforge/files/20170731-tilepath.patch b/media-gfx/fontforge/files/20170731-tilepath.patch deleted file mode 100644 index c14d81dc430c..000000000000 --- a/media-gfx/fontforge/files/20170731-tilepath.patch +++ /dev/null @@ -1,16 +0,0 @@ -Fix implicit declarations - -Fixed upstream in a larger refactor. - ---- a/fontforgeexe/tilepath.c -+++ b/fontforgeexe/tilepath.c -@@ -24,7 +24,9 @@ - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -+#include "cvundoes.h" - #include "fontforgeui.h" -+#include "fvfonts.h" - #include "splineutil.h" - #include "splineutil2.h" - #include diff --git a/media-gfx/fontforge/fontforge-20170731-r5.ebuild b/media-gfx/fontforge/fontforge-20170731-r5.ebuild deleted file mode 100644 index 3717888256a5..000000000000 --- a/media-gfx/fontforge/fontforge-20170731-r5.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_6 ) - -inherit gnome2-utils python-single-r1 xdg-utils - -DESCRIPTION="postscript font editor and converter" -HOMEPAGE="http://fontforge.github.io/" -SRC_URI="https://github.com/fontforge/fontforge/releases/download/${PV}/fontforge-dist-${PV}.tar.xz" - -LICENSE="BSD GPL-3+" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" -IUSE="cairo truetype-debugger gif gtk jpeg png +python readline test tiff svg unicode X" - -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - cairo? ( png ) - python? ( ${PYTHON_REQUIRED_USE} ) - test? ( png python ) -" - -RDEPEND=" - dev-libs/glib - dev-libs/libltdl:0 - dev-libs/libxml2:2= - >=media-libs/freetype-2.3.7:2= - cairo? ( - >=x11-libs/cairo-1.6:0= - x11-libs/pango:0= - ) - gif? ( media-libs/giflib:0= ) - jpeg? ( virtual/jpeg:0 ) - png? ( media-libs/libpng:0= ) - tiff? ( media-libs/tiff:0= ) - truetype-debugger? ( >=media-libs/freetype-2.3.8:2[fontforge,-bindist(-)] ) - gtk? ( x11-libs/gtk+:2= ) - python? ( ${PYTHON_DEPS} ) - readline? ( sys-libs/readline:0= ) - unicode? ( media-libs/libuninameslist:0= ) - X? ( - x11-libs/libX11:0= - x11-libs/libXi:0= - >=x11-libs/pango-1.10:0=[X] - ) -" -DEPEND="${RDEPEND} - sys-devel/gettext - virtual/pkgconfig - X? ( x11-base/xorg-proto ) -" - -# Needs keywording on many arches. -# zeromq? ( -# >=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 - "${FILESDIR}"/CVE-2020-5395.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 -} diff --git a/media-gfx/fontforge/fontforge-20190801.ebuild b/media-gfx/fontforge/fontforge-20190801.ebuild deleted file mode 100644 index 74590785e86e..000000000000 --- a/media-gfx/fontforge/fontforge-20190801.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 2004-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7} ) - -inherit python-single-r1 xdg - -DESCRIPTION="postscript font editor and converter" -HOMEPAGE="http://fontforge.github.io/" -SRC_URI="https://github.com/fontforge/fontforge/releases/download/${PV}/fontforge-${PV}.tar.gz" - -LICENSE="BSD GPL-3+" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" -IUSE="cairo truetype-debugger gif gtk jpeg png +python readline test tiff svg unicode X" - -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - cairo? ( png ) - gtk? ( cairo ) - python? ( ${PYTHON_REQUIRED_USE} ) -" - -RDEPEND=" - dev-libs/glib - dev-libs/libltdl:0 - dev-libs/libxml2:2= - >=media-libs/freetype-2.3.7:2= - cairo? ( - >=x11-libs/cairo-1.6:0= - x11-libs/pango:0= - ) - gif? ( media-libs/giflib:0= ) - jpeg? ( virtual/jpeg:0 ) - png? ( media-libs/libpng:0= ) - tiff? ( media-libs/tiff:0= ) - truetype-debugger? ( >=media-libs/freetype-2.3.8:2[fontforge,-bindist(-)] ) - gtk? ( >=x11-libs/gtk+-3.10:3 ) - python? ( ${PYTHON_DEPS} ) - readline? ( sys-libs/readline:0= ) - unicode? ( media-libs/libuninameslist:0= ) - X? ( - x11-libs/libX11:0= - x11-libs/libXi:0= - >=x11-libs/pango-1.10:0=[X] - ) -" -DEPEND="${RDEPEND} - X? ( x11-base/xorg-proto ) -" -BDEPEND=" - sys-devel/gettext - virtual/pkgconfig -" - -# Needs keywording on many arches. -# zeromq? ( -# >=net-libs/czmq-2.2.0:0= -# >=net-libs/zeromq-4.0.4:0= -# ) - -PATCHES=( - "${FILESDIR}"/20170731-gethex-unaligned.patch - "${FILESDIR}"/CVE-2020-5395.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 python python-extension) - $(use_enable python python-scripting) - --enable-tile-path - $(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 X x) - ) - if use gtk; then - # broken AC_ARG_ENABLE usage - # https://bugs.gentoo.org/681550 - myeconfargs+=( --enable-gdk=gdk3 ) - fi - econf "${myeconfargs[@]}" -} - -src_install() { - emake DESTDIR="${D}" install - docompress -x /usr/share/doc/${PF}/html - einstalldocs - find "${ED}" -name '*.la' -type f -delete || die -} -- cgit v1.2.3-65-gdbad