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 1CAEE138334 for ; Mon, 17 Jun 2019 14:31:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 39E9EE0917; Mon, 17 Jun 2019 14:31:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 06C13E0917 for ; Mon, 17 Jun 2019 14:31:33 +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 60A1934631D for ; Mon, 17 Jun 2019 14:31:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DA3D25DE for ; Mon, 17 Jun 2019 14:31:28 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1560781878.4306d728998b0eaf3e863d887920813e6af91e1a.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/seamonkey/, www-client/seamonkey/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-client/seamonkey/files/seamonkey-gcc9.patch www-client/seamonkey/seamonkey-2.49.9.1_p0.ebuild X-VCS-Directories: www-client/seamonkey/ www-client/seamonkey/files/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 4306d728998b0eaf3e863d887920813e6af91e1a X-VCS-Branch: master Date: Mon, 17 Jun 2019 14:31:28 +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: ea6c07fa-4926-44bf-983c-aff279ac0ef7 X-Archives-Hash: 92d4eb0e5ff59a015a113d5dfd1d3277 commit: 4306d728998b0eaf3e863d887920813e6af91e1a Author: Lars Wendler gentoo org> AuthorDate: Mon Jun 17 14:31:18 2019 +0000 Commit: Lars Wendler gentoo org> CommitDate: Mon Jun 17 14:31:18 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4306d728 www-client/seamonkey: Fixed build with gcc9 Thanks-to: Helmut Jarausch igpm.rwth-aachen.de> Closes: https://bugs.gentoo.org/685092 Package-Manager: Portage-2.3.67, Repoman-2.3.14 Signed-off-by: Lars Wendler gentoo.org> www-client/seamonkey/files/seamonkey-gcc9.patch | 22 ++++++++++++++++++++++ www-client/seamonkey/seamonkey-2.49.9.1_p0.ebuild | 5 ++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/www-client/seamonkey/files/seamonkey-gcc9.patch b/www-client/seamonkey/files/seamonkey-gcc9.patch new file mode 100644 index 00000000000..87d14e6a16c --- /dev/null +++ b/www-client/seamonkey/files/seamonkey-gcc9.patch @@ -0,0 +1,22 @@ +--- a/mozilla/js/xpconnect/src/XPCWrappedNative.cpp.ORIG 2018-07-09 21:54:43.000000000 +0200 ++++ b/mozilla/js/xpconnect/src/XPCWrappedNative.cpp 2019-05-04 17:49:23.893560494 +0200 +@@ -2218,15 +2218,16 @@ + const char* fmt = (i == 0) ? + "(%s" : (i == count-1) ? + ", %s)" : ", %s"; ++ ++ if (!name) { ++ return nullptr; ++ } + name = JS_sprintf_append(name, fmt, + array[i]->GetNameString()); + } + } + } + +- if (!name) { +- return nullptr; +- } + const char* fmt = "[xpconnect wrapped %s" FMT_ADDR FMT_STR(" (native") + FMT_ADDR FMT_STR(")") "]"; + if (si) { diff --git a/www-client/seamonkey/seamonkey-2.49.9.1_p0.ebuild b/www-client/seamonkey/seamonkey-2.49.9.1_p0.ebuild index 05e55c8f784..4b7e0269c38 100644 --- a/www-client/seamonkey/seamonkey-2.49.9.1_p0.ebuild +++ b/www-client/seamonkey/seamonkey-2.49.9.1_p0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -156,6 +156,9 @@ src_prepare() { eapply "${WORKDIR}"/firefox popd &>/dev/null || die + # gcc9 patch #685092 + eapply "${FILESDIR}"/${PN}-gcc9.patch + if grep -q '^sdkdir.*$(MOZ_APP_NAME)-devel' mozilla/config/baseconfig.mk ; then sed '/^sdkdir/s@-devel@@' \ -i mozilla/config/baseconfig.mk || die