Gentoo Archives: gentoo-commits

From: "Jory Pratt (anarchy)" <anarchy@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in mail-client/thunderbird: ChangeLog thunderbird-12.0.1.ebuild thunderbird-11.0.1.ebuild
Date: Mon, 30 Apr 2012 16:57:29
Message-Id: 20120430165720.476A42004B@flycatcher.gentoo.org
1 anarchy 12/04/30 16:57:20
2
3 Modified: ChangeLog
4 Added: thunderbird-12.0.1.ebuild
5 Removed: thunderbird-11.0.1.ebuild
6 Log:
7 remove tb-11.0.1 add tb-12.0.1 for security
8
9 (Portage version: 2.1.10.57/cvs/Linux x86_64)
10
11 Revision Changes Path
12 1.137 mail-client/thunderbird/ChangeLog
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/thunderbird/ChangeLog?rev=1.137&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/thunderbird/ChangeLog?rev=1.137&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/thunderbird/ChangeLog?r1=1.136&r2=1.137
17
18 Index: ChangeLog
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v
21 retrieving revision 1.136
22 retrieving revision 1.137
23 diff -u -r1.136 -r1.137
24 --- ChangeLog 30 Apr 2012 12:26:26 -0000 1.136
25 +++ ChangeLog 30 Apr 2012 16:57:20 -0000 1.137
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.136 2012/04/30 12:26:26 ago Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v 1.137 2012/04/30 16:57:20 anarchy Exp $
31 +
32 +*thunderbird-12.0.1 (30 Apr 2012)
33 +
34 + 30 Apr 2012; Jory A. Pratt <anarchy@g.o> -thunderbird-11.0.1.ebuild,
35 + +thunderbird-12.0.1.ebuild:
36 + Remove tb-11.0.1, add tb-12.0.1
37
38 30 Apr 2012; Agostino Sarubbo <ago@g.o> thunderbird-10.0.4.ebuild:
39 Stable for AMD64, wrt bug #413657
40
41
42
43 1.1 mail-client/thunderbird/thunderbird-12.0.1.ebuild
44
45 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/thunderbird/thunderbird-12.0.1.ebuild?rev=1.1&view=markup
46 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/thunderbird/thunderbird-12.0.1.ebuild?rev=1.1&content-type=text/plain
47
48 Index: thunderbird-12.0.1.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-12.0.1.ebuild,v 1.1 2012/04/30 16:57:20 anarchy Exp $
53
54 EAPI="3"
55 WANT_AUTOCONF="2.1"
56 MOZ_ESR=""
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.4.1"
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-12.0-patches-0.1"
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.3
100 >=dev-libs/nspr-4.9
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 dev-util/pkgconfig
125 webm? ( x86? ( ${ASM_DEPEND} )
126 amd64? ( ${ASM_DEPEND} )
127 virtual/opengl )"
128
129 if [[ ${PV} =~ beta ]]; then
130 S="${WORKDIR}/comm-beta"
131 elif [[ ${MOZ_ESR} == 1 ]]; then
132 S="${WORKDIR}/comm-esr${PV%%.*}"
133 else
134 S="${WORKDIR}/comm-release"
135 fi
136
137 pkg_setup() {
138 moz_pkgsetup
139
140 export MOZILLA_DIR="${S}/mozilla"
141
142 if ! use bindist ; then
143 elog "You are enabling official branding. You may not redistribute this build"
144 elog "to any users on your network or the internet. Doing so puts yourself into"
145 elog "a legal problem with Mozilla Foundation"
146 elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
147 elog
148 fi
149
150 # Ensure we have enough disk space to compile
151 CHECKREQS_DISK_BUILD="4G"
152 check-reqs_pkg_setup
153 }
154
155 src_unpack() {
156 unpack ${A}
157
158 # Unpack language packs
159 mozlinguas_src_unpack
160 }
161
162 src_prepare() {
163 # Apply our Thunderbird patchset
164 EPATCH_SUFFIX="patch" \
165 EPATCH_FORCE="yes" \
166 epatch "${WORKDIR}/thunderbird"
167
168 # Apply our patchset from firefox to thunderbird as well
169 pushd "${S}"/mozilla &>/dev/null || die
170 EPATCH_SUFFIX="patch" \
171 EPATCH_FORCE="yes" \
172 epatch "${WORKDIR}/firefox"
173 popd &>/dev/null || die
174
175 if use crypt ; then
176 mv "${WORKDIR}"/enigmail "${S}"/mailnews/extensions/enigmail
177 cd "${S}"
178 fi
179
180 #Fix compilation with curl-7.21.7 bug 376027
181 sed -e '/#include <curl\/types.h>/d' \
182 -i "${S}"/mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc \
183 -i "${S}"/mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc \
184 -i "${S}"/mozilla/config/system-headers \
185 -i "${S}"/mozilla/js/src/config/system-headers || die "Sed failed"
186
187 # Allow user to apply any additional patches without modifing ebuild
188 epatch_user
189
190 eautoreconf
191 # Ensure we run eautoreconf in mozilla to regenerate configure
192 cd "${S}"/mozilla
193 eautoconf
194 }
195
196 src_configure() {
197 declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
198 MEXTENSIONS="default"
199
200 ####################################
201 #
202 # mozconfig, CFLAGS and CXXFLAGS setup
203 #
204 ####################################
205
206 mozconfig_init
207 mozconfig_config
208
209 # It doesn't compile on alpha without this LDFLAGS
210 use alpha && append-ldflags "-Wl,--no-relax"
211
212 mozconfig_annotate '' --prefix="${EPREFIX}"/usr
213 mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
214 mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
215 mozconfig_annotate '' --with-default-mozilla-five-home="${EPREFIX}${MOZILLA_FIVE_HOME}"
216 mozconfig_annotate '' --with-user-appdir=.thunderbird
217 mozconfig_annotate '' --with-system-png
218 mozconfig_annotate '' --enable-system-ffi
219 mozconfig_annotate '' --target="${CTARGET:-${CHOST}}"
220 mozconfig_annotate 'Missing fetures' --disable-system-cairo
221
222 # Use enable features
223 mozconfig_use_enable lightning calendar
224 mozconfig_use_enable gconf
225
226 # Bug #72667
227 if use mozdom; then
228 MEXTENSIONS="${MEXTENSIONS},inspector"
229 fi
230
231 # Use an objdir to keep things organized.
232 echo "mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/tbird" >> "${S}"/.mozconfig
233
234 # Finalize and report settings
235 mozconfig_final
236
237 ####################################
238 #
239 # Configure and build
240 #
241 ####################################
242
243 # Disable no-print-directory
244 MAKEOPTS=${MAKEOPTS/--no-print-directory/}
245
246 if [[ $(gcc-major-version) -lt 4 ]]; then
247 append-cxxflags -fno-stack-protector
248 elif [[ $(gcc-major-version) -gt 4 || $(gcc-minor-version) -gt 3 ]]; then
249 if use amd64 || use x86; then
250 append-flags -mno-avx
251 fi
252 fi
253 }
254
255 src_compile() {
256 CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
257 MOZ_MAKE_FLAGS="${MAKEOPTS}" \
258 emake -f client.mk || die
259
260 # Only build enigmail extension if crypt enabled.
261 if use crypt ; then
262 cd "${S}"/mailnews/extensions/enigmail || die
263 ./makemake -r 2&> /dev/null
264 cd "${S}"/tbird/mailnews/extensions/enigmail
265 emake || die "make enigmail failed"
266 emake xpi || die "make enigmail xpi failed"
267 fi
268 }
269
270 src_install() {
271 declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
272 declare emid
273 local obj_dir="tbird"
274 cd "${S}/${obj_dir}"
275
276 # Copy our preference before omnijar is created.
277 cp "${FILESDIR}"/thunderbird-gentoo-default-prefs-1.js-1 \
278 "${S}/${obj_dir}/mozilla/dist/bin/defaults/pref/all-gentoo.js" || die
279
280 # Pax mark xpcshell for hardened support, only used for startupcache creation.
281 pax-mark m "${S}"/${obj_dir}/mozilla/dist/bin/xpcshell
282
283 emake DESTDIR="${D}" install || die "emake install failed"
284
285 # Install language packs
286 mozlinguas_src_install
287
288 if ! use bindist; then
289 newicon "${S}"/other-licenses/branding/thunderbird/content/icon48.png thunderbird-icon.png
290 domenu "${FILESDIR}"/icon/${PN}.desktop
291 else
292 newicon "${S}"/mail/branding/aurora/content/icon48.png thunderbird-icon-unbranded.png
293 newmenu "${FILESDIR}"/icon/${PN}-unbranded.desktop \
294 ${PN}.desktop
295
296 sed -i -e "s:Mozilla\ Thunderbird:EarlyBird:g" \
297 "${ED}"/usr/share/applications/${PN}.desktop
298 fi
299
300 if use crypt ; then
301 cd "${T}" || die
302 unzip "${S}"/${obj_dir}/mozilla/dist/bin/enigmail*.xpi install.rdf || die
303 emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' install.rdf)
304
305 dodir ${MOZILLA_FIVE_HOME}/extensions/${emid} || die
306 cd "${D}"${MOZILLA_FIVE_HOME}/extensions/${emid} || die
307 unzip "${S}"/${obj_dir}/mozilla/dist/bin/enigmail*.xpi || die
308 fi
309
310 if use lightning ; then
311 emid="{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}"
312 dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
313 cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid}
314 unzip "${S}"/${obj_dir}/mozilla/dist/xpi-stage/gdata-provider.xpi
315
316 emid="calendar-timezones@×××××××.org"
317 dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
318 cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid}
319 unzip "${S}"/${obj_dir}/mozilla/dist/xpi-stage/calendar-timezones.xpi
320
321 emid="{e2fda1a4-762b-4020-b5ad-a41df1933103}"
322 dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
323 cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid}
324 unzip "${S}"/${obj_dir}/mozilla/dist/xpi-stage/lightning.xpi
325
326 # Fix mimetype so it shows up as a calendar application in GNOME 3
327 # This requires that the .desktop file was already installed earlier
328 sed -e "s:^\(MimeType=\):\1text/calendar;:" \
329 -e "s:^\(Categories=\):\1Calendar;:" \
330 -i "${ED}"/usr/share/applications/${PN}.desktop
331 fi
332
333 pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/thunderbird-bin
334
335 share_plugins_dir
336
337 if use minimal; then
338 rm -rf "${ED}"/usr/include "${ED}${MOZILLA_FIVE_HOME}"/{idl,include,lib,sdk} || \
339 die "Failed to remove sdk and headers"
340 fi
341 }
342
343 pkg_postinst() {
344 elog
345 elog "If you are experience problems with plugins please issue the"
346 elog "following command : rm \${HOME}/.thunderbird/*/extensions.sqlite ,"
347 elog "then restart thunderbird"
348 }