From: "Lars Wendler" <polynomial-c@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/seamonkey/files/, www-client/seamonkey/
Date: Mon, 14 Oct 2019 06:43:51 +0000 (UTC) [thread overview]
Message-ID: <1571035418.50c601ef08f894524b063c37e3eff641b7e1df23.polynomial-c@gentoo> (raw)
commit: 50c601ef08f894524b063c37e3eff641b7e1df23
Author: Jory Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 14 02:58:46 2019 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Oct 14 06:43:38 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50c601ef
www-client/seamonkey: Fix gcc-9 support to not break plugins
Closes: https://bugs.gentoo.org/685092
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org>
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
www-client/seamonkey/files/seamonkey-gcc9.patch | 22 ----------------------
...ey-2.49.5.ebuild => seamonkey-2.49.5-r1.ebuild} | 6 +++---
www-client/seamonkey/seamonkey-2.49.9.1_p0.ebuild | 6 +++---
3 files changed, 6 insertions(+), 28 deletions(-)
diff --git a/www-client/seamonkey/files/seamonkey-gcc9.patch b/www-client/seamonkey/files/seamonkey-gcc9.patch
deleted file mode 100644
index 87d14e6a16c..00000000000
--- a/www-client/seamonkey/files/seamonkey-gcc9.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- 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.5.ebuild b/www-client/seamonkey/seamonkey-2.49.5-r1.ebuild
similarity index 98%
rename from www-client/seamonkey/seamonkey-2.49.5.ebuild
rename to www-client/seamonkey/seamonkey-2.49.5-r1.ebuild
index 42817d46f0a..7bc6b4b0d5f 100644
--- a/www-client/seamonkey/seamonkey-2.49.5.ebuild
+++ b/www-client/seamonkey/seamonkey-2.49.5-r1.ebuild
@@ -125,9 +125,6 @@ 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
@@ -147,6 +144,9 @@ src_prepare() {
local ms="${S}/mozilla"
+ # Don't error for format with gcc-9
+ grep -rl -- '-Werror=format' | xargs sed -i 's/error=format/no-&/' || die "sed failed"
+
# Enable gnomebreakpad
if use debug ; then
sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
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 d841b16c823..cf04b840c0a 100644
--- a/www-client/seamonkey/seamonkey-2.49.9.1_p0.ebuild
+++ b/www-client/seamonkey/seamonkey-2.49.9.1_p0.ebuild
@@ -156,9 +156,6 @@ 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
@@ -183,6 +180,9 @@ src_prepare() {
local ms="${S}/mozilla"
+ # Don't error for format with gcc-9
+ grep -rl -- '-Werror=format' | xargs sed -i 's/error=format/no-&/' || die "sed failed"
+
# Enable gnomebreakpad
if use debug ; then
sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
next reply other threads:[~2019-10-14 6:43 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-14 6:43 Lars Wendler [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-08-13 7:53 [gentoo-commits] repo/gentoo:master commit in: www-client/seamonkey/files/, www-client/seamonkey/ Lars Wendler
2021-08-08 20:42 Lars Wendler
2021-08-08 18:57 Lars Wendler
2021-05-14 10:17 Lars Wendler
2021-05-04 8:30 Lars Wendler
2021-04-15 8:30 Lars Wendler
2020-10-01 7:17 Lars Wendler
2016-12-23 0:08 Lars Wendler
2015-09-28 5:37 Lars Wendler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1571035418.50c601ef08f894524b063c37e3eff641b7e1df23.polynomial-c@gentoo \
--to=polynomial-c@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox