From f45955e60d4da9b7f4a1088c98042f9c06669039 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 10 Dec 2017 09:09:16 +0000 Subject: gentoo resync : 10.12.2017 --- media-gfx/fontforge/Manifest | 8 +- .../20170731-startnoui-FindOrMakeEncoding.patch | 22 ++++ media-gfx/fontforge/files/20170731-tilepath.patch | 16 +++ media-gfx/fontforge/fontforge-20170731-r2.ebuild | 119 +++++++++++++++++++++ media-gfx/fontforge/fontforge-20170731.ebuild | 114 -------------------- 5 files changed, 162 insertions(+), 117 deletions(-) create mode 100644 media-gfx/fontforge/files/20170731-startnoui-FindOrMakeEncoding.patch create mode 100644 media-gfx/fontforge/files/20170731-tilepath.patch create mode 100644 media-gfx/fontforge/fontforge-20170731-r2.ebuild delete mode 100644 media-gfx/fontforge/fontforge-20170731.ebuild (limited to 'media-gfx/fontforge') diff --git a/media-gfx/fontforge/Manifest b/media-gfx/fontforge/Manifest index 64ef0d182d61..621ef885b29f 100644 --- a/media-gfx/fontforge/Manifest +++ b/media-gfx/fontforge/Manifest @@ -1,5 +1,7 @@ -DIST fontforge-dist-20160404.tar.gz 20906256 SHA256 6c73a556030d985e166974e5d6025255290874c2d6bb349c9930b03f17b45bcd SHA512 be94f04881b12ed3b1a34d0d7cc9149321db17d51458f135b2683ea600401e4fa55647ced4b4e014555ba1c900a684b9d5d6f2e2812ce03c432d23ca72f5c363 WHIRLPOOL 2313c7775da7f7a47ef8bae3cbef897e8b0996c8f74db099562e0a3636984e8a9a55ca5f2ca11b205a7b1aff76e7fe4e7601f15b7951147353403da0e41d692f -DIST fontforge-dist-20170731.tar.xz 13985256 SHA256 840adefbedd1717e6b70b33ad1e7f2b116678fa6a3d52d45316793b9fd808822 SHA512 26f7a40714460716a24dd0229fdb027f3766bcc48db64b8993436ddcb6277898f9f3b67ad4fc0be515b2b38e01370d1c7d9ee3c6ece1be862b7d8c9882411f11 WHIRLPOOL 6d6e2b6322043bcd8822fb1e64a98b969ff1bba02d63442cf0646b737576ead76961a30cf146447afa0f72a2e9a30a05e6dad5f9060a00cd35e5cc2e15097889 +AUX 20170731-startnoui-FindOrMakeEncoding.patch 751 BLAKE2B c4a0248affa9117c5150aacb40a54bcb6f29d84866e1d193898f49a4fe58735eda2319856b6cfdbce450492871a5fe2255443849dd0f98ee70285614f7e44bb1 SHA512 0135717d9760a0bbf6d35ce21c19fb9019d3da01859882918a5643bbe6011a55eaf57ad07c8063c2c5c20cd6c6907420f8015abf54210ccdd75b2ba473e6b366 +AUX 20170731-tilepath.patch 411 BLAKE2B 39ef99a26b85fc25d6c0b778a6b0ddfdb2c366b6456bd8ed47b12ca8681e8970e65e3b69cd06880794832f761c6de801d9e7c51e1edfff5abf434aa7f7dcc7c2 SHA512 026f6765b2db7549f72cd6ccff8d23bdf357ab24035c89cd792fa933f6033445f6cbaf7fa20f1372bdeda2caa242b9f8237f3019292cba0cc551c6de9e5c8341 +DIST fontforge-dist-20160404.tar.gz 20906256 BLAKE2B 11f9a54de2cada7e243349ec0ddeb3f2025f12a9e9323b2bea437009ccd5e34d27ba41752752434c16b1a0b809c9878c23cd074bb59b590b427c599d575f0c45 SHA512 be94f04881b12ed3b1a34d0d7cc9149321db17d51458f135b2683ea600401e4fa55647ced4b4e014555ba1c900a684b9d5d6f2e2812ce03c432d23ca72f5c363 +DIST fontforge-dist-20170731.tar.xz 13985256 BLAKE2B 7bc49a3b7747de419e4fafb445062873cf9bf56aa73fd7499509b787a1c0fd6c47b0b5d7bfeb2a69d9237f9f66f989af968b0d00e9d5e57030906394f042f29c SHA512 26f7a40714460716a24dd0229fdb027f3766bcc48db64b8993436ddcb6277898f9f3b67ad4fc0be515b2b38e01370d1c7d9ee3c6ece1be862b7d8c9882411f11 EBUILD fontforge-20160404.ebuild 2473 BLAKE2B e4984924e48c1ab426f5b2b5e8fd85c227595808b11c91c9f3be9d073879feb6556badab55a95170d9131fdc6831978b945cc7d3df46e412c8546b562b2ffb4c SHA512 b83e786156024e34042835af61205984e6d4c2d03dc20337b96e2228c2969073cdf130dcded5bd8e139a179b059096d62a5a88268d6645830e45932576d61e98 -EBUILD fontforge-20170731.ebuild 2630 BLAKE2B fcdf4711fb3ad00d7a998c44751612787ef9dbe5dc437411f1197ece16e26de97c33b346cd23ff59434a9f815d8e08f672a5cc1a4c97e7116d8707a02e4fcdeb SHA512 46de2ca04d948f933f43b64bfb8522c75ce4b9bc782f13312c8e996331b722e34cb696d42023ea32eb982f94b5ae511657eed77ec0d2923fac7df28ab4bb3bf0 +EBUILD fontforge-20170731-r2.ebuild 2741 BLAKE2B 99f31b2dc59409690276974051b08a4c4fef2ea91a9ae7c2a6f6aa0e41d9bb21ed8c933bbb3605242882f1937b46eb14562c56bef6ca45d4df0c8e4fefccf8ab SHA512 569bc6a3da2c70ac90aea8609e817ff833a044395e8487bb85c5984f07055ca988c82b13b1f646fe80e54b175617c7ba8a82084ad1ccb68cd107802c61e90629 MISC metadata.xml 908 BLAKE2B 57e840cbf69ebd2780ecaf5a3009905b782223a16339beae90acf1c087a185944e33fe952b477184244cb3f5f313fcce32a561ce903d751de457b77f4a90cd74 SHA512 973d4967be4eb7aad087ce977a4d94945a8894138604e8d37257dac97f74e98f7fb9a7cad7e7f46abb4c8c39dcb4bd79e9ad26f96838ad39ac1894e154834d28 diff --git a/media-gfx/fontforge/files/20170731-startnoui-FindOrMakeEncoding.patch b/media-gfx/fontforge/files/20170731-startnoui-FindOrMakeEncoding.patch new file mode 100644 index 000000000000..30731b904f25 --- /dev/null +++ b/media-gfx/fontforge/files/20170731-startnoui-FindOrMakeEncoding.patch @@ -0,0 +1,22 @@ +From 72572a68d306712c040ca741f0655b190326a509 Mon Sep 17 00:00:00 2001 +From: Jeremy Tan +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 new file mode 100644 index 000000000000..c14d81dc430c --- /dev/null +++ b/media-gfx/fontforge/files/20170731-tilepath.patch @@ -0,0 +1,16 @@ +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-r2.ebuild b/media-gfx/fontforge/fontforge-20170731-r2.ebuild new file mode 100644 index 000000000000..c8ad245b14d7 --- /dev/null +++ b/media-gfx/fontforge/fontforge-20170731-r2.ebuild @@ -0,0 +1,119 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python{2_7,3_4,3_5} ) + +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 ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~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/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] + ) + !media-gfx/pfaedit +" +DEPEND="${RDEPEND} + sys-devel/gettext + virtual/pkgconfig + X? ( x11-proto/inputproto ) +" + +# 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 +) + +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-20170731.ebuild b/media-gfx/fontforge/fontforge-20170731.ebuild deleted file mode 100644 index ae257f14831e..000000000000 --- a/media-gfx/fontforge/fontforge-20170731.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python{2_7,3_4,3_5} ) - -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 ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~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/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] - ) - !media-gfx/pfaedit -" -DEPEND="${RDEPEND} - sys-devel/gettext - virtual/pkgconfig - X? ( x11-proto/inputproto ) -" - -# 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}" - -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 -} -- cgit v1.2.3