1 |
commit: 7f29ef5ff39eeee3518283a873589e76f1e302e6 |
2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Oct 23 00:51:55 2018 +0000 |
4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Oct 23 00:51:55 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=7f29ef5f |
7 |
|
8 |
mail-client/thunderbird: synchronize with Gentoo repository |
9 |
|
10 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
11 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
12 |
|
13 |
mail-client/thunderbird/Manifest | 2 +- |
14 |
mail-client/thunderbird/metadata.xml | 7 ------- |
15 |
mail-client/thunderbird/thunderbird-60.2.1.ebuild | 11 +++++------ |
16 |
3 files changed, 6 insertions(+), 14 deletions(-) |
17 |
|
18 |
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest |
19 |
index 48da73d..1fc261a 100644 |
20 |
--- a/mail-client/thunderbird/Manifest |
21 |
+++ b/mail-client/thunderbird/Manifest |
22 |
@@ -1,4 +1,4 @@ |
23 |
-DIST firefox-60.0-patches-03.tar.xz 111764 BLAKE2B dd6fca1a7dad526cf1bdebb606773fab6bbb18e3cd601252f5b627e3d5ccb50a60bdc3ca228b1ed57d8b2334275fe5ef2669f8c98f8acf278effdb9dc7fc61df SHA512 24a09df0e785cd9ba71ae6baee33ef159c1fc3b580784f7d20a775dc846aaa51d660eca67e284960af72651d245236623a0736695c76be75a8b395e5b69ba1ce |
24 |
+DIST firefox-60.0-patches-04.tar.xz 120496 BLAKE2B 4b4fd58a91d8fd9603c3a7bdb669f275f7cbd7b9add7c790a2e326f46a540e77a390e9da3f85e81feee8e5354cb25c93e140fb2f721cdcd0fe197b7c24ea0091 SHA512 d8aaa1fafe22dcef8cba609ba6e2d322c18b46f4d3b91897696651958108f887510a068295b55bb21d84b660bbe7574a6533a57d8e26f96d2877139864dba828 |
25 |
DIST gdata-provider-4.4.1.tar.xz 78728 BLAKE2B bfe04d714334c38c932d2186ffd859583176ef455b283534c5f8f9e1ab7dc13bdfb8c15db6007de482ab015afc2b8524aad725380bec75ee5f59ea81d6307ba9 SHA512 6c9b5ac41a1064bd1799d2a2f633c3064b27f1294ac3c8908cdef6c1d2eea7b602f2f7bf240b71f507fe9ad286588f030e12f49a41b3bed7bbcc99f3021369f9 |
26 |
DIST lightning-6.2.2.1.tar.xz 1521172 BLAKE2B 0155735fbebfa1d7103281f2d24c41ddd16561a09db3502bdc2e689bf8174a86c414608fcae199e2756eaa93b57332b0389433c7e0d86c454f244b8a50b43a85 SHA512 b9427709022e07741dba48f4933e364c2df15c1f4bcda481f50e05fa5f8f118d47a87e4b5322fab412e9f2f89c0889a5154a369bb6d0b9a1a94a748dc768fb59 |
27 |
DIST thunderbird-60.0-patches-0.tar.xz 10292 BLAKE2B a81ac6708389baff21accccac1511c1fc372324cac8bb3ee0f3b5d2a0690b6e22ef658b41c887b99168b43c4ea4bb0947d3e48ad9b7e80db558db22c976df868 SHA512 1dae465676b2ff4faae08ebf69e6bac46552bc0331659bf5f444c45b026e4c8d2fc46cd3758e3bd121716aa85d5dcc56de6483919f7f0077b9d9720574dbd1aa |
28 |
|
29 |
diff --git a/mail-client/thunderbird/metadata.xml b/mail-client/thunderbird/metadata.xml |
30 |
index 7fdeae0..39a30c3 100644 |
31 |
--- a/mail-client/thunderbird/metadata.xml |
32 |
+++ b/mail-client/thunderbird/metadata.xml |
33 |
@@ -9,17 +9,11 @@ |
34 |
<flag name="bindist">Disable official Thunderbird branding (icons, name) which |
35 |
are not binary-redistributable according to upstream.</flag> |
36 |
<flag name="clang">Use Clang compiler instead of GCC</flag> |
37 |
- <flag name="crypt"> Enable encryption support with enigmail</flag> |
38 |
<flag name="mozdom">Enable Mozilla's DOM inspector</flag> |
39 |
<flag name="lightning">Enable app-global calendar support |
40 |
(note 38.0 and above bundles calendar support when this flag is off)</flag> |
41 |
<flag name="custom-optimization">Build with user-specified compiler optimizations |
42 |
(-Os, -O0, -O1, -O2, -O3) from CFLAGS (unsupported)</flag> |
43 |
- <flag name="gtk2">Use the cairo-gtk2 rendering engine instead of the default cairo-gtk3</flag> |
44 |
- <flag name="jemalloc">Enable or disable jemalloc</flag> |
45 |
- <flag name="rust">Enable support for using rust compiler (experimental)</flag> |
46 |
- <flag name="system-cairo">Use the system-wide <pkg>x11-libs/cairo</pkg> |
47 |
- instead of bundled.</flag> |
48 |
<flag name="system-harfbuzz">Use the system-wide <pkg>media-libs/harfbuzz</pkg> |
49 |
and <pkg>media-gfx/graphite2</pkg> instead of bundled.</flag> |
50 |
<flag name="system-icu">Use the system-wide <pkg>dev-libs/icu</pkg> |
51 |
@@ -32,6 +26,5 @@ |
52 |
instead of bundled.</flag> |
53 |
<flag name="system-sqlite">Use the system-wide <pkg>dev-db/sqlite</pkg> |
54 |
installation with secure-delete enabled</flag> |
55 |
- <flag name="minimal">Remove the software development kit and headers</flag> |
56 |
</use> |
57 |
</pkgmetadata> |
58 |
|
59 |
diff --git a/mail-client/thunderbird/thunderbird-60.2.1.ebuild b/mail-client/thunderbird/thunderbird-60.2.1.ebuild |
60 |
index 948f6f9..961d064 100644 |
61 |
--- a/mail-client/thunderbird/thunderbird-60.2.1.ebuild |
62 |
+++ b/mail-client/thunderbird/thunderbird-60.2.1.ebuild |
63 |
@@ -9,7 +9,7 @@ MOZ_LIGHTNING_VER="6.2.2.1" |
64 |
MOZ_LIGHTNING_GDATA_VER="4.4.1" |
65 |
|
66 |
PYTHON_COMPAT=( python3_{5,6,7} ) |
67 |
-PYTHON_REQ_USE='ncurses,sqlite,ssl,threads' |
68 |
+PYTHON_REQ_USE='ncurses,sqlite,ssl,threads(+)' |
69 |
|
70 |
# This list can be updated using scripts/get_langs.sh from the mozilla overlay |
71 |
MOZ_LANGS=(ar ast be bg br ca cs cy da de el en en-GB en-US es-AR |
72 |
@@ -22,7 +22,7 @@ MOZ_PV="${PV/_beta/b}" |
73 |
|
74 |
# Patches |
75 |
PATCHTB="thunderbird-60.0-patches-0" |
76 |
-PATCHFF="firefox-60.0-patches-03" |
77 |
+PATCHFF="firefox-60.0-patches-04" |
78 |
|
79 |
MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases" |
80 |
|
81 |
@@ -45,7 +45,7 @@ IUSE="bindist clang dbus debug hardened jack lightning mozdom neon pulseaudio |
82 |
system-libevent system-libvpx system-sqlite wifi" |
83 |
RESTRICT="!bindist? ( bindist )" |
84 |
|
85 |
-PATCH_URIS=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c}/mozilla/patchsets/{${PATCHTB},${PATCHFF}}.tar.xz ) |
86 |
+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 ) |
87 |
SRC_URI="${SRC_URI} |
88 |
${MOZ_HTTP_URI}/${MOZ_PV}/source/${MOZ_P}.source.tar.xz |
89 |
https://dev.gentoo.org/~axs/distfiles/lightning-${MOZ_LIGHTNING_VER}.tar.xz |
90 |
@@ -79,7 +79,7 @@ CDEPEND=" |
91 |
>=x11-libs/pixman-0.19.2 |
92 |
>=dev-libs/glib-2.26:2 |
93 |
>=sys-libs/zlib-1.2.3 |
94 |
- >=virtual/libffi-3.0.10 |
95 |
+ >=virtual/libffi-3.0.10:= |
96 |
virtual/ffmpeg |
97 |
x11-libs/libX11 |
98 |
x11-libs/libXcomposite |
99 |
@@ -197,7 +197,6 @@ src_prepare() { |
100 |
"${WORKDIR}"/firefox/2005_ffmpeg4.patch \ |
101 |
|| die |
102 |
eapply "${WORKDIR}/firefox" |
103 |
- eapply "${FILESDIR}"/${PN}-60.0-blessings-TERM.patch # 654316 |
104 |
eapply "${FILESDIR}"/${PN}-60.0-rust-1.29-comp.patch |
105 |
|
106 |
# Ensure that are plugins dir is enabled as default |
107 |
@@ -264,7 +263,7 @@ src_configure() { |
108 |
# Force gcc |
109 |
einfo "Enforcing the use of gcc due to USE=-clang ..." |
110 |
CC=${CHOST}-gcc |
111 |
- CXX=${CHOST}-gcc++ |
112 |
+ CXX=${CHOST}-g++ |
113 |
strip-unsupported-flags |
114 |
fi |