From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 43422138010 for ; Mon, 24 Sep 2012 20:33:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E7C1821C02D; Mon, 24 Sep 2012 20:33:02 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id A92EC21C02D for ; Mon, 24 Sep 2012 20:33:02 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E91E233D187 for ; Mon, 24 Sep 2012 20:33:01 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id A9241E5444 for ; Mon, 24 Sep 2012 20:33:00 +0000 (UTC) From: "Jory Pratt" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jory Pratt" Message-ID: <1348518734.ce31f01fa8ff485fb67125069b3b3269d84d4bd7.anarchy@gentoo> Subject: [gentoo-commits] proj/mozilla:master commit in: www-client/firefox/ X-VCS-Repository: proj/mozilla X-VCS-Files: www-client/firefox/Manifest www-client/firefox/firefox-16.0_beta4.ebuild X-VCS-Directories: www-client/firefox/ X-VCS-Committer: anarchy X-VCS-Committer-Name: Jory Pratt X-VCS-Revision: ce31f01fa8ff485fb67125069b3b3269d84d4bd7 X-VCS-Branch: master Date: Mon, 24 Sep 2012 20:33:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 3259f719-b8a9-4516-a1f8-d1c9ecd3298f X-Archives-Hash: 6c4a2d8cfbf97e6cb725eb66805f68e9 commit: ce31f01fa8ff485fb67125069b3b3269d84d4bd7 Author: Jory A. Pratt gentoo org> AuthorDate: Mon Sep 24 20:32:14 2012 +0000 Commit: Jory Pratt gentoo org> CommitDate: Mon Sep 24 20:32:14 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=ce31f01f firefox-16.0_beta4 update --- www-client/firefox/Manifest | 3 + www-client/firefox/firefox-16.0_beta4.ebuild | 373 ++++++++++++++++++++++++++ 2 files changed, 376 insertions(+), 0 deletions(-) diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest index 2940d0c..5468ca4 100644 --- a/www-client/firefox/Manifest +++ b/www-client/firefox/Manifest @@ -92,4 +92,7 @@ DIST firefox-15.0.1-zh-CN.xpi 290962 SHA256 3f46939dfa27182f7c13944f9d4f188abae9 DIST firefox-15.0.1-zh-TW.xpi 291947 SHA256 bee8adb2dd6a1634eb3ad3474af56b2aab76dabaca90078b66cb7de2c80a0c5b SHA512 1eb501f9ed4841b50014ef31180d6d9777d4c08ae62a3e7c51b483196c8b98aef1cb572ad82ee911557ae5034d48560abb77ff30a08c11711e4ec2813b582b43 WHIRLPOOL d69a53d64f8b3ef6a1dff5929cc278ccfa57cc0cb25fabe3c1e2c47679f078259ebd17d1bdca7f1d8a55d898fd3f0e3057d6a3a2bd6eb76d9e7b80a294b613a0 DIST firefox-15.0.1-zu.xpi 277290 SHA256 308ee298af63d3a8ceec734ba0d8df4098a9eec1cbaf7566adc30816d64ec170 SHA512 5daef16cb52bd031368ab87b662069b55c230a4143b2fcb937074236f31ee28ba1b859526146575ef4fef7fc78b3248f29b3dc1870523357aa07b568e20d164e WHIRLPOOL a0074d73e554971991ef401124ea18ee0ad903bab8ac701f5d3837b3cb0868ab1d85fda7634bc004794edea493aff6d73b04579b66beb05e0e256546fc6dffa7 DIST firefox-15.0.1.source.tar.bz2 83710112 SHA256 d5b245e3f16933edf49bc9754d38013f0f82c855f164f429b92697e14ae0c3bf SHA512 6e56906cd07ad45c5981d256838e3fc12e915f25dbf117ee2a4e1dd6dcdc939f5d05759bd8223272b17553948f7f26ae30e16993735025ee425ea2303811c61f WHIRLPOOL 43a5353123bc63a8c48d6ab3b2cac8487d0a295ffb429692a88d1ed22deac57cf3e2eb988e1578eeb99f16a056c80fcd2426fad2aeb83d74c81fa948b7d77212 +DIST firefox-16.0-patches-0.3.tar.xz 7220 SHA256 223d41d7aff806d326bcffc2c2a692113e35c1a143a62b9b90849384ff93ac7e SHA512 3b369f97253fe6b2fe848d5e2d6581ca463a19991f21c7d568d25e6c415f8f4867beefbd03d0d4f8a46346d6497a0d9979de66d5b63e505613295b4eaafd4f29 WHIRLPOOL f6c3e90e1d6187790204bed199a3afb2b23d7a8a957ab107765d8435056866a1d1f0d9206f868f8c4ed599655a1fc34fd7d125dad847dc713e1bdd1edd6af0be +DIST firefox-16.0b4.source.tar.bz2 89186049 SHA256 2ac8065bb32a3cfe5de791042caf6141f833a980f559f72e4813c17e23697ee8 SHA512 6403573cdf5c6e535cdc4907ba2f886578b240c07fe7d41d3bcbbbd383a298faae7b1361ab02b3ab89361303413bf92a8b9c16a5a76b721aa325c31ca3eddee3 WHIRLPOOL 17bdb92c0dbd92a0efeaf18a52ce2cd007bad1136e2c43b596e76a532c8564d607197680c095f062a39c0fa5277fc9c8fa9bbfd2e88311f7467f2b4ffec78aef EBUILD firefox-15.0.1.ebuild 11583 SHA256 1f3ada16f1e01665a2d9889e35d9820facf7fdd3052ebc27d2e679539a4ac5ff SHA512 8854796f3561ed5bbc0cfeb0936a8fe488e4ad63035152f5cb948d850b2f0965bbaa09ebc31b148185cb8717053fd25487dca53220e092a3f64125b5d4f7216c WHIRLPOOL 938e8df9d4ebc98ac90b57abc679254465d203ec42686355a4a45a9b04dfb6cb515201ab08381ed56c18bd3c838bad9cdcd602cdb21ca67849ff7be5c060ba1c +EBUILD firefox-16.0_beta4.ebuild 11540 SHA256 1491e7ea7be07b30f4b570cd9f1b5630f29a5d10251eef87e28ebcc6bf1cd8f7 SHA512 0508db25999ce5a56c240472da52d782faee2c499bc4dd9a564eb963d4c438b4e11e00deb0538159860a4bb5fa54aab9bce934e9298d346b9daf92d5aa22a805 WHIRLPOOL 8a5510181d7ead54ae55342eff756e4159916526705dedf1131bf792181126d3c76fae16c303b9c368ea2e0bcd947db1e2cc4831a53c2e5e0430e7577f499c42 diff --git a/www-client/firefox/firefox-16.0_beta4.ebuild b/www-client/firefox/firefox-16.0_beta4.ebuild new file mode 100644 index 0000000..226cba4 --- /dev/null +++ b/www-client/firefox/firefox-16.0_beta4.ebuild @@ -0,0 +1,373 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="3" +VIRTUALX_REQUIRED="pgo" +WANT_AUTOCONF="2.1" +MOZ_ESR="" + +# This list can be updated with scripts/get_langs.sh from the mozilla overlay +MOZ_LANGS=(af ak ar as ast be bg bn-BD bn-IN br bs ca cs csb cy da de +el en en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa ff fi fr +fy-NL ga-IE gd gl gu-IN he hi-IN hr hu hy-AM id is it ja kk km kn ko ku +lg lij lt lv mai mk ml mr nb-NO nl nn-NO nso or pa-IN pl pt-BR pt-PT rm ro +ru si sk sl son sq sr sv-SE ta ta-LK te th tr uk vi zh-CN zh-TW zu ) + +# Convert the ebuild version to the upstream mozilla version, used by mozlinguas +MOZ_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI +MOZ_PV="${MOZ_PV/_beta/b}" # Handle beta for SRC_URI +MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI + +if [[ ${MOZ_ESR} == 1 ]]; then + # ESR releases have slightly version numbers + MOZ_PV="${MOZ_PV}esr" +fi + +# Patch version +PATCH="${PN}-16.0-patches-0.3" +# Upstream ftp release URI that's used by mozlinguas.eclass +# We don't use the http mirror because it deletes old tarballs. +MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/${PN}/releases/" + +inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-3 multilib pax-utils fdo-mime autotools python virtualx nsplugins mozlinguas + +DESCRIPTION="Firefox Web Browser" +HOMEPAGE="http://www.mozilla.com/firefox" + +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +SLOT="0" +LICENSE="MPL-2.0 GPL-2 LGPL-2.1" +IUSE="bindist gstreamer +ipc +jit +minimal pgo selinux system-sqlite +webm" + +# More URIs appended below... +SRC_URI="${SRC_URI} + http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.xz + http://dev.gentoo.org/~nirbheek/mozilla/patchsets/${PATCH}.tar.xz" + +ASM_DEPEND=">=dev-lang/yasm-1.1" + +# Mesa 7.10 needed for WebGL + bugfixes +RDEPEND=" + >=sys-devel/binutils-2.16.1 + >=dev-libs/nss-3.13.6 + >=dev-libs/nspr-4.9.2 + >=dev-libs/glib-2.26:2 + >=media-libs/mesa-7.10 + >=media-libs/libpng-1.5.9[apng] + virtual/libffi + gstreamer? ( + >=media-libs/gstreamer-0.10.33:0.10 + >=media-libs/gst-plugins-base-0.10.33:0.10 ) + system-sqlite? ( >=dev-db/sqlite-3.7.12.1[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) + webm? ( >=media-libs/libvpx-1.0.0 + media-libs/alsa-lib ) + selinux? ( sec-policy/selinux-mozilla )" +# We don't use PYTHON_DEPEND/PYTHON_USE_WITH for some silly reason +DEPEND="${RDEPEND} + virtual/pkgconfig + pgo? ( + =dev-lang/python-2*[sqlite] + >=sys-devel/gcc-4.5 ) + webm? ( x86? ( ${ASM_DEPEND} ) + amd64? ( ${ASM_DEPEND} ) + virtual/opengl )" + +# No source releases for alpha|beta +if [[ ${PV} =~ alpha ]]; then + CHANGESET="8a3042764de7" + SRC_URI="${SRC_URI} + http://dev.gentoo.org/~nirbheek/mozilla/firefox/firefox-${MOZ_PV}_${CHANGESET}.source.tar.bz2" + S="${WORKDIR}/mozilla-aurora-${CHANGESET}" +elif [[ ${PV} =~ beta ]]; then + S="${WORKDIR}/mozilla-beta" + SRC_URI="${SRC_URI} + ${MOZ_FTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.bz2" +else + SRC_URI="${SRC_URI} + ${MOZ_FTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.bz2" + if [[ ${MOZ_ESR} == 1 ]]; then + S="${WORKDIR}/mozilla-esr${PV%%.*}" + else + S="${WORKDIR}/mozilla-release" + fi +fi + +QA_PRESTRIPPED="usr/$(get_libdir)/${PN}/firefox" + +pkg_setup() { + moz_pkgsetup + + # Avoid PGO profiling problems due to enviroment leakage + # These should *always* be cleaned up anyway + unset DBUS_SESSION_BUS_ADDRESS \ + DISPLAY \ + ORBIT_SOCKETDIR \ + SESSION_MANAGER \ + XDG_SESSION_COOKIE \ + XAUTHORITY + + if ! use bindist; then + einfo + elog "You are enabling official branding. You may not redistribute this build" + elog "to any users on your network or the internet. Doing so puts yourself into" + elog "a legal problem with Mozilla Foundation" + elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag" + fi + + if use pgo; then + einfo + ewarn "You will do a double build for profile guided optimization." + ewarn "This will result in your build taking at least twice as long as before." + fi + + # Ensure we have enough disk space to compile + if use pgo || use debug || use test ; then + CHECKREQS_DISK_BUILD="8G" + else + CHECKREQS_DISK_BUILD="4G" + fi + check-reqs_pkg_setup +} + +src_unpack() { + unpack ${A} + + # Unpack language packs + mozlinguas_src_unpack +} + +src_prepare() { + # Apply our patches + EPATCH_SUFFIX="patch" \ + EPATCH_FORCE="yes" \ + epatch "${WORKDIR}/firefox" + + # Allow user to apply any additional patches without modifing ebuild + epatch_user + + # Enable gnomebreakpad + if use debug ; then + sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \ + "${S}"/build/unix/run-mozilla.sh || die "sed failed!" + fi + + # Disable gnomevfs extension + sed -i -e "s:gnomevfs::" "${S}/"browser/confvars.sh \ + -e "s:gnomevfs::" "${S}/"xulrunner/confvars.sh \ + || die "Failed to remove gnomevfs extension" + + # Ensure that are plugins dir is enabled as default + sed -i -e "s:/usr/lib/mozilla/plugins:/usr/$(get_libdir)/nsbrowser/plugins:" \ + "${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path!" + + # Fix sandbox violations during make clean, bug 372817 + sed -e "s:\(/no-such-file\):${T}\1:g" \ + -i "${S}"/config/rules.mk \ + -i "${S}"/js/src/config/rules.mk \ + -i "${S}"/nsprpub/configure{.in,} \ + || die + + #Fix compilation with curl-7.21.7 bug 376027 + sed -e '/#include /d' \ + -i "${S}"/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc \ + -i "${S}"/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc \ + -i "${S}"/config/system-headers \ + -i "${S}"/js/src/config/system-headers || die "Sed failed" + + # Don't exit with error when some libs are missing which we have in + # system. + sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \ + -i "${S}"/browser/installer/Makefile.in || die + + # Don't error out when there's no files to be removed: + sed 's@\(xargs rm\)$@\1 -f@' \ + -i "${S}"/toolkit/mozapps/installer/packager.mk || die + + eautoreconf +} + +src_configure() { + MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" + MEXTENSIONS="default" + + #################################### + # + # mozconfig, CFLAGS and CXXFLAGS setup + # + #################################### + + mozconfig_init + mozconfig_config + + # It doesn't compile on alpha without this LDFLAGS + use alpha && append-ldflags "-Wl,--no-relax" + + mozconfig_annotate '' --prefix="${EPREFIX}"/usr + mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir) + mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}" + mozconfig_annotate '' --disable-gconf + mozconfig_annotate '' --disable-mailnews + mozconfig_annotate '' --enable-canvas + mozconfig_annotate '' --enable-safe-browsing + mozconfig_annotate '' --with-system-png + mozconfig_annotate '' --enable-system-ffi + + # Other ff-specific settings + mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME} + mozconfig_annotate '' --target="${CTARGET:-${CHOST}}" + + mozconfig_use_enable gstreamer + mozconfig_use_enable system-sqlite + # Both methodjit and tracejit conflict with PaX + mozconfig_use_enable jit methodjit + mozconfig_use_enable jit tracejit + + # Allow for a proper pgo build + if use pgo; then + echo "mk_add_options PROFILE_GEN_SCRIPT='\$(PYTHON) \$(OBJDIR)/_profile/pgo/profileserver.py'" >> "${S}"/.mozconfig + fi + + # Finalize and report settings + mozconfig_final + + if [[ $(gcc-major-version) -lt 4 ]]; then + append-cxxflags -fno-stack-protector + elif [[ $(gcc-major-version) -gt 4 || $(gcc-minor-version) -gt 3 ]]; then + if use amd64 || use x86; then + append-flags -mno-avx + fi + fi +} + +src_compile() { + if use pgo; then + addpredict /root + addpredict /etc/gconf + # Reset and cleanup environment variables used by GNOME/XDG + gnome2_environment_reset + + # Firefox tries to use dri stuff when it's run, see bug 380283 + shopt -s nullglob + cards=$(echo -n /dev/dri/card* | sed 's/ /:/g') + if test -n "${cards}"; then + # FOSS drivers are fine + addpredict "${cards}" + else + cards=$(echo -n /dev/ati/card* /dev/nvidiactl* | sed 's/ /:/g') + if test -n "${cards}"; then + # Binary drivers seem to cause access violations anyway, so + # let's use indirect rendering so that the device files aren't + # touched at all. See bug 394715. + export LIBGL_ALWAYS_INDIRECT=1 + fi + fi + shopt -u nullglob + + CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \ + MOZ_MAKE_FLAGS="${MAKEOPTS}" \ + Xemake -f client.mk profiledbuild || die "Xemake failed" + else + CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \ + MOZ_MAKE_FLAGS="${MAKEOPTS}" \ + emake -f client.mk || die "emake failed" + fi + +} + +src_install() { + MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" + + # MOZ_BUILD_ROOT, and hence OBJ_DIR change depending on arch, compiler, pgo, etc. + local obj_dir="$(echo */config.log)" + obj_dir="${obj_dir%/*}" + cd "${S}/${obj_dir}" + + # Without methodjit and tracejit there's no conflict with PaX + if use jit; then + # Pax mark xpcshell for hardened support, only used for startupcache creation. + pax-mark m "${S}/${obj_dir}"/dist/bin/xpcshell + fi + + # Add our default prefs for firefox + cp "${FILESDIR}"/gentoo-default-prefs.js-1 \ + "${S}/${obj_dir}/dist/bin/defaults/preferences/all-gentoo.js" || die + + MOZ_MAKE_FLAGS="${MAKEOPTS}" \ + emake DESTDIR="${D}" install || die "emake install failed" + + # Install language packs + mozlinguas_src_install + + local size sizes icon_path icon name + if use bindist; then + sizes="16 32 48" + icon_path="${S}/browser/branding/aurora" + # Firefox's new rapid release cycle means no more codenames + # Let's just stick with this one... + icon="aurora" + name="Aurora" + else + sizes="16 22 24 32 256" + icon_path="${S}/browser/branding/official" + icon="${PN}" + name="Mozilla Firefox" + fi + + # Install icons and .desktop for menu entry + for size in ${sizes}; do + insinto "/usr/share/icons/hicolor/${size}x${size}/apps" + newins "${icon_path}/default${size}.png" "${icon}.png" || die + done + # The 128x128 icon has a different name + insinto "/usr/share/icons/hicolor/128x128/apps" + newins "${icon_path}/mozicon128.png" "${icon}.png" || die + # Install a 48x48 icon into /usr/share/pixmaps for legacy DEs + newicon "${icon_path}/content/icon48.png" "${icon}.png" || die + newmenu "${FILESDIR}/icon/${PN}.desktop" "${PN}.desktop" || die + sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${icon}:" \ + "${ED}/usr/share/applications/${PN}.desktop" || die + + # Add StartupNotify=true bug 237317 + if use startup-notification ; then + echo "StartupNotify=true" >> "${ED}/usr/share/applications/${PN}.desktop" + fi + + # Without methodjit and tracejit there's no conflict with PaX + if use jit; then + # Required in order to use plugins and even run firefox on hardened. + pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{firefox,firefox-bin} + fi + + # Plugin-container needs to be pax-marked for hardened to ensure plugins such as flash + # continue to work as expected. + pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/plugin-container + + # Plugins dir + share_plugins_dir + + if use minimal; then + rm -rf "${ED}"/usr/include "${ED}${MOZILLA_FIVE_HOME}"/{idl,include,lib,sdk} || \ + die "Failed to remove sdk and headers" + fi + + # very ugly hack to make firefox not sigbus on sparc + # FIXME: is this still needed?? + use sparc && { sed -e 's/Firefox/FirefoxGentoo/g' \ + -i "${ED}/${MOZILLA_FIVE_HOME}/application.ini" || \ + die "sparc sed failed"; } +} + +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postinst() { + # Update mimedb for the new .desktop file + fdo-mime_desktop_database_update + gnome2_icon_cache_update +} + +pkg_postrm() { + gnome2_icon_cache_update +}