Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

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