1 |
polynomial-c 12/06/06 14:42:14 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: thunderbird-10.0.5.ebuild |
5 |
Removed: thunderbird-10.0.3.ebuild |
6 |
Log: |
7 |
Security bump. Removed old. |
8 |
|
9 |
(Portage version: 2.2.0_alpha110/cvs/Linux x86_64) |
10 |
|
11 |
Revision Changes Path |
12 |
1.149 mail-client/thunderbird/ChangeLog |
13 |
|
14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/thunderbird/ChangeLog?rev=1.149&view=markup |
15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/thunderbird/ChangeLog?rev=1.149&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/thunderbird/ChangeLog?r1=1.148&r2=1.149 |
17 |
|
18 |
Index: ChangeLog |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v |
21 |
retrieving revision 1.148 |
22 |
retrieving revision 1.149 |
23 |
diff -u -r1.148 -r1.149 |
24 |
--- ChangeLog 6 Jun 2012 12:56:51 -0000 1.148 |
25 |
+++ ChangeLog 6 Jun 2012 14:42:14 -0000 1.149 |
26 |
@@ -1,6 +1,12 @@ |
27 |
# ChangeLog for mail-client/thunderbird |
28 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v 1.148 2012/06/06 12:56:51 anarchy Exp $ |
30 |
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v 1.149 2012/06/06 14:42:14 polynomial-c Exp $ |
31 |
+ |
32 |
+*thunderbird-10.0.5 (06 Jun 2012) |
33 |
+ |
34 |
+ 06 Jun 2012; Lars Wendler <polynomial-c@g.o> |
35 |
+ -thunderbird-10.0.3.ebuild, +thunderbird-10.0.5.ebuild: |
36 |
+ Security bump. Removed old. |
37 |
|
38 |
06 Jun 2012; Jory A. Pratt <anarchy@g.o> thunderbird-13.0.ebuild: |
39 |
Fix nss/nspr dep |
40 |
|
41 |
|
42 |
|
43 |
1.1 mail-client/thunderbird/thunderbird-10.0.5.ebuild |
44 |
|
45 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/thunderbird/thunderbird-10.0.5.ebuild?rev=1.1&view=markup |
46 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/thunderbird/thunderbird-10.0.5.ebuild?rev=1.1&content-type=text/plain |
47 |
|
48 |
Index: thunderbird-10.0.5.ebuild |
49 |
=================================================================== |
50 |
# Copyright 1999-2012 Gentoo Foundation |
51 |
# Distributed under the terms of the GNU General Public License v2 |
52 |
# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-10.0.5.ebuild,v 1.1 2012/06/06 14:42:14 polynomial-c Exp $ |
53 |
|
54 |
EAPI="3" |
55 |
WANT_AUTOCONF="2.1" |
56 |
MOZ_ESR="1" |
57 |
|
58 |
# This list can be updated using scripts/get_langs.sh from the mozilla overlay |
59 |
MOZ_LANGS=(ar ast be bg bn-BD br ca cs da de el en en-GB en-US es-AR es-ES et eu fi |
60 |
fr fy-NL ga-IE gd gl he hu id is it ja ko lt nb-NO nl nn-NO pa-IN pl pt-BR pt-PT |
61 |
rm ro ru si sk sl sq sr sv-SE ta-LK tr uk vi zh-CN zh-TW) |
62 |
|
63 |
# Convert the ebuild version to the upstream mozilla version, used by mozlinguas |
64 |
MOZ_PV="${PV/_beta/b}" |
65 |
# ESR releases have slightly version numbers |
66 |
if [[ ${MOZ_ESR} == 1 ]]; then |
67 |
MOZ_PV="${MOZ_PV}esr" |
68 |
fi |
69 |
MOZ_P="${PN}-${MOZ_PV}" |
70 |
|
71 |
# Enigmail version |
72 |
EMVER="1.3.5" |
73 |
# Upstream ftp release URI that's used by mozlinguas.eclass |
74 |
# We don't use the http mirror because it deletes old tarballs. |
75 |
MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/${PN}/releases/" |
76 |
|
77 |
inherit flag-o-matic toolchain-funcs mozconfig-3 makeedit multilib autotools pax-utils python check-reqs nsplugins mozlinguas |
78 |
|
79 |
DESCRIPTION="Thunderbird Mail Client" |
80 |
HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/" |
81 |
|
82 |
KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" |
83 |
SLOT="0" |
84 |
LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )" |
85 |
IUSE="bindist gconf +crashreporter +crypt +ipc +lightning +minimal mozdom +webm" |
86 |
|
87 |
PATCH="thunderbird-10.0-patches-0.1" |
88 |
PATCHFF="firefox-10.0-patches-0.7" |
89 |
|
90 |
SRC_URI="${SRC_URI} |
91 |
${MOZ_FTP_URI}${MOZ_PV}/source/${MOZ_P}.source.tar.bz2 |
92 |
crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-${EMVER}.tar.gz ) |
93 |
http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.xz |
94 |
http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCHFF}.tar.xz" |
95 |
|
96 |
ASM_DEPEND=">=dev-lang/yasm-1.1" |
97 |
|
98 |
RDEPEND=">=sys-devel/binutils-2.16.1 |
99 |
>=dev-libs/nss-3.13.1 |
100 |
>=dev-libs/nspr-4.8.8 |
101 |
>=dev-libs/glib-2.26 |
102 |
crashreporter? ( net-misc/curl ) |
103 |
gconf? ( >=gnome-base/gconf-1.2.1:2 ) |
104 |
media-libs/libpng[apng] |
105 |
>=x11-libs/cairo-1.10 |
106 |
>=x11-libs/pango-1.14.0 |
107 |
>=x11-libs/gtk+-2.14 |
108 |
webm? ( >=media-libs/libvpx-1.0.0 |
109 |
media-libs/alsa-lib ) |
110 |
virtual/libffi |
111 |
!x11-plugins/enigmail |
112 |
system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,unlock-notify,debug=] ) |
113 |
crypt? ( || ( |
114 |
( >=app-crypt/gnupg-2.0 |
115 |
|| ( |
116 |
app-crypt/pinentry[gtk] |
117 |
app-crypt/pinentry[qt4] |
118 |
) |
119 |
) |
120 |
=app-crypt/gnupg-1.4* |
121 |
) )" |
122 |
|
123 |
DEPEND="${RDEPEND} |
124 |
virtual/pkgconfig |
125 |
webm? ( x86? ( ${ASM_DEPEND} ) |
126 |
amd64? ( ${ASM_DEPEND} ) )" |
127 |
|
128 |
if [[ ${MOZ_ESR} == 1 ]]; then |
129 |
S="${WORKDIR}/comm-esr${PV%%.*}" |
130 |
else |
131 |
S="${WORKDIR}/comm-release" |
132 |
fi |
133 |
|
134 |
pkg_setup() { |
135 |
moz_pkgsetup |
136 |
|
137 |
export MOZILLA_DIR="${S}/mozilla" |
138 |
|
139 |
if ! use bindist ; then |
140 |
elog "You are enabling official branding. You may not redistribute this build" |
141 |
elog "to any users on your network or the internet. Doing so puts yourself into" |
142 |
elog "a legal problem with Mozilla Foundation" |
143 |
elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag" |
144 |
elog |
145 |
fi |
146 |
|
147 |
# Ensure we have enough disk space to compile |
148 |
CHECKREQS_DISK_BUILD="4G" |
149 |
check-reqs_pkg_setup |
150 |
} |
151 |
|
152 |
src_unpack() { |
153 |
unpack ${A} |
154 |
|
155 |
# Unpack language packs |
156 |
mozlinguas_src_unpack |
157 |
} |
158 |
|
159 |
src_prepare() { |
160 |
# Apply our Thunderbird patchset |
161 |
EPATCH_SUFFIX="patch" \ |
162 |
EPATCH_FORCE="yes" \ |
163 |
epatch "${WORKDIR}/thunderbird" |
164 |
|
165 |
# Apply our patchset from firefox to thunderbird as well |
166 |
pushd "${S}"/mozilla &>/dev/null || die |
167 |
EPATCH_EXCLUDE="6012_fix_shlibsign.patch 6013_fix_abort_declaration.patch" \ |
168 |
EPATCH_SUFFIX="patch" \ |
169 |
EPATCH_FORCE="yes" \ |
170 |
epatch "${WORKDIR}/firefox" |
171 |
popd &>/dev/null || die |
172 |
|
173 |
if use crypt ; then |
174 |
mv "${WORKDIR}"/enigmail "${S}"/mailnews/extensions/enigmail |
175 |
cd "${S}" |
176 |
fi |
177 |
|
178 |
#Fix compilation with curl-7.21.7 bug 376027 |
179 |
sed -e '/#include <curl\/types.h>/d' \ |
180 |
-i "${S}"/mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc \ |
181 |
-i "${S}"/mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc \ |
182 |
-i "${S}"/mozilla/config/system-headers \ |
183 |
-i "${S}"/mozilla/js/src/config/system-headers || die "Sed failed" |
184 |
|
185 |
# Shell scripts sometimes contain DOS line endings; bug 391889 |
186 |
grep -rlZ --include="*.sh" $'\r$' . | |
187 |
while read -r -d $'\0' file ; do |
188 |
einfo edos2unix "${file}" |
189 |
edos2unix "${file}" |
190 |
done |
191 |
|
192 |
# Allow user to apply any additional patches without modifing ebuild |
193 |
epatch_user |
194 |
|
195 |
eautoreconf |
196 |
cd "${S}"/mozilla |
197 |
eautoconf |
198 |
} |
199 |
|
200 |
src_configure() { |
201 |
declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" |
202 |
MEXTENSIONS="default" |
203 |
|
204 |
#################################### |
205 |
# |
206 |
# mozconfig, CFLAGS and CXXFLAGS setup |
207 |
# |
208 |
#################################### |
209 |
|
210 |
mozconfig_init |
211 |
mozconfig_config |
212 |
|
213 |
# It doesn't compile on alpha without this LDFLAGS |
214 |
use alpha && append-ldflags "-Wl,--no-relax" |
215 |
|
216 |
mozconfig_annotate '' --prefix="${EPREFIX}"/usr |
217 |
mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir) |
218 |
mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}" |
219 |
mozconfig_annotate '' --with-default-mozilla-five-home="${EPREFIX}${MOZILLA_FIVE_HOME}" |
220 |
mozconfig_annotate '' --with-user-appdir=.thunderbird |
221 |
mozconfig_annotate '' --with-system-png |
222 |
mozconfig_annotate '' --enable-system-ffi |
223 |
mozconfig_annotate '' --target="${CTARGET:-${CHOST}}" |
224 |
|
225 |
# Use enable features |
226 |
mozconfig_use_enable lightning calendar |
227 |
mozconfig_use_enable gconf |
228 |
|
229 |
# Bug #72667 |
230 |
if use mozdom; then |
231 |
MEXTENSIONS="${MEXTENSIONS},inspector" |
232 |
fi |
233 |
|
234 |
# Use an objdir to keep things organized. |
235 |
echo "mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/tbird" >> "${S}"/.mozconfig |
236 |
|
237 |
# Finalize and report settings |
238 |
mozconfig_final |
239 |
|
240 |
#################################### |
241 |
# |
242 |
# Configure and build |
243 |
# |
244 |
#################################### |
245 |
|
246 |
# Disable no-print-directory |
247 |
MAKEOPTS=${MAKEOPTS/--no-print-directory/} |
248 |
|
249 |
if [[ $(gcc-major-version) -lt 4 ]]; then |
250 |
append-cxxflags -fno-stack-protector |
251 |
elif [[ $(gcc-major-version) -gt 4 || $(gcc-minor-version) -gt 3 ]]; then |
252 |
if use amd64 || use x86; then |
253 |
append-flags -mno-avx |
254 |
fi |
255 |
fi |
256 |
} |
257 |
|
258 |
src_compile() { |
259 |
CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \ |
260 |
MOZ_MAKE_FLAGS="${MAKEOPTS}" \ |
261 |
emake -f client.mk || die |
262 |
|
263 |
# Only build enigmail extension if crypt enabled. |
264 |
if use crypt ; then |
265 |
cd "${S}"/mailnews/extensions/enigmail || die |
266 |
./makemake -r 2&> /dev/null |
267 |
cd "${S}"/tbird/mailnews/extensions/enigmail |
268 |
emake || die "make enigmail failed" |
269 |
emake xpi || die "make enigmail xpi failed" |
270 |
fi |
271 |
} |
272 |
|
273 |
src_install() { |
274 |
declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" |
275 |
declare emid |
276 |
local obj_dir="tbird" |
277 |
cd "${S}/${obj_dir}" |
278 |
|
279 |
# Copy our preference before omnijar is created. |
280 |
cp "${FILESDIR}"/thunderbird-gentoo-default-prefs-1.js-1 \ |
281 |
"${S}/${obj_dir}/mozilla/dist/bin/defaults/pref/all-gentoo.js" || die |
282 |
|
283 |
# Pax mark xpcshell for hardened support, only used for startupcache creation. |
284 |
pax-mark m "${S}"/${obj_dir}/mozilla/dist/bin/xpcshell |
285 |
|
286 |
emake DESTDIR="${D}" install || die "emake install failed" |
287 |
|
288 |
# Install language packs |
289 |
mozlinguas_src_install |
290 |
|
291 |
if ! use bindist; then |
292 |
newicon "${S}"/other-licenses/branding/thunderbird/content/icon48.png thunderbird-icon.png |
293 |
domenu "${FILESDIR}"/icon/${PN}.desktop |
294 |
else |
295 |
newicon "${S}"/mail/branding/aurora/content/icon48.png thunderbird-icon-unbranded.png |
296 |
newmenu "${FILESDIR}"/icon/${PN}-unbranded.desktop \ |
297 |
${PN}.desktop |
298 |
|
299 |
sed -i -e "s:Mozilla\ Thunderbird:Lanikai:g" \ |
300 |
"${ED}"/usr/share/applications/${PN}.desktop |
301 |
fi |
302 |
|
303 |
if use crypt ; then |
304 |
cd "${T}" || die |
305 |
unzip "${S}"/${obj_dir}/mozilla/dist/bin/enigmail*.xpi install.rdf || die |
306 |
emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' install.rdf) |
307 |
|
308 |
dodir ${MOZILLA_FIVE_HOME}/extensions/${emid} || die |
309 |
cd "${D}"${MOZILLA_FIVE_HOME}/extensions/${emid} || die |
310 |
unzip "${S}"/${obj_dir}/mozilla/dist/bin/enigmail*.xpi || die |
311 |
fi |
312 |
|
313 |
if use lightning ; then |
314 |
emid="{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}" |
315 |
dodir ${MOZILLA_FIVE_HOME}/extensions/${emid} |
316 |
cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid} |
317 |
unzip "${S}"/${obj_dir}/mozilla/dist/xpi-stage/gdata-provider.xpi |
318 |
|
319 |
emid="calendar-timezones@×××××××.org" |
320 |
dodir ${MOZILLA_FIVE_HOME}/extensions/${emid} |
321 |
cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid} |
322 |
unzip "${S}"/${obj_dir}/mozilla/dist/xpi-stage/calendar-timezones.xpi |
323 |
|
324 |
emid="{e2fda1a4-762b-4020-b5ad-a41df1933103}" |
325 |
dodir ${MOZILLA_FIVE_HOME}/extensions/${emid} |
326 |
cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid} |
327 |
unzip "${S}"/${obj_dir}/mozilla/dist/xpi-stage/lightning.xpi |
328 |
|
329 |
# Fix mimetype so it shows up as a calendar application in GNOME 3 |
330 |
# This requires that the .desktop file was already installed earlier |
331 |
sed -e "s:^\(MimeType=\):\1text/calendar;:" \ |
332 |
-e "s:^\(Categories=\):\1Calendar;:" \ |
333 |
-i "${ED}"/usr/share/applications/${PN}.desktop |
334 |
fi |
335 |
|
336 |
pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/thunderbird-bin |
337 |
|
338 |
share_plugins_dir |
339 |
|
340 |
if use minimal; then |
341 |
rm -rf "${ED}"/usr/include "${ED}${MOZILLA_FIVE_HOME}"/{idl,include,lib,sdk} || \ |
342 |
die "Failed to remove sdk and headers" |
343 |
fi |
344 |
} |
345 |
|
346 |
pkg_postinst() { |
347 |
elog |
348 |
elog "If you are experience problems with plugins please issue the" |
349 |
elog "following command : rm \${HOME}/.thunderbird/*/extensions.sqlite ," |
350 |
elog "then restart thunderbird" |
351 |
} |