commit: 0705900ad44b26d5e659d9fb8e1bea7ce194f9c5
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 23 21:48:37 2015 +0000
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Wed Dec 23 21:52:01 2015 +0000
URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=0705900a
added nss.m4 patch and thunderbird-38.5.0 for crossdev testing
.../thunderbird/files/nss.m4.pkg-config.patch | 33 ++++++++++++++++++++++
mail-client/thunderbird/thunderbird-38.5.0.ebuild | 8 +-----
2 files changed, 34 insertions(+), 7 deletions(-)
diff --git a/mail-client/thunderbird/files/nss.m4.pkg-config.patch
b/mail-client/thunderbird/files/nss.m4.pkg-config.patch
new file mode 100644
index 0000000..e3ac8f8
--- /dev/null
+++ b/mail-client/thunderbird/files/nss.m4.pkg-config.patch
@@ -0,0 +1,33 @@
+--- a/build/autoconf/nss.m4 2015-11-20 15:37:26.951993242 -0500
++++ b/build/autoconf/nss.m4 2015-11-20 15:37:19.431992752 -0500
+@@ -8,6 +8,8 @@
+ AC_DEFUN([AM_PATH_NSS],
+ [dnl
+
++PKG_CHECK_MODULES([NSS],[nss >= $1],[ifelse([$2], , :, [$2])],[
++
+ AC_ARG_WITH(nss-prefix,
+ [ --with-nss-prefix=PFX Prefix where NSS is installed],
+ nss_config_prefix="$withval",
+@@ -84,8 +86,9 @@
+ ifelse([$3], , :, [$3])
+ fi
+
++ ])
+
+- AC_SUBST(NSS_CFLAGS)
++ AC_SUBST_LIST(NSS_CFLAGS)
+ AC_SUBST_LIST(NSS_LIBS)
+
+ ])
+--- a/configure.in 2015-11-20 15:40:57.401762087 -0500
++++ b/configure.in 2015-11-20 15:50:10.080854755 -0500
+@@ -8775,7 +8775,7 @@
+ AC_SUBST(NSPR_CFLAGS)
+ AC_SUBST(MOZ_NATIVE_NSPR)
+
+-AC_SUBST(NSS_CFLAGS)
++AC_SUBST_LIST(NSS_CFLAGS)
+ AC_SUBST(MOZ_NATIVE_NSS)
+ AC_SUBST(NSS_DISABLE_DBM)
+
diff --git a/mail-client/thunderbird/thunderbird-38.5.0.ebuild
b/mail-client/thunderbird/thunderbird-38.5.0.ebuild
index a3fbfee..45f8567 100644
--- a/mail-client/thunderbird/thunderbird-38.5.0.ebuild
+++ b/mail-client/thunderbird/thunderbird-38.5.0.ebuild
@@ -140,6 +140,7 @@ src_prepare() {
EPATCH_EXCLUDE="8010_bug114311-freetype26.patch
8011_bug1194520-freetype261_until_moz43.patch" \
epatch "${WORKDIR}/firefox"
+ epatch "${FILESDIR}"/nss.m4.pkg-config.patch
popd &>/dev/null || die
# Ensure that are plugins dir is enabled as default
@@ -185,7 +186,6 @@ src_prepare() {
}
src_configure() {
- declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
MEXTENSIONS="default"
####################################
@@ -197,9 +197,6 @@ src_configure() {
mozconfig_init
mozconfig_config
- # We want rpath support to prevent unneeded hacks on different libc
variants
- append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}"
-
# It doesn't compile on alpha without this LDFLAGS
use alpha && append-ldflags "-Wl,--no-relax"
@@ -211,7 +208,6 @@ src_configure() {
mozconfig_annotate '' --enable-calendar
# Other tb-specific settings
- mozconfig_annotate ''
--with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
mozconfig_annotate '' --with-user-appdir=.thunderbird
mozconfig_use_enable ldap
@@ -252,7 +248,6 @@ src_configure() {
src_compile() {
mkdir -p "${BUILD_OBJ_DIR}" && cd "${BUILD_OBJ_DIR}" || die
- CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
emake -f "${S}"/client.mk
@@ -267,7 +262,6 @@ src_compile() {
}
src_install() {
- declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
DICTPATH="\"${EPREFIX}/usr/share/myspell\""
declare emid
