From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id EBB901381F3 for ; Thu, 26 Sep 2013 16:34:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 883ABE0BFA; Thu, 26 Sep 2013 16:34:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 10543E0BFA for ; Thu, 26 Sep 2013 16:34:42 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C6B4E33EEAA for ; Thu, 26 Sep 2013 16:34:41 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 275FDE5309 for ; Thu, 26 Sep 2013 16:34:39 +0000 (UTC) From: "Ian Stakenvicius" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ian Stakenvicius" Message-ID: <1380213262.b9ef50e665245324cc4025b096dc1b9c3c2edaa3.axs@gentoo> Subject: [gentoo-commits] proj/mozilla:master commit in: mail-client/thunderbird/, www-client/firefox/, www-client/seamonkey/, ... X-VCS-Repository: proj/mozilla X-VCS-Files: mail-client/thunderbird/files/moz24-drop-Wl-build-id.patch mail-client/thunderbird/thunderbird-24.0-r1.ebuild www-client/firefox/files/moz24-drop-Wl-build-id.patch www-client/firefox/firefox-24.0-r1.ebuild www-client/seamonkey/files/moz24-drop-Wl-build-id.patch www-client/seamonkey/seamonkey-2.21.ebuild X-VCS-Directories: mail-client/thunderbird/ www-client/firefox/ www-client/seamonkey/ mail-client/thunderbird/files/ www-client/seamonkey/files/ www-client/firefox/files/ X-VCS-Committer: axs X-VCS-Committer-Name: Ian Stakenvicius X-VCS-Revision: b9ef50e665245324cc4025b096dc1b9c3c2edaa3 X-VCS-Branch: master Date: Thu, 26 Sep 2013 16:34:39 +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-Archives-Salt: 03b9f9bd-6219-4887-9342-315d4129d5d5 X-Archives-Hash: d49dfef2b72848d30bafbbca24762bd8 commit: b9ef50e665245324cc4025b096dc1b9c3c2edaa3 Author: Ian Stakenvicius gentoo org> AuthorDate: Thu Sep 26 16:33:12 2013 +0000 Commit: Ian Stakenvicius gentoo org> CommitDate: Thu Sep 26 16:34:22 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=b9ef50e6 drop -Wl,--build-id from LDFLAGS, bug #465466; also add missing selinux in seamonkey IUSE --- .../thunderbird/files/moz24-drop-Wl-build-id.patch | 32 ++++++++++++++++++++++ mail-client/thunderbird/thunderbird-24.0-r1.ebuild | 4 ++- .../firefox/files/moz24-drop-Wl-build-id.patch | 32 ++++++++++++++++++++++ www-client/firefox/firefox-24.0-r1.ebuild | 6 ++-- .../seamonkey/files/moz24-drop-Wl-build-id.patch | 32 ++++++++++++++++++++++ www-client/seamonkey/seamonkey-2.21.ebuild | 4 ++- 6 files changed, 106 insertions(+), 4 deletions(-) diff --git a/mail-client/thunderbird/files/moz24-drop-Wl-build-id.patch b/mail-client/thunderbird/files/moz24-drop-Wl-build-id.patch new file mode 100644 index 0000000..434dd23 --- /dev/null +++ b/mail-client/thunderbird/files/moz24-drop-Wl-build-id.patch @@ -0,0 +1,32 @@ +--- a/comm-esr24/mozilla/configure.in 2013-09-26 09:41:27.220542321 -0400 ++++ b/comm-esr24/mozilla/configure.in 2013-09-26 09:49:07.888550730 -0400 +@@ -1339,13 +1339,6 @@ + AC_TRY_LINK(,,AC_MSG_RESULT([yes]), + AC_MSG_RESULT([no]) + LDFLAGS=$_SAVE_LDFLAGS) +- AC_MSG_CHECKING([for --build-id option to ld]) +- _SAVE_LDFLAGS=$LDFLAGS +- LDFLAGS="$LDFLAGS -Wl,--build-id" +- AC_TRY_LINK(,,AC_MSG_RESULT([yes]) +- [NSPR_LDFLAGS="$NSPR_LDFLAGS -Wl,--build-id"], +- AC_MSG_RESULT([no]) +- LDFLAGS=$_SAVE_LDFLAGS) + + + # Check for -mssse3 on $CC +--- a/comm-esr24/mozilla/js/src/configure.in 2013-09-26 09:41:27.222542321 -0400 ++++ b/comm-esr24/mozilla/js/src/configure.in 2013-09-26 09:49:19.121550935 -0400 +@@ -1154,13 +1154,6 @@ + DSO_PIC_CFLAGS='-fPIC' + ASFLAGS="$ASFLAGS -fPIC" + +- AC_MSG_CHECKING([for --build-id option to ld]) +- _SAVE_LDFLAGS=$LDFLAGS +- LDFLAGS="$LDFLAGS -Wl,--build-id" +- AC_TRY_LINK(,,AC_MSG_RESULT([yes]), +- AC_MSG_RESULT([no]) +- LDFLAGS=$_SAVE_LDFLAGS) +- + # Turn on GNU-specific warnings: + # -Wall - turn on a lot of warnings + # -Wpointer-arith - good to have diff --git a/mail-client/thunderbird/thunderbird-24.0-r1.ebuild b/mail-client/thunderbird/thunderbird-24.0-r1.ebuild index 4bdf8d3..a46f767 100644 --- a/mail-client/thunderbird/thunderbird-24.0-r1.ebuild +++ b/mail-client/thunderbird/thunderbird-24.0-r1.ebuild @@ -51,7 +51,7 @@ SRC_URI="${SRC_URI} ASM_DEPEND=">=dev-lang/yasm-1.1" -RDEPEND=" +RDEPEND=" >=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.15.1 >=dev-libs/nspr-4.10 @@ -122,6 +122,8 @@ src_prepare() { EPATCH_SUFFIX="patch" \ EPATCH_FORCE="yes" \ epatch "${WORKDIR}/thunderbird" + # drop -Wl,--build-id from LDFLAGS, bug #465446 + epatch "${FILESDIR}"/moz${PV%%\.*}-drop-Wl-build-id.patch # Apply our patchset from firefox to thunderbird as well pushd "${S}"/mozilla &>/dev/null || die diff --git a/www-client/firefox/files/moz24-drop-Wl-build-id.patch b/www-client/firefox/files/moz24-drop-Wl-build-id.patch new file mode 100644 index 0000000..434dd23 --- /dev/null +++ b/www-client/firefox/files/moz24-drop-Wl-build-id.patch @@ -0,0 +1,32 @@ +--- a/comm-esr24/mozilla/configure.in 2013-09-26 09:41:27.220542321 -0400 ++++ b/comm-esr24/mozilla/configure.in 2013-09-26 09:49:07.888550730 -0400 +@@ -1339,13 +1339,6 @@ + AC_TRY_LINK(,,AC_MSG_RESULT([yes]), + AC_MSG_RESULT([no]) + LDFLAGS=$_SAVE_LDFLAGS) +- AC_MSG_CHECKING([for --build-id option to ld]) +- _SAVE_LDFLAGS=$LDFLAGS +- LDFLAGS="$LDFLAGS -Wl,--build-id" +- AC_TRY_LINK(,,AC_MSG_RESULT([yes]) +- [NSPR_LDFLAGS="$NSPR_LDFLAGS -Wl,--build-id"], +- AC_MSG_RESULT([no]) +- LDFLAGS=$_SAVE_LDFLAGS) + + + # Check for -mssse3 on $CC +--- a/comm-esr24/mozilla/js/src/configure.in 2013-09-26 09:41:27.222542321 -0400 ++++ b/comm-esr24/mozilla/js/src/configure.in 2013-09-26 09:49:19.121550935 -0400 +@@ -1154,13 +1154,6 @@ + DSO_PIC_CFLAGS='-fPIC' + ASFLAGS="$ASFLAGS -fPIC" + +- AC_MSG_CHECKING([for --build-id option to ld]) +- _SAVE_LDFLAGS=$LDFLAGS +- LDFLAGS="$LDFLAGS -Wl,--build-id" +- AC_TRY_LINK(,,AC_MSG_RESULT([yes]), +- AC_MSG_RESULT([no]) +- LDFLAGS=$_SAVE_LDFLAGS) +- + # Turn on GNU-specific warnings: + # -Wall - turn on a lot of warnings + # -Wpointer-arith - good to have diff --git a/www-client/firefox/firefox-24.0-r1.ebuild b/www-client/firefox/firefox-24.0-r1.ebuild index 03e1525..23eaae4 100644 --- a/www-client/firefox/firefox-24.0-r1.ebuild +++ b/www-client/firefox/firefox-24.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-18.0-r1.ebuild,v 1.1 2013/01/16 16:58:19 anarchy Exp $ +# $Header: $ EAPI="3" VIRTUALX_REQUIRED="pgo" @@ -147,6 +147,8 @@ src_prepare() { EPATCH_SUFFIX="patch" \ EPATCH_FORCE="yes" \ epatch "${WORKDIR}/firefox" + # drop -Wl,--build-id from LDFLAGS, bug #465446 + epatch "${FILESDIR}"/moz${PV%%\.*}-drop-Wl-build-id.patch # Allow user to apply any additional patches without modifing ebuild epatch_user @@ -157,7 +159,7 @@ src_prepare() { "${S}"/build/unix/run-mozilla.sh || die "sed failed!" fi - # Ensure that are plugins dir is enabled as default + # Ensure that our plugins dir is enabled as default sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \ "${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!" sed -i -e "s:/usr/lib64/mozilla/plugins:/usr/lib64/nsbrowser/plugins:" \ diff --git a/www-client/seamonkey/files/moz24-drop-Wl-build-id.patch b/www-client/seamonkey/files/moz24-drop-Wl-build-id.patch new file mode 100644 index 0000000..434dd23 --- /dev/null +++ b/www-client/seamonkey/files/moz24-drop-Wl-build-id.patch @@ -0,0 +1,32 @@ +--- a/comm-esr24/mozilla/configure.in 2013-09-26 09:41:27.220542321 -0400 ++++ b/comm-esr24/mozilla/configure.in 2013-09-26 09:49:07.888550730 -0400 +@@ -1339,13 +1339,6 @@ + AC_TRY_LINK(,,AC_MSG_RESULT([yes]), + AC_MSG_RESULT([no]) + LDFLAGS=$_SAVE_LDFLAGS) +- AC_MSG_CHECKING([for --build-id option to ld]) +- _SAVE_LDFLAGS=$LDFLAGS +- LDFLAGS="$LDFLAGS -Wl,--build-id" +- AC_TRY_LINK(,,AC_MSG_RESULT([yes]) +- [NSPR_LDFLAGS="$NSPR_LDFLAGS -Wl,--build-id"], +- AC_MSG_RESULT([no]) +- LDFLAGS=$_SAVE_LDFLAGS) + + + # Check for -mssse3 on $CC +--- a/comm-esr24/mozilla/js/src/configure.in 2013-09-26 09:41:27.222542321 -0400 ++++ b/comm-esr24/mozilla/js/src/configure.in 2013-09-26 09:49:19.121550935 -0400 +@@ -1154,13 +1154,6 @@ + DSO_PIC_CFLAGS='-fPIC' + ASFLAGS="$ASFLAGS -fPIC" + +- AC_MSG_CHECKING([for --build-id option to ld]) +- _SAVE_LDFLAGS=$LDFLAGS +- LDFLAGS="$LDFLAGS -Wl,--build-id" +- AC_TRY_LINK(,,AC_MSG_RESULT([yes]), +- AC_MSG_RESULT([no]) +- LDFLAGS=$_SAVE_LDFLAGS) +- + # Turn on GNU-specific warnings: + # -Wall - turn on a lot of warnings + # -Wpointer-arith - good to have diff --git a/www-client/seamonkey/seamonkey-2.21.ebuild b/www-client/seamonkey/seamonkey-2.21.ebuild index bd99c36..ff65a4f 100644 --- a/www-client/seamonkey/seamonkey-2.21.ebuild +++ b/www-client/seamonkey/seamonkey-2.21.ebuild @@ -47,7 +47,7 @@ fi SLOT="0" LICENSE="MPL-2.0 GPL-2 LGPL-2.1" -IUSE="+chatzilla +crypt gstreamer +ipc +jit minimal pulseaudio +roaming system-cairo system-icu system-jpeg system-sqlite" +IUSE="+chatzilla +crypt gstreamer +ipc +jit minimal pulseaudio +roaming selinux system-cairo system-icu system-jpeg system-sqlite" SRC_URI="${SRC_URI} ${MOZ_FTP_URI}/source/${MY_MOZ_P}.source.tar.bz2 -> ${P}.source.tar.bz2 @@ -130,6 +130,8 @@ src_prepare() { EPATCH_FORCE="yes" \ epatch "${WORKDIR}/firefox" popd &>/dev/null || die + # drop -Wl,--build-id from LDFLAGS, bug #465466 + epatch "${FILESDIR}"/moz${PATCHFF:8:2}-drop-Wl-build-id.patch # Shell scripts sometimes contain DOS line endings; bug 391889 grep -rlZ --include="*.sh" $'\r$' . |