commit: 947a55c69d57b3bc3e8fe0d0fa153a84b99349bb
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 24 16:22:06 2017 +0000
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Fri Nov 24 16:22:06 2017 +0000
URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=947a55c6
thunderbird-52.5: bump lightning component, drop 52.4
mail-client/thunderbird/Manifest | 2 +-
mail-client/thunderbird/thunderbird-52.4.0.ebuild | 362 ----------------------
mail-client/thunderbird/thunderbird-52.5.0.ebuild | 2 +-
3 files changed, 2 insertions(+), 364 deletions(-)
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index 0e93cdd..a934762 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -1,6 +1,6 @@
DIST firefox-52.4-patches-02.tar.xz 14412 SHA256
28e63a625cb22cec73fe5efd952566d6bd965dc453f205b0c00b2fb3b580dcdc SHA512
6befeaefc118bc161ad05eed619142814e5cf31aaeede3fb5618b1f5ace887e9e1fa6914320b513404380a426cfb0f45107435f92b2d7e95d95cd7c44e03ad96
WHIRLPOOL
40323ecada75c7ee05ae19cd98bb262937a0d70f5fd7a25ec9454227f33ce81f363b602222b8f0bea879224e9f7c0132de982b2c551e40a0c7c63b8106efca69
DIST gdata-provider-3.3.tar.xz 85628 SHA256
1a1751a5dd3d941bb28051c1d3af5d96c6c06b00c1b2d6b2442e312ec14644bd SHA512
ae0c0e6fd42d6e7088256ca8a4be5b0bac84b2f331b51afdc982354caef60b6ba631d4f76bfba7523000b49235c8f8c63704d90acf24b34b14696b709be9342b
WHIRLPOOL
2b77c9343437633dc8b26365b6f172999364b81b4928744e0eba0d0de50179fbd845085cc4fbf95a0c068a9b76bd2280db8f9f349ded680686ab6cac949bbcc6
-DIST lightning-5.4.4.tar.xz 1872584 SHA256
8f330202f348734228ad5fc599a7a626506a3517393cc35708129084cd70262a SHA512
2168766a1fb3c4c77a3d13552518ac9b3e78f23a016a37a439b885b6eb56de369de85d2ba4fdbd201b54dc210493e94cdfd8d7dbe0573ae6d9d145ad97771ddd
WHIRLPOOL
b802126524d6aad3cd2399f2631c9898557a7b8491172ae29aef5f23d9f9f3e271de07accecd3bc1cf992e1a9c1944d02bc9091b8de94cde7fcebd3f7266bf18
+DIST lightning-5.4.5.tar.xz 1898160 SHA256
dcb454e78046739724390f4d062c4ad371e3b7ffab2838a9ca095f302ef596cb SHA512
621d21c20bd74271f83ce9eb89b1f65cb43ab6182793bb7b9b3ca04799644f6700d15a59c6b312459d0471f5f243c3b9f534d1adf4bc72c36c2bd04f2937e3d3
WHIRLPOOL
4611c9270c658577d876290cd1df09cb4b30b2ee2c2d0afd89b68de30ef65aa84b393238b209ca8da38419c9d029e0689a2625a3738d838c1a9fb37cb5b90dff
DIST thunderbird-52.5.0-ar.xpi 604235 SHA256
0e0b7f56a2423908bf8b955c79b2834be01b278c40370a76eb33bbb7c8d91288 SHA512
2d9b168f14fac07d66c7d889b3d28061f5f85eb6c60d1f8650382cbca3749bc3b77cae67ad707f6c4bbcb956eb2003abac5734040b289a50ed21fecd3d2ad12f
WHIRLPOOL
254dddf94906f162b0e45d796cf5e46d06f3c414be3187613e6da85d1dcf42b51ed3c6919661f1c7f3d60715fed1807b78c7f5619c10ea4db3ba188a4397291a
DIST thunderbird-52.5.0-ast.xpi 541173 SHA256
e63212a8b45661609cdba50ce7c6546dd8c843fc8573cbfd3ffd99f6f63ee548 SHA512
e4955ea38a41126f5304431f0eaaf06a01a7f186b9ac52867ce2df098b5ea761c97c8be4ebebd4cb6598bf7dd6aeded6b257dac1ce27dda8b719877a275e7ffb
WHIRLPOOL
a094967736df5daf1e1447b8246a88355760796391e656b4e5c4ae4dbf250b2530c78cc63034abd465b346f111cb04f66c9b74d4451b73e7d8c3a78fa16062af
DIST thunderbird-52.5.0-be.xpi 570932 SHA256
ad60b7728a0f5e168e0fde4b15b3db15145577d78361855678591f1fc5d5e8f8 SHA512
da8eb62a4a1704c0f14e8043fb4663db706292c15c3a89b770ac7cab7dff606faf285454ed49cbfdc3ca92c7b10f07a477fd7036d740ac2e18d35ce0e50dbf76
WHIRLPOOL
acb2a6b9a17c0e44d84aef503ebe5b18eeeaf387808983af07ab145a8cbc32ce7ac5da83b4b1f57ae3a0df18b6dca7235ba5a056f8c28cdb1b714df1111dc1a5
diff --git a/mail-client/thunderbird/thunderbird-52.4.0.ebuild
b/mail-client/thunderbird/thunderbird-52.4.0.ebuild
deleted file mode 100644
index a45c7e5..0000000
--- a/mail-client/thunderbird/thunderbird-52.4.0.ebuild
+++ /dev/null
@@ -1,362 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WANT_AUTOCONF="2.1"
-MOZ_ESR=""
-MOZ_LIGHTNING_VER="5.4.4"
-MOZ_LIGHTNING_GDATA_VER="3.3"
-
-# This list can be updated using scripts/get_langs.sh from the mozilla overlay
-MOZ_LANGS=(ar ast be bg bn-BD br ca cs cy da de el en en-GB en-US es-AR
-es-ES et eu fi fr fy-NL ga-IE gd gl he hr hsb hu hy-AM id is it ja ko lt
-nb-NO nl nn-NO pa-IN pl pt-BR pt-PT rm ro ru si sk sl sq sr sv-SE ta-LK tr
-uk vi zh-CN zh-TW )
-
-# Convert the ebuild version to the upstream mozilla version, used by
mozlinguas
-MOZ_PV="${PV/_beta/b}"
-
-# Patches
-PATCHFF="firefox-52.4-patches-02"
-
-MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases";
-
-# ESR releases have slightly version numbers
-if [[ ${MOZ_ESR} == 1 ]]; then
- MOZ_PV="${MOZ_PV}esr"
-fi
-MOZ_P="${PN}-${MOZ_PV}"
-
-MOZCONFIG_OPTIONAL_GTK2ONLY=1
-MOZCONFIG_OPTIONAL_WIFI=1
-
-inherit flag-o-matic toolchain-funcs mozconfig-v6.52 makeedit autotools
pax-utils check-reqs nsplugins mozlinguas-v2 xdg-utils gnome2-utils
-
-DESCRIPTION="Thunderbird Mail Client"
-HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/";
-
-KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="bindist crypt hardened ldap lightning +minimal mozdom rust selinux"
-RESTRICT="!bindist? ( bindist )"
-
-PATCH_URIS=(
https://dev.gentoo.org/~{anarchy,axs,polynomial-c}/mozilla/patchsets/${PATCHFF}.tar.xz
)
-SRC_URI="${SRC_URI}
- ${MOZ_HTTP_URI}/${MOZ_PV}/source/${MOZ_P}.source.tar.xz
-
https://dev.gentoo.org/~axs/distfiles/lightning-${MOZ_LIGHTNING_VER}.tar.xz
- lightning? (
https://dev.gentoo.org/~axs/distfiles/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}.tar.xz
)
- ${PATCH_URIS[@]}"
-
-ASM_DEPEND=">=dev-lang/yasm-1.1"
-
-CDEPEND="
- >=dev-libs/nss-3.28.3
- >=dev-libs/nspr-4.13.1
- crypt? ( >=x11-plugins/enigmail-1.9.7 )
- "
-
-DEPEND="rust? ( dev-lang/rust )
- amd64? ( ${ASM_DEPEND}
- virtual/opengl )
- x86? ( ${ASM_DEPEND}
- virtual/opengl )"
-
-RDEPEND="${CDEPEND}
- selinux? ( sec-policy/selinux-thunderbird )
-"
-
-S="${WORKDIR}/${MOZ_P}"
-
-BUILD_OBJ_DIR="${S}/tbird"
-
-pkg_setup() {
- moz_pkgsetup
-
- export MOZILLA_DIR="${S}/mozilla"
-
- if ! use bindist ; then
- elog "You are enabling official branding. You may not
redistribute this build"
- elog "to any users on your network or the internet. Doing so
puts yourself into"
- elog "a legal problem with Mozilla Foundation"
- elog "You can disable it by emerging ${PN} _with_ the bindist
USE-flag"
- elog
- fi
-}
-
-pkg_pretend() {
- # Ensure we have enough disk space to compile
- CHECKREQS_DISK_BUILD="4G"
- check-reqs_pkg_setup
-}
-
-src_unpack() {
- unpack ${A}
-
- # Unpack language packs
- mozlinguas_src_unpack
-
- # this version of lightning is a .tar.xz, no xpi needed
- #xpi_unpack lightning-${MOZ_LIGHTNING_VER}.xpi
-
- # this version of gdata-provider is a .tar.xz , no xpi needed
- #use lightning && xpi_unpack
gdata-provider-${MOZ_LIGHTNING_GDATA_VER}.xpi
-}
-
-src_prepare() {
- # Apply our Thunderbird patchset
- epatch "${FILESDIR}"/1000_fix_gentoo_preferences.patch
-
- # Apply our patchset from firefox to thunderbird as well
- pushd "${S}"/mozilla &>/dev/null || die
- eapply "${WORKDIR}/firefox"
- popd &>/dev/null || die
-
- # Ensure that are plugins dir is enabled as default
- sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
- "${S}"/mozilla/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:" \
- "${S}"/mozilla/xpcom/io/nsAppFileLocationProvider.cpp || die
"sed failed to replace plugin path for 64bit!"
-
- # Don't exit with error when some libs are missing which we have in
- # system.
- sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
- -i "${S}"/mail/installer/Makefile.in || die
-
- # Don't error out when there's no files to be removed:
- sed 's@\(xargs rm\)$@\1 -f@' \
- -i "${S}"/mozilla/toolkit/mozapps/installer/packager.mk || die
-
- # Shell scripts sometimes contain DOS line endings; bug 391889
- grep -rlZ --include="*.sh" $'\r$' . |
- while read -r -d $'\0' file ; do
- einfo edos2unix "${file}"
- edos2unix "${file}"
- done
-
- # Allow user to apply any additional patches without modifing ebuild
- eapply_user
-
- # Confirm the version of lightning being grabbed for langpacks is the
same
- # as that used in thunderbird
- local THIS_MOZ_LIGHTNING_VER=$(python
"${S}"/calendar/lightning/build/makeversion.py ${PV})
- if [[ ${MOZ_LIGHTNING_VER} != ${THIS_MOZ_LIGHTNING_VER} ]]; then
- eqawarn "The version of lightning used for localization differs
from the version"
- eqawarn "in thunderbird. Please update MOZ_LIGHTNING_VER in
the ebuild from ${MOZ_LIGHTNING_VER}"
- eqawarn "to ${THIS_MOZ_LIGHTNING_VER}"
- fi
-
- eautoreconf
- # Ensure we run eautoreconf in mozilla to regenerate configure
- cd "${S}"/mozilla || die
- eautoconf
- cd "${S}"/mozilla/js/src || die
- eautoconf
-}
-
-src_configure() {
- MEXTENSIONS="default"
-
- ####################################
- #
- # mozconfig, CFLAGS and CXXFLAGS setup
- #
- ####################################
-
- mozconfig_init
- mozconfig_config
-
- # It doesn't compile on alpha without this LDFLAGS
- use alpha && append-ldflags "-Wl,--no-relax"
-
- # Add full relro support for hardened
- use hardened && append-ldflags "-Wl,-z,relro,-z,now"
-
- mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
- mozconfig_annotate '' --enable-calendar
-
- # Other tb-specific settings
- mozconfig_annotate '' --with-user-appdir=.thunderbird
-
- mozconfig_use_enable ldap
- mozconfig_use_enable rust
-
- mozlinguas_mozconfig
-
- # Bug #72667
- if use mozdom; then
- MEXTENSIONS="${MEXTENSIONS},inspector"
- fi
-
- # Use an objdir to keep things organized.
- echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
- echo "mk_add_options XARGS=/usr/bin/xargs" >> "${S}"/.mozconfig
-
- # Finalize and report settings
- mozconfig_final
-
- ####################################
- #
- # Configure and build
- #
- ####################################
-
- # Disable no-print-directory
- MAKEOPTS=${MAKEOPTS/--no-print-directory/}
-
- if [[ $(gcc-major-version) -lt 4 ]]; then
- append-cxxflags -fno-stack-protector
- fi
-
- # workaround for funky/broken upstream configure...
- SHELL="${SHELL:-${EPREFIX}/bin/bash}" \
- emake V=1 -f client.mk configure
-}
-
-src_compile() {
- MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" \
- emake V=1 -f client.mk
-}
-
-src_install() {
- declare emid
- cd "${BUILD_OBJ_DIR}" || die
-
- # Pax mark xpcshell for hardened support, only used for startupcache
creation.
- pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell
-
- # Copy our preference before omnijar is created.
- cp "${FILESDIR}"/thunderbird-gentoo-default-prefs-1.js-1 \
- "${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
- || die
-
- mozconfig_install_prefs \
- "${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js"
-
- # dev-db/sqlite does not have FTS3_TOKENIZER support.
- # gloda needs it to function, and bad crashes happen when its enabled
and doesn't work
- if in_iuse system-sqlite && use system-sqlite ; then
- echo "sticky_pref(\"mailnews.database.global.indexer.enabled\",
false);" \
-
>>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
- fi
-
- MOZ_MAKE_FLAGS="${MAKEOPTS}" \
- emake DESTDIR="${D}" install
-
- # Install language packs
- mozlinguas_src_install
-
- local size sizes icon_path icon
- if ! use bindist; then
- icon_path="${S}/other-licenses/branding/thunderbird"
- icon="${PN}-icon"
-
- domenu "${FILESDIR}"/icon/${PN}.desktop
- else
- icon_path="${S}/mail/branding/aurora"
- icon="${PN}-icon-unbranded"
-
- newmenu "${FILESDIR}"/icon/${PN}-unbranded.desktop \
- ${PN}.desktop
-
- sed -i -e "s:Mozilla\ Thunderbird:EarlyBird:g" \
- "${ED}"/usr/share/applications/${PN}.desktop
- fi
-
- # Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
- newicon "${icon_path}"/mailicon48.png "${icon}".png
- # Install icons for menu entry
- sizes="16 22 24 32 48 256"
- for size in ${sizes}; do
- newicon -s ${size} "${icon_path}/mailicon${size}.png"
"${icon}.png"
- done
-
- local emid
- # stage extra locales for lightning and install over existing
- mozlinguas_xpistage_langpacks
"${BUILD_OBJ_DIR}"/dist/xpi-stage/lightning \
- "${WORKDIR}"/lightning-${MOZ_LIGHTNING_VER} lightning calendar
-
- emid='{e2fda1a4-762b-4020-b5ad-a41df1933103}'
- mkdir -p "${T}/${emid}" || die
- cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/xpi-stage/lightning/*
|| die
- insinto ${MOZILLA_FIVE_HOME}/distribution/extensions
- doins -r "${T}/${emid}"
-
- if use lightning; then
- # move lightning out of distribution/extensions and into
extensions for app-global install
- mv
"${ED}"/${MOZILLA_FIVE_HOME}/{distribution,}/extensions/${emid} || die
-
- # stage extra locales for gdata-provider and install app-global
- mozlinguas_xpistage_langpacks
"${BUILD_OBJ_DIR}"/dist/xpi-stage/gdata-provider \
- "${WORKDIR}"/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}
- emid='{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}'
- mkdir -p "${T}/${emid}" || die
- cp -RLp -t "${T}/${emid}"
"${BUILD_OBJ_DIR}"/dist/xpi-stage/gdata-provider/* || die
- insinto ${MOZILLA_FIVE_HOME}/extensions
- doins -r "${T}/${emid}"
- fi
-
- if use crypt; then
- emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q'
"${EROOT}"usr/share/enigmail/install.rdf)
- if [[ -n ${emid} ]]; then
- dosym "${EPREFIX}"/usr/share/enigmail
${MOZILLA_FIVE_HOME}/extensions/${emid}
- else
- eerror "${EPREFIX}/usr/share/enigmail/install.rdf: No
such file or directory"
- die "<EM:ID> tag for x11-plugins/enigmail could not be
found!"
- fi
- fi
-
- # Required in order to use plugins and even run thunderbird on hardened.
- pax-mark pm
"${ED}"${MOZILLA_FIVE_HOME}/{thunderbird,thunderbird-bin,plugin-container}
-
- if use minimal; then
- rm -r "${ED}"/usr/include
"${ED}"${MOZILLA_FIVE_HOME}/{idl,include,lib,sdk} || \
- die "Failed to remove sdk and headers"
- fi
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-
- # Because PM's dont seem to properly merge a symlink replacing a
directory
- if use crypt ; then
- local emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q'
"${EROOT}"usr/share/enigmail/install.rdf)
- local
emidpath="${EROOT%/}"${MOZILLA_FIVE_HOME}/extensions/${emid}
- if [[ -z ${emid} ]]; then
- eerror "${EROOT%/}/usr/share/enigmail/install.rdf: No
such file or directory"
- die "Could not find enigmail on disk during
pkg_preinst()"
- fi
- if [[ ! -h "${emidpath}" ]] && [[ -d "${emidpath}" ]]; then
- rm -Rf "${emidpath}" || (
- eerror "Could not remove enigmail directory from
previous installation,"
- eerror "You must remove this by hand and rename the
symbolic link yourself:"
- eerror
- eerror "\t cd ${EPREFIX}${MOZILLA_FIVE_HOME}/extensions"
- eerror "\t rm -Rf ${emid}"
- eerror "\t mv ${emid}.backup* ${emid}" )
- fi
- fi
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- gnome2_icon_cache_update
-
- elog
- elog "If you experience problems with plugins please issue the"
- elog "following command : rm \${HOME}/.thunderbird/*/extensions.sqlite
,"
- elog "then restart thunderbird"
-
- if ! use lightning; then
- elog
- elog "If calendar fails to show up in extensions please open
config editor"
- elog "and set extensions.lastAppVersion to 38.0.0 to force a
reload. If this"
- elog "fails to show the calendar extension after restarting
with above change"
- elog "please file a bug report."
- fi
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- gnome2_icon_cache_update
-}
diff --git a/mail-client/thunderbird/thunderbird-52.5.0.ebuild
b/mail-client/thunderbird/thunderbird-52.5.0.ebuild
index f8a54d0..0a8440c 100644
--- a/mail-client/thunderbird/thunderbird-52.5.0.ebuild
+++ b/mail-client/thunderbird/thunderbird-52.5.0.ebuild
@@ -4,7 +4,7 @@
EAPI=6
WANT_AUTOCONF="2.1"
MOZ_ESR=""
-MOZ_LIGHTNING_VER="5.4.4"
+MOZ_LIGHTNING_VER="5.4.5"
MOZ_LIGHTNING_GDATA_VER="3.3"
# This list can be updated using scripts/get_langs.sh from the mozilla overlay
