[gentoo-commits] proj/mozilla:master commit in: mail-client/thunderbird/, www-client/firefox/, mail-client/thunderbird/files/, ...

[Jory Pratt]

commit:     e4bac2e258a7f5e421411bbde626c7b6541a6fa3
Author:     Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Sun Nov  3 18:30:20 2013 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Sun Nov  3 18:30:20 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=e4bac2e2

Fix symbols in esr releases

---
 mail-client/thunderbird/Manifest                   |  2 +-
 .../thunderbird/files/moz24-drop-Wl-build-id.patch | 32 ----------------------
 ...-24.1.0.ebuild => thunderbird-24.1.0-r1.ebuild} |  8 ++----
 www-client/firefox/Manifest                        |  2 +-
 .../firefox/files/moz24-drop-Wl-build-id.patch     | 32 ----------------------
 ...efox-24.1.0.ebuild => firefox-24.1.0-r1.ebuild} |  4 +--
 6 files changed, 6 insertions(+), 74 deletions(-)

diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index 7063dea..56f3ccd 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -1,5 +1,5 @@
 DIST enigmail-1.6.tar.gz 1231111 SHA256 10d5eb7ba364b9b6e6275aae8bba1d0e4321ed7d55a715337d566ccf2a56ea4d SHA512 877ca75a0ed1538f156307dc181ce8808deb96f58250d26d4d2c1f474d637959347c2305cb3b8f92f12d3ebd95bfa9d4d35aaaa1f4670728f205be7ae76852b8 WHIRLPOOL 91a11a81cc7b4c05c4a0a320284bc362b13f6aecb4fb20b04f38080bffbc5b94ab1913cf7e2d4480a452a916fd0d4297830ce0ba36867c7418b11deb1e060b06
-DIST firefox-24.0-patches-0.5.tar.xz 7532 SHA256 ffe813f88865aa91d7041b7069dd598eb576519284579766c43910cf53ce96fa SHA512 0090c8e9f7dc46ea60f5fb6edb08f76fe1607012ab277bab4c023c313bce32b8ee4776f70ff1d6b11fc16b4ec29d0c99c69c59b4095953165029d8ad2c54055b WHIRLPOOL 1f7fe475d953103081bbd13d64baf6cd8f8d6a7a8da30a1d4a42cce83201c55b5ef5cd8ef87eb0135f35efb6f466ac64ea595d2c4a1880043a7ccce42b839e0b
+DIST firefox-24.0-patches-0.6.tar.xz 9104 SHA256 1135f97625e23822309e5b2ce65ab0331cd8c7ebb1896d7b9daf2d77d1a11d4d SHA512 b8746373a7e9d2d5775dd2a73ca7d3675f2cbe32b81eacdf6a2208077f39fb842b454c49bb0a750e48c84c3d2ea73fa9c27f6135e7d1a08be2fc73afc520f172 WHIRLPOOL 5d8b89d1849709835611e0ef306dd4814e6ac10fcf9cfee10f6aa72b5e938546c505827441fe2d935eb63605434f77bc72ec201005693534b43dc19635caaf82
 DIST thunderbird-24.0-patches-0.1.tar.xz 1056 SHA256 2a4e128a6f5c35c865fbef77c006e6b24b98f89ceee5de6cfbf572e2c5fdca70 SHA512 aa411270fa4b6ffebbbb210a57a4b5c900ae5a696b7d6050dab2ee439365f3fc7e348c5c45b7632279d6f3c54009e7b29f1acb42501960489157875d79891361 WHIRLPOOL b7e7329d1eb78b222cc18c7b1750e737706e66f64b31ccd94ddf27733d0b8c651d001798d2319e544ac558affe76f69be71a225e246b99a36cee4fd0808dcf5f
 DIST thunderbird-24.1.0-ar.xpi 457861 SHA256 c1ae369bd2e7a43ef25be76b7865ec9cdf902ae0c9a37d5fd994e8905854b7a6 SHA512 c9e6ac99e62944da3fdce7939c7dc606e8cbba6ce99327f3e97fabc2c0f14e399c39951fb9b116c8d3f95b88ebbe9f5da383a85f4e89930fc8d24daac061bd96 WHIRLPOOL bbfeeecafc2a17742a4203d23caf9b2dffc59c69d39052b047f36b12119d742aba372c95f4aece8cedf0dd56bb73927aaa617231490990ffc297d6f10bb0137c
 DIST thunderbird-24.1.0-ast.xpi 373830 SHA256 0f1777c390f81070deca42c2f9cd440e0964c84267c8b4532d21e12f31354433 SHA512 adc91774f55d581bfb37ad630248bc51294d453990c0d08ae6e72faa46b710156269160b6ebf3381fadd37523337a4d7839eb31d69c7ba3b1e8daa68a434c6f2 WHIRLPOOL d49d6b712be2e50f5eeb1cd72e92c73ba293527a237de92778d69af591dd883573c17282c7c01eac76a7ee6c39bd6c81a8faae60bb721c3cd8c64f3928d2453b

diff --git a/mail-client/thunderbird/files/moz24-drop-Wl-build-id.patch b/mail-client/thunderbird/files/moz24-drop-Wl-build-id.patch
deleted file mode 100644
index 434dd23..0000000
--- a/mail-client/thunderbird/files/moz24-drop-Wl-build-id.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- 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.1.0.ebuild b/mail-client/thunderbird/thunderbird-24.1.0-r1.ebuild
similarity index 97%
rename from mail-client/thunderbird/thunderbird-24.1.0.ebuild
rename to mail-client/thunderbird/thunderbird-24.1.0-r1.ebuild
index b14560a..c8d16dc 100644
--- a/mail-client/thunderbird/thunderbird-24.1.0.ebuild
+++ b/mail-client/thunderbird/thunderbird-24.1.0-r1.ebuild
@@ -38,7 +38,7 @@ LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
 IUSE="bindist crypt gstreamer +jit ldap +lightning +minimal mozdom pulseaudio selinux system-cairo system-icu system-jpeg system-sqlite"
 
 PATCH="thunderbird-24.0-patches-0.1"
-PATCHFF="firefox-24.0-patches-0.5"
+PATCHFF="firefox-24.0-patches-0.6"
 
 SRC_URI="${SRC_URI}
 	${MOZ_FTP_URI}${MOZ_PV}/source/${MOZ_P}.source.tar.bz2
@@ -121,8 +121,6 @@ src_prepare() {
 	EPATCH_SUFFIX="patch" \
 	EPATCH_FORCE="yes" \
 	epatch "${WORKDIR}/thunderbird"
-	# drop -Wl,--build-id from LDFLAGS, bug #465466
-	epatch "${FILESDIR}"/moz${PV%%\.*}-drop-Wl-build-id.patch
 
 	# Apply our patchset from firefox to thunderbird as well
 	pushd "${S}"/mozilla &>/dev/null || die
@@ -253,8 +251,8 @@ src_compile() {
 		cd "${S}"/mailnews/extensions/enigmail || die
 		./makemake -r 2&> /dev/null
 		cd "${S}"/tbird/mailnews/extensions/enigmail
-		emake -j1 || die "make enigmail failed"
-		emake -j1 xpi || die "make enigmail xpi failed"
+		emake || die "make enigmail failed"
+		emake xpi || die "make enigmail xpi failed"
 	fi
 }
 

diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 67a5522..830527d 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -1,4 +1,4 @@
-DIST firefox-24.0-patches-0.5.tar.xz 7532 SHA256 ffe813f88865aa91d7041b7069dd598eb576519284579766c43910cf53ce96fa SHA512 0090c8e9f7dc46ea60f5fb6edb08f76fe1607012ab277bab4c023c313bce32b8ee4776f70ff1d6b11fc16b4ec29d0c99c69c59b4095953165029d8ad2c54055b WHIRLPOOL 1f7fe475d953103081bbd13d64baf6cd8f8d6a7a8da30a1d4a42cce83201c55b5ef5cd8ef87eb0135f35efb6f466ac64ea595d2c4a1880043a7ccce42b839e0b
+DIST firefox-24.0-patches-0.6.tar.xz 9104 SHA256 1135f97625e23822309e5b2ce65ab0331cd8c7ebb1896d7b9daf2d77d1a11d4d SHA512 b8746373a7e9d2d5775dd2a73ca7d3675f2cbe32b81eacdf6a2208077f39fb842b454c49bb0a750e48c84c3d2ea73fa9c27f6135e7d1a08be2fc73afc520f172 WHIRLPOOL 5d8b89d1849709835611e0ef306dd4814e6ac10fcf9cfee10f6aa72b5e938546c505827441fe2d935eb63605434f77bc72ec201005693534b43dc19635caaf82
 DIST firefox-24.1.0esr-af.xpi 338128 SHA256 0f364ae7ecbade66aee28d29fe4bb7884a7b575f9db4f2b7e323ac1723056542 SHA512 f8261ef1c524ce3fe899498c425573fd75039a3557f873a5a33223ffe14d3cbb4348f3ee9bdbb8d666e166ef5e8e331ea66baa7bcb67ff40bd6c15b0a9b76999 WHIRLPOOL 9aef6fe06a10446f8a5f7f2938093c8ffc05e041dc4d9597ae52769a2a04c8964a16e0c23f58d936636027e87d86f6779f7c224ef697460b782ec6a82e7eb7d1
 DIST firefox-24.1.0esr-ak.xpi 340940 SHA256 ddc628b73fb8c10e0d6633d702fcbc3f4116f9054ef71faeda9db28ff247b558 SHA512 88b87c46329cec09dd9860cf5f43e288b8ca543589f793a952128acd8364ce779bb2ed8af6510273fcedeb10fe1ab72dc904da4ede278a87b4e58ed788a6f0df WHIRLPOOL 8a6e1f7a619e0cafc93b6201afb542ee16dbd70f168dd17a66fa68067ca93ae4ab06e494d34ab1db1f950b6eeb3b518e78e3d686b5d7f7686ca82494ecf79c6e
 DIST firefox-24.1.0esr-ar.xpi 368919 SHA256 37790b3d162303df5066be84a86828f8b302f496c5e2cb2b682f06ec55e09d2f SHA512 c7c8c831ba0a40b352baa79839b98dad5bb11ce04ab0e8a032343b2838fe7564fdc8946817ecb7b67c8bc9d81e1e03b8744fe02e1bf3e4926115d3b7b3d23146 WHIRLPOOL 42329c34f44eb2a04c0b5ffc7229da557481d4ac1afe4288c30e225c74ed5bd9614a133fc1f51e3e41ce99f6b4a0cbe5017678f0ba4638794d386e0ca61268fb

diff --git a/www-client/firefox/files/moz24-drop-Wl-build-id.patch b/www-client/firefox/files/moz24-drop-Wl-build-id.patch
deleted file mode 100644
index 434dd23..0000000
--- a/www-client/firefox/files/moz24-drop-Wl-build-id.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- 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.1.0.ebuild b/www-client/firefox/firefox-24.1.0-r1.ebuild
similarity index 98%
rename from www-client/firefox/firefox-24.1.0.ebuild
rename to www-client/firefox/firefox-24.1.0-r1.ebuild
index 08536f2..885b051 100644
--- a/www-client/firefox/firefox-24.1.0.ebuild
+++ b/www-client/firefox/firefox-24.1.0-r1.ebuild
@@ -25,7 +25,7 @@ if [[ ${MOZ_ESR} == 1 ]]; then
 fi
 
 # Patch version
-PATCH="${PN}-24.0-patches-0.5"
+PATCH="${PN}-24.0-patches-0.6"
 # Upstream ftp release URI that's used by mozlinguas.eclass
 # We don't use the http mirror because it deletes old tarballs.
 MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/${PN}/releases/"
@@ -147,8 +147,6 @@ src_prepare() {
 	EPATCH_SUFFIX="patch" \
 	EPATCH_FORCE="yes" \
 	epatch "${WORKDIR}/firefox"
-	# drop -Wl,--build-id from LDFLAGS, bug #465466
-	epatch "${FILESDIR}"/moz${PV%%\.*}-drop-Wl-build-id.patch
 
 	# Allow user to apply any additional patches without modifing ebuild
 	epatch_user