From 7f29ef5ff39eeee3518283a873589e76f1e302e6 Mon Sep 17 00:00:00 2001 From: Thomas Deutschmann Date: Tue, 23 Oct 2018 02:51:55 +0200 Subject: mail-client/thunderbird: synchronize with Gentoo repository Package-Manager: Portage-2.3.51, Repoman-2.3.11 Signed-off-by: Thomas Deutschmann --- mail-client/thunderbird/Manifest | 2 +- mail-client/thunderbird/metadata.xml | 7 ------- mail-client/thunderbird/thunderbird-60.2.1.ebuild | 11 +++++------ 3 files changed, 6 insertions(+), 14 deletions(-) (limited to 'mail-client') diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest index 48da73d0..1fc261a2 100644 --- a/mail-client/thunderbird/Manifest +++ b/mail-client/thunderbird/Manifest @@ -1,4 +1,4 @@ -DIST firefox-60.0-patches-03.tar.xz 111764 BLAKE2B dd6fca1a7dad526cf1bdebb606773fab6bbb18e3cd601252f5b627e3d5ccb50a60bdc3ca228b1ed57d8b2334275fe5ef2669f8c98f8acf278effdb9dc7fc61df SHA512 24a09df0e785cd9ba71ae6baee33ef159c1fc3b580784f7d20a775dc846aaa51d660eca67e284960af72651d245236623a0736695c76be75a8b395e5b69ba1ce +DIST firefox-60.0-patches-04.tar.xz 120496 BLAKE2B 4b4fd58a91d8fd9603c3a7bdb669f275f7cbd7b9add7c790a2e326f46a540e77a390e9da3f85e81feee8e5354cb25c93e140fb2f721cdcd0fe197b7c24ea0091 SHA512 d8aaa1fafe22dcef8cba609ba6e2d322c18b46f4d3b91897696651958108f887510a068295b55bb21d84b660bbe7574a6533a57d8e26f96d2877139864dba828 DIST gdata-provider-4.4.1.tar.xz 78728 BLAKE2B bfe04d714334c38c932d2186ffd859583176ef455b283534c5f8f9e1ab7dc13bdfb8c15db6007de482ab015afc2b8524aad725380bec75ee5f59ea81d6307ba9 SHA512 6c9b5ac41a1064bd1799d2a2f633c3064b27f1294ac3c8908cdef6c1d2eea7b602f2f7bf240b71f507fe9ad286588f030e12f49a41b3bed7bbcc99f3021369f9 DIST lightning-6.2.2.1.tar.xz 1521172 BLAKE2B 0155735fbebfa1d7103281f2d24c41ddd16561a09db3502bdc2e689bf8174a86c414608fcae199e2756eaa93b57332b0389433c7e0d86c454f244b8a50b43a85 SHA512 b9427709022e07741dba48f4933e364c2df15c1f4bcda481f50e05fa5f8f118d47a87e4b5322fab412e9f2f89c0889a5154a369bb6d0b9a1a94a748dc768fb59 DIST thunderbird-60.0-patches-0.tar.xz 10292 BLAKE2B a81ac6708389baff21accccac1511c1fc372324cac8bb3ee0f3b5d2a0690b6e22ef658b41c887b99168b43c4ea4bb0947d3e48ad9b7e80db558db22c976df868 SHA512 1dae465676b2ff4faae08ebf69e6bac46552bc0331659bf5f444c45b026e4c8d2fc46cd3758e3bd121716aa85d5dcc56de6483919f7f0077b9d9720574dbd1aa diff --git a/mail-client/thunderbird/metadata.xml b/mail-client/thunderbird/metadata.xml index 7fdeae0d..39a30c37 100644 --- a/mail-client/thunderbird/metadata.xml +++ b/mail-client/thunderbird/metadata.xml @@ -9,17 +9,11 @@ Disable official Thunderbird branding (icons, name) which are not binary-redistributable according to upstream. Use Clang compiler instead of GCC - Enable encryption support with enigmail Enable Mozilla's DOM inspector Enable app-global calendar support (note 38.0 and above bundles calendar support when this flag is off) Build with user-specified compiler optimizations (-Os, -O0, -O1, -O2, -O3) from CFLAGS (unsupported) - Use the cairo-gtk2 rendering engine instead of the default cairo-gtk3 - Enable or disable jemalloc - Enable support for using rust compiler (experimental) - Use the system-wide x11-libs/cairo - instead of bundled. Use the system-wide media-libs/harfbuzz and media-gfx/graphite2 instead of bundled. Use the system-wide dev-libs/icu @@ -32,6 +26,5 @@ instead of bundled. Use the system-wide dev-db/sqlite installation with secure-delete enabled - Remove the software development kit and headers diff --git a/mail-client/thunderbird/thunderbird-60.2.1.ebuild b/mail-client/thunderbird/thunderbird-60.2.1.ebuild index 948f6f9c..961d0647 100644 --- a/mail-client/thunderbird/thunderbird-60.2.1.ebuild +++ b/mail-client/thunderbird/thunderbird-60.2.1.ebuild @@ -9,7 +9,7 @@ MOZ_LIGHTNING_VER="6.2.2.1" MOZ_LIGHTNING_GDATA_VER="4.4.1" PYTHON_COMPAT=( python3_{5,6,7} ) -PYTHON_REQ_USE='ncurses,sqlite,ssl,threads' +PYTHON_REQ_USE='ncurses,sqlite,ssl,threads(+)' # This list can be updated using scripts/get_langs.sh from the mozilla overlay MOZ_LANGS=(ar ast be bg br ca cs cy da de el en en-GB en-US es-AR @@ -22,7 +22,7 @@ MOZ_PV="${PV/_beta/b}" # Patches PATCHTB="thunderbird-60.0-patches-0" -PATCHFF="firefox-60.0-patches-03" +PATCHFF="firefox-60.0-patches-04" MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases" @@ -45,7 +45,7 @@ IUSE="bindist clang dbus debug hardened jack lightning mozdom neon pulseaudio system-libevent system-libvpx system-sqlite wifi" RESTRICT="!bindist? ( bindist )" -PATCH_URIS=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c}/mozilla/patchsets/{${PATCHTB},${PATCHFF}}.tar.xz ) +PATCH_URIS=( https://dev.gentoo.org/~whissi/dist/firefox/${PATCHFF}.tar.xz https://dev.gentoo.org/~{anarchy,axs,polynomial-c}/mozilla/patchsets/{${PATCHTB},${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 @@ -79,7 +79,7 @@ CDEPEND=" >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 - >=virtual/libffi-3.0.10 + >=virtual/libffi-3.0.10:= virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite @@ -197,7 +197,6 @@ src_prepare() { "${WORKDIR}"/firefox/2005_ffmpeg4.patch \ || die eapply "${WORKDIR}/firefox" - eapply "${FILESDIR}"/${PN}-60.0-blessings-TERM.patch # 654316 eapply "${FILESDIR}"/${PN}-60.0-rust-1.29-comp.patch # Ensure that are plugins dir is enabled as default @@ -264,7 +263,7 @@ src_configure() { # Force gcc einfo "Enforcing the use of gcc due to USE=-clang ..." CC=${CHOST}-gcc - CXX=${CHOST}-gcc++ + CXX=${CHOST}-g++ strip-unsupported-flags fi -- cgit v1.2.3-65-gdbad