From deba8115d2c2af26df42966b91ef04ff4dd79cde Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 14 May 2020 11:09:11 +0100 Subject: gentoo resync : 14.05.2020 --- media-libs/gd/Manifest | 5 ++ .../gd/files/gd-2.3.0-disable-flaky-tests.patch | 25 +++++++ .../gd/files/gd-2.3.0-fix-tests-bug722448.patch | 62 +++++++++++++++++ media-libs/gd/files/gd-2.3.0-getlib.patch | 81 ++++++++++++++++++++++ media-libs/gd/gd-2.3.0.ebuild | 81 ++++++++++++++++++++++ 5 files changed, 254 insertions(+) create mode 100644 media-libs/gd/files/gd-2.3.0-disable-flaky-tests.patch create mode 100644 media-libs/gd/files/gd-2.3.0-fix-tests-bug722448.patch create mode 100644 media-libs/gd/files/gd-2.3.0-getlib.patch create mode 100644 media-libs/gd/gd-2.3.0.ebuild (limited to 'media-libs/gd') diff --git a/media-libs/gd/Manifest b/media-libs/gd/Manifest index 5374c98e05a3..b7a9d9394b7d 100644 --- a/media-libs/gd/Manifest +++ b/media-libs/gd/Manifest @@ -3,8 +3,13 @@ AUX gd-2.2.5-CVE-2018-5711.patch 3225 BLAKE2B f3e22fa172bb6d07a7bc1da59e25efed81 AUX gd-2.2.5-CVE-2019-6977.patch 1167 BLAKE2B 7ec6fbd6c7a4841915d968558e8f8c647b873ece655e884661af1afe5732df66520de7b0c096c0faac5af57764fd0a8c6e9e83af155d93c3db74636944ff15d7 SHA512 5214ac4148c618f3fef3bb3b6675e41a76e31465cd8dac326ee99dc1ae4cfe760749997d2941743efa48e79b8dbdb536d6b6d79d9bc4e5363f2c50da52ab5cac AUX gd-2.2.5-CVE-2019-6978.patch 7852 BLAKE2B 2d9ced220950994fe3977c0ddbb3bf234fbc0912515ee1eb7e6f98510aabd4163b33ac4f0ccd4336538b20c27dea4f625a3e56ec865fe4bce610f7382415db42 SHA512 2a890d8b0c923e59b3d1b054f92999a48d7fa7065f64fdecc7bf80f719e5e10150a34549059a8edf13fba45c76c68be3ca698f38be0411cb2b9978daa2db3899 AUX gd-2.2.5-ossfuzz5700.patch 2680 BLAKE2B 55beecdf63e280ab54b83b214d704bccc83a6779b650b4b6f31b3d6989deadaa179d4e733f0b07a4ee8aac5be043879619924ed21c0b6ede300b804783aded31 SHA512 cfac2479729105a9ed0200191b9e9a47e3e1962d4d9b0f811bc94006a79e9ac08ddb6ed424f60e8626c44e7316f0c1747de49e26890d5b454c8206fa22a65530 +AUX gd-2.3.0-disable-flaky-tests.patch 792 BLAKE2B 81d4d56f0365e51fd1f406f3f27cd788a670bc091e13c8d39e8fb8234dd934896d6161940e010e2c0118000a36012bc2f878674a7409bcc19662686afaf99cb3 SHA512 285c542ca60f25597c29c040c95bd1885dbd3c29d3c1af52123646bc06abbd271bd37d4dedc1fc0bb218a84063814c8d8176a30c1da8a19445064469e26a5ea6 +AUX gd-2.3.0-fix-tests-bug722448.patch 2231 BLAKE2B 629caa9cd7dbd63cab93c97466921ee9131c5542618fdb5ce772a9b1bd3fcf2e64f93da999ca9011917cf8e726cae914c76529eca1a24cd2c31f55c4e75aaa7c SHA512 6d66af4e5d70e1e919f81bf0fd7261bd13216da4873927826d5c4925cf1673a9a3e98d588f693bab7505ee02e7a231c19687e27c1efc1a606bab3b3ab20a93dd +AUX gd-2.3.0-getlib.patch 2848 BLAKE2B 308577a8fce5b764cf96139d21d4aa6a6deb86244d0b858f520da1835547853d693f7c71621222744fe438f393aaaefa1fc6316ef27442a426af09df95c0faa2 SHA512 24d4774af36ca832504063c8327ff9a84956ae1a48cda3ef6f27d819e8a18b31a9083f2ce6d2587d5acb237d8c96c3d68cfe8eb8350a10715c15d16aca1cf37c DIST libgd-2.2.5-ossfuzz5700.dat 30 BLAKE2B 5ddd3d2be2adf05e1e2eb1852cc689be57d4d77c57b471e8b6021877f2fb137d15b4c73445fbb23a9ed585974a96dd154759a48712c1e7b5bdc5750d534aee4a SHA512 2394e92ff7a42c818e13a1ac9ad15bc81aa401adc917366ec8c440bb7f27a63777ab059aa03c501dafef0ac16b462dd23c7fb9f8086ce558203384a98a235fff DIST libgd-2.2.5-php_bug_75571.dat 1731 BLAKE2B 4b5d3f258b73e8089ede1b2c9f538855f410965a9e01e1f3f151ae52f072036172b184bd1a4d07b8355bb974bf088bebb0e812175a277bb67926274272bd80a0 SHA512 b3048640ce7828cca7901fadc989e867cfc6d31b44c0f5a1bda54d7428f317c8c8fc6403fef301e193869a95eb46eb7195d47710ec7f8c507ba049cb6cdcb281 DIST libgd-2.2.5.tar.xz 2594092 BLAKE2B 222a7e012fbf9924ac391ee96c7cd3dec96afd78c6d43dfb680b33e7143e7df87fe6be75bbfe8fb93e916302d7daf08271214c84da28712e93a36465566cb2bd SHA512 e4598e17a277a75e02255402182cab139cb3f2cffcd68ec05cc10bbeaf6bc7aa39162c3445cd4a7efc1a26b72b9152bbedb187351e3ed099ea51767319997a6b +DIST libgd-2.3.0.tar.xz 2539188 BLAKE2B a90f48be959d1bb6774ec44960e191b8be134ff3e74401eba4cbf9b165c72665f3dffe3beaaf92fa6069e0ef79533be5d57a5946a1839f55446072fa322ed808 SHA512 5b201d22560e147a3d5471010b898ad0268c3a2453b870d1267b6ba92e540cf9f75099336c1ab08217e41827ac86fe04525726bf29ad117e5dcbaef9a8d0622a EBUILD gd-2.2.5-r2.ebuild 3143 BLAKE2B 7566cefe70ef129bafc17ed928b0e7c1ccb5b1b05d25b7c6016e08f62ea680ef96e9a9a7a48ed8e0e49b4d3e87e8dbf90810b1b992a4ce0f52bbb703cec9af86 SHA512 581529ce33b146df1711422a3b916d1af1c74e85669d274e8639acaa881f56404f0c4afd62886688d77439a2467c6c9045864413b50b47452742b26b3da1be24 +EBUILD gd-2.3.0.ebuild 2574 BLAKE2B c80be170ccd5e7a17ddb0e6c793833c05aa2703090b1b6e774284e04f1fc4caebdfdd49907d72bd0e8b458fb99ab22628042995894ad930a7a9920c169fda4c0 SHA512 4d5fbcb78a88d0942daa7320da23dd5aca7d0093883d8f1a5224b3d26aff037b346c19c0b1c3b69b41a04b435289b44e25f4db6516ca976de75073f95b142fb3 MISC metadata.xml 1507 BLAKE2B 34dbcbc70165ebe74ea14e6394e2691bda7523e4c848b13a512de8f0707c194a7da3de41a8fe483d7a8b2aa1af8f0d164ea210605ae76480dbf22b976b53d2f5 SHA512 0ac3c1ca25c190333e7f97dbb05e197e62e76abeaa045966fa3024dbeb22d541d78794df08d450e887591909a25dfb6a4fef861ed62f7f055b129e17b1329919 diff --git a/media-libs/gd/files/gd-2.3.0-disable-flaky-tests.patch b/media-libs/gd/files/gd-2.3.0-disable-flaky-tests.patch new file mode 100644 index 000000000000..245b3aac4433 --- /dev/null +++ b/media-libs/gd/files/gd-2.3.0-disable-flaky-tests.patch @@ -0,0 +1,25 @@ +diff --git a/tests/gdimagecopyresampled/Makemodule.am b/tests/gdimagecopyresampled/Makemodule.am +index d42eab5..3644213 100644 +--- a/tests/gdimagecopyresampled/Makemodule.am ++++ b/tests/gdimagecopyresampled/Makemodule.am +@@ -4,8 +4,7 @@ libgd_test_programs += \ + if HAVE_LIBPNG + libgd_test_programs += \ + gdimagecopyresampled/basic \ +- gdimagecopyresampled/basic_alpha \ +- gdimagecopyresampled/bug00201 ++ gdimagecopyresampled/basic_alpha + endif + + EXTRA_DIST += \ +diff --git a/tests/gdimagegrayscale/Makemodule.am b/tests/gdimagegrayscale/Makemodule.am +index c6fec00..2d81a4a 100644 +--- a/tests/gdimagegrayscale/Makemodule.am ++++ b/tests/gdimagegrayscale/Makemodule.am +@@ -1,6 +1,5 @@ + if HAVE_LIBPNG + libgd_test_programs += \ +- gdimagegrayscale/basic \ + gdimagegrayscale/bug00386 + endif + diff --git a/media-libs/gd/files/gd-2.3.0-fix-tests-bug722448.patch b/media-libs/gd/files/gd-2.3.0-fix-tests-bug722448.patch new file mode 100644 index 000000000000..eef62fca676b --- /dev/null +++ b/media-libs/gd/files/gd-2.3.0-fix-tests-bug722448.patch @@ -0,0 +1,62 @@ +From ec0b4397698bd358557d33641aac4beb1912f43b Mon Sep 17 00:00:00 2001 +From: wilson chen +Date: Wed, 15 Apr 2020 00:25:01 +0800 +Subject: [PATCH] Improve test cases for gdImageString16 and gdImageStringUp16 + (#625) + +Fixed #623. wchar_t is 32 bits on 64-bits AIX, which will result in test case failure. +So we replace wchar_t with unsigned short array. +--- + tests/gdimagestring16/gdimagestring16.c | 6 ++---- + tests/gdimagestringup16/gdimagestringup16.c | 6 ++---- + 2 files changed, 4 insertions(+), 8 deletions(-) + +diff --git a/tests/gdimagestring16/gdimagestring16.c b/tests/gdimagestring16/gdimagestring16.c +index 57eae978..0ca06680 100644 +--- a/tests/gdimagestring16/gdimagestring16.c ++++ b/tests/gdimagestring16/gdimagestring16.c +@@ -9,9 +9,7 @@ int main() + { + /* Declare the image */ + gdImagePtr im = NULL; +- wchar_t *wchr = L"H"; +- unsigned short *sptr; +- sptr = (unsigned short *)wchr; ++ unsigned short s[2] = {'H', 0}; + int foreground; + int errorcode = 0; + gdFontPtr fontptr = gdFontGetLarge(); +@@ -20,7 +18,7 @@ int main() + gdImageColorAllocate(im, 255, 255, 255); + foreground = gdImageColorAllocate(im, 22, 4, 238); + +- gdImageString16(im, fontptr, 2, 2, sptr, foreground); ++ gdImageString16(im, fontptr, 2, 2, s, foreground); + + if (!gdAssertImageEqualsToFile("gdimagestring16/gdimagestring16_exp.png", im)) + errorcode = 1; +diff --git a/tests/gdimagestringup16/gdimagestringup16.c b/tests/gdimagestringup16/gdimagestringup16.c +index c843abec..c24639fd 100644 +--- a/tests/gdimagestringup16/gdimagestringup16.c ++++ b/tests/gdimagestringup16/gdimagestringup16.c +@@ -9,9 +9,7 @@ int main() + { + /* Declare the image */ + gdImagePtr im = NULL; +- wchar_t *wchr = L"H"; +- unsigned short *sptr; +- sptr = (unsigned short *)wchr; ++ unsigned short s[2] = {'H', 0}; + int foreground; + int errorcode = 0; + gdFontPtr fontptr = gdFontGetLarge(); +@@ -20,7 +18,7 @@ int main() + gdImageColorAllocate(im, 255, 255, 255); + foreground = gdImageColorAllocate(im, 22, 4, 238); + +- gdImageStringUp16(im, fontptr, 2, 18, sptr, foreground); ++ gdImageStringUp16(im, fontptr, 2, 18, s, foreground); + + if (!gdAssertImageEqualsToFile("gdimagestringup16/gdimagestringup16_exp.png", im)) + errorcode = 1; + diff --git a/media-libs/gd/files/gd-2.3.0-getlib.patch b/media-libs/gd/files/gd-2.3.0-getlib.patch new file mode 100644 index 000000000000..91884e93292d --- /dev/null +++ b/media-libs/gd/files/gd-2.3.0-getlib.patch @@ -0,0 +1,81 @@ +From 635dd9a3065ed88e1741e6b963044b80e913f96a Mon Sep 17 00:00:00 2001 +From: Remi Collet +Date: Tue, 24 Mar 2020 08:01:01 +0100 +Subject: [PATCH] distribute getlib.sh + +--- + config/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/config/Makefile.am b/config/Makefile.am +index 122287ee..6416dda4 100644 +--- a/config/Makefile.am ++++ b/config/Makefile.am +@@ -1,5 +1,5 @@ + ## Process this file with automake to produce Makefile.in -*-Makefile-*- +-EXTRA_DIST = gdlib.pc.cmake gdlib.pc.in getver.pl ++EXTRA_DIST = gdlib.pc.cmake gdlib.pc.in getlib.sh getver.pl + + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = gdlib.pc + +diff -ruN a/config/getlib.sh b/config/getlib.sh +--- a/config/getlib.sh 1970-01-01 00:00:00.000000000 -0000 ++++ b/config/getlib.sh 2020-05-05 17:37:31.638896089 -0000 +@@ -0,0 +1,43 @@ ++#!/bin/sh ++ ++GETVER="${0%/*}/getver.pl" ++GDLIB_MAJOR=$("${GETVER}" MAJOR) ++GDLIB_MINOR=$("${GETVER}" MINOR) ++GDLIB_REVISION=$("${GETVER}" RELEASE) ++ ++# Dynamic library version information ++# See http://www.gnu.org/software/libtool/manual/libtool.html#Updating-version-info ++ ++GDLIB_LT_CURRENT=3 ++# This is the version where the soname (current above) changes. We use it ++# to reset the revision base back to zero. It's a bit of a pain, but some ++# systems restrict the revision range below to [0..255] (like OS X). ++GDLIB_PREV_MAJOR=2 ++GDLIB_PREV_MINOR=2 ++# This isn't 100% correct, but it tends to be a close enough approximation ++# for how we manage the codebase. It's rare to do a release that doesn't ++# modify the library since this project is centered around the library. ++GDLIB_LT_REVISION=$(( ((GDLIB_MAJOR - GDLIB_PREV_MAJOR) << 6) | ((GDLIB_MINOR - GDLIB_PREV_MINOR) << 3) | GDLIB_REVISION )) ++GDLIB_LT_AGE=0 ++ ++# The first three fields we feed into libtool and the OS target determines how ++# they get used. The last two fields we feed into cmake. We use the same rules ++# as Linux SONAME versioning in libtool, but cmake should handle it for us. ++case $1 in ++CURRENT) ++ printf '%s' "${GDLIB_LT_CURRENT}" ++ ;; ++REVISION) ++ printf '%s' "${GDLIB_LT_REVISION}" ++ ;; ++AGE) ++ printf '%s' "${GDLIB_LT_AGE}" ++ ;; ++VERSION) ++ printf '%s' "$(( GDLIB_LT_CURRENT - GDLIB_LT_AGE )).${GDLIB_LT_AGE}.${GDLIB_LT_REVISION}" ++ ;; ++SONAME) ++ printf '%s' "$(( GDLIB_LT_CURRENT - GDLIB_LT_AGE ))" ++ ;; ++esac ++ +diff --git a/configure.ac b/configure.ac +index 8996053..86d0bc9 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -20,7 +20,7 @@ AC_CANONICAL_HOST + + dnl Keep the libtool version details in an external script so cmake can + dnl access the values too. +-define([lt_gv], [config/getlib.sh ]$1) ++define([lt_gv], [${SHELL} config/getlib.sh ]$1) + m4_define([gd_LT_CURRENT], esyscmd(lt_gv(CURRENT))) + m4_define([gd_LT_REVISION], esyscmd(lt_gv(REVISION))) + m4_define([gd_LT_AGE], esyscmd(lt_gv(AGE))) diff --git a/media-libs/gd/gd-2.3.0.ebuild b/media-libs/gd/gd-2.3.0.ebuild new file mode 100644 index 000000000000..c4adf18cf67e --- /dev/null +++ b/media-libs/gd/gd-2.3.0.ebuild @@ -0,0 +1,81 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit autotools flag-o-matic multilib-minimal + +DESCRIPTION="Graphics library for fast image creation" +HOMEPAGE="https://libgd.org/ https://www.boutell.com/gd/" +SRC_URI="https://github.com/libgd/libgd/releases/download/${P}/lib${P}.tar.xz" + +LICENSE="gd IJG HPND BSD" +SLOT="2/3" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="cpu_flags_x86_sse fontconfig jpeg png static-libs test tiff truetype webp xpm zlib" +RESTRICT="!test? ( test )" + +# fontconfig has prefixed font paths, details see bug #518970 +REQUIRED_USE="prefix? ( fontconfig )" + +RDEPEND="fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] ) + jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] ) + png? ( >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] ) + tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] ) + truetype? ( >=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}] ) + webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] ) + xpm? ( >=x11-libs/libXpm-3.5.10-r1[${MULTILIB_USEDEP}] >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] ) + zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )" +DEPEND="${RDEPEND} + >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]" + +S="${WORKDIR}/lib${P}" + +PATCHES=( + "${FILESDIR}/${PN}-2.3.0-disable-flaky-tests.patch" + "${FILESDIR}/${PN}-2.3.0-getlib.patch" + "${FILESDIR}/${P}-fix-tests-bug722448.patch" +) + +src_prepare() { + default + eautoreconf +} + +multilib_src_configure() { + # bug 603360, https://github.com/libgd/libgd/blob/fd06f7f83c5e78bf5b7f5397746b4e5ee4366250/docs/README.TESTING#L65 + if use cpu_flags_x86_sse ; then + append-cflags -msse -mfpmath=sse + else + append-cflags -ffloat-store + fi + + # bug 632076, https://github.com/libgd/libgd/issues/278 + if use arm64 || use ppc64 || use s390 ; then + append-cflags -ffp-contract=off + fi + + # we aren't actually {en,dis}abling X here ... the configure + # script uses it just to add explicit -I/-L paths which we + # don't care about on Gentoo systems. + local myeconfargs=( + --disable-werror + --without-x + --without-liq + $(use_enable static-libs static) + $(use_with fontconfig) + $(use_with png) + $(use_with tiff) + $(use_with truetype freetype) + $(use_with jpeg) + $(use_with webp) + $(use_with xpm) + $(use_with zlib) + ) + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_install_all() { + dodoc README.md + find "${ED}" -name '*.la' -delete || die +} -- cgit v1.2.3