From: "Lars Wendler" <polynomial-c@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/seamonkey/, www-client/seamonkey/files/
Date: Thu, 11 May 2017 08:10:05 +0000 (UTC) [thread overview]
Message-ID: <1494490201.e3ca3e4837d9e28c97faa8e7b33369a787c0ef7f.polynomial-c@gentoo> (raw)
commit: e3ca3e4837d9e28c97faa8e7b33369a787c0ef7f
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu May 11 08:09:47 2017 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu May 11 08:10:01 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3ca3e48
www-client/seamonkey: Fixed compilation with >=glibc-2.25
Package-Manager: Portage-2.3.5, Repoman-2.3.2
...-sysmacros.h-for-major-minor-when-availab.patch | 59 ++++++++++++++++++++++
www-client/seamonkey/seamonkey-2.48_beta1.ebuild | 1 +
2 files changed, 60 insertions(+)
diff --git a/www-client/seamonkey/files/firefox-Include-sys-sysmacros.h-for-major-minor-when-availab.patch b/www-client/seamonkey/files/firefox-Include-sys-sysmacros.h-for-major-minor-when-availab.patch
new file mode 100644
index 00000000000..9a3dad17058
--- /dev/null
+++ b/www-client/seamonkey/files/firefox-Include-sys-sysmacros.h-for-major-minor-when-availab.patch
@@ -0,0 +1,59 @@
+From 5679a9daa463bd038883afe69332ef3807c41442 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Wed, 1 Feb 2017 18:48:02 +0100
+Subject: [PATCH] Include sys/sysmacros.h for major(), minor() when available
+
+Include sys/sysmacros.h explicitly as that will be required by future
+glibc versions to expose major() and minor() macros.
+
+Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1329798
+---
+ build/moz.configure/headers.configure | 4 ++++
+ config/system-headers | 1 +
+ xpcom/io/nsLocalFileUnix.cpp | 3 +++
+ 3 files changed, 8 insertions(+)
+
+diff --git a/build/moz.configure/headers.configure b/build/moz.configure/headers.configure
+index 52ffa2f89..53ca44ca4 100644
+--- a/build/moz.configure/headers.configure
++++ b/build/moz.configure/headers.configure
+@@ -57,6 +57,10 @@ check_headers(
+ check_header('sys/queue.h',
+ when=non_msvc_compiler)
+
++# sys/sysmacros.h may be necessary for major()/minor() macros
++check_header('sys/sysmacros.h',
++ when=non_msvc_compiler)
++
+ check_headers(
+ 'sys/types.h',
+ 'netinet/in.h',
+diff --git a/config/system-headers b/config/system-headers
+index 60788e788..984e86933 100644
+--- a/config/system-headers
++++ b/config/system-headers
+@@ -1055,6 +1055,7 @@ sys/statvfs.h
+ sys/syscall.h
+ sys/sysctl.h
+ sys/sysinfo.h
++sys/sysmacros.h
+ sys/sysmp.h
+ sys/syssgi.h
+ sys/system_properties.h
+diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
+index 6f13e2a7d..be7bf4de2 100644
+--- a/xpcom/io/nsLocalFileUnix.cpp
++++ b/xpcom/io/nsLocalFileUnix.cpp
+@@ -30,6 +30,9 @@
+ #define BLOCK_SIZE 1024 /* kernel block size */
+ #endif
+ #endif
++#if defined(HAVE_SYS_SYSMACROS_H)
++#include <sys/sysmacros.h>
++#endif
+
+ #include "xpcom-private.h"
+ #include "nsDirectoryServiceDefs.h"
+--
+2.11.0
+
diff --git a/www-client/seamonkey/seamonkey-2.48_beta1.ebuild b/www-client/seamonkey/seamonkey-2.48_beta1.ebuild
index 1a2af943b06..9f5f5eb9e1c 100644
--- a/www-client/seamonkey/seamonkey-2.48_beta1.ebuild
+++ b/www-client/seamonkey/seamonkey-2.48_beta1.ebuild
@@ -151,6 +151,7 @@ src_prepare() {
rm -f "${WORKDIR}"/firefox/1000_gentoo_install_dir.patch
rm -f "${WORKDIR}"/firefox/2000-firefox_gentoo_install_dirs.patch
eapply "${WORKDIR}"/firefox
+ eapply "${FILESDIR}/firefox-Include-sys-sysmacros.h-for-major-minor-when-availab.patch"
popd &>/dev/null || die
# ugly hackaround for system-harfbuzz
next reply other threads:[~2017-05-11 8:10 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-11 8:10 Lars Wendler [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-01-29 5:50 [gentoo-commits] repo/gentoo:master commit in: www-client/seamonkey/, www-client/seamonkey/files/ Sam James
2021-05-26 8:02 Lars Wendler
2021-01-22 9:29 Lars Wendler
2020-12-31 15:01 Lars Wendler
2020-11-30 9:46 Lars Wendler
2020-10-22 19:23 Lars Wendler
2020-08-12 12:08 Lars Wendler
2020-07-18 18:43 Lars Wendler
2019-06-17 14:31 Lars Wendler
2018-01-02 10:10 Lars Wendler
2017-07-24 13:46 Lars Wendler
2017-01-07 1:22 Lars Wendler
2016-09-01 21:03 Ian Stakenvicius
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=1494490201.e3ca3e4837d9e28c97faa8e7b33369a787c0ef7f.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