diff options
author | Lars Wendler <polynomial-c@gentoo.org> | 2014-10-21 18:29:15 +0000 |
---|---|---|
committer | Lars Wendler <polynomial-c@gentoo.org> | 2014-10-21 18:29:15 +0000 |
commit | 4d57fc4ac9b926545098ed33d5b562340c501987 (patch) | |
tree | dfc856eaabd7e6b9c28b052468d1b4dc0cf37b17 /www-client/seamonkey | |
parent | version bump; fix dependency wrt 519316 (diff) | |
download | gentoo-2-4d57fc4ac9b926545098ed33d5b562340c501987.tar.gz gentoo-2-4d57fc4ac9b926545098ed33d5b562340c501987.tar.bz2 gentoo-2-4d57fc4ac9b926545098ed33d5b562340c501987.zip |
Version bump
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)
Diffstat (limited to 'www-client/seamonkey')
-rw-r--r-- | www-client/seamonkey/ChangeLog | 9 | ||||
-rw-r--r-- | www-client/seamonkey/files/seamonkey-2.30-jemalloc-configure.patch | 29 | ||||
-rw-r--r-- | www-client/seamonkey/files/seamonkey-2.30-pulseaudio_configure_switch_fix.patch | 20 | ||||
-rw-r--r-- | www-client/seamonkey/metadata.xml | 2 | ||||
-rw-r--r-- | www-client/seamonkey/seamonkey-2.30.ebuild | 368 |
5 files changed, 427 insertions, 1 deletions
diff --git a/www-client/seamonkey/ChangeLog b/www-client/seamonkey/ChangeLog index c28c1787eaa0..c1ce643921ba 100644 --- a/www-client/seamonkey/ChangeLog +++ b/www-client/seamonkey/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for www-client/seamonkey # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/ChangeLog,v 1.497 2014/10/05 18:08:51 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/ChangeLog,v 1.498 2014/10/21 18:29:15 polynomial-c Exp $ + +*seamonkey-2.30 (21 Oct 2014) + + 21 Oct 2014; Lars Wendler <polynomial-c@gentoo.org> +seamonkey-2.30.ebuild, + +files/seamonkey-2.30-jemalloc-configure.patch, + +files/seamonkey-2.30-pulseaudio_configure_switch_fix.patch: + Version bump. 05 Oct 2014; Lars Wendler <polynomial-c@gentoo.org> seamonkey-2.29.1.ebuild: Removed QA warming (useless blank line). diff --git a/www-client/seamonkey/files/seamonkey-2.30-jemalloc-configure.patch b/www-client/seamonkey/files/seamonkey-2.30-jemalloc-configure.patch new file mode 100644 index 000000000000..437d1adc220b --- /dev/null +++ b/www-client/seamonkey/files/seamonkey-2.30-jemalloc-configure.patch @@ -0,0 +1,29 @@ +--- a/mozilla/memory/jemalloc/src/configure.ac 2014-10-11 05:06:41.000000000 -0400 ++++ b/mozilla/memory/jemalloc/src/configure.ac 2014-10-16 13:41:10.809799170 -0400 +@@ -887,7 +887,7 @@ + dnl Check whether the BSD/SUSv1 sbrk() exists. If not, disable DSS support. + AC_CHECK_FUNC([sbrk], [have_sbrk="1"], [have_sbrk="0"]) + if test "x$have_sbrk" = "x1" ; then +- if test "x$sbrk_deprecated" == "x1" ; then ++ if test "x$sbrk_deprecated" = "x1" ; then + AC_MSG_RESULT([Disabling dss allocation because sbrk is deprecated]) + enable_dss="0" + else +@@ -1180,7 +1180,7 @@ + printf("%d\n", rv); + } + ], [je_cv_gcc_builtin_ffsl]) +-if test "x${je_cv_gcc_builtin_ffsl}" == "xyes" ; then ++if test "x${je_cv_gcc_builtin_ffsl}" = "xyes" ; then + AC_DEFINE([JEMALLOC_INTERNAL_FFSL], [__builtin_ffsl]) + AC_DEFINE([JEMALLOC_INTERNAL_FFS], [__builtin_ffs]) + else +@@ -1194,7 +1194,7 @@ + printf("%d\n", rv); + } + ], [je_cv_function_ffsl]) +- if test "x${je_cv_function_ffsl}" == "xyes" ; then ++ if test "x${je_cv_function_ffsl}" = "xyes" ; then + AC_DEFINE([JEMALLOC_INTERNAL_FFSL], [ffsl]) + AC_DEFINE([JEMALLOC_INTERNAL_FFS], [ffs]) + else diff --git a/www-client/seamonkey/files/seamonkey-2.30-pulseaudio_configure_switch_fix.patch b/www-client/seamonkey/files/seamonkey-2.30-pulseaudio_configure_switch_fix.patch new file mode 100644 index 000000000000..d4fa60302d9c --- /dev/null +++ b/www-client/seamonkey/files/seamonkey-2.30-pulseaudio_configure_switch_fix.patch @@ -0,0 +1,20 @@ +--- comm-beta/mozilla/configure.in ++++ comm-beta/mozilla/configure.in +@@ -5489,17 +5489,6 @@ + dnl = Disable PulseAudio + dnl ======================================================== + +-dnl If using Linux, ensure that the PA library is available +-case "$OS_TARGET" in +-WINNT|Darwin|Android|OpenBSD) +- ;; +-*) +- if test -z "$MOZ_B2G"; then +- MOZ_PULSEAUDIO=1 +- fi +- ;; +-esac +- + MOZ_ARG_DISABLE_BOOL(pulseaudio, + [ --disable-pulseaudio Disable PulseAudio support], + MOZ_PULSEAUDIO=, diff --git a/www-client/seamonkey/metadata.xml b/www-client/seamonkey/metadata.xml index 908635ccd2d3..a641646fae86 100644 --- a/www-client/seamonkey/metadata.xml +++ b/www-client/seamonkey/metadata.xml @@ -19,6 +19,8 @@ Use system icu indead of bundled.</flag> <flag name="system-jpeg">Use the system-wide <pkg>media-libs/libjpeg-turbo</pkg> Use system jpeg instead of bundled.</flag> + <flag name="system-libvpx">Use the system-wide <pkg>media-libs/libvpx</pkg> + instead of bundled.</flag> <flag name='system-sqlite'>Use the system-wide <pkg>dev-db/sqlite</pkg> installation with secure-delete enabled</flag> </use> diff --git a/www-client/seamonkey/seamonkey-2.30.ebuild b/www-client/seamonkey/seamonkey-2.30.ebuild new file mode 100644 index 000000000000..424e19e4ebdf --- /dev/null +++ b/www-client/seamonkey/seamonkey-2.30.ebuild @@ -0,0 +1,368 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.30.ebuild,v 1.1 2014/10/21 18:29:15 polynomial-c Exp $ + +EAPI=5 +WANT_AUTOCONF="2.1" + +# This list can be updated with scripts/get_langs.sh from the mozilla overlay +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 + pl pt-PT ru sk sv-SE tr uk zh-CN zh-TW) + +MOZ_PV="${PV/_pre*}" +MOZ_PV="${MOZ_PV/_alpha/a}" +MOZ_PV="${MOZ_PV/_beta/b}" +MOZ_PV="${MOZ_PV/_rc/rc}" +MOZ_P="${P}" +MY_MOZ_P="${PN}-${MOZ_PV}" + +if [[ ${PV} == *_pre* ]] ; then + MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/${PN}/candidates/${MOZ_PV}-candidates/build${PV##*_pre}" + MOZ_LANGPACK_PREFIX="linux-i686/xpi/" + # And the langpack stuff stays at eclass defaults +else + MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/${PN}/releases/${MOZ_PV}" + MOZ_LANGPACK_PREFIX="langpack/${MY_MOZ_P}." + MOZ_LANGPACK_SUFFIX=".langpack.xpi" +fi + +MOZCONFIG_OPTIONAL_WIFI=1 +MOZCONFIG_OPTIONAL_JIT="enabled" +inherit check-reqs flag-o-matic toolchain-funcs eutils mozconfig-v5.33 multilib pax-utils fdo-mime autotools mozextension nsplugins mozlinguas + +PATCHFF="firefox-31.0-patches-0.2" +PATCH="${PN}-2.30-patches-01" +EMVER="1.7.2" + +DESCRIPTION="Seamonkey Web Browser" +HOMEPAGE="http://www.seamonkey-project.org" + +if [[ ${PV} == *_pre* ]] ; then + # pre-releases. No need for arch teams to change KEYWORDS here. + + KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86" +else + # This is where arch teams should change the KEYWORDS. + + KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86" +fi + +SLOT="0" +LICENSE="MPL-2.0 GPL-2 LGPL-2.1" +IUSE="+chatzilla +crypt +ipc minimal pulseaudio +roaming selinux test" + +SRC_URI="${SRC_URI} + ${MOZ_FTP_URI}/source/${MY_MOZ_P}.source.tar.bz2 -> ${P}.source.tar.bz2 + http://dev.gentoo.org/~axs/mozilla/patchsets/${PATCHFF}.tar.xz + http://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz + crypt? ( http://www.enigmail.net/download/source/enigmail-${EMVER}.tar.gz )" + +ASM_DEPEND=">=dev-lang/yasm-1.1" + +RDEPEND=">=dev-libs/nss-3.17.1 + >=dev-libs/nspr-4.10.6 + crypt? ( || ( + ( >=app-crypt/gnupg-2.0 + || ( + app-crypt/pinentry[gtk] + app-crypt/pinentry[qt4] + ) + ) + =app-crypt/gnupg-1.4* ) ) + selinux? ( sec-policy/selinux-mozilla ) + system-sqlite? ( >=dev-db/sqlite-3.8.5:3[secure-delete,debug=] )" + +DEPEND="${RDEPEND} + !elibc_glibc? ( !elibc_uclibc? ( dev-libs/libexecinfo ) ) + crypt? ( dev-lang/perl ) + amd64? ( ${ASM_DEPEND} + virtual/opengl ) + x86? ( ${ASM_DEPEND} + virtual/opengl )" + +if [[ ${PV} == *beta* ]] ; then + S="${WORKDIR}/comm-beta" +else + S="${WORKDIR}/comm-release" +fi + +BUILD_OBJ_DIR="${WORKDIR}/seamonk" + +pkg_setup() { + if [[ ${PV} == *_pre* ]] ; then + ewarn "You're using an unofficial release of ${PN}. Don't file any bug in" + ewarn "Gentoo's Bugtracker against this package in case it breaks for you." + ewarn "Those belong to upstream: https://bugzilla.mozilla.org" + fi + + moz_pkgsetup +} + +pkg_pretend() { + # Ensure we have enough disk space to compile + if 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}/seamonkey" + + epatch "${FILESDIR}"/${PN}-2.30-pulseaudio_configure_switch_fix.patch \ + "${FILESDIR}"/${PN}-2.30-jemalloc-configure.patch + + # browser patches go here + pushd "${S}"/mozilla &>/dev/null || die + EPATCH_EXCLUDE="2000-firefox_gentoo_install_dirs.patch + 8000_gcc49_mozbug999496_ff31.patch" \ + EPATCH_SUFFIX="patch" \ + EPATCH_FORCE="yes" \ + epatch "${WORKDIR}/firefox" + popd &>/dev/null || die + # drop -Wl,--build-id from LDFLAGS, bug #465466 + + # Shell scripts sometimes contain DOS line endings; bug 391889 + grep -rlZ --include="*.sh" $'\r$' . | + while read -r -d $'\0' file ; do + einfo edos2unix "${file}" + edos2unix "${file}" + done + + # Allow user to apply any additional patches without modifing ebuild + epatch_user + + local ms="${S}/mozilla" + + # Enable gnomebreakpad + if use debug ; then + sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \ + "${ms}"/build/unix/run-mozilla.sh || die "sed failed!" + fi + + # Ensure that are plugins dir is enabled as default + sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \ + "${ms}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!" + sed -i -e "s:/usr/lib64/mozilla/plugins:/usr/lib64/nsbrowser/plugins:" \ + "${ms}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!" + + # 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}"/suite/installer/Makefile.in || die + # Don't error out when there's no files to be removed: + sed 's@\(xargs rm\)$@\1 -f@' \ + -i "${ms}"/toolkit/mozapps/installer/packager.mk || die + + eautoreconf + cd "${S}"/mozilla || die + eautoconf + cd "${S}"/mozilla/js/src || die + eautoconf + cd "${S}"/mozilla/memory/jemalloc/src || die + WANT_AUTOCONF= eautoconf +} + +src_configure() { + MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" + MEXTENSIONS="default" + # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys) + # Note: These are for Gentoo Linux use ONLY. For your own distribution, please + # get your own set of keys. + _google_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc + + #################################### + # + # 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" + + if use chatzilla ; then + MEXTENSIONS+=",irc" + else + MEXTENSIONS+=",-irc" + fi + if ! use roaming ; then + MEXTENSIONS+=",-sroaming" + fi + + # Setup api key for location services + echo -n "${_google_api_key}" > "${S}"/google-api-key + mozconfig_annotate '' --with-google-api-keyfile="${S}/google-api-key" + + mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}" + mozconfig_annotate '' --enable-jsd + mozconfig_annotate '' --enable-canvas + + # Other sm-specific settings + mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME} + + mozconfig_annotate '' --enable-safe-browsing + + # Use an objdir to keep things organized. + echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" \ + >> "${S}"/.mozconfig + # Add a TOPSRCDIR too just in case + echo "mk_add_options TOPSRCDIR=${S}" \ + >> "${S}"/.mozconfig + + # Finalize and report settings + mozconfig_final + + if use crypt ; then + pushd "${WORKDIR}"/enigmail &>/dev/null || die + econf + popd &>/dev/null || die + fi + + # Work around breakage in makeopts with --no-print-directory + MAKEOPTS="${MAKEOPTS/--no-print-directory/}" + + 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 + + mkdir -p "${BUILD_OBJ_DIR}" && cd "${BUILD_OBJ_DIR}" || die + # run configure twice to get it to prepare the objdir and then actually set up properly + # apparently necessary due to build system b0rkage on mozilla-33 + _moz_src_configure() { + CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \ + MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \ + emake V=1 -f "${S}"/client.mk configure + } + _moz_src_configure + _moz_src_configure +} + +src_compile() { + CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \ + MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \ + emake V=1 -f "${S}"/client.mk + + # Only build enigmail extension if conditions are met. + if use crypt ; then + einfo "Building enigmail" + pushd "${WORKDIR}"/enigmail &>/dev/null || die + emake -j1 + emake xpi + popd &>/dev/null || die + fi +} + +src_install() { + MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" + DICTPATH="\"${EPREFIX}/usr/share/myspell\"" + + local emid + cd "${BUILD_OBJ_DIR}" || die + + # Pax mark xpcshell for hardened support, only used for startupcache creation. + pax-mark m "${BUILD_OBJ_DIR}/mozilla/dist/bin/xpcshell" + + # Copy our preference before omnijar is created. + sed "s|SEAMONKEY_PVR|${PVR}|" "${FILESDIR}"/all-gentoo-1.js > \ + "${BUILD_OBJ_DIR}/mozilla/dist/bin/defaults/pref/all-gentoo.js" \ + || die + + # Set default path to search for dictionaries. + echo "pref(\"spellchecker.dictionary_path\", ${DICTPATH});" \ + >> "${BUILD_OBJ_DIR}/mozilla/dist/bin/defaults/pref/all-gentoo.js" \ + || die + + echo 'pref("extensions.autoDisableScopes", 3);' >> \ + "${BUILD_OBJ_DIR}/mozilla/dist/bin/defaults/pref/all-gentoo.js" \ + || die + + MOZ_MAKE_FLAGS="${MAKEOPTS}" \ + emake DESTDIR="${D}" install + cp "${FILESDIR}"/icon/${PN}.desktop "${T}" || die + + if use crypt ; then + local em_dir="${WORKDIR}/enigmail/build" + pushd "${T}" &>/dev/null || die + unzip "${em_dir}"/enigmail*.xpi install.rdf || die + emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' install.rdf) + #' + dodir ${MOZILLA_FIVE_HOME}/extensions/${emid} + cd "${D}"${MOZILLA_FIVE_HOME}/extensions/${emid} || die + unzip "${em_dir}"/enigmail*.xpi || die + + popd &>/dev/null || die + fi + + sed 's|^\(MimeType=.*\)$|\1text/x-vcard;text/directory;application/mbox;message/rfc822;x-scheme-handler/mailto;|' \ + -i "${T}"/${PN}.desktop || die + sed 's|^\(Categories=.*\)$|\1Email;|' -i "${T}"/${PN}.desktop \ + || die + + # Install language packs + mozlinguas_src_install + + # Add StartupNotify=true bug 290401 + if use startup-notification ; then + echo "StartupNotify=true" >> "${T}"/${PN}.desktop || die + fi + + # Install icon and .desktop for menu entry + newicon "${S}"/suite/branding/nightly/content/icon64.png ${PN}.png + domenu "${T}"/${PN}.desktop + + # Required in order to use plugins and even run seamonkey on hardened. + pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{seamonkey,seamonkey-bin,plugin-container} + + if use minimal ; then + rm -rf "${ED}"/usr/include "${ED}${MOZILLA_FIVE_HOME}"/{idl,include,lib,sdk} + fi + + # Handle plugins dir through nsplugins.eclass + share_plugins_dir + + #doman "${BUILD_OBJ_DIR}/suite/app/${PN}.1" + + # revdep-rebuild entry + insinto /etc/revdep-rebuild + echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}*" >> ${T}/11${PN} + doins "${T}"/11${PN} +} + +pkg_preinst() { + MOZILLA_FIVE_HOME="${ROOT}/usr/$(get_libdir)/${PN}" + + if [ -d ${MOZILLA_FIVE_HOME}/plugins ] ; then + rm ${MOZILLA_FIVE_HOME}/plugins -rf + fi +} + +pkg_postinst() { + MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" + + # Update mimedb for the new .desktop file + fdo-mime_desktop_database_update + + if use chatzilla ; then + elog "chatzilla is now an extension which can be en-/disabled and configured via" + elog "the Add-on manager." + fi +} |