From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 473CC1382C5 for ; Tue, 12 May 2020 22:30:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7824BE09BF; Tue, 12 May 2020 22:30:27 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3FCFAE09BF for ; Tue, 12 May 2020 22:30:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7B02F34FCB2 for ; Tue, 12 May 2020 22:30:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 87454219 for ; Tue, 12 May 2020 22:30:23 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1589322599.394bb39d8e64a4b5e16c32c5ce03aa28d6f713e2.whissi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/gd/files/, media-libs/gd/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/gd/files/gd-2.3.0-fix-tests-bug722448.patch media-libs/gd/gd-2.3.0.ebuild X-VCS-Directories: media-libs/gd/files/ media-libs/gd/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: 394bb39d8e64a4b5e16c32c5ce03aa28d6f713e2 X-VCS-Branch: master Date: Tue, 12 May 2020 22:30:23 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 66a4b670-96b2-43ed-bc32-4133e8dce652 X-Archives-Hash: 041dc7de5d9c5aa6c90c73b770d63389 commit: 394bb39d8e64a4b5e16c32c5ce03aa28d6f713e2 Author: Sam James (sam_c) cmpct info> AuthorDate: Mon May 11 23:06:20 2020 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Tue May 12 22:29:59 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=394bb39d media-libs/gd: Add upstream patch for 2 tests Fixes gdimagestring16 and gdimagestringup16 tests. Thanks-to: ernsteiswuerfel mailbox.org> Closes: https://bugs.gentoo.org/722448 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Sam James (sam_c) cmpct.info> Closes: https://github.com/gentoo/gentoo/pull/15754 Signed-off-by: Thomas Deutschmann gentoo.org> .../gd/files/gd-2.3.0-fix-tests-bug722448.patch | 62 ++++++++++++++++++++++ media-libs/gd/gd-2.3.0.ebuild | 1 + 2 files changed, 63 insertions(+) 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 00000000000..eef62fca676 --- /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/gd-2.3.0.ebuild b/media-libs/gd/gd-2.3.0.ebuild index d9d3160c5c5..fe6404cb6d5 100644 --- a/media-libs/gd/gd-2.3.0.ebuild +++ b/media-libs/gd/gd-2.3.0.ebuild @@ -34,6 +34,7 @@ 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() {