Gentoo Archives: gentoo-commits

From: "Ian Stakenvicius (axs)" <axs@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in www-client/seamonkey: seamonkey-2.26.ebuild seamonkey-2.26.1.ebuild ChangeLog
Date: Wed, 25 Jun 2014 14:09:06
Message-Id: 20140625140851.635512004E@flycatcher.gentoo.org
1 axs 14/06/25 14:08:51
2
3 Modified: seamonkey-2.26.ebuild ChangeLog
4 Added: seamonkey-2.26.1.ebuild
5 Log:
6 version bump, security bug 512896; excluded the libexecinfo dependency on uclibc profiles per blueness' advice
7
8 (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 2B6559ED)
9
10 Revision Changes Path
11 1.4 www-client/seamonkey/seamonkey-2.26.ebuild
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/seamonkey/seamonkey-2.26.ebuild?rev=1.4&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/seamonkey/seamonkey-2.26.ebuild?rev=1.4&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/seamonkey/seamonkey-2.26.ebuild?r1=1.3&r2=1.4
16
17 Index: seamonkey-2.26.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.26.ebuild,v
20 retrieving revision 1.3
21 retrieving revision 1.4
22 diff -u -r1.3 -r1.4
23 --- seamonkey-2.26.ebuild 7 May 2014 15:25:03 -0000 1.3
24 +++ seamonkey-2.26.ebuild 25 Jun 2014 14:08:51 -0000 1.4
25 @@ -1,6 +1,6 @@
26 # Copyright 1999-2014 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.26.ebuild,v 1.3 2014/05/07 15:25:03 ago Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.26.ebuild,v 1.4 2014/06/25 14:08:51 axs Exp $
30
31 EAPI=5
32 WANT_AUTOCONF="2.1"
33 @@ -79,7 +79,7 @@
34 selinux? ( sec-policy/selinux-mozilla )"
35
36 DEPEND="${RDEPEND}
37 - !elibc_glibc? ( dev-libs/libexecinfo )
38 + !elibc_glibc? ( !elibc_uclibc? ( dev-libs/libexecinfo ) )
39 >=sys-devel/binutils-2.16.1
40 virtual/pkgconfig
41 amd64? ( ${ASM_DEPEND}
42
43
44
45 1.490 www-client/seamonkey/ChangeLog
46
47 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/seamonkey/ChangeLog?rev=1.490&view=markup
48 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/seamonkey/ChangeLog?rev=1.490&content-type=text/plain
49 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/seamonkey/ChangeLog?r1=1.489&r2=1.490
50
51 Index: ChangeLog
52 ===================================================================
53 RCS file: /var/cvsroot/gentoo-x86/www-client/seamonkey/ChangeLog,v
54 retrieving revision 1.489
55 retrieving revision 1.490
56 diff -u -r1.489 -r1.490
57 --- ChangeLog 7 May 2014 15:25:03 -0000 1.489
58 +++ ChangeLog 25 Jun 2014 14:08:51 -0000 1.490
59 @@ -1,6 +1,13 @@
60 # ChangeLog for www-client/seamonkey
61 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
62 -# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/ChangeLog,v 1.489 2014/05/07 15:25:03 ago Exp $
63 +# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/ChangeLog,v 1.490 2014/06/25 14:08:51 axs Exp $
64 +
65 +*seamonkey-2.26.1 (25 Jun 2014)
66 +
67 + 25 Jun 2014; Ian Stakenvicius (_AxS_) <axs@g.o>
68 + +seamonkey-2.26.1.ebuild, seamonkey-2.26.ebuild:
69 + version bump, security bug 512896; excluded the libexecinfo dependency on
70 + uclibc profiles per blueness' advice
71
72 07 May 2014; Agostino Sarubbo <ago@g.o> seamonkey-2.26.ebuild:
73 Stable for x86, wrt bug #509050
74
75
76
77 1.1 www-client/seamonkey/seamonkey-2.26.1.ebuild
78
79 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/seamonkey/seamonkey-2.26.1.ebuild?rev=1.1&view=markup
80 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/seamonkey/seamonkey-2.26.1.ebuild?rev=1.1&content-type=text/plain
81
82 Index: seamonkey-2.26.1.ebuild
83 ===================================================================
84 # Copyright 1999-2014 Gentoo Foundation
85 # Distributed under the terms of the GNU General Public License v2
86 # $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.26.1.ebuild,v 1.1 2014/06/25 14:08:51 axs Exp $
87
88 EAPI=5
89 WANT_AUTOCONF="2.1"
90
91 # This list can be updated with scripts/get_langs.sh from the mozilla overlay
92 MOZ_LANGS=(be ca cs de en en-GB en-US es-AR es-ES fi fr gl hu it ja lt nb-NO nl
93 pl pt-PT ru sk sv-SE tr uk zh-CN zh-TW)
94
95 MOZ_PV="${PV/_pre*}"
96 MOZ_PV="${MOZ_PV/_alpha/a}"
97 MOZ_PV="${MOZ_PV/_beta/b}"
98 MOZ_PV="${MOZ_PV/_rc/rc}"
99 MOZ_P="${P}"
100 MY_MOZ_P="${PN}-${MOZ_PV}"
101
102 if [[ ${PV} == *_pre* ]] ; then
103 MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/${PN}/candidates/${MOZ_PV}-candidates/build${PV##*_pre}"
104 MOZ_LANGPACK_PREFIX="linux-i686/xpi/"
105 # And the langpack stuff stays at eclass defaults
106 else
107 MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/${PN}/releases/${MOZ_PV}"
108 MOZ_LANGPACK_PREFIX="langpack/${MY_MOZ_P}."
109 MOZ_LANGPACK_SUFFIX=".langpack.xpi"
110 fi
111
112 inherit check-reqs flag-o-matic toolchain-funcs eutils mozconfig-3 multilib pax-utils fdo-mime autotools mozextension nsplugins mozlinguas
113
114 PATCHFF="firefox-29.0-patches-0.1"
115 PATCH="${PN}-2.23-patches-01"
116 EMVER="1.6.1_pre20140112"
117
118 DESCRIPTION="Seamonkey Web Browser"
119 HOMEPAGE="http://www.seamonkey-project.org"
120
121 if [[ ${PV} == *_pre* ]] ; then
122 # pre-releases. No need for arch teams to change KEYWORDS here.
123
124 KEYWORDS=""
125 else
126 # This is where arch teams should change the KEYWORDS.
127
128 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
129 fi
130
131 SLOT="0"
132 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
133 IUSE="+chatzilla +crypt gstreamer +ipc +jit minimal pulseaudio +roaming selinux system-cairo system-icu system-jpeg system-sqlite test"
134
135 SRC_URI="${SRC_URI}
136 ${MOZ_FTP_URI}/source/${MY_MOZ_P}.source.tar.bz2 -> ${P}.source.tar.bz2
137 http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCHFF}.tar.xz
138 http://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz
139 crypt? ( http://dev.gentoo.org/~polynomial-c/mozilla/enigmail-${EMVER}.tar.xz )"
140 #crypt? ( http://www.enigmail.net/download/source/enigmail-${EMVER}.tar.gz )
141
142 ASM_DEPEND=">=dev-lang/yasm-1.1"
143
144 # Mesa 7.10 needed for WebGL + bugfixes
145 RDEPEND=">=dev-libs/nss-3.16
146 >=dev-libs/nspr-4.10.4
147 >=dev-libs/glib-2.26:2
148 >=media-libs/mesa-7.10
149 >=media-libs/libpng-1.6.7[apng]
150 >=x11-libs/pango-1.14.0
151 >=x11-libs/gtk+-2.14:2
152 virtual/libffi
153 gstreamer? ( media-plugins/gst-plugins-meta:0.10[ffmpeg] )
154 system-cairo? ( >=x11-libs/cairo-1.12[X] x11-libs/pixman )
155 system-icu? ( >=dev-libs/icu-51.1 )
156 system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
157 system-sqlite? ( >=dev-db/sqlite-3.8.1:3[secure-delete,debug=] )
158 >=media-libs/libvpx-1.3.0
159 crypt? ( >=app-crypt/gnupg-1.4 )
160 kernel_linux? ( media-libs/alsa-lib )
161 pulseaudio? ( media-sound/pulseaudio )
162 selinux? ( sec-policy/selinux-mozilla )"
163
164 DEPEND="${RDEPEND}
165 !elibc_glibc? ( !elibc_uclibc? ( dev-libs/libexecinfo ) )
166 >=sys-devel/binutils-2.16.1
167 virtual/pkgconfig
168 amd64? ( ${ASM_DEPEND}
169 virtual/opengl )
170 x86? ( ${ASM_DEPEND}
171 virtual/opengl )"
172
173 if [[ ${PV} == *beta* ]] ; then
174 S="${WORKDIR}/comm-beta"
175 else
176 S="${WORKDIR}/comm-release"
177 fi
178
179 BUILD_OBJ_DIR="${WORKDIR}/seamonk"
180
181 pkg_setup() {
182 if [[ ${PV} == *_pre* ]] ; then
183 ewarn "You're using an unofficial release of ${PN}. Don't file any bug in"
184 ewarn "Gentoo's Bugtracker against this package in case it breaks for you."
185 ewarn "Those belong to upstream: https://bugzilla.mozilla.org"
186 fi
187
188 moz_pkgsetup
189 }
190
191 pkg_pretend() {
192 # Ensure we have enough disk space to compile
193 if use debug || use test ; then
194 CHECKREQS_DISK_BUILD="8G"
195 else
196 CHECKREQS_DISK_BUILD="4G"
197 fi
198 check-reqs_pkg_setup
199 }
200
201 src_unpack() {
202 unpack ${A}
203
204 # Unpack language packs
205 mozlinguas_src_unpack
206 }
207
208 src_prepare() {
209 # Apply our patches
210 EPATCH_SUFFIX="patch" \
211 EPATCH_FORCE="yes" \
212 epatch "${WORKDIR}/seamonkey"
213
214 epatch "${FILESDIR}/pixman-supplement.patch"
215
216 # browser patches go here
217 pushd "${S}"/mozilla &>/dev/null || die
218 EPATCH_EXCLUDE="2000-firefox_gentoo_install_dirs.patch" \
219 EPATCH_SUFFIX="patch" \
220 EPATCH_FORCE="yes" \
221 epatch "${WORKDIR}/firefox"
222 popd &>/dev/null || die
223 # drop -Wl,--build-id from LDFLAGS, bug #465466
224
225 # Shell scripts sometimes contain DOS line endings; bug 391889
226 grep -rlZ --include="*.sh" $'\r$' . |
227 while read -r -d $'\0' file ; do
228 einfo edos2unix "${file}"
229 edos2unix "${file}"
230 done
231
232 if use crypt ; then
233 mv "${WORKDIR}"/enigmail "${S}"/mailnews/extensions/enigmail
234 #pushd "${S}"/mailnews/extensions/enigmail &>/dev/null || die
235
236 #popd &>/dev/null || die
237 fi
238
239 # Allow user to apply any additional patches without modifing ebuild
240 epatch_user
241
242 local ms="${S}/mozilla"
243
244 # Enable gnomebreakpad
245 if use debug ; then
246 sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
247 "${ms}"/build/unix/run-mozilla.sh || die "sed failed!"
248 fi
249
250 # Ensure that are plugins dir is enabled as default
251 sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
252 "${ms}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!"
253 sed -i -e "s:/usr/lib64/mozilla/plugins:/usr/lib64/nsbrowser/plugins:" \
254 "${ms}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!"
255
256 # Don't exit with error when some libs are missing which we have in
257 # system.
258 sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
259 -i "${S}"/suite/installer/Makefile.in || die
260 # Don't error out when there's no files to be removed:
261 sed 's@\(xargs rm\)$@\1 -f@' \
262 -i "${ms}"/toolkit/mozapps/installer/packager.mk || die
263
264 eautoreconf
265 cd "${S}"/mozilla || die
266 eautoconf
267 cd js/src || die
268 eautoconf
269 }
270
271 src_configure() {
272 MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
273 MEXTENSIONS="default"
274
275 ####################################
276 #
277 # mozconfig, CFLAGS and CXXFLAGS setup
278 #
279 ####################################
280
281 mozconfig_init
282 mozconfig_config
283
284 # It doesn't compile on alpha without this LDFLAGS
285 use alpha && append-ldflags "-Wl,--no-relax"
286
287 if use chatzilla ; then
288 MEXTENSIONS+=",irc"
289 else
290 MEXTENSIONS+=",-irc"
291 fi
292 if ! use roaming ; then
293 MEXTENSIONS+=",-sroaming"
294 fi
295
296 # We must force enable jemalloc 3 threw .mozconfig
297 echo "export MOZ_JEMALLOC=1" >> ${S}/.mozconfig
298
299 mozconfig_annotate '' --enable-jemalloc
300 mozconfig_annotate '' --enable-replace-malloc
301 mozconfig_annotate '' --prefix="${EPREFIX}"/usr
302 mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
303 mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
304 mozconfig_annotate '' --disable-gconf
305 mozconfig_annotate '' --enable-jsd
306 mozconfig_annotate '' --enable-canvas
307 mozconfig_annotate '' --with-system-png
308 mozconfig_annotate '' --enable-system-ffi
309 mozconfig_annotate '' --disable-gold
310
311 # Other sm-specific settings
312 mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
313
314 mozconfig_annotate '' --target="${CTARGET:-${CHOST}}"
315 mozconfig_annotate '' --build="${CTARGET:-${CHOST}}"
316 mozconfig_annotate '' --enable-safe-browsing
317
318 mozconfig_use_enable gstreamer
319 mozconfig_use_enable pulseaudio
320 mozconfig_use_enable system-cairo
321 mozconfig_use_enable system-sqlite
322 mozconfig_use_with system-jpeg
323 mozconfig_use_with system-icu
324 mozconfig_use_enable system-icu intl-api
325 # Feature is know to cause problems on hardened
326 mozconfig_use_enable jit ion
327
328 # Use an objdir to keep things organized.
329 echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" \
330 >> "${S}"/.mozconfig
331
332 # Finalize and report settings
333 mozconfig_final
334
335 if use crypt ; then
336 pushd "${S}"/mailnews/extensions/enigmail &>/dev/null || die
337 # econf fails here and would produce useless Makefiles anyway
338 ./configure || die
339 popd &>/dev/null || die
340 fi
341
342 # Work around breakage in makeopts with --no-print-directory
343 MAKEOPTS="${MAKEOPTS/--no-print-directory/}"
344
345 if [[ $(gcc-major-version) -lt 4 ]] ; then
346 append-cxxflags -fno-stack-protector
347 elif [[ $(gcc-major-version) -gt 4 || $(gcc-minor-version) -gt 3 ]] ; then
348 if use amd64 || use x86 ; then
349 append-flags -mno-avx
350 fi
351 fi
352 }
353
354 src_compile() {
355 mkdir -p ${BUILD_OBJ_DIR} && cd ${BUILD_OBJ_DIR} || die
356
357 CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
358 MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \
359 emake -f "${S}/client.mk"
360
361 # Only build enigmail extension if conditions are met.
362 if use crypt ; then
363 cd "${S}"/mailnews/extensions/enigmail || die
364 emake
365 emake xpi
366 fi
367 }
368
369 src_install() {
370 MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
371 DICTPATH="\"${EPREFIX}/usr/share/myspell\""
372
373 local emid
374 cd "${BUILD_OBJ_DIR}" || die
375
376 # Pax mark xpcshell for hardened support, only used for startupcache creation.
377 pax-mark m "${BUILD_OBJ_DIR}/mozilla/dist/bin/xpcshell"
378
379 # Copy our preference before omnijar is created.
380 sed "s|SEAMONKEY_PVR|${PVR}|" "${FILESDIR}"/all-gentoo-1.js > \
381 "${BUILD_OBJ_DIR}/mozilla/dist/bin/defaults/pref/all-gentoo.js" \
382 || die
383
384 # Set default path to search for dictionaries.
385 echo "pref(\"spellchecker.dictionary_path\", ${DICTPATH});" \
386 >> "${BUILD_OBJ_DIR}/mozilla/dist/bin/defaults/pref/all-gentoo.js" \
387 || die
388
389 if ! use libnotify ; then
390 echo 'pref("browser.download.manager.showAlertOnComplete", false);' \
391 >> "${BUILD_OBJ_DIR}/mozilla/dist/bin/defaults/pref/all-gentoo.js" \
392 || die
393 fi
394
395 echo 'pref("extensions.autoDisableScopes", 3);' >> \
396 "${BUILD_OBJ_DIR}/mozilla/dist/bin/defaults/pref/all-gentoo.js" \
397 || die
398
399 MOZ_MAKE_FLAGS="${MAKEOPTS}" \
400 emake DESTDIR="${D}" install
401 cp "${FILESDIR}"/icon/${PN}.desktop "${T}" || die
402
403 if use crypt ; then
404 local em_dir="${S}/mailnews/extensions/enigmail/build"
405 pushd "${T}" &>/dev/null || die
406 unzip "${em_dir}"/enigmail*.xpi install.rdf || die
407 emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' install.rdf)
408
409 dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
410 cd "${D}"${MOZILLA_FIVE_HOME}/extensions/${emid} || die
411 unzip "${em_dir}"/enigmail*.xpi || die
412
413 popd &>/dev/null || die
414 fi
415
416 sed 's|^\(MimeType=.*\)$|\1text/x-vcard;text/directory;application/mbox;message/rfc822;x-scheme-handler/mailto;|' \
417 -i "${T}"/${PN}.desktop || die
418 sed 's|^\(Categories=.*\)$|\1Email;|' -i "${T}"/${PN}.desktop \
419 || die
420
421 # Install language packs
422 mozlinguas_src_install
423
424 # Add StartupNotify=true bug 290401
425 if use startup-notification ; then
426 echo "StartupNotify=true" >> "${T}"/${PN}.desktop || die
427 fi
428
429 # Install icon and .desktop for menu entry
430 newicon "${S}"/suite/branding/nightly/content/icon64.png ${PN}.png
431 domenu "${T}"/${PN}.desktop
432
433 # Required in order to use plugins and even run seamonkey on hardened.
434 pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{seamonkey,seamonkey-bin,plugin-container}
435
436 if use minimal ; then
437 rm -rf "${ED}"/usr/include "${ED}${MOZILLA_FIVE_HOME}"/{idl,include,lib,sdk}
438 fi
439
440 # Handle plugins dir through nsplugins.eclass
441 share_plugins_dir
442
443 doman "${BUILD_OBJ_DIR}/suite/app/${PN}.1"
444 }
445
446 pkg_preinst() {
447 MOZILLA_FIVE_HOME="${ROOT}/usr/$(get_libdir)/${PN}"
448
449 if [ -d ${MOZILLA_FIVE_HOME}/plugins ] ; then
450 rm ${MOZILLA_FIVE_HOME}/plugins -rf
451 fi
452 }
453
454 pkg_postinst() {
455 MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
456
457 # Update mimedb for the new .desktop file
458 fdo-mime_desktop_database_update
459
460 if use chatzilla ; then
461 elog "chatzilla is now an extension which can be en-/disabled and configured via"
462 elog "the Add-on manager."
463 fi
464 }