| 1 |
commit: 0d4e09848683bf52c42e82ca559db3d154690f06 |
| 2 |
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Dec 23 21:48:37 2015 +0000 |
| 4 |
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Dec 23 21:50:31 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=0d4e0984 |
| 7 |
|
| 8 |
added thunderbird-38.5.0 for crossdev testing |
| 9 |
|
| 10 |
.../thunderbird/files/nss.m4.pkg-config.patch | 33 ++++++++++++++++++++++ |
| 11 |
mail-client/thunderbird/thunderbird-38.5.0.ebuild | 8 +----- |
| 12 |
2 files changed, 34 insertions(+), 7 deletions(-) |
| 13 |
|
| 14 |
diff --git a/mail-client/thunderbird/files/nss.m4.pkg-config.patch b/mail-client/thunderbird/files/nss.m4.pkg-config.patch |
| 15 |
new file mode 100644 |
| 16 |
index 0000000..e3ac8f8 |
| 17 |
--- /dev/null |
| 18 |
+++ b/mail-client/thunderbird/files/nss.m4.pkg-config.patch |
| 19 |
@@ -0,0 +1,33 @@ |
| 20 |
+--- a/build/autoconf/nss.m4 2015-11-20 15:37:26.951993242 -0500 |
| 21 |
++++ b/build/autoconf/nss.m4 2015-11-20 15:37:19.431992752 -0500 |
| 22 |
+@@ -8,6 +8,8 @@ |
| 23 |
+ AC_DEFUN([AM_PATH_NSS], |
| 24 |
+ [dnl |
| 25 |
+ |
| 26 |
++PKG_CHECK_MODULES([NSS],[nss >= $1],[ifelse([$2], , :, [$2])],[ |
| 27 |
++ |
| 28 |
+ AC_ARG_WITH(nss-prefix, |
| 29 |
+ [ --with-nss-prefix=PFX Prefix where NSS is installed], |
| 30 |
+ nss_config_prefix="$withval", |
| 31 |
+@@ -84,8 +86,9 @@ |
| 32 |
+ ifelse([$3], , :, [$3]) |
| 33 |
+ fi |
| 34 |
+ |
| 35 |
++ ]) |
| 36 |
+ |
| 37 |
+- AC_SUBST(NSS_CFLAGS) |
| 38 |
++ AC_SUBST_LIST(NSS_CFLAGS) |
| 39 |
+ AC_SUBST_LIST(NSS_LIBS) |
| 40 |
+ |
| 41 |
+ ]) |
| 42 |
+--- a/configure.in 2015-11-20 15:40:57.401762087 -0500 |
| 43 |
++++ b/configure.in 2015-11-20 15:50:10.080854755 -0500 |
| 44 |
+@@ -8775,7 +8775,7 @@ |
| 45 |
+ AC_SUBST(NSPR_CFLAGS) |
| 46 |
+ AC_SUBST(MOZ_NATIVE_NSPR) |
| 47 |
+ |
| 48 |
+-AC_SUBST(NSS_CFLAGS) |
| 49 |
++AC_SUBST_LIST(NSS_CFLAGS) |
| 50 |
+ AC_SUBST(MOZ_NATIVE_NSS) |
| 51 |
+ AC_SUBST(NSS_DISABLE_DBM) |
| 52 |
+ |
| 53 |
|
| 54 |
diff --git a/mail-client/thunderbird/thunderbird-38.5.0.ebuild b/mail-client/thunderbird/thunderbird-38.5.0.ebuild |
| 55 |
index a3fbfee..45f8567 100644 |
| 56 |
--- a/mail-client/thunderbird/thunderbird-38.5.0.ebuild |
| 57 |
+++ b/mail-client/thunderbird/thunderbird-38.5.0.ebuild |
| 58 |
@@ -140,6 +140,7 @@ src_prepare() { |
| 59 |
EPATCH_EXCLUDE="8010_bug114311-freetype26.patch |
| 60 |
8011_bug1194520-freetype261_until_moz43.patch" \ |
| 61 |
epatch "${WORKDIR}/firefox" |
| 62 |
+ epatch "${FILESDIR}"/nss.m4.pkg-config.patch |
| 63 |
popd &>/dev/null || die |
| 64 |
|
| 65 |
# Ensure that are plugins dir is enabled as default |
| 66 |
@@ -185,7 +186,6 @@ src_prepare() { |
| 67 |
} |
| 68 |
|
| 69 |
src_configure() { |
| 70 |
- declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" |
| 71 |
MEXTENSIONS="default" |
| 72 |
|
| 73 |
#################################### |
| 74 |
@@ -197,9 +197,6 @@ src_configure() { |
| 75 |
mozconfig_init |
| 76 |
mozconfig_config |
| 77 |
|
| 78 |
- # We want rpath support to prevent unneeded hacks on different libc variants |
| 79 |
- append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}" |
| 80 |
- |
| 81 |
# It doesn't compile on alpha without this LDFLAGS |
| 82 |
use alpha && append-ldflags "-Wl,--no-relax" |
| 83 |
|
| 84 |
@@ -211,7 +208,6 @@ src_configure() { |
| 85 |
mozconfig_annotate '' --enable-calendar |
| 86 |
|
| 87 |
# Other tb-specific settings |
| 88 |
- mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME} |
| 89 |
mozconfig_annotate '' --with-user-appdir=.thunderbird |
| 90 |
|
| 91 |
mozconfig_use_enable ldap |
| 92 |
@@ -252,7 +248,6 @@ src_configure() { |
| 93 |
src_compile() { |
| 94 |
mkdir -p "${BUILD_OBJ_DIR}" && cd "${BUILD_OBJ_DIR}" || die |
| 95 |
|
| 96 |
- CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \ |
| 97 |
MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \ |
| 98 |
emake -f "${S}"/client.mk |
| 99 |
|
| 100 |
@@ -267,7 +262,6 @@ src_compile() { |
| 101 |
} |
| 102 |
|
| 103 |
src_install() { |
| 104 |
- declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" |
| 105 |
DICTPATH="\"${EPREFIX}/usr/share/myspell\"" |
| 106 |
|
| 107 |
declare emid |
Archives