1 |
polynomial-c 11/09/05 06:23:18 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: seamonkey-2.3.3.ebuild |
5 |
Log: |
6 |
Security bump |
7 |
|
8 |
(Portage version: 2.2.0_alpha51/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.334 www-client/seamonkey/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/seamonkey/ChangeLog?rev=1.334&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/seamonkey/ChangeLog?rev=1.334&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/seamonkey/ChangeLog?r1=1.333&r2=1.334 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/www-client/seamonkey/ChangeLog,v |
20 |
retrieving revision 1.333 |
21 |
retrieving revision 1.334 |
22 |
diff -u -r1.333 -r1.334 |
23 |
--- ChangeLog 4 Sep 2011 00:44:34 -0000 1.333 |
24 |
+++ ChangeLog 5 Sep 2011 06:23:18 -0000 1.334 |
25 |
@@ -1,6 +1,13 @@ |
26 |
# ChangeLog for www-client/seamonkey |
27 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/ChangeLog,v 1.333 2011/09/04 00:44:34 phajdan.jr Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/ChangeLog,v 1.334 2011/09/05 06:23:18 polynomial-c Exp $ |
30 |
+ |
31 |
+*seamonkey-2.3.3 (05 Sep 2011) |
32 |
+ |
33 |
+ 05 Sep 2011; Lars Wendler <polynomial-c@g.o> |
34 |
+ +files/seamonkey-2.3.1-scrollbar-mouse-interaction-improvement.patch, |
35 |
+ +seamonkey-2.3.3.ebuild: |
36 |
+ Security bump. |
37 |
|
38 |
04 Sep 2011; Pawel Hajdan jr <phajdan.jr@g.o> seamonkey-2.3.1.ebuild: |
39 |
x86 stable wrt security bug #379549 |
40 |
|
41 |
|
42 |
|
43 |
1.1 www-client/seamonkey/seamonkey-2.3.3.ebuild |
44 |
|
45 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/seamonkey/seamonkey-2.3.3.ebuild?rev=1.1&view=markup |
46 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/seamonkey/seamonkey-2.3.3.ebuild?rev=1.1&content-type=text/plain |
47 |
|
48 |
Index: seamonkey-2.3.3.ebuild |
49 |
=================================================================== |
50 |
# Copyright 1999-2011 Gentoo Foundation |
51 |
# Distributed under the terms of the GNU General Public License v2 |
52 |
# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.3.3.ebuild,v 1.1 2011/09/05 06:23:18 polynomial-c Exp $ |
53 |
|
54 |
EAPI="3" |
55 |
WANT_AUTOCONF="2.1" |
56 |
|
57 |
inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib fdo-mime autotools mozextension python |
58 |
|
59 |
PATCH="${PN}-2.3.3-patches-01" |
60 |
EMVER="1.3.1" |
61 |
|
62 |
LANGS="be ca cs de en en-GB en-US es-AR es-ES fi fr gl hu it ja lt nb-NO nl pl pt-PT ru sk sv-SE tr zh-CN" |
63 |
NOSHORTLANGS="en-GB en-US es-AR" |
64 |
|
65 |
MY_PV="${PV/_pre*}" |
66 |
MY_PV="${MY_PV/_alpha/a}" |
67 |
MY_PV="${MY_PV/_beta/b}" |
68 |
MY_PV="${MY_PV/_rc/rc}" |
69 |
MY_P="${PN}-${MY_PV}" |
70 |
|
71 |
# release versions usually have language packs. So be careful with changing this. |
72 |
HAS_LANGS="true" |
73 |
LANGPACK_PREFIX="${MY_P}." |
74 |
LANGPACK_SUFFIX=".langpack" |
75 |
if [[ ${PV} == *_pre* ]] ; then |
76 |
# pre-releases. No need for arch teams to change KEYWORDS here. |
77 |
|
78 |
REL_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${PN}/nightly/${MY_PV}-candidates/build${PV##*_pre}" |
79 |
#LANG_URI="${REL_URI}/langpack" |
80 |
LANG_URI="${REL_URI}/linux-i686/xpi" |
81 |
LANGPACK_PREFIX="" |
82 |
LANGPACK_SUFFIX="" |
83 |
#KEYWORDS="" |
84 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86" |
85 |
#HAS_LANGS="false" |
86 |
else |
87 |
# This is where arch teams should change the KEYWORDS. |
88 |
|
89 |
#REL_URI="http://releases.mozilla.org/pub/mozilla.org/${PN}/releases/${MY_PV}" |
90 |
REL_URI="ftp://ftp.mozilla.org/pub/${PN}/releases/${MY_PV}" |
91 |
LANG_URI="${REL_URI}/langpack" |
92 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86" |
93 |
[[ ${PV} == *alpha* ]] && HAS_LANGS="false" |
94 |
fi |
95 |
|
96 |
DESCRIPTION="Seamonkey Web Browser" |
97 |
HOMEPAGE="http://www.seamonkey-project.org" |
98 |
|
99 |
SLOT="0" |
100 |
LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )" |
101 |
IUSE="+alsa +chatzilla +crypt +ipc +methodjit +roaming system-sqlite +webm" |
102 |
|
103 |
SRC_URI="${REL_URI}/source/${MY_P}.source.tar.bz2 -> ${P}.source.tar.bz2 |
104 |
http://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz |
105 |
crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-${EMVER}.tar.gz )" |
106 |
|
107 |
if ${HAS_LANGS} ; then |
108 |
for X in ${LANGS} ; do |
109 |
if [ "${X}" != "en" ] ; then |
110 |
SRC_URI="${SRC_URI} |
111 |
linguas_${X/-/_}? ( ${LANG_URI}/${LANGPACK_PREFIX}${X}${LANGPACK_SUFFIX}.xpi -> ${P}-${X}.xpi )" |
112 |
fi |
113 |
IUSE="${IUSE} linguas_${X/-/_}" |
114 |
# english is handled internally |
115 |
if [ "${#X}" == 5 ] && ! has ${X} ${NOSHORTLANGS}; then |
116 |
#if [ "${X}" != "en-US" ]; then |
117 |
SRC_URI="${SRC_URI} |
118 |
linguas_${X%%-*}? ( ${LANG_URI}/${LANGPACK_PREFIX}${X}${LANGPACK_SUFFIX}.xpi -> ${P}-${X}.xpi )" |
119 |
#fi |
120 |
IUSE="${IUSE} linguas_${X%%-*}" |
121 |
fi |
122 |
done |
123 |
fi |
124 |
|
125 |
ASM_DEPEND=">=dev-lang/yasm-1.1" |
126 |
|
127 |
# Mesa 7.10 needed for WebGL + bugfixes |
128 |
RDEPEND=">=sys-devel/binutils-2.16.1 |
129 |
>=dev-libs/nss-3.12.10 |
130 |
>=dev-libs/nspr-4.8.8 |
131 |
>=dev-libs/glib-2.26 |
132 |
>=media-libs/mesa-7.10 |
133 |
>=media-libs/libpng-1.4.1[apng] |
134 |
>=x11-libs/cairo-1.10 |
135 |
dev-libs/libffi |
136 |
system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete,unlock-notify,debug=] ) |
137 |
crypt? ( >=app-crypt/gnupg-1.4 ) |
138 |
webm? ( media-libs/libvpx |
139 |
media-libs/alsa-lib )" |
140 |
|
141 |
DEPEND="${RDEPEND} |
142 |
dev-util/pkgconfig |
143 |
webm? ( amd64? ( ${ASM_DEPEND} ) |
144 |
x86? ( ${ASM_DEPEND} ) )" |
145 |
|
146 |
if [[ ${PV} == *beta* ]] ; then |
147 |
S="${WORKDIR}/comm-beta" |
148 |
else |
149 |
S="${WORKDIR}/comm-release" |
150 |
fi |
151 |
|
152 |
linguas() { |
153 |
local LANG SLANG |
154 |
for LANG in ${LINGUAS}; do |
155 |
if has ${LANG} en en_US; then |
156 |
has en ${linguas} || linguas="${linguas:+"${linguas} "}en" |
157 |
continue |
158 |
elif has ${LANG} ${LANGS//-/_}; then |
159 |
has ${LANG//_/-} ${linguas} || linguas="${linguas:+"${linguas} "}${LANG//_/-}" |
160 |
continue |
161 |
elif [[ " ${LANGS} " == *" ${LANG}-"* ]]; then |
162 |
for X in ${LANGS}; do |
163 |
if [[ "${X}" == "${LANG}-"* ]] && \ |
164 |
[[ " ${NOSHORTLANGS} " != *" ${X} "* ]]; then |
165 |
has ${X} ${linguas} || linguas="${linguas:+"${linguas} "}${X}" |
166 |
continue 2 |
167 |
fi |
168 |
done |
169 |
fi |
170 |
ewarn "Sorry, but ${PN} does not support the ${LANG} LINGUA" |
171 |
done |
172 |
} |
173 |
|
174 |
src_unpack() { |
175 |
unpack ${A} |
176 |
|
177 |
if ${HAS_LANGS} ; then |
178 |
linguas |
179 |
for X in ${linguas}; do |
180 |
# FIXME: Add support for unpacking xpis to portage |
181 |
[[ ${X} != "en" ]] && xpi_unpack "${P}-${X}.xpi" |
182 |
done |
183 |
if [[ ${linguas} != "" && ${linguas} != "en" ]]; then |
184 |
einfo "Selected language packs (first will be default): ${linguas}" |
185 |
fi |
186 |
fi |
187 |
} |
188 |
|
189 |
pkg_setup() { |
190 |
if [[ ${PV} == *_pre* ]] ; then |
191 |
ewarn "You're using an unofficial release of ${PN}. Don't file any bug in" |
192 |
ewarn "Gentoo's Bugtracker against this package in case it breaks for you." |
193 |
ewarn "Those belong to upstream: https://bugzilla.mozilla.org" |
194 |
fi |
195 |
|
196 |
moz_pkgsetup |
197 |
|
198 |
if ! use methodjit ; then |
199 |
einfo |
200 |
ewarn "You are disabling the method-based JIT in JägerMonkey." |
201 |
ewarn "This will greatly slowdown JavaScript in ${PN}!" |
202 |
fi |
203 |
} |
204 |
|
205 |
src_prepare() { |
206 |
# Apply our patches |
207 |
EPATCH_SUFFIX="patch" \ |
208 |
EPATCH_FORCE="yes" \ |
209 |
epatch "${WORKDIR}/_seamonkey" |
210 |
|
211 |
# browser patches go here |
212 |
pushd "${S}"/mozilla &>/dev/null || die |
213 |
EPATCH_SUFFIX="patch" \ |
214 |
EPATCH_FORCE="yes" \ |
215 |
epatch "${WORKDIR}/_mozilla" |
216 |
popd &>/dev/null || die |
217 |
|
218 |
# mailnews patches go here |
219 |
#pushd "${S}"/mailnews &>/dev/null || die |
220 |
#EPATCH_SUFFIX="patch" \ |
221 |
#EPATCH_FORCE="yes" \ |
222 |
#epatch "${WORKDIR}/_mailnews" |
223 |
#popd &>/dev/null || die |
224 |
|
225 |
epatch "${FILESDIR}"/${PN}-2.2-curl7217-includes-fix.patch \ |
226 |
"${FILESDIR}"/${PN}-2.3.1-scrollbar-mouse-interaction-improvement.patch |
227 |
|
228 |
# Allow user to apply any additional patches without modifing ebuild |
229 |
epatch_user |
230 |
|
231 |
if use crypt ; then |
232 |
mv "${WORKDIR}"/enigmail "${S}"/mailnews/extensions/enigmail |
233 |
cd "${S}"/mailnews/extensions/enigmail || die |
234 |
./makemake -r 2&>/dev/null |
235 |
sed -e 's:@srcdir@:${S}/mailnews/extensions/enigmail:' \ |
236 |
-i Makefile.in || die |
237 |
cd "${S}" |
238 |
fi |
239 |
|
240 |
#Ensure we disable javaxpcom by default to prevent configure breakage |
241 |
sed -i -e s:MOZ_JAVAXPCOM\=1::g "${S}"/mozilla/xulrunner/confvars.sh \ |
242 |
|| die "sed javaxpcom" |
243 |
|
244 |
# Disable gnomevfs extension |
245 |
sed -i -e "s:gnomevfs::" "${S}/"suite/confvars.sh \ |
246 |
|| die "Failed to remove gnomevfs extension" |
247 |
|
248 |
eautoreconf |
249 |
cd "${S}"/mozilla || die |
250 |
eautoreconf |
251 |
cd "${S}"/mozilla/js/src || die |
252 |
eautoreconf |
253 |
} |
254 |
|
255 |
src_configure() { |
256 |
declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" |
257 |
MEXTENSIONS="" |
258 |
|
259 |
#################################### |
260 |
# |
261 |
# mozconfig, CFLAGS and CXXFLAGS setup |
262 |
# |
263 |
#################################### |
264 |
|
265 |
mozconfig_init |
266 |
mozconfig_config |
267 |
|
268 |
# It doesn't compile on alpha without this LDFLAGS |
269 |
use alpha && append-ldflags "-Wl,--no-relax" |
270 |
|
271 |
if ! use chatzilla ; then |
272 |
MEXTENSIONS="${MEXTENSIONS},-irc" |
273 |
fi |
274 |
if ! use roaming ; then |
275 |
MEXTENSIONS="${MEXTENSIONS},-sroaming" |
276 |
fi |
277 |
|
278 |
mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}" |
279 |
mozconfig_annotate '' --disable-gconf |
280 |
mozconfig_annotate '' --enable-jsd |
281 |
mozconfig_annotate '' --enable-canvas |
282 |
mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME} |
283 |
|
284 |
mozconfig_use_enable system-sqlite |
285 |
mozconfig_use_enable methodjit |
286 |
|
287 |
if use crypt ; then |
288 |
mozconfig_annotate "mail crypt" --enable-chrome-format=jar |
289 |
fi |
290 |
|
291 |
mozconfig_annotate '' --with-system-png |
292 |
|
293 |
# Finalize and report settings |
294 |
mozconfig_final |
295 |
|
296 |
if [[ $(gcc-major-version) -lt 4 ]]; then |
297 |
append-cxxflags -fno-stack-protector |
298 |
elif [[ $(gcc-major-version) -gt 4 || $(gcc-minor-version) -gt 3 ]]; then |
299 |
if use amd64 || use x86; then |
300 |
append-flags -mno-avx |
301 |
fi |
302 |
fi |
303 |
|
304 |
#################################### |
305 |
# |
306 |
# Configure and build |
307 |
# |
308 |
#################################### |
309 |
|
310 |
# Work around breakage in makeopts with --no-print-directory |
311 |
MAKEOPTS="${MAKEOPTS/--no-print-directory/}" |
312 |
|
313 |
CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" PYTHON="$(PYTHON)" econf |
314 |
} |
315 |
|
316 |
src_compile() { |
317 |
emake || die |
318 |
|
319 |
# Only build enigmail extension if conditions are met. |
320 |
if use crypt ; then |
321 |
emake -C "${S}"/mailnews/extensions/enigmail || die "make enigmail failed" |
322 |
emake -j1 -C "${S}"/mailnews/extensions/enigmail xpi || die "make enigmail xpi failed" |
323 |
fi |
324 |
} |
325 |
|
326 |
src_install() { |
327 |
declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" |
328 |
declare emid |
329 |
|
330 |
emake DESTDIR="${D}" install || die "emake install failed" |
331 |
cp -f "${FILESDIR}"/icon/${PN}.desktop "${T}" || die |
332 |
|
333 |
if use crypt ; then |
334 |
cd "${T}" || die |
335 |
unzip "${S}"/mozilla/dist/bin/enigmail*.xpi install.rdf || die |
336 |
emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' install.rdf) |
337 |
|
338 |
dodir ${MOZILLA_FIVE_HOME}/extensions/${emid} || die |
339 |
cd "${D}"${MOZILLA_FIVE_HOME}/extensions/${emid} || die |
340 |
unzip "${S}"/mozilla/dist/bin/enigmail*.xpi || die |
341 |
fi |
342 |
|
343 |
sed 's|^\(MimeType=.*\)$|\1text/x-vcard;text/directory;application/mbox;message/rfc822;x-scheme-handler/mailto;|' \ |
344 |
-i "${T}"/${PN}.desktop || die |
345 |
sed 's|^\(Categories=.*\)$|\1Email;|' -i "${T}"/${PN}.desktop \ |
346 |
|| die |
347 |
|
348 |
if ${HAS_LANGS} ; then |
349 |
linguas |
350 |
for X in ${linguas}; do |
351 |
[[ ${X} != "en" ]] && xpi_install "${WORKDIR}"/"${P}-${X}" |
352 |
done |
353 |
fi |
354 |
|
355 |
# Add StartupNotify=true bug 290401 |
356 |
if use startup-notification ; then |
357 |
echo "StartupNotify=true" >> "${T}"/${PN}.desktop |
358 |
fi |
359 |
|
360 |
# Install icon and .desktop for menu entry |
361 |
newicon "${S}"/suite/branding/nightly/content/icon64.png ${PN}.png \ |
362 |
|| die |
363 |
domenu "${T}"/${PN}.desktop || die |
364 |
|
365 |
# Add our default prefs |
366 |
sed "s|SEAMONKEY_PVR|${PVR}|" "${FILESDIR}"/all-gentoo.js \ |
367 |
> "${D}"${MOZILLA_FIVE_HOME}/defaults/pref/all-gentoo.js \ |
368 |
|| die |
369 |
|
370 |
# Plugins dir |
371 |
rm -rf "${D}"${MOZILLA_FIVE_HOME}/plugins || die "failed to remove existing plugins dir" |
372 |
dosym ../nsbrowser/plugins "${MOZILLA_FIVE_HOME}"/plugins || die |
373 |
|
374 |
doman "${S}"/suite/app/${PN}.1 || die |
375 |
} |
376 |
|
377 |
pkg_preinst() { |
378 |
declare MOZILLA_FIVE_HOME="${ROOT}/usr/$(get_libdir)/${PN}" |
379 |
|
380 |
if [ -d ${MOZILLA_FIVE_HOME}/plugins ] ; then |
381 |
rm ${MOZILLA_FIVE_HOME}/plugins -rf |
382 |
fi |
383 |
} |
384 |
|
385 |
pkg_postinst() { |
386 |
declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" |
387 |
|
388 |
# Update mimedb for the new .desktop file |
389 |
fdo-mime_desktop_database_update |
390 |
|
391 |
if use chatzilla ; then |
392 |
elog "chatzilla is now an extension which can be en-/disabled and configured via" |
393 |
elog "the Add-on manager." |
394 |
fi |
395 |
} |