commit: de385caaa74f5f83483d076398306708adf9985f
Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 13 19:47:12 2015 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Sat Jun 13 19:47:12 2015 +0000
URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=de385caa
drop gtk3 builds for now, misc thunderbird fixes
eclass/mozconfig-v5.38.eclass | 8 +---
mail-client/thunderbird/thunderbird-38.0.1.ebuild | 53 +----------------------
2 files changed, 4 insertions(+), 57 deletions(-)
diff --git a/eclass/mozconfig-v5.38.eclass b/eclass/mozconfig-v5.38.eclass
index 6acd44e..ad1b197 100644
--- a/eclass/mozconfig-v5.38.eclass
+++ b/eclass/mozconfig-v5.38.eclass
@@ -45,7 +45,7 @@ esac
# Set the variable to any value if the use flag should exist but not be
default-enabled.
# use-flags common among all mozilla ebuilds
-IUSE="${IUSE} dbus debug gstreamer gtk3 +jemalloc3 pulseaudio selinux
startup-notification system-cairo system-icu system-jpeg system-sqlite
system-libvpx"
+IUSE="${IUSE} dbus debug gstreamer +jemalloc3 pulseaudio selinux
startup-notification system-cairo system-icu system-jpeg system-sqlite
system-libvpx"
# some notes on deps:
# gtk:2 minimum is technically 2.10 but gio support (enabled by default) needs
2.14
@@ -144,11 +144,7 @@ mozconfig_config() {
--enable-svg \
--with-system-bz2
- if use gtk3 ; then
- mozconfig_annotate 'Enable Cairo Gtk+3 support'
--enable-default-toolkit=cairo-gtk3
- else
- mozconfig_annotate '' --enable-default-toolkit=cairo-gtk2
- fi
+ mozconfig_annotate '' --enable-default-toolkit=cairo-gtk2
if has bindist ${IUSE}; then
mozconfig_use_enable !bindist official-branding
diff --git a/mail-client/thunderbird/thunderbird-38.0.1.ebuild
b/mail-client/thunderbird/thunderbird-38.0.1.ebuild
index 2302f77..54accf5 100644
--- a/mail-client/thunderbird/thunderbird-38.0.1.ebuild
+++ b/mail-client/thunderbird/thunderbird-38.0.1.ebuild
@@ -275,12 +275,12 @@ src_install() {
# Copy our preference before omnijar is created.
cp "${FILESDIR}"/thunderbird-gentoo-default-prefs-1.js-1 \
- "${BUILD_OBJ_DIR}/mozilla/dist/bin/defaults/pref/all-gentoo.js"
\
+ "${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
|| die
# Set default path to search for dictionaries.
echo "pref(\"spellchecker.dictionary_path\", ${DICTPATH});" \
- >>
"${BUILD_OBJ_DIR}/mozilla/dist/bin/defaults/pref/all-gentoo.js" \
+ >> "${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
|| die
# Pax mark xpcshell for hardened support, only used for startupcache
creation.
@@ -315,55 +315,6 @@ src_install() {
unzip "${enigmail_xpipath}"/enigmail*.xpi || die
fi
- if use lightning ; then
- local l c
- mozlinguas_export
-
- emid="{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}"
- # just for ESR31, install custom-rolled gdata-provider
- cd "${WORKDIR}/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}" || die
- insinto ${MOZILLA_FIVE_HOME}/extensions/${emid}
- if [[ -e chrome.manifest.original ]]; then
- cp chrome.manifest.original chrome.manifest || die
- fi
- doins -r chrome.manifest components defaults modules install.rdf
- cd
"${WORKDIR}/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}/chrome" || die
- insinto ${MOZILLA_FIVE_HOME}/extensions/${emid}/chrome
- doins -r gdata-provider gdata-provider-en-US
- # Install locales for gdata-provider -- each locale is a
directory tree
- for l in "${mozlinguas[@]}"; do if [[ -d gdata-provider-${l}
]]; then
- doins -r gdata-provider-${l}
- echo "locale gdata-provider ${l}
chrome/gdata-provider-${l}/locale/${l}/" \
- >>
"${ED}"/${MOZILLA_FIVE_HOME}/extensions/${emid}/chrome.manifest \
- || die "Error adding gdata-provider-${l} to
chrome.manifest"
- else
- ewarn "Sorry, but lightning gdata-provider in ${P} does
not support the ${l} locale"
- fi; done
-
- emid="{e2fda1a4-762b-4020-b5ad-a41df1933103}"
- dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
- cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid} || die
- unzip "${BUILD_OBJ_DIR}"/mozilla/dist/xpi-stage/lightning-*.xpi
|| die
- # Install locales for lightning - each locale is a jar file
- insinto ${MOZILLA_FIVE_HOME}/extensions/${emid}/chrome
- cd "${WORKDIR}"/lightning-${MOZ_LIGHTNING_VER}/chrome || die
- for l in "${mozlinguas[@]}"; do if [[ -e calendar-${l}.jar ]];
then
- for c in calendar lightning; do
- doins ${c}-${l}.jar
- echo "locale ${c} $l
jar:chrome/${c}-${l}.jar!/locale/${l}/${c}/" \
- >>
"${ED}"/${MOZILLA_FIVE_HOME}/extensions/${emid}/chrome.manifest \
- || die "Error adding ${c}-${l} to
chrome.manifest"
- done
- else
- ewarn "Sorry, but lightning calendar in ${P} does not
support the ${l} locale"
- fi; done
-
- # Fix mimetype so it shows up as a calendar application in
GNOME 3
- # This requires that the .desktop file was already installed
earlier
- sed -e "s:^\(MimeType=\):\1text/calendar;:" \
- -e "s:^\(Categories=\):\1Calendar;:" \
- -i "${ED}"/usr/share/applications/${PN}.desktop || die
- fi
# Required in order for jit to work on hardened, for mozilla-31
use jit && pax-mark pm
"${ED}"${MOZILLA_FIVE_HOME}/{thunderbird,thunderbird-bin}
