* [gentoo-commits] proj/mozilla:master commit in: www-client/seamonkey/files/enigmail/, www-client/seamonkey/, ...
@ 2011-02-13 11:47 Lars Wendler
0 siblings, 0 replies; 5+ messages in thread
From: Lars Wendler @ 2011-02-13 11:47 UTC (permalink / raw
To: gentoo-commits
commit: 059950519c49f7f2a6c2fd324cad13d8c3f48d0e
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 13 11:46:50 2011 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sun Feb 13 11:46:50 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=05995051
seamonkey: Added 2.1b2 release candidate.
---
.../2.1/seamonkey-2.1b2-system-cairo-fixup.patch | 133 +++++++
.../files/2.1/seamonkey-libnotify07.patch | 36 ++
...enigmail-1.1.2-seamonkey-2.1b2-versionfix.patch | 11 +
.../seamonkey/seamonkey-2.1_beta2_pre2.ebuild | 373 ++++++++++++++++++++
4 files changed, 553 insertions(+), 0 deletions(-)
diff --git a/www-client/seamonkey/files/2.1/seamonkey-2.1b2-system-cairo-fixup.patch b/www-client/seamonkey/files/2.1/seamonkey-2.1b2-system-cairo-fixup.patch
new file mode 100644
index 0000000..608b4b5
--- /dev/null
+++ b/www-client/seamonkey/files/2.1/seamonkey-2.1b2-system-cairo-fixup.patch
@@ -0,0 +1,133 @@
+work around new features that are not avaliable in system-cairo on linux
+(romaxa's original patch with modifications to use cairo-tee)
+
+diff --git a/config/system-headers b/config/system-headers
+--- a/mozilla/config/system-headers
++++ b/mozilla/config/system-headers
+@@ -81,16 +81,17 @@ pixman.h
+ cairo.h
+ cairo-atsui.h
+ cairo-beos.h
+ cairo-ft.h
+ cairo-glitz.h
+ cairo-os2.h
+ cairo-pdf.h
+ cairo-ps.h
++cairo-tee.h
+ cairo-quartz.h
+ cairo-win32.h
+ cairo-xlib.h
+ cairo-xlib-xrender.h
+ cairo-directfb.h
+ cairo-qpainter.h
+ #endif
+ dfiff.h
+diff --git a/gfx/thebes/gfxASurface.cpp b/gfx/thebes/gfxASurface.cpp
+--- a/mozilla/gfx/thebes/gfxASurface.cpp
++++ b/mozilla/gfx/thebes/gfxASurface.cpp
+@@ -216,19 +216,21 @@ gfxASurface::Init(cairo_surface_t* surfa
+
+ mSurface = surface;
+ mSurfaceValid = PR_TRUE;
+
+ if (existingSurface) {
+ mFloatingRefs = 0;
+ } else {
+ mFloatingRefs = 1;
++#ifdef MOZ_TREE_CAIRO
+ if (cairo_surface_get_content(surface) != CAIRO_CONTENT_COLOR) {
+ cairo_surface_set_subpixel_antialiasing(surface, CAIRO_SUBPIXEL_ANTIALIASING_DISABLED);
+ }
++#endif
+ }
+ }
+
+ gfxASurface::gfxSurfaceType
+ gfxASurface::GetType() const
+ {
+ if (!mSurfaceValid)
+ return (gfxSurfaceType)-1;
+@@ -430,28 +432,34 @@ gfxASurface::FormatFromContent(gfxASurfa
+ default:
+ return ImageFormatRGB24;
+ }
+ }
+
+ void
+ gfxASurface::SetSubpixelAntialiasingEnabled(PRBool aEnabled)
+ {
++#ifdef MOZ_TREE_CAIRO
+ if (!mSurfaceValid)
+ return;
+ cairo_surface_set_subpixel_antialiasing(mSurface,
+ aEnabled ? CAIRO_SUBPIXEL_ANTIALIASING_ENABLED : CAIRO_SUBPIXEL_ANTIALIASING_DISABLED);
++#endif
+ }
+
+ PRBool
+ gfxASurface::GetSubpixelAntialiasingEnabled()
+ {
+ if (!mSurfaceValid)
+ return PR_FALSE;
++#ifdef MOZ_TREE_CAIRO
+ return cairo_surface_get_subpixel_antialiasing(mSurface) == CAIRO_SUBPIXEL_ANTIALIASING_ENABLED;
++#else
++ return PR_TRUE;
++#endif
+ }
+
+ PRInt32
+ gfxASurface::BytePerPixelFromFormat(gfxImageFormat format)
+ {
+ switch (format) {
+ case ImageFormatARGB32:
+ case ImageFormatRGB24:
+diff --git a/gfx/thebes/gfxTeeSurface.cpp b/gfx/thebes/gfxTeeSurface.cpp
+--- a/mozilla/gfx/thebes/gfxTeeSurface.cpp
++++ b/mozilla/gfx/thebes/gfxTeeSurface.cpp
+@@ -32,17 +32,24 @@
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+ #include "gfxTeeSurface.h"
+
++/* Once cairo in tree is update ensure we remove the ifdef
++ and just include cairo-tee.h
++*/
++#ifdef MOZ_TREE_CAIRO
+ #include "cairo.h"
++#else
++#include "cairo-tee.h"
++#endif
+
+ gfxTeeSurface::gfxTeeSurface(cairo_surface_t *csurf)
+ {
+ Init(csurf, PR_TRUE);
+ }
+
+ gfxTeeSurface::gfxTeeSurface(gfxASurface **aSurfaces, PRInt32 aSurfaceCount)
+ {
+diff --git a/js/src/config/system-headers b/js/src/config/system-headers
+--- a/mozilla/js/src/config/system-headers
++++ b/mozilla/js/src/config/system-headers
+@@ -82,16 +82,17 @@ cairo.h
+ cairo-atsui.h
+ cairo-beos.h
+ cairo-ft.h
+ cairo-glitz.h
+ cairo-os2.h
+ cairo-pdf.h
+ cairo-ps.h
+ cairo-quartz.h
++cairo-tee.h
+ cairo-win32.h
+ cairo-xlib.h
+ cairo-xlib-xrender.h
+ cairo-directfb.h
+ cairo-qpainter.h
+ #endif
+ dfiff.h
+ exception
diff --git a/www-client/seamonkey/files/2.1/seamonkey-libnotify07.patch b/www-client/seamonkey/files/2.1/seamonkey-libnotify07.patch
new file mode 100644
index 0000000..8560e1b
--- /dev/null
+++ b/www-client/seamonkey/files/2.1/seamonkey-libnotify07.patch
@@ -0,0 +1,36 @@
+# HG changeset patch
+# User Priit Laes <plaes@plaes.org>
+# Date 1295907218 -7200
+# Node ID ebfe5822e8916cce3d1811e67f6cb95ba3caeb24
+# Parent e874889e43d1b40f16c8234d53f39126a04e6621
+Add support for libnotify-0.7+
+
+--- mozilla/toolkit/system/gnome/nsAlertsIconListener.cpp
++++ mozilla/toolkit/system/gnome/nsAlertsIconListener.cpp
+@@ -46,6 +46,11 @@
+
+ #include <gdk/gdk.h>
+
++// Compatibility macro for <libnotify-0.7
++#ifndef NOTIFY_CHECK_VERSION
++#define NOTIFY_CHECK_VERSION(x,y,z) 0
++#endif
++
+ static PRBool gHasActions = PR_FALSE;
+
+ static void notify_action_cb(NotifyNotification *notification,
+@@ -218,7 +223,13 @@
+ {
+ mNotification = notify_notification_new(mAlertTitle.get(),
+ mAlertText.get(),
+- NULL, NULL);
++ NULL
++// >=libnotify-0.7.0 has no support for attaching to widgets
++#if !NOTIFY_CHECK_VERSION(0,7,0)
++ , NULL
++#endif
++ );
++
+ if (!mNotification)
+ return NS_ERROR_OUT_OF_MEMORY;
+
diff --git a/www-client/seamonkey/files/enigmail/enigmail-1.1.2-seamonkey-2.1b2-versionfix.patch b/www-client/seamonkey/files/enigmail/enigmail-1.1.2-seamonkey-2.1b2-versionfix.patch
new file mode 100644
index 0000000..88309b4
--- /dev/null
+++ b/www-client/seamonkey/files/enigmail/enigmail-1.1.2-seamonkey-2.1b2-versionfix.patch
@@ -0,0 +1,11 @@
+--- enigmail/package/install.rdf
++++ enigmail/package/install.rdf
+@@ -23,7 +23,7 @@
+ <Description>
+ <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
+ <em:minVersion>2.1a1pre</em:minVersion>
+- <em:maxVersion>2.1a2</em:maxVersion>
++ <em:maxVersion>2.1b2</em:maxVersion>
+ </Description>
+ </em:targetApplication>
+ <em:targetApplication>
diff --git a/www-client/seamonkey/seamonkey-2.1_beta2_pre2.ebuild b/www-client/seamonkey/seamonkey-2.1_beta2_pre2.ebuild
new file mode 100644
index 0000000..2a054b5
--- /dev/null
+++ b/www-client/seamonkey/seamonkey-2.1_beta2_pre2.ebuild
@@ -0,0 +1,373 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.0.4-r1.ebuild,v 1.1 2010/04/09 03:56:59 polynomial-c Exp $
+
+EAPI="2"
+WANT_AUTOCONF="2.1"
+
+inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib fdo-mime autotools mozextension python
+
+PATCH="${PN}-2.0.5-patches-01"
+EMVER="1.1.2"
+
+LANGS="be cs de en en-US es-ES fi fr it lt nb-NO nl pl ru sk sv-SE"
+NOSHORTLANGS="es-ES nb-NO sv-SE"
+
+MY_PV="${PV/_pre*}"
+MY_PV="${MY_PV/_alpha/a}"
+MY_PV="${MY_PV/_beta/b}"
+MY_PV="${MY_PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+
+# release versions usually have language packs. So be careful with changing this.
+HAS_LANGS="true"
+if [[ ${PV} == *_pre* ]] ; then
+ # pre-releases. No need for arch teams to change KEYWORDS here.
+
+ REL_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${PN}/nightly/${MY_PV}-candidates/build${PV##*_pre}"
+ #KEYWORDS=""
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+ #HAS_LANGS="false"
+else
+ # This is where arch teams should change the KEYWORDS.
+
+ REL_URI="http://releases.mozilla.org/pub/mozilla.org/${PN}/releases/${MY_PV}"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+ [[ ${PV} == *alpha* ]] && HAS_LANGS="false"
+fi
+
+DESCRIPTION="Seamonkey Web Browser"
+HOMEPAGE="http://www.seamonkey-project.org"
+
+SLOT="0"
+LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
+IUSE="+alsa +chatzilla +composer +crypt libnotify ldap +mailclient +roaming system-sqlite +vpx wifi"
+
+SRC_URI="${REL_URI}/source/${MY_P}.source.tar.bz2
+ http://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.bz2
+ crypt? ( mailclient? ( http://dev.gentoo.org/~polynomial-c/mozilla/enigmail-${EMVER}-20110124.tar.bz2 ) )"
+
+if ${HAS_LANGS} ; then
+ for X in ${LANGS} ; do
+ if [ "${X}" != "en" ] && [ "${X}" != "en-US" ]; then
+ SRC_URI="${SRC_URI}
+ linguas_${X/-/_}? ( ${REL_URI}/langpack/${MY_P}.${X}.langpack.xpi -> ${MY_P}-${X}.xpi )"
+ fi
+ IUSE="${IUSE} linguas_${X/-/_}"
+ # english is handled internally
+ if [ "${#X}" == 5 ] && ! has ${X} ${NOSHORTLANGS}; then
+ if [ "${X}" != "en-US" ]; then
+ SRC_URI="${SRC_URI}
+ linguas_${X%%-*}? ( ${REL_URI}/langpack/${MY_P}.${X}.langpack.xpi -> ${MY_P}-${X}.xpi )"
+ fi
+ IUSE="${IUSE} linguas_${X%%-*}"
+ fi
+ done
+fi
+
+RDEPEND=">=sys-devel/binutils-2.16.1
+ >=dev-libs/nss-3.12.9
+ >=dev-libs/nspr-4.8.7
+ alsa? ( media-libs/alsa-lib )
+ system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete,unlock-notify] )
+ >=media-libs/libpng-1.4.1[apng]
+ >=app-text/hunspell-1.2
+ >=x11-libs/gtk+-2.10.0
+ >=x11-libs/cairo-1.10.0[X]
+ >=x11-libs/pango-1.14.0[X]
+ libnotify? ( >=x11-libs/libnotify-0.4 )
+ crypt? ( mailclient? ( >=app-crypt/gnupg-1.4 ) )
+ vpx? ( media-libs/libvpx )
+ wifi? ( net-wireless/wireless-tools )"
+ #vpx? ( media-libs/libvpx )
+
+DEPEND="${RDEPEND}
+ =dev-lang/python-2*[threads]
+ dev-util/pkgconfig
+ vpx? ( dev-lang/yasm )"
+
+S="${WORKDIR}/comm-central"
+
+linguas() {
+ local LANG SLANG
+ for LANG in ${LINGUAS}; do
+ if has ${LANG} en en_US; then
+ has en ${linguas} || linguas="${linguas:+"${linguas} "}en"
+ continue
+ elif has ${LANG} ${LANGS//-/_}; then
+ has ${LANG//_/-} ${linguas} || linguas="${linguas:+"${linguas} "}${LANG//_/-}"
+ continue
+ elif [[ " ${LANGS} " == *" ${LANG}-"* ]]; then
+ for X in ${LANGS}; do
+ if [[ "${X}" == "${LANG}-"* ]] && \
+ [[ " ${NOSHORTLANGS} " != *" ${X} "* ]]; then
+ has ${X} ${linguas} || linguas="${linguas:+"${linguas} "}${X}"
+ continue 2
+ fi
+ done
+ fi
+ ewarn "Sorry, but ${PN} does not support the ${LANG} LINGUA"
+ done
+}
+
+src_unpack() {
+ unpack ${A}
+
+ if ${HAS_LANGS} ; then
+ linguas
+ for X in ${linguas}; do
+ # FIXME: Add support for unpacking xpis to portage
+ [[ ${X} != "en" ]] && xpi_unpack "${MY_P}-${X}.xpi"
+ done
+ if [[ ${linguas} != "" && ${linguas} != "en" ]]; then
+ einfo "Selected language packs (first will be default): ${linguas}"
+ fi
+ fi
+}
+
+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
+
+ # Ensure we always build with C locale.
+ export LANG="C"
+ export LC_ALL="C"
+ export LC_MESSAGES="C"
+ export LC_CTYPE="C"
+
+ export BUILD_OFFICIAL=1
+ export MOZILLA_OFFICIAL=1
+
+ python_set_active_version 2
+}
+
+src_prepare() {
+ # Apply our patches
+ EPATCH_EXCLUDE="1002_fix-system-hunspell-dict-detections.patch
+ 104-no_dynamic_nss_softokn.patch
+ 118-bz467766_att351173-dont-reset-user-prefs-on-upgrade.patch
+ 310-gecko-1.9.1-cairo-1.8.10-crash-fix.patch" \
+ EPATCH_SUFFIX="patch" \
+ EPATCH_FORCE="yes" \
+ epatch "${WORKDIR}"
+
+ #epatch "${FILESDIR}"/2.1/${PN}-2.1b1-system-libvpx.patch
+ epatch "${FILESDIR}"/2.1/${PN}-2.1b1-configure-fix.patch
+ epatch "${FILESDIR}"/2.1/${PN}-2.1b2-system-cairo-fixup.patch
+ epatch "${FILESDIR}"/2.1/${PN}-libnotify07.patch
+
+ if use crypt && use mailclient ; then
+ mv "${WORKDIR}"/enigmail "${S}"/mailnews/extensions/enigmail
+ cd "${S}"/mailnews/extensions/enigmail || die
+ epatch "${FILESDIR}"/enigmail/enigmail-1.1.2-seamonkey-2.1b2-versionfix.patch
+ epatch "${FILESDIR}"/enigmail/enigmail-1.1.2-20110124-makefile.diff
+ eautomake
+ makemake2
+ sed -e 's:@srcdir@:${S}/mailnews/extensions/enigmail:' \
+ -i Makefile.in || die
+ cd "${S}"
+ fi
+
+ #pushd "${S}"/mozilla &>/dev/null || die pushd
+ #popd &>/dev/null || die popd
+
+ #Ensure we disable javaxpcom by default to prevent configure breakage
+ sed -i -e s:MOZ_JAVAXPCOM\=1::g ${S}/mozilla/xulrunner/confvars.sh \
+ || die "sed javaxpcom"
+
+ eautoreconf
+ cd "${S}"/mozilla || die
+ eautoreconf
+ cd "${S}"/mozilla/js/src || die
+ eautoreconf
+}
+
+src_configure() {
+ declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+ MEXTENSIONS=""
+
+ ####################################
+ #
+ # 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="${MEXTENSIONS},-irc"
+ fi
+ if ! use roaming ; then
+ MEXTENSIONS="${MEXTENSIONS},-sroaming"
+ fi
+
+ if ! use gnome ; then
+ MEXTENSIONS="${MEXTENSIONS},-gnomevfs"
+ fi
+
+ if ! use composer ; then
+ if ! use chatzilla && ! use mailclient ; then
+ mozconfig_annotate '-composer' --disable-composer
+ fi
+ fi
+
+ mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
+ mozconfig_annotate '' --enable-application=suite
+ mozconfig_annotate 'broken' --disable-mochitest
+ mozconfig_annotate 'broken' --disable-crashreporter
+ mozconfig_annotate '' --enable-system-hunspell
+ mozconfig_annotate '' --enable-jsd
+ mozconfig_annotate '' --enable-image-encoder=all
+ mozconfig_annotate '' --enable-canvas
+ mozconfig_annotate '' --with-system-nspr
+ mozconfig_annotate '' --with-system-nss
+ mozconfig_annotate '' --with-system-bz2
+ mozconfig_annotate '' --enable-oji --enable-mathml
+ mozconfig_annotate 'places' --enable-storage --enable-places --enable-places_bookmarks
+ mozconfig_annotate '' --disable-installer
+ mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
+ mozconfig_annotate '' --enable-printing
+
+ # Enable/Disable based on USE flags
+ mozconfig_use_enable alsa ogg
+ mozconfig_use_enable alsa wave
+ mozconfig_use_enable libnotify
+ mozconfig_use_enable ldap
+ mozconfig_use_enable ldap ldap-experimental
+ #if use ldap ; then
+ # mozconfig_annotate 'ldap' --enable-ldap
+ # mozconfig_annotate 'ldap' --enable-ldap-experimental
+ #fi
+ mozconfig_use_enable mailclient mailnews
+ mozconfig_use_enable system-sqlite
+ mozconfig_use_enable vpx webm
+ #mozconfig_use_with vpx system-vpx
+ mozconfig_use_enable wifi necko-wifi
+
+ if use vpx && ! use alsa; then
+ ewarn "USE=vpx needs USE=alsa, disabling WebM support."
+ mozconfig_annotate '+webm -alsa' --disable-webm
+ fi
+
+ if use amd64 || use x86 || use arm || use sparc; then
+ mozconfig_annotate '' --enable-tracejit
+ fi
+
+ if use mailclient && use crypt ; then
+ mozconfig_annotate "mail crypt" --enable-chrome-format=jar
+ fi
+
+ # ZOMG! Mozilla guys wanna have APNG in libpng if building with
+ # system-libpng. Kids, leave your fingers from drugs that make you
+ # do such nasty "extensions"!!!
+ # See https://bugs.gentoo.org/183370 for details.
+ mozconfig_annotate '' --with-system-png
+
+ # Finalize and report settings
+ mozconfig_final
+
+ if [[ $(gcc-major-version) -lt 4 ]]; then
+ append-cxxflags -fno-stack-protector
+ fi
+
+ ####################################
+ #
+ # Configure and build
+ #
+ ####################################
+
+ # Work around breakage in makeopts with --no-print-directory
+ MAKEOPTS="${MAKEOPTS/--no-print-directory/}"
+
+ CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" PYTHON="$(PYTHON)" econf
+}
+
+src_compile() {
+ # Should the build use multiprocessing? Not enabled by default, as it tends to break.
+ [ "${WANT_MP}" = "true" ] && jobs=${MAKEOPTS} || jobs="-j1"
+ emake ${jobs} || die
+
+ # Only build enigmail extension if conditions are met.
+ if use crypt && use mailclient ; then
+ emake -C "${S}"/mailnews/extensions/enigmail || die "make enigmail failed"
+ emake -j1 -C "${S}"/mailnews/extensions/enigmail xpi || die "make enigmail xpi failed"
+ fi
+}
+
+src_install() {
+ declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+ declare emid
+
+ emake DESTDIR="${D}" install || die "emake install failed"
+ cp -f "${FILESDIR}"/icon/seamonkey.desktop "${T}" || die
+
+ if use crypt && use mailclient ; then
+ cd "${T}" || die
+ unzip "${S}"/mozilla/dist/bin/enigmail*.xpi install.rdf || die
+ emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' install.rdf)
+
+ dodir ${MOZILLA_FIVE_HOME}/extensions/${emid} || die
+ cd "${D}"${MOZILLA_FIVE_HOME}/extensions/${emid} || die
+ unzip "${S}"/mozilla/dist/bin/enigmail*.xpi || die
+
+ sed 's|^\(MimeType=.*\)$|\1MimeType=text/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
+ fi
+
+ if ${HAS_LANGS} ; then
+ linguas
+ for X in ${linguas}; do
+ [[ ${X} != "en" ]] && xpi_install "${WORKDIR}"/"${MY_P}-${X}"
+ done
+ fi
+
+ # Install icon and .desktop for menu entry
+ newicon "${S}"/suite/branding/nightly/content/icon64.png seamonkey.png \
+ || die
+ domenu "${T}"/seamonkey.desktop || die
+
+ # Add StartupNotify=true bug 290401
+ if use startup-notification ; then
+ echo "StartupNotify=true" >> "${D}"/usr/share/applications/seamonkey.desktop
+ fi
+
+ # Add our default prefs
+ sed "s|SEAMONKEY_PVR|${PVR}|" "${FILESDIR}"/all-gentoo.js \
+ > "${D}"${MOZILLA_FIVE_HOME}/defaults/pref/all-gentoo.js \
+ || die
+
+ # Plugins dir
+ rm -rf "${D}"${MOZILLA_FIVE_HOME}/plugins || die "failed to remove existing plugins dir"
+ dosym ../nsbrowser/plugins "${MOZILLA_FIVE_HOME}"/plugins || die
+
+ doman "${S}"/suite/app/${PN}.1 || die
+}
+
+pkg_preinst() {
+ declare MOZILLA_FIVE_HOME="${ROOT}/usr/$(get_libdir)/${PN}"
+
+ if [ -d ${MOZILLA_FIVE_HOME}/plugins ] ; then
+ rm ${MOZILLA_FIVE_HOME}/plugins -rf
+ fi
+}
+
+pkg_postinst() {
+ declare 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
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/mozilla:master commit in: www-client/seamonkey/files/enigmail/, www-client/seamonkey/, ...
@ 2011-03-01 22:51 Lars Wendler
0 siblings, 0 replies; 5+ messages in thread
From: Lars Wendler @ 2011-03-01 22:51 UTC (permalink / raw
To: gentoo-commits
commit: 64c62a2256d2976ef34a539b4f4440f5a41bb5e8
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 1 22:51:25 2011 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Mar 1 22:51:25 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=64c62a22
seamonkey: Added libpng15 patch. Removed old beta1 ebuild.
---
www-client/seamonkey/Manifest | 14 +-
.../files/2.1/seamonkey-2.1b1-bug607222.patch | 47 ---
.../seamonkey/files/2.1/xulrunner-libpng15.diff | 12 +
...enigmail-1.1.2-seamonkey-2.1b1-versionfix.patch | 11 -
www-client/seamonkey/seamonkey-2.1_beta1-r1.ebuild | 359 --------------------
www-client/seamonkey/seamonkey-2.1_beta2.ebuild | 3 +
6 files changed, 17 insertions(+), 429 deletions(-)
diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index 7116aa6..9ee97b2 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -1,23 +1,14 @@
-AUX 2.1/seamonkey-2.1b1-bug607222.patch 1570 RMD160 e1ccd2e3ffc293ac6a0b0b46e0e352551f491c92 SHA1 7bdfcb1e0aea8e6238b6c1560627cee712737d7c SHA256 8daacb3ef9cbb53ec3886ad7108107799682609e32af237434f3c8695ac63d86
AUX 2.1/seamonkey-2.1b1-configure-fix.patch 690 RMD160 854bf17b5b5b5806c4936f80fbbd971e822a88e0 SHA1 10c39ddf76e3638fced4e48bbc2443b4eb88078c SHA256 f4b4a786ff743e9618d663832fbe7f21b36b0f84e1bf04cd0dae106da18fd2f4
AUX 2.1/seamonkey-2.1b2-system-cairo-fixup.patch 3364 RMD160 e823edc67c7d0984fed7645b09c417b93eb663ed SHA1 62b3f66be453a2fb13e2504858849aaef72bbb44 SHA256 fac11adcee4f506a005725a5741f55ba55810f7bcfc82fce5fba4317c84f4be5
AUX 2.1/seamonkey-libnotify07.patch 1117 RMD160 d9258ba252d3c94e8ac706424e94f055b278b499 SHA1 22502e4414f125efbada4812116f1e189c749782 SHA256 05ed978e07d1d74b38c53b205f98cc502dc6ce31cb04a21ad5f20a7a2fb5bdac
+AUX 2.1/xulrunner-libpng15.diff 446 RMD160 a6b43dde909929befa6b7ec38f0fb51d0ddf4ac5 SHA1 6e9dd65b774022111c6723bda5341acadef8b040 SHA256 ece56d83be83178bc05bcd3b11251624371522d2db932974f4a6e72f49857e51
AUX all-gentoo.js 788 RMD160 08464d4a78e2126dce9e482988af1720d54a087d SHA1 74aed071070a8d896b655fd975da67329939339c SHA256 3ca0cbee6ca3d8857e7afadcfe76f65bd9c4130936602a1dbabb484406df0f45
AUX enigmail/enigmail-1.1.2-20110124-makefile.diff 1572 RMD160 3840707bebdc8785ea08689cc95e0b762ca116f5 SHA1 0b607adf7af0d4d9a969b2c14abb19e1c9e94888 SHA256 9fc6c5d59864d53536ff755a2245ec60c61a4ffa2a81920c869687e5604f3144
-AUX enigmail/enigmail-1.1.2-seamonkey-2.1b1-versionfix.patch 388 RMD160 e87b1d5d7ebab0c7bff851b6cd15575288addd7f SHA1 a45b74b08eca03f44dd174bc466d0bde02c7f082 SHA256 35f63bf315c3b9b096ccab4c351d7c85b5651c0d5bf85e9ecde83f39bfad23f6
AUX enigmail/enigmail-1.1.2-seamonkey-2.1b2-versionfix.patch 388 RMD160 978e6888f0dd25fae9f59e594c800c64626607dd SHA1 08261cf1027d10723fa74d2e00f20b734d679983 SHA256 3ed44f737ad3eb89eb58bb03cb375579b2002d0ac06982b0d17f281041c42959
AUX icon/seamonkey.desktop 154 RMD160 7e1712122cee7510bf058024338e0b75ea7a5e9a SHA1 6f5e33c702fbaa86974e139e398399927462e31e SHA256 78ebd5d753065f6ecf148a010cb59a4756a8c94447cfac6f4db502864bac5d8c
AUX icon/seamonkey.png 4172 RMD160 d296c4d4e0920e4476f4c6c607946434202ad521 SHA1 f76213195e2dc002ff2e411ed0247d2624ce7b09 SHA256 7ffc1911a62b526702f3c991365dd8f18b6427c7e173456a101db4fb4c43ae59
DIST enigmail-1.1.2-20110124.tar.bz2 862291 RMD160 6b7b4a9a4295c5d0b0ff149d3750b3c059e29d47 SHA1 a4d81224def58e68ca6b8fc291b93d3598279096 SHA256 89c24933ccdf765d5a0928127a5139e3f800a2b5bf7c20020d0870e78e70f044
DIST seamonkey-2.0.5-patches-01.tar.bz2 14905 RMD160 b9323ffc75c31343982b37151a879129fe37dc9b SHA1 5bb55b2fc707f84157af181aa9e30a3b7d839dbc SHA256 288ea43820b8c1f5380024f751fa23e59bc9bafba9d506678968ac7e40ea9dc5
-DIST seamonkey-2.1b1-de.xpi 551777 RMD160 a26bc15e0aeb0241e434766febe39bcff9775750 SHA1 c1192256b20b66ba78044aa1828321b8a7aeae8f SHA256 68ede1f62e1823339caebde78b1772e4490c93bf06216510bbb51f67e4afecac
-DIST seamonkey-2.1b1-es-ES.xpi 513747 RMD160 4cf7478d3672cb4e7b0811a287eef704833a00ee SHA1 469dd2fca9b47b6c91fc56434ff07cf9d484edee SHA256 bc0eacfd09541741cdba27886e117d47a20187113d89938dedfe38345cd69b1c
-DIST seamonkey-2.1b1-fr.xpi 631303 RMD160 86c27a0710003c8c84912480f458b497a97a8470 SHA1 ba8675f3b4c3f818991dca09864c49a66ee8cd1a SHA256 8328cfbdc7555d266a441e64ca510bf9f29b1fca026b9e9bcf279ab5962936a0
-DIST seamonkey-2.1b1-lt.xpi 609956 RMD160 2b96157ffcb3b2833b005a86123fa0e6558b9eaa SHA1 c0eaf1cbf7f46bae9fb4987b4d241884007a9094 SHA256 eaf12f26f38a6f870da0ccb19e876b2ec7d0542c1cdc972a1c84a52c61d8a327
-DIST seamonkey-2.1b1-nb-NO.xpi 503305 RMD160 7f9c5ef52c6208ab3af722acd7bec18172b38be2 SHA1 91d99023d55601b9dd8c087195124d4fb52827df SHA256 21523862f76c9ff7511f644403923fe6cdfab5c928c23e65767a360125e25771
-DIST seamonkey-2.1b1-ru.xpi 566693 RMD160 fd3d87af623ebba27d1145827262228352447894 SHA1 998aaf0ff3dfbed43afefc355e9a5e36f847fd23 SHA256 e3891cd4f71bac88ced5d8a0f99e8b3776b2b319c41628121fbb2418973bb66f
-DIST seamonkey-2.1b1-sk.xpi 532895 RMD160 acf5aa1e10ded262e36fef99aba478bc1d88700b SHA1 fff2eb4932c16a2852bd5e99bdc2e0c35801bdf5 SHA256 ea365bf6f93482b0fd2c8bd6af829cbfdd0ae2afe8c4eaf234fc30c0ff96aacb
-DIST seamonkey-2.1b1.source.tar.bz2 78582261 RMD160 28a2fafdfedb1e602c15b2aab554549354ddac08 SHA1 8bc7bfe512fbd1eeed4950b77f0da4f7408ab434 SHA256 0fa74bbd1f5eba6495e3e3373e5cec419d721e21c7e71bbb92a367eb98212df4
DIST seamonkey-2.1b2-be.xpi 789040 RMD160 6c79a349353cecb1b14bfdb93891caa4ceb2d047 SHA1 32a2c65dad11733d75d86965e846d50ce413042d SHA256 2610a08907c15de896ce799d144489e5b85e94b8de33c9ff1e49d11ce9d39c82
DIST seamonkey-2.1b2-cs.xpi 813191 RMD160 59d344f2e4221c63893b2bd27cc0dcf754e5a560 SHA1 e80cd550f3aa96427fcc4b6ff16868c90ae9ac49 SHA256 a21ee7ba40ec280903d6eb00a44591b56492e94ef58a32be7bb072f6712fc2ec
DIST seamonkey-2.1b2-de.xpi 851721 RMD160 681e3d607ebce24bab6b5b7a82a3f5b74a8fbf57 SHA1 99c45ff247f37147db5972dc1a8e28956fe2f755 SHA256 a3e05119f04cb3486b9d143ece730351fc8e0ac83d7627d139dd53c7886f2ede
@@ -33,5 +24,4 @@ DIST seamonkey-2.1b2-ru.xpi 885903 RMD160 7a2a6d60609521013fe2380d5ab67f59490730
DIST seamonkey-2.1b2-sk.xpi 835935 RMD160 6ab9dcc723d2bb147a23d84532eaf13ca94eea07 SHA1 b3ef9378fd13566bd3443f9e3507c7ba96a8391a SHA256 78a5a655567e4fed278911b99443c23c671065a6a864aebfbb29fbafa4fae0f0
DIST seamonkey-2.1b2-sv-SE.xpi 867156 RMD160 6d3ca2aab099e6bc6c57c641b20a1ab10751a31e SHA1 ec46f7c052ed388d3022ad7ffeb4c6a6c0e8b0aa SHA256 abb1bff1771543d6202fc520f66acec930be02dec1d2c75b329b96955ec6815c
DIST seamonkey-2.1b2.source.tar.bz2 83425193 RMD160 d7a9a61fd470a58e19f4e9b2d2c7a00eaf1362ac SHA1 c94fd66240fd9d77a73fdeec271131c23fd6cf98 SHA256 9f9e59303b1d39dc97aa943f49018a572d41b5e566c66e176f1f012e2e9d898a
-EBUILD seamonkey-2.1_beta1-r1.ebuild 10839 RMD160 2fd92ff75172db7839f10ff33229cca4dc24d2bc SHA1 9db73e136810c70ccd5d12c9528e206f2bdef353 SHA256 a2f1ac22cc516dc86df9133bbb11617415fa76f39c551a857b8f305169b1570e
-EBUILD seamonkey-2.1_beta2.ebuild 11404 RMD160 5aa66c209276449d3fca8a4bcd5f334083db5d9e SHA1 c08443ec023fdc65d8d1c310ee8f23aa1554a9e7 SHA256 de8aa8a42a58cb9d4b8e72f9b6c3a9ca32529c64c545ec1b797a6571b80951ac
+EBUILD seamonkey-2.1_beta2.ebuild 11509 RMD160 53059d098eba0d51303bcfd5eafef109a6d9d017 SHA1 5c27af8e030445bef3ff83dcd549a080bcb38047 SHA256 1768c2d87bdf28dd4f3ddf2b179eec9417130858fb0fa693ae096747e98867d4
diff --git a/www-client/seamonkey/files/2.1/seamonkey-2.1b1-bug607222.patch b/www-client/seamonkey/files/2.1/seamonkey-2.1b1-bug607222.patch
deleted file mode 100644
index 8f28c96..0000000
--- a/www-client/seamonkey/files/2.1/seamonkey-2.1b1-bug607222.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- mozilla/content/base/src/nsGenericElement.cpp
-+++ mozilla/content/base/src/nsGenericElement.cpp
-@@ -3573,18 +3573,18 @@
- }
- }
-
-- PRUint32 childCount = aChildArray.ChildCount();
-- NS_ENSURE_TRUE(aIndex <= childCount, NS_ERROR_ILLEGAL_VALUE);
--
- // The id-handling code, and in the future possibly other code, need to
- // react to unexpected attribute changes.
- nsMutationGuard::DidMutate();
-
-- PRBool isAppend = (aIndex == childCount);
--
-+ // Do this before checking the child-count since this could cause mutations
- nsIDocument* doc = GetCurrentDoc();
- mozAutoDocUpdate updateBatch(doc, UPDATE_CONTENT_MODEL, aNotify);
-
-+ PRUint32 childCount = aChildArray.ChildCount();
-+ NS_ENSURE_TRUE(aIndex <= childCount, NS_ERROR_ILLEGAL_VALUE);
-+ PRBool isAppend = (aIndex == childCount);
-+
- rv = aChildArray.InsertChildAt(aKid, aIndex);
- NS_ENSURE_SUCCESS(rv, rv);
- if (aIndex == 0) {
-@@ -4039,6 +4039,8 @@
- nsresult res = NS_OK;
- PRInt32 insPos;
-
-+ mozAutoDocConditionalContentUpdateBatch batch(GetCurrentDoc(), PR_TRUE);
-+
- // Figure out which index to insert at
- if (aRefChild) {
- insPos = IndexOf(aRefChild);
-@@ -4100,11 +4102,6 @@
- }
- }
-
-- // We want an update batch when we expect several mutations to be performed,
-- // which is when we're replacing a node, or when we're inserting a fragment.
-- mozAutoDocConditionalContentUpdateBatch batch(GetCurrentDoc(),
-- aReplace || nodeType == nsIDOMNode::DOCUMENT_FRAGMENT_NODE);
--
- // If we're replacing
- if (aReplace) {
- refContent = GetChildAt(insPos + 1);
diff --git a/www-client/seamonkey/files/2.1/xulrunner-libpng15.diff b/www-client/seamonkey/files/2.1/xulrunner-libpng15.diff
new file mode 100644
index 0000000..34639fc
--- /dev/null
+++ b/www-client/seamonkey/files/2.1/xulrunner-libpng15.diff
@@ -0,0 +1,12 @@
+--- mozilla/modules/libpr0n/decoders/nsPNGDecoder.cpp
++++ mozilla/modules/libpr0n/decoders/nsPNGDecoder.cpp
+@@ -386,7 +386,8 @@
+ // First try to see if iCCP chunk is present
+ if (png_get_valid(png_ptr, info_ptr, PNG_INFO_iCCP)) {
+ png_uint_32 profileLen;
+- char *profileData, *profileName;
++ png_bytep profileData;
++ png_charp profileName;
+ int compression;
+
+ png_get_iCCP(png_ptr, info_ptr, &profileName, &compression,
diff --git a/www-client/seamonkey/files/enigmail/enigmail-1.1.2-seamonkey-2.1b1-versionfix.patch b/www-client/seamonkey/files/enigmail/enigmail-1.1.2-seamonkey-2.1b1-versionfix.patch
deleted file mode 100644
index d34bcc7..0000000
--- a/www-client/seamonkey/files/enigmail/enigmail-1.1.2-seamonkey-2.1b1-versionfix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- enigmail/package/install.rdf
-+++ enigmail/package/install.rdf
-@@ -23,7 +23,7 @@
- <Description>
- <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
- <em:minVersion>2.1a1pre</em:minVersion>
-- <em:maxVersion>2.1a2</em:maxVersion>
-+ <em:maxVersion>2.1b1</em:maxVersion>
- </Description>
- </em:targetApplication>
- <em:targetApplication>
diff --git a/www-client/seamonkey/seamonkey-2.1_beta1-r1.ebuild b/www-client/seamonkey/seamonkey-2.1_beta1-r1.ebuild
deleted file mode 100644
index 252d3e1..0000000
--- a/www-client/seamonkey/seamonkey-2.1_beta1-r1.ebuild
+++ /dev/null
@@ -1,359 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.0.4-r1.ebuild,v 1.1 2010/04/09 03:56:59 polynomial-c Exp $
-
-EAPI="2"
-WANT_AUTOCONF="2.1"
-
-inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib fdo-mime autotools mozextension python
-
-PATCH="${PN}-2.0.5-patches-01"
-EMVER="1.1.2"
-
-LANGS="de en es-ES fr lt nb-NO ru sk"
-NOSHORTLANGS="es-ES nb-NO"
-
-MY_PV="${PV/_pre*}"
-MY_PV="${MY_PV/_alpha/a}"
-MY_PV="${MY_PV/_beta/b}"
-MY_PV="${MY_PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-
-# release versions usually have language packs. So be careful with changing this.
-HAS_LANGS="true"
-if [[ ${PV} == *_pre* ]] ; then
- # pre-releases. No need for arch teams to change KEYWORDS here.
-
- REL_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${PN}/nightly/${MY_PV}-candidates/build${PV##*_pre}"
- KEYWORDS=""
- #KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
- HAS_LANGS="false"
-else
- # This is where arch teams should change the KEYWORDS.
-
- REL_URI="http://releases.mozilla.org/pub/mozilla.org/${PN}/releases/${MY_PV}"
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
- [[ ${PV} == *alpha* ]] && HAS_LANGS="false"
-fi
-
-DESCRIPTION="Seamonkey Web Browser"
-HOMEPAGE="http://www.seamonkey-project.org"
-
-SLOT="0"
-LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE="+alsa +chatzilla +composer +crypt libnotify ldap +mailclient +roaming system-sqlite +vpx wifi"
-
-SRC_URI="${REL_URI}/source/${MY_P}.source.tar.bz2
- http://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.bz2
- crypt? ( mailclient? ( http://dev.gentoo.org/~polynomial-c/mozilla/enigmail-${EMVER}-20110124.tar.bz2 ) )"
-
-if ${HAS_LANGS} ; then
- for X in ${LANGS} ; do
- if [ "${X}" != "en" ] && [ "${X}" != "en-US" ]; then
- SRC_URI="${SRC_URI}
- linguas_${X/-/_}? ( ${REL_URI}/langpack/${MY_P}.${X}.langpack.xpi -> ${MY_P}-${X}.xpi )"
- fi
- IUSE="${IUSE} linguas_${X/-/_}"
- # english is handled internally
- if [ "${#X}" == 5 ] && ! has ${X} ${NOSHORTLANGS}; then
- if [ "${X}" != "en-US" ]; then
- SRC_URI="${SRC_URI}
- linguas_${X%%-*}? ( ${REL_URI}/langpack/${MY_P}.${X}.langpack.xpi -> ${MY_P}-${X}.xpi )"
- fi
- IUSE="${IUSE} linguas_${X%%-*}"
- fi
- done
-fi
-
-RDEPEND=">=sys-devel/binutils-2.16.1
- >=dev-libs/nss-3.12.8
- >=dev-libs/nspr-4.8.6
- alsa? ( media-libs/alsa-lib )
- system-sqlite? ( >=dev-db/sqlite-3.7.1[fts3,secure-delete,unlock-notify] )
- >=media-libs/libpng-1.4.1[apng]
- >=app-text/hunspell-1.2
- >=x11-libs/gtk+-2.10.0
- >=x11-libs/cairo-1.10.0[X]
- >=x11-libs/pango-1.14.0[X]
- libnotify? ( >=x11-libs/libnotify-0.4 )
- crypt? ( mailclient? ( >=app-crypt/gnupg-1.4 ) )
- wifi? ( net-wireless/wireless-tools )"
- #vpx? ( media-libs/libvpx )
-
-DEPEND="${RDEPEND}
- =dev-lang/python-2*[threads]
- dev-util/pkgconfig
- vpx? ( dev-lang/yasm )"
-
-S="${WORKDIR}/comm-central"
-
-linguas() {
- local LANG SLANG
- for LANG in ${LINGUAS}; do
- if has ${LANG} en en_US; then
- has en ${linguas} || linguas="${linguas:+"${linguas} "}en"
- continue
- elif has ${LANG} ${LANGS//-/_}; then
- has ${LANG//_/-} ${linguas} || linguas="${linguas:+"${linguas} "}${LANG//_/-}"
- continue
- elif [[ " ${LANGS} " == *" ${LANG}-"* ]]; then
- for X in ${LANGS}; do
- if [[ "${X}" == "${LANG}-"* ]] && \
- [[ " ${NOSHORTLANGS} " != *" ${X} "* ]]; then
- has ${X} ${linguas} || linguas="${linguas:+"${linguas} "}${X}"
- continue 2
- fi
- done
- fi
- ewarn "Sorry, but ${PN} does not support the ${LANG} LINGUA"
- done
-}
-
-src_unpack() {
- unpack ${A}
-
- if ${HAS_LANGS} ; then
- linguas
- for X in ${linguas}; do
- # FIXME: Add support for unpacking xpis to portage
- [[ ${X} != "en" ]] && xpi_unpack "${MY_P}-${X}.xpi"
- done
- if [[ ${linguas} != "" && ${linguas} != "en" ]]; then
- einfo "Selected language packs (first will be default): ${linguas}"
- fi
- fi
-}
-
-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
-
- # Ensure we always build with C locale.
- export LANG="C"
- export LC_ALL="C"
- export LC_MESSAGES="C"
- export LC_CTYPE="C"
-
- export BUILD_OFFICIAL=1
- export MOZILLA_OFFICIAL=1
-
- python_set_active_version 2
-}
-
-src_prepare() {
- # Apply our patches
- EPATCH_EXCLUDE="1002_fix-system-hunspell-dict-detections.patch
- 118-bz467766_att351173-dont-reset-user-prefs-on-upgrade.patch
- 310-gecko-1.9.1-cairo-1.8.10-crash-fix.patch" \
- EPATCH_SUFFIX="patch" \
- EPATCH_FORCE="yes" \
- epatch "${WORKDIR}"
-
- #epatch "${FILESDIR}"/2.1/${PN}-2.1b1-system-libvpx.patch
- epatch "${FILESDIR}"/2.1/${PN}-2.1b1-configure-fix.patch
- epatch "${FILESDIR}"/2.1/${PN}-2.1b1-bug607222.patch
- #epatch "${FILESDIR}"/2.1/${PN}-2.1b1-bug484968.scrolltabs.02.diff
-
- if use crypt && use mailclient ; then
- mv "${WORKDIR}"/enigmail "${S}"/mailnews/extensions/enigmail
- cd "${S}"/mailnews/extensions/enigmail || die
- epatch "${FILESDIR}"/enigmail/enigmail-1.1.2-seamonkey-2.1b1-versionfix.patch
- epatch "${FILESDIR}"/enigmail/enigmail-1.1.2-20110124-makefile.diff
- eautomake
- makemake2
- cd "${S}"
- fi
-
- #pushd "${S}"/mozilla &>/dev/null || die pushd
- #popd &>/dev/null || die popd
-
- #Ensure we disable javaxpcom by default to prevent configure breakage
- sed -i -e s:MOZ_JAVAXPCOM\=1::g ${S}/mozilla/xulrunner/confvars.sh \
- || die "sed javaxpcom"
-
- eautoreconf
- cd "${S}"/mozilla || die
- eautoreconf
- cd "${S}"/mozilla/js/src || die
- eautoreconf
-}
-
-src_configure() {
- declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
- MEXTENSIONS=""
-
- ####################################
- #
- # 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="${MEXTENSIONS},-irc"
- fi
- if ! use roaming ; then
- MEXTENSIONS="${MEXTENSIONS},-sroaming"
- fi
-
- if ! use gnome ; then
- MEXTENSIONS="${MEXTENSIONS},-gnomevfs"
- fi
-
- if ! use composer ; then
- if ! use chatzilla && ! use mailclient ; then
- mozconfig_annotate '-composer' --disable-composer
- fi
- fi
-
- mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
- mozconfig_annotate '' --enable-application=suite
- mozconfig_annotate 'broken' --disable-mochitest
- mozconfig_annotate 'broken' --disable-crashreporter
- mozconfig_annotate '' --enable-system-hunspell
- mozconfig_annotate '' --enable-jsd
- mozconfig_annotate '' --enable-image-encoder=all
- mozconfig_annotate '' --enable-canvas
- mozconfig_annotate '' --with-system-nspr
- mozconfig_annotate '' --with-system-nss
- mozconfig_annotate '' --with-system-bz2
- mozconfig_annotate '' --enable-oji --enable-mathml
- mozconfig_annotate 'places' --enable-storage --enable-places --enable-places_bookmarks
- mozconfig_annotate '' --disable-installer
- mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
- mozconfig_annotate '' --enable-printing
-
- # Enable/Disable based on USE flags
- mozconfig_use_enable alsa ogg
- mozconfig_use_enable alsa wave
- mozconfig_use_enable libnotify
- mozconfig_use_enable ldap
- mozconfig_use_enable ldap ldap-experimental
- #if use ldap ; then
- # mozconfig_annotate 'ldap' --enable-ldap
- # mozconfig_annotate 'ldap' --enable-ldap-experimental
- #fi
- mozconfig_use_enable mailclient mailnews
- mozconfig_use_enable system-sqlite
- mozconfig_use_enable vpx webm
- #mozconfig_use_with vpx system-vpx
- mozconfig_use_enable wifi necko-wifi
-
- if use vpx && ! use alsa; then
- ewarn "USE=vpx needs USE=alsa, disabling WebM support."
- mozconfig_annotate '+webm -alsa' --disable-webm
- fi
-
- if use amd64 || use x86 || use arm || use sparc; then
- mozconfig_annotate '' --enable-tracejit
- fi
-
- # ZOMG! Mozilla guys wanna have APNG in libpng if building with
- # system-libpng. Kids, leave your fingers from drugs that make you
- # do such nasty "extensions"!!!
- # See https://bugs.gentoo.org/183370 for details.
- mozconfig_annotate '' --with-system-png
-
- # Finalize and report settings
- mozconfig_final
-
- if [[ $(gcc-major-version) -lt 4 ]]; then
- append-cxxflags -fno-stack-protector
- fi
-
- ####################################
- #
- # Configure and build
- #
- ####################################
-
- # Work around breakage in makeopts with --no-print-directory
- MAKEOPTS="${MAKEOPTS/--no-print-directory/}"
-
- CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" PYTHON="$(PYTHON)" econf
-}
-
-src_compile() {
- # Should the build use multiprocessing? Not enabled by default, as it tends to break.
- [ "${WANT_MP}" = "true" ] && jobs=${MAKEOPTS} || jobs="-j1"
- emake ${jobs} || die
-
- # Only build enigmail extension if conditions are met.
- if use crypt && use mailclient ; then
- emake -C "${S}"/mailnews/extensions/enigmail || die "make enigmail failed"
- emake -j1 -C "${S}"/mailnews/extensions/enigmail xpi || die "make enigmail xpi failed"
- fi
-}
-
-src_install() {
- declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
- declare emid
-
- emake DESTDIR="${D}" install || die "emake install failed"
-
- if use crypt && use mailclient ; then
- cd "${T}" || die
- unzip "${S}"/mozilla/dist/bin/enigmail*.xpi install.rdf || die
- emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' install.rdf)
-
- dodir ${MOZILLA_FIVE_HOME}/extensions/${emid} || die
- cd "${D}"${MOZILLA_FIVE_HOME}/extensions/${emid} || die
- unzip "${S}"/mozilla/dist/bin/enigmail*.xpi || die
- fi
-
- if ${HAS_LANGS} ; then
- linguas
- for X in ${linguas}; do
- [[ ${X} != "en" ]] && xpi_install "${WORKDIR}"/"${MY_P}-${X}"
- done
- fi
-
- # Install icon and .desktop for menu entry
- newicon "${S}"/suite/branding/nightly/content/icon64.png seamonkey.png \
- || die
- domenu "${FILESDIR}"/icon/seamonkey.desktop || die
-
- # Add StartupNotify=true bug 290401
- if use startup-notification ; then
- echo "StartupNotify=true" >> "${D}"/usr/share/applications/seamonkey.desktop
- fi
-
- # Add our default prefs
- sed "s|SEAMONKEY_PVR|${PVR}|" "${FILESDIR}"/all-gentoo.js \
- > "${D}"${MOZILLA_FIVE_HOME}/defaults/pref/all-gentoo.js \
- || die
-
- # Plugins dir
- rm -rf "${D}"${MOZILLA_FIVE_HOME}/plugins || die "failed to remove existing plugins dir"
- dosym ../nsbrowser/plugins "${MOZILLA_FIVE_HOME}"/plugins || die
-
- doman "${S}"/suite/app/${PN}.1 || die
-}
-
-pkg_preinst() {
- declare MOZILLA_FIVE_HOME="${ROOT}/usr/$(get_libdir)/${PN}"
-
- if [ -d ${MOZILLA_FIVE_HOME}/plugins ] ; then
- rm ${MOZILLA_FIVE_HOME}/plugins -rf
- fi
-}
-
-pkg_postinst() {
- declare 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
-}
diff --git a/www-client/seamonkey/seamonkey-2.1_beta2.ebuild b/www-client/seamonkey/seamonkey-2.1_beta2.ebuild
index 2a054b5..5b059d0 100644
--- a/www-client/seamonkey/seamonkey-2.1_beta2.ebuild
+++ b/www-client/seamonkey/seamonkey-2.1_beta2.ebuild
@@ -158,6 +158,9 @@ src_prepare() {
epatch "${FILESDIR}"/2.1/${PN}-2.1b1-configure-fix.patch
epatch "${FILESDIR}"/2.1/${PN}-2.1b2-system-cairo-fixup.patch
epatch "${FILESDIR}"/2.1/${PN}-libnotify07.patch
+ if has_version \>=media-libs/libpng-1.5.0 ; then
+ epatch "${FILESDIR}"/2.1/xulrunner-libpng15.diff
+ fi
if use crypt && use mailclient ; then
mv "${WORKDIR}"/enigmail "${S}"/mailnews/extensions/enigmail
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/mozilla:master commit in: www-client/seamonkey/files/enigmail/, www-client/seamonkey/, ...
@ 2011-04-10 6:56 Lars Wendler
0 siblings, 0 replies; 5+ messages in thread
From: Lars Wendler @ 2011-04-10 6:56 UTC (permalink / raw
To: gentoo-commits
commit: c94399fbb43c3ba420d5c9fd970a1bb9eedae545
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 10 06:55:16 2011 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sun Apr 10 06:55:16 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=c94399fb
seamonkey: 2.1b3 was re-released so revbumped the ebuild.
---
www-client/seamonkey/Manifest | 4 +-
...key-2.1b3-restore-tabbar-scrolling-from-b2.diff | 51 ++++++++++++++++++++
...enigmail-1.1.2-seamonkey-2.1b3-versionfix.patch | 11 ++++
..._beta3.ebuild => seamonkey-2.1_beta3-r1.ebuild} | 7 ++-
4 files changed, 71 insertions(+), 2 deletions(-)
diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index e096ab7..5308f90 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -1,11 +1,13 @@
AUX 2.1/seamonkey-2.1b1-configure-fix.patch 690 RMD160 854bf17b5b5b5806c4936f80fbbd971e822a88e0 SHA1 10c39ddf76e3638fced4e48bbc2443b4eb88078c SHA256 f4b4a786ff743e9618d663832fbe7f21b36b0f84e1bf04cd0dae106da18fd2f4
AUX 2.1/seamonkey-2.1b2-gconf-config-update.patch 1569 RMD160 e237530c4d95de84aa295927fd1c703d8a54b9a9 SHA1 6f78524f88fd7b3f4fef4eec1666eabe96c89992 SHA256 9da47f2752f7bb353297b93be3aaecf2d6004af3c91717d22e35a347ee6cf2a2
AUX 2.1/seamonkey-2.1b2-system-cairo-fixup.patch 3364 RMD160 e823edc67c7d0984fed7645b09c417b93eb663ed SHA1 62b3f66be453a2fb13e2504858849aaef72bbb44 SHA256 fac11adcee4f506a005725a5741f55ba55810f7bcfc82fce5fba4317c84f4be5
+AUX 2.1/seamonkey-2.1b3-restore-tabbar-scrolling-from-b2.diff 1617 RMD160 085b370c0424130b5a773cb4621ec749f961d890 SHA1 9d8e6a27e170f5b93ada3d299c2b7828701945c2 SHA256 1c6e20c190412d72787e73d8beb3d9d676db73e569854f2b135be990a4f75763
AUX 2.1/seamonkey-libnotify07.patch 1117 RMD160 d9258ba252d3c94e8ac706424e94f055b278b499 SHA1 22502e4414f125efbada4812116f1e189c749782 SHA256 05ed978e07d1d74b38c53b205f98cc502dc6ce31cb04a21ad5f20a7a2fb5bdac
AUX 2.1/xulrunner-libpng15.diff 446 RMD160 a6b43dde909929befa6b7ec38f0fb51d0ddf4ac5 SHA1 6e9dd65b774022111c6723bda5341acadef8b040 SHA256 ece56d83be83178bc05bcd3b11251624371522d2db932974f4a6e72f49857e51
AUX all-gentoo.js 788 RMD160 08464d4a78e2126dce9e482988af1720d54a087d SHA1 74aed071070a8d896b655fd975da67329939339c SHA256 3ca0cbee6ca3d8857e7afadcfe76f65bd9c4130936602a1dbabb484406df0f45
AUX enigmail/enigmail-1.1.2-20110124-makefile.diff 1572 RMD160 3840707bebdc8785ea08689cc95e0b762ca116f5 SHA1 0b607adf7af0d4d9a969b2c14abb19e1c9e94888 SHA256 9fc6c5d59864d53536ff755a2245ec60c61a4ffa2a81920c869687e5604f3144
AUX enigmail/enigmail-1.1.2-seamonkey-2.1b2-versionfix.patch 388 RMD160 978e6888f0dd25fae9f59e594c800c64626607dd SHA1 08261cf1027d10723fa74d2e00f20b734d679983 SHA256 3ed44f737ad3eb89eb58bb03cb375579b2002d0ac06982b0d17f281041c42959
+AUX enigmail/enigmail-1.1.2-seamonkey-2.1b3-versionfix.patch 388 RMD160 50285565b464fcf11ea2c4332f99a595c8543cc8 SHA1 137ebbc0441e290b56879525a31cba1a7977cd93 SHA256 935ad53a3a6e042d8a3f890d2dcb96cbfc3a81779fdd1f15b6eaa14b69334d75
AUX icon/seamonkey.desktop 285 RMD160 b684a071867d4d66799dd6b08187c6b66fa789bb SHA1 e95f4f7ab1d2c436e3b641768ce6514367992f56 SHA256 a95d1da8080d4e83f399b0ffeefa20d0a6fd0dc8a3da8edc41cd8cedb34557f7
AUX icon/seamonkey.png 4172 RMD160 d296c4d4e0920e4476f4c6c607946434202ad521 SHA1 f76213195e2dc002ff2e411ed0247d2624ce7b09 SHA256 7ffc1911a62b526702f3c991365dd8f18b6427c7e173456a101db4fb4c43ae59
DIST enigmail-1.1.2-20110124.tar.bz2 862291 RMD160 6b7b4a9a4295c5d0b0ff149d3750b3c059e29d47 SHA1 a4d81224def58e68ca6b8fc291b93d3598279096 SHA256 89c24933ccdf765d5a0928127a5139e3f800a2b5bf7c20020d0870e78e70f044
@@ -40,4 +42,4 @@ DIST seamonkey-2.1b3-ru.xpi 891638 RMD160 58ea86a0c9552ec939782ae07245e6fb65bdf2
DIST seamonkey-2.1b3-sk.xpi 843090 RMD160 32f1c70a1bb5635c7e57d6b7862601398ba31594 SHA1 9d87f6882d2548a68df190d8f47ed0f63a2c0431 SHA256 01d4a0e2aae52ee6acc7388e16cbb5b00f370a30d9e2335ed22c23fb7e9d9f6a
DIST seamonkey-2.1b3.source.tar.bz2 84193584 RMD160 6d4f1d224d680e6fed773ba5306cbabcbae4ca62 SHA1 7b4ba58cf5df42cec8e840f2f0416604a1ad87d9 SHA256 97afefa90d86c873d3e78238bab44f57efedba296291fe0320458b26df9d9ec9
EBUILD seamonkey-2.1_beta2.ebuild 9938 RMD160 d25cfd907b05a60add6f2e5783f6bdfa45b7dcf9 SHA1 8c9c3737078166fa0a5501b149ac72e7448fb99f SHA256 3f19c147f4528374ac731d3bdca8f3eb179b8a7135334d904b896313efa7e8b3
-EBUILD seamonkey-2.1_beta3.ebuild 9731 RMD160 f252ce3190eb820693aa9e51de606251ae56b403 SHA1 fec1a3775b5d59ae5a6ace660b83e3f40fd72d85 SHA256 6d007d8c69e2e7dea744167e2813d81b52251ace29454f637b95515a780875fd
+EBUILD seamonkey-2.1_beta3-r1.ebuild 9878 RMD160 76c30a9727f076351a3b76380fa25de9a45dac04 SHA1 4158b2d86a17fe4c47ebe8aa0e44bc0fa24a15d8 SHA256 c1f33886625ca99ad5bfb95145580340619356cf5491d074852d9b2eacf585c7
diff --git a/www-client/seamonkey/files/2.1/seamonkey-2.1b3-restore-tabbar-scrolling-from-b2.diff b/www-client/seamonkey/files/2.1/seamonkey-2.1b3-restore-tabbar-scrolling-from-b2.diff
new file mode 100644
index 0000000..d42312c
--- /dev/null
+++ b/www-client/seamonkey/files/2.1/seamonkey-2.1b3-restore-tabbar-scrolling-from-b2.diff
@@ -0,0 +1,51 @@
+
+diff --git a/suite/browser/tabbrowser.xml b/suite/browser/tabbrowser.xml
+--- a/suite/browser/tabbrowser.xml
++++ b/suite/browser/tabbrowser.xml
+@@ -2995,17 +2995,17 @@
+ tab.style.minWidth = this.mPrefs.getIntPref("browser.tabs.tabMinWidth") + "px";
+ tab.style.maxWidth = this.mPrefs.getIntPref("browser.tabs.tabMaxWidth") + "px";
+ window.addEventListener("resize", this, false);
+ ]]>
+ </constructor>
+
+ <destructor>
+ <![CDATA[
+- document.removeEventListener("resize", this, false);
++ window.removeEventListener("resize", this, false);
+ ]]>
+ </destructor>
+
+ <field name="mPrefs" readonly="true">
+ Components.classes["@mozilla.org/preferences-service;1"]
+ .getService(Components.interfaces.nsIPrefBranch2);
+ </field>
+
+@@ -3118,16 +3118,23 @@
+ <handler event="TabSelect" action="this._handleTabSelect();"/>
+
+ <handler event="transitionend">
+ <![CDATA[
+ if (event.propertyName == "max-width")
+ this._handleNewTab(event.target);
+ ]]>
+ </handler>
++
++ <handler event="DOMMouseScroll" phase="capturing">
++ <![CDATA[
++ this.advanceSelectedTab(event.detail < 0 ? -1 : 1);
++ event.stopPropagation();
++ ]]>
++ </handler>
+ </handlers>
+ </binding>
+
+ <binding id="tabbrowser-alltabs-popup"
+ extends="chrome://global/content/bindings/popup.xml#popup">
+ <implementation implements="nsIDOMEventListener">
+ <method name="_tabOnTabClose">
+ <parameter name="aEvent"/>
+
+
+
+
diff --git a/www-client/seamonkey/files/enigmail/enigmail-1.1.2-seamonkey-2.1b3-versionfix.patch b/www-client/seamonkey/files/enigmail/enigmail-1.1.2-seamonkey-2.1b3-versionfix.patch
new file mode 100644
index 0000000..7714844
--- /dev/null
+++ b/www-client/seamonkey/files/enigmail/enigmail-1.1.2-seamonkey-2.1b3-versionfix.patch
@@ -0,0 +1,11 @@
+--- enigmail/package/install.rdf
++++ enigmail/package/install.rdf
+@@ -23,7 +23,7 @@
+ <Description>
+ <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
+ <em:minVersion>2.1a1pre</em:minVersion>
+- <em:maxVersion>2.1a2</em:maxVersion>
++ <em:maxVersion>2.1b3</em:maxVersion>
+ </Description>
+ </em:targetApplication>
+ <em:targetApplication>
diff --git a/www-client/seamonkey/seamonkey-2.1_beta3.ebuild b/www-client/seamonkey/seamonkey-2.1_beta3-r1.ebuild
similarity index 97%
rename from www-client/seamonkey/seamonkey-2.1_beta3.ebuild
rename to www-client/seamonkey/seamonkey-2.1_beta3-r1.ebuild
index 5b20c71..32f7cff 100644
--- a/www-client/seamonkey/seamonkey-2.1_beta3.ebuild
+++ b/www-client/seamonkey/seamonkey-2.1_beta3-r1.ebuild
@@ -19,6 +19,8 @@ MY_PV="${MY_PV/_beta/b}"
MY_PV="${MY_PV/_rc/rc}"
MY_P="${PN}-${MY_PV}"
+[[ ${MY_PV} == 2.1b3 ]] && MY_PV="${MY_PV}-real"
+
# release versions usually have language packs. So be careful with changing this.
HAS_LANGS="true"
if [[ ${PV} == *_pre* ]] ; then
@@ -144,10 +146,13 @@ src_prepare() {
fi
epatch "${FILESDIR}"/2.1/${PN}-2.1b2-gconf-config-update.patch
+ EPATCH_OPTS="-R" \
+ epatch "${FILESDIR}"/2.1/${PN}-2.1b3-restore-tabbar-scrolling-from-b2.diff
+
if use crypt && use mailclient ; then
mv "${WORKDIR}"/enigmail "${S}"/mailnews/extensions/enigmail
cd "${S}"/mailnews/extensions/enigmail || die
- epatch "${FILESDIR}"/enigmail/enigmail-1.1.2-seamonkey-2.1b2-versionfix.patch
+ epatch "${FILESDIR}"/enigmail/enigmail-1.1.2-seamonkey-2.1b3-versionfix.patch
epatch "${FILESDIR}"/enigmail/enigmail-1.1.2-20110124-makefile.diff
eautomake
makemake2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/mozilla:master commit in: www-client/seamonkey/files/enigmail/, www-client/seamonkey/, ...
@ 2011-06-23 10:07 Lars Wendler
0 siblings, 0 replies; 5+ messages in thread
From: Lars Wendler @ 2011-06-23 10:07 UTC (permalink / raw
To: gentoo-commits
commit: 4cc68d07e848a6e90156944e1063d552140095e9
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 23 10:06:04 2011 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Jun 23 10:06:04 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=4cc68d07
seamonkey: new 2.2b1 ebuild
---
www-client/seamonkey/Manifest | 26 ++++++++--
...-2.1b3-restore-tabbar-scrolling-from-2.1b2.diff | 51 +++++---------------
...enigmail-1.1.2-seamonkey-2.1b3-versionfix.patch | 11 ----
...nigmail-1.2a2-seamonkey-2.2b1-versionfix.patch} | 4 +-
www-client/seamonkey/seamonkey-2.1.ebuild | 2 -
www-client/seamonkey/seamonkey-2.1_rc2_pre1.ebuild | 2 -
...onkey-2.1.ebuild => seamonkey-2.2_beta1.ebuild} | 10 ++--
7 files changed, 40 insertions(+), 66 deletions(-)
diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index adcdd1d..4369a03 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -1,10 +1,9 @@
AUX 2.1/seamonkey-2.1b1-configure-fix.patch 690 RMD160 854bf17b5b5b5806c4936f80fbbd971e822a88e0 SHA1 10c39ddf76e3638fced4e48bbc2443b4eb88078c SHA256 f4b4a786ff743e9618d663832fbe7f21b36b0f84e1bf04cd0dae106da18fd2f4
-AUX 2.1/seamonkey-2.1b3-restore-tabbar-scrolling-from-2.1b2.diff 1708 RMD160 cbafdeb503985052a5f589eb5f1e142c5e5fdfb1 SHA1 fa7be6cabfd58db2fa1d79c70332b3f06c383b83 SHA256 ae6cafc054b803713c3c3d72f0d34035272ba9af775e16132be92edf6c9f0600
+AUX 2.1/seamonkey-2.1b3-restore-tabbar-scrolling-from-2.1b2.diff 744 RMD160 7c9bab23159e956813fa2e2a59dac5dbc16dbe60 SHA1 d29a9ded0cad3df137539642e6a6031c361c47ac SHA256 a8b217e3bf7902caab447f849712459f92e19c8889bc66c977019c603ddb99d4
AUX all-gentoo.js 788 RMD160 08464d4a78e2126dce9e482988af1720d54a087d SHA1 74aed071070a8d896b655fd975da67329939339c SHA256 3ca0cbee6ca3d8857e7afadcfe76f65bd9c4130936602a1dbabb484406df0f45
AUX enigmail/enigmail-1.1.2-20110124-makefile.diff 1572 RMD160 3840707bebdc8785ea08689cc95e0b762ca116f5 SHA1 0b607adf7af0d4d9a969b2c14abb19e1c9e94888 SHA256 9fc6c5d59864d53536ff755a2245ec60c61a4ffa2a81920c869687e5604f3144
-AUX enigmail/enigmail-1.1.2-seamonkey-2.1b2-versionfix.patch 388 RMD160 978e6888f0dd25fae9f59e594c800c64626607dd SHA1 08261cf1027d10723fa74d2e00f20b734d679983 SHA256 3ed44f737ad3eb89eb58bb03cb375579b2002d0ac06982b0d17f281041c42959
-AUX enigmail/enigmail-1.1.2-seamonkey-2.1b3-versionfix.patch 388 RMD160 50285565b464fcf11ea2c4332f99a595c8543cc8 SHA1 137ebbc0441e290b56879525a31cba1a7977cd93 SHA256 935ad53a3a6e042d8a3f890d2dcb96cbfc3a81779fdd1f15b6eaa14b69334d75
AUX enigmail/enigmail-1.1.2-seamonkey-2.1rc1-versionfix.patch 386 RMD160 54acaf1f87ea3bc65d7e5027b074dcee93b6a1a0 SHA1 18b91e45c263ec1cacce63b2c0eeb266d6a69196 SHA256 5b6e504403aac97a083979e270ec874595d5ef9c5fdc60af067c20ec8f58a4f5
+AUX enigmail/enigmail-1.2a2-seamonkey-2.2b1-versionfix.patch 386 RMD160 0ecafbbace7acefdf63f5b57ca90d70f31b56a2f SHA1 e83f76194e408b3ae3b4cb34e02a99a972354fc3 SHA256 6b9131ae198a8964504bece6004e2ea671df8f8a11af1fce25f45d3934b548b6
AUX icon/seamonkey.desktop 288 RMD160 c9f56aed280a3ff68f0c40ae453fc24351daeea6 SHA1 87254c3cbfad672309e4b1fa408d08b74be31056 SHA256 524ae39ffc10b2a950aa344ae6c3f3d9b4a21009697edfd52ec47aa850d795d0
AUX icon/seamonkey.png 4172 RMD160 d296c4d4e0920e4476f4c6c607946434202ad521 SHA1 f76213195e2dc002ff2e411ed0247d2624ce7b09 SHA256 7ffc1911a62b526702f3c991365dd8f18b6427c7e173456a101db4fb4c43ae59
DIST enigmail-1.2a1_pre-20110513.tar.xz 777568 RMD160 3657239cc1f3896881b852d141a8fbea1d4bb1bb SHA1 86548076b2b180cc3fa25cf121dde2ef37c95e68 SHA256 6bd68993292df117024cc3a6b6f324241f78efcaf140ff8b2c6f406b149890a9
@@ -54,5 +53,22 @@ DIST seamonkey-2.1rc2-sk.xpi 843122 RMD160 ebc43feff78380769fe77307a290c1f8b9b9f
DIST seamonkey-2.1rc2-sv-SE.xpi 872350 RMD160 a76848536344344f70be6086e5ab744aaa1f05c1 SHA1 c572e47361e1d2b88ef147581ba2e6ebe3b65704 SHA256 e5c060c38d7623a516cc40d19d9fd73162ea670b4bf09636f5750c28e08ba7de
DIST seamonkey-2.1rc2-tr.xpi 807997 RMD160 39b77333f6a2e5c0fd7aacc78f5301f1875d4e86 SHA1 4e74e0208c1af8d2c17b7cc6f11cf0c14cbb302e SHA256 0b4568ad637da667118dc3a6d64b3e5ff554172a2fbc6b08d21f93d161a76f29
DIST seamonkey-2.1rc2.source.tar.bz2 84298154 RMD160 92cebd02db7da34ef2da2e8c29eab73744b64e68 SHA1 6bbffc04e81d10ac7999d3deb5f0d3caa6e4978f SHA256 6046ca1836d5c3d45ff42dbaf42b57131c7c9e82de189e9cbaa5b1206ffdee38
-EBUILD seamonkey-2.1.ebuild 9216 RMD160 549ca4ae28a12dd68ed931a63857c7b0b6666859 SHA1 a8ed8e21925ce4c206cec4ee4f7730b30e0fbebf SHA256 e0d30d92e6cac3393a80836f3b76e9046ba480d5043d07e02dabc289830d93dd
-EBUILD seamonkey-2.1_rc2_pre1.ebuild 9331 RMD160 df71d0c2ff2d7889ba7dff9761ac5d57a4c9df35 SHA1 9d4f3c77c2abb95bb92089180ae53df25d5db184 SHA256 41644bc521a5ceb7b056ff29bf99d91d9734624b63a393960991344bb3cde050
+DIST seamonkey-2.2b1-ca.xpi 811511 RMD160 90d7eb1ab3dd7e75f0663beab0965f2bfb9324fd SHA1 1d162a40db541e872e6982c74e5a0f5bdc15a966 SHA256 c6f321e337d6789c042fd4134135af1965724c35ac1457d452f3ba4a3b7c1c62
+DIST seamonkey-2.2b1-cs.xpi 814944 RMD160 0b6eb23de7a55403c431d62f946a2ecbd2bd5196 SHA1 6d1f0ab5e44a8eabf354a626c46a60cb594127be SHA256 a48b52ff47af3290bd722d1b32ebe14b4c5c3d57a3793a4f7906cbbf282ad69b
+DIST seamonkey-2.2b1-de.xpi 857283 RMD160 153ced9129f1d4a3d48b3f21e53442520a23e5aa SHA1 50262dc5de171b859ba151098b2480e6112db9ea SHA256 513e1887cb8f14fd9c40c344be026512c3e947395f69218b6fd787fe916c2a3c
+DIST seamonkey-2.2b1-en-GB.xpi 787529 RMD160 173f1a71617297c95e2f2cd357c93ec9a0dda893 SHA1 f2f8d038c3d07bbdc61772d03c136338eec61744 SHA256 aae9abac12b62e15f3a934cfeaf5b61c5bf72e14af801e11e3952a4a016e11e7
+DIST seamonkey-2.2b1-en-US.xpi 786992 RMD160 7e17630e798162f6e04c1c2f19e1061f4829792b SHA1 c7e6718c6986676a7aa177d8e83e833fdf0d7761 SHA256 6ba84298b90208cc71fd77fe835465916f8d57767e55dba493fe335fcbb84e7a
+DIST seamonkey-2.2b1-es-AR.xpi 813118 RMD160 768e58f9c7b6e02da1e7d7ee5dd68618cd6b069c SHA1 93891c828d0d7acfd4b87ba3f2b84d92d7e20bf3 SHA256 14bc5c00e1085f2d6fe9a6a598f238f6bb4b0e9b50dec338355d519a1f6b3cb6
+DIST seamonkey-2.2b1-es-ES.xpi 785711 RMD160 d03aa7045d4bc16e2a675c2ecd31c2647418f745 SHA1 c1c7faeb313e687b0a4798f5af3e386d9d698d91 SHA256 e11e0ba19bd934b5232b7150ba59140ac5a9eaa7f98c4b0b62033a7a85de80bc
+DIST seamonkey-2.2b1-fr.xpi 896109 RMD160 c531f0cadd34d1d6154716ef3b2f11406c665ba9 SHA1 c45f3e8bba9031d0c0013e22d5d6516f68fa0175 SHA256 552723f5d865ac36184662bdb546ff225d87418e4b0a9667aeb585b7b3958e10
+DIST seamonkey-2.2b1-it.xpi 739672 RMD160 251a161aa41a3f85a40e4a7d09c78c6038476aa9 SHA1 0533ce41a9ace0e2fb35b5cbf46b93142c806a69 SHA256 bd2a4a5c25f98fac4a35869be1fd613dd0aee8c03af4e55a05c143aeba4b2772
+DIST seamonkey-2.2b1-ja.xpi 861377 RMD160 b10cc9cfe0f1c0848d7d96537086f95b9a29470f SHA1 e71b43980ad76d7b7913e2dc67f16783b892dcc7 SHA256 5e65be420e489fe9c1a80bc5b49d9a0b94a0c24a4cadb2f0d8fbf7cf828bdba7
+DIST seamonkey-2.2b1-lt.xpi 959540 RMD160 2a9466e8a4445814cb43e6ffaeecd878ff47ff61 SHA1 56a01e2ac70e307caec488c5985f4cb5729ba8c8 SHA256 a31dabc20c642e1207c7866fe19adf634c2eb9a01fbb38668ac944fceca95477
+DIST seamonkey-2.2b1-nl.xpi 804312 RMD160 0f145df5a07a7566f04671288ba956c0496a48ac SHA1 28673a959cdca80688ee737d14dc0bc9a673e85d SHA256 d070c4a076b17489bfe7eba279ed0509be199f48e0dbd75b3c9390b64b7570cb
+DIST seamonkey-2.2b1-patches-01.tar.xz 17104 RMD160 d82c7d464be8bd3f593570529910bcb371797a6a SHA1 3c5584a1fe22a8cb5b69423499c32d25a0335606 SHA256 c4704e8959f65e02e6b10546de43c16cbbf57a28289a5f7e7084925439442278
+DIST seamonkey-2.2b1-ru.xpi 889516 RMD160 c03cfdca92558d4eac4e254a718f2b17309c83a4 SHA1 d4c5b485efd0565e908c724f4d6bc4759666d087 SHA256 4778f575201d82daab127d9505a1b901d5a5b78ed422b496bdc9ea7a87cdba50
+DIST seamonkey-2.2b1-sk.xpi 840212 RMD160 c0229531c487e489c909c00ffaf05dfd1c6306b4 SHA1 fb6cc53327baae982cae4e4187fa37c087256334 SHA256 69c3af3aef1e4ce83e9274124fc60b457bc12fb06382fe322568357e395de6a6
+DIST seamonkey-2.2b1.source.tar.bz2 87668841 RMD160 52f18e3f4445244eeeec2b5cbb2049a2552c3c8d SHA1 b17568d5e045852690938129933ef956c0fdfea7 SHA256 c5f655e2d916149513b613f8d522e4a0e9cff2a9a2549c93c8ade10a3e0b6d84
+EBUILD seamonkey-2.1.ebuild 9195 RMD160 6317e5c4791ca14097db26bcec30533916411fb2 SHA1 16fe0a63f4a6840b5133ce701169f644672e5779 SHA256 5adf1c4dc32ecd36c3be025715d49bc32c70b85b44cb6caf0465a231c28bbc90
+EBUILD seamonkey-2.1_rc2_pre1.ebuild 9310 RMD160 10f4f54ba31e90286932cabd8a30e2b7ec945a9e SHA1 3d6eb075f73f9a3424ff66a7d076595ce88ba86a SHA256 3bcbd48eff61456be7c3c59d64528c642c1abdea3d82f74d47395c5507016c23
+EBUILD seamonkey-2.2_beta1.ebuild 9164 RMD160 85a36b62b3f11e42d9f1b861a37915c94076de99 SHA1 17c9d72c88d2a3cb3d5b7d900b7a973b75fa8f4e SHA256 cd8203fd8e6b1e7805f4e7412b6c54c8334dd8c7c0cafbb0910bb7b4f60721be
diff --git a/www-client/seamonkey/files/2.1/seamonkey-2.1b3-restore-tabbar-scrolling-from-2.1b2.diff b/www-client/seamonkey/files/2.1/seamonkey-2.1b3-restore-tabbar-scrolling-from-2.1b2.diff
index 8457d88..2696764 100644
--- a/www-client/seamonkey/files/2.1/seamonkey-2.1b3-restore-tabbar-scrolling-from-2.1b2.diff
+++ b/www-client/seamonkey/files/2.1/seamonkey-2.1b3-restore-tabbar-scrolling-from-2.1b2.diff
@@ -1,53 +1,28 @@
# This patch reverts the change from
# https://bugzilla.mozilla.org/show_bug.cgi?id=643294
-diff --git a/suite/browser/tabbrowser.xml b/suite/browser/tabbrowser.xml
---- a/suite/browser/tabbrowser.xml
-+++ b/suite/browser/tabbrowser.xml
-@@ -2995,17 +2995,17 @@
- tab.style.minWidth = this.mPrefs.getIntPref("browser.tabs.tabMinWidth") + "px";
- tab.style.maxWidth = this.mPrefs.getIntPref("browser.tabs.tabMaxWidth") + "px";
- window.addEventListener("resize", this, false);
- ]]>
- </constructor>
+--- comm-2.0/suite/browser/tabbrowser.xml
++++ comm-2.0/suite/browser/tabbrowser.xml
+@@ -3000,7 +3000,7 @@
<destructor>
<![CDATA[
-- document.removeEventListener("resize", this, false);
-+ window.removeEventListener("resize", this, false);
+- window.removeEventListener("resize", this, false);
++ document.removeEventListener("resize", this, false);
]]>
</destructor>
- <field name="mPrefs" readonly="true">
- Components.classes["@mozilla.org/preferences-service;1"]
- .getService(Components.interfaces.nsIPrefBranch2);
- </field>
-
-@@ -3118,16 +3118,23 @@
- <handler event="TabSelect" action="this._handleTabSelect();"/>
-
- <handler event="transitionend">
- <![CDATA[
- if (event.propertyName == "max-width")
+@@ -3123,13 +3123,6 @@
this._handleNewTab(event.target);
]]>
</handler>
-+
-+ <handler event="DOMMouseScroll" phase="capturing">
-+ <![CDATA[
-+ this.advanceSelectedTab(event.detail < 0 ? -1 : 1);
-+ event.stopPropagation();
-+ ]]>
-+ </handler>
+-
+- <handler event="DOMMouseScroll" phase="capturing">
+- <![CDATA[
+- this.advanceSelectedTab(event.detail < 0 ? -1 : 1);
+- event.stopPropagation();
+- ]]>
+- </handler>
</handlers>
</binding>
- <binding id="tabbrowser-alltabs-popup"
- extends="chrome://global/content/bindings/popup.xml#popup">
- <implementation implements="nsIDOMEventListener">
- <method name="_tabOnTabClose">
- <parameter name="aEvent"/>
-
-
-
-
diff --git a/www-client/seamonkey/files/enigmail/enigmail-1.1.2-seamonkey-2.1b3-versionfix.patch b/www-client/seamonkey/files/enigmail/enigmail-1.1.2-seamonkey-2.1b3-versionfix.patch
deleted file mode 100644
index 7714844..0000000
--- a/www-client/seamonkey/files/enigmail/enigmail-1.1.2-seamonkey-2.1b3-versionfix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- enigmail/package/install.rdf
-+++ enigmail/package/install.rdf
-@@ -23,7 +23,7 @@
- <Description>
- <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
- <em:minVersion>2.1a1pre</em:minVersion>
-- <em:maxVersion>2.1a2</em:maxVersion>
-+ <em:maxVersion>2.1b3</em:maxVersion>
- </Description>
- </em:targetApplication>
- <em:targetApplication>
diff --git a/www-client/seamonkey/files/enigmail/enigmail-1.1.2-seamonkey-2.1b2-versionfix.patch b/www-client/seamonkey/files/enigmail/enigmail-1.2a2-seamonkey-2.2b1-versionfix.patch
similarity index 76%
rename from www-client/seamonkey/files/enigmail/enigmail-1.1.2-seamonkey-2.1b2-versionfix.patch
rename to www-client/seamonkey/files/enigmail/enigmail-1.2a2-seamonkey-2.2b1-versionfix.patch
index 88309b4..eeec0bb 100644
--- a/www-client/seamonkey/files/enigmail/enigmail-1.1.2-seamonkey-2.1b2-versionfix.patch
+++ b/www-client/seamonkey/files/enigmail/enigmail-1.2a2-seamonkey-2.2b1-versionfix.patch
@@ -4,8 +4,8 @@
<Description>
<em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
<em:minVersion>2.1a1pre</em:minVersion>
-- <em:maxVersion>2.1a2</em:maxVersion>
-+ <em:maxVersion>2.1b2</em:maxVersion>
+- <em:maxVersion>2.1b2</em:maxVersion>
++ <em:maxVersion>2.2</em:maxVersion>
</Description>
</em:targetApplication>
<em:targetApplication>
diff --git a/www-client/seamonkey/seamonkey-2.1.ebuild b/www-client/seamonkey/seamonkey-2.1.ebuild
index da667bd..bb72f67 100644
--- a/www-client/seamonkey/seamonkey-2.1.ebuild
+++ b/www-client/seamonkey/seamonkey-2.1.ebuild
@@ -134,8 +134,6 @@ src_prepare() {
epatch "${WORKDIR}/patch"
#epatch "${FILESDIR}"/2.1/${PN}-2.1b1-configure-fix.patch
-
- EPATCH_OPTS="-R" \
epatch "${FILESDIR}"/2.1/${PN}-2.1b3-restore-tabbar-scrolling-from-2.1b2.diff
if use crypt ; then
diff --git a/www-client/seamonkey/seamonkey-2.1_rc2_pre1.ebuild b/www-client/seamonkey/seamonkey-2.1_rc2_pre1.ebuild
index 564c86e..9b6cfed 100644
--- a/www-client/seamonkey/seamonkey-2.1_rc2_pre1.ebuild
+++ b/www-client/seamonkey/seamonkey-2.1_rc2_pre1.ebuild
@@ -134,8 +134,6 @@ src_prepare() {
epatch "${WORKDIR}/patch"
epatch "${FILESDIR}"/2.1/${PN}-2.1b1-configure-fix.patch
-
- EPATCH_OPTS="-R" \
epatch "${FILESDIR}"/2.1/${PN}-2.1b3-restore-tabbar-scrolling-from-2.1b2.diff
if use crypt && use mailclient ; then
diff --git a/www-client/seamonkey/seamonkey-2.1.ebuild b/www-client/seamonkey/seamonkey-2.2_beta1.ebuild
similarity index 97%
copy from www-client/seamonkey/seamonkey-2.1.ebuild
copy to www-client/seamonkey/seamonkey-2.2_beta1.ebuild
index da667bd..4d3dbf8 100644
--- a/www-client/seamonkey/seamonkey-2.1.ebuild
+++ b/www-client/seamonkey/seamonkey-2.2_beta1.ebuild
@@ -7,10 +7,10 @@ WANT_AUTOCONF="2.1"
inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib fdo-mime autotools mozextension python
-PATCH="${PN}-2.1rc1-patches-01"
+PATCH="${PN}-2.2b1-patches-01"
EMVER="1.2a2"
-LANGS="be ca cs de en en-GB en-US es-AR es-ES fi fr it ja lt nb-NO nl pl pt-PT ru sk sv-SE tr"
+LANGS="ca cs de en en-GB en-US es-AR es-ES fr it ja lt nl ru sk"
NOSHORTLANGS="en-GB en-US es-AR"
MY_PV="${PV/_pre*}"
@@ -78,7 +78,7 @@ DEPEND="${RDEPEND}
dev-util/pkgconfig
dev-lang/yasm"
-S="${WORKDIR}/comm-2.0"
+S="${WORKDIR}/comm-beta"
linguas() {
local LANG SLANG
@@ -134,14 +134,12 @@ src_prepare() {
epatch "${WORKDIR}/patch"
#epatch "${FILESDIR}"/2.1/${PN}-2.1b1-configure-fix.patch
-
- EPATCH_OPTS="-R" \
epatch "${FILESDIR}"/2.1/${PN}-2.1b3-restore-tabbar-scrolling-from-2.1b2.diff
if use crypt ; then
mv "${WORKDIR}"/enigmail "${S}"/mailnews/extensions/enigmail
cd "${S}"/mailnews/extensions/enigmail || die
- epatch "${FILESDIR}"/enigmail/enigmail-1.1.2-seamonkey-2.1rc1-versionfix.patch
+ epatch "${FILESDIR}"/enigmail/enigmail-1.2a2-seamonkey-2.2b1-versionfix.patch
epatch "${FILESDIR}"/enigmail/enigmail-1.1.2-20110124-makefile.diff
eautomake
makemake2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/mozilla:master commit in: www-client/seamonkey/files/enigmail/, www-client/seamonkey/, ...
@ 2012-02-09 5:55 Lars Wendler
0 siblings, 0 replies; 5+ messages in thread
From: Lars Wendler @ 2012-02-09 5:55 UTC (permalink / raw
To: gentoo-commits
commit: 815c49621d7e4b499b0fc81a52c89dfb1ae84b64
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 9 05:55:08 2012 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Feb 9 05:55:08 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=815c4962
seamonkey: cleanup and sync with portage tree.
---
www-client/seamonkey/Manifest | 34 +--
www-client/seamonkey/files/all-gentoo-1.js | 19 ++
www-client/seamonkey/files/all-gentoo.js | 15 -
.../files/enigmail/enigmail-1.3.3-bug373733.patch | 20 --
...1-scrollbar-mouse-interaction-improvement.patch | 105 ------
.../seamonkey/files/seamonkey-2.6b1-bug682677.diff | 71 ----
www-client/seamonkey/seamonkey-2.7.ebuild | 49 ++--
www-client/seamonkey/seamonkey-2.7_beta5.ebuild | 334 --------------------
8 files changed, 44 insertions(+), 603 deletions(-)
diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index 56bc188..40d6de5 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -1,9 +1,6 @@
-AUX all-gentoo.js 712 RMD160 9c8352b0780ee3ac1e6f372dccb15975dfa09212 SHA1 5825d4485807fe53ddf8bbee70c7352f16c5ea45 SHA256 dfe92f212383bb79b3e2aebb03763c1ad179b3cbc90b22eb4b6aeddba98d100b
-AUX enigmail/enigmail-1.3.3-bug373733.patch 1168 RMD160 296a154bb79945a763f922149eb68667c4b51343 SHA1 52f5ec3cc1818eaa45a689200e4a84c7c599e377 SHA256 c8a61a29164e66a47c2d12ec96c3c31a6b3019f3fd3b961584642fdde228b379
+AUX all-gentoo-1.js 957 RMD160 0f8662577dfad72d786c196ab804f7cc9cd3f9f6 SHA1 22c105f15e2e86878b743fe516386fd6823fbb3f SHA256 9a0a0f220719bfa7e03b9cb3a5ccdbc9c5d43f75b443eceed65a8f3cb43b21d5
AUX icon/seamonkey.desktop 288 RMD160 c9f56aed280a3ff68f0c40ae453fc24351daeea6 SHA1 87254c3cbfad672309e4b1fa408d08b74be31056 SHA256 524ae39ffc10b2a950aa344ae6c3f3d9b4a21009697edfd52ec47aa850d795d0
AUX icon/seamonkey.png 4172 RMD160 d296c4d4e0920e4476f4c6c607946434202ad521 SHA1 f76213195e2dc002ff2e411ed0247d2624ce7b09 SHA256 7ffc1911a62b526702f3c991365dd8f18b6427c7e173456a101db4fb4c43ae59
-AUX seamonkey-2.3.1-scrollbar-mouse-interaction-improvement.patch 3768 RMD160 48d6849a54d73054dde7f76e2e0aff4ebcd24926 SHA1 744f5d981e2219843ddba47341053ed74463ef11 SHA256 eed1c52b02b89d97328aa25b9c825d5b76d833bad87ce98f6fed5c32da91b5ac
-AUX seamonkey-2.6b1-bug682677.diff 2317 RMD160 b45155ae8a81ea8014b3844af50c223ca2b3756b SHA1 6914ce260d12318659bf1c4a83ca2e915d16d3c7 SHA256 f79675ebcc555c2e42f7c10e17dd79863968435c0d2bca064e40f315bfc19f88
DIST enigmail-1.3.5.tar.gz 1348362 RMD160 9aa3cdd7b8f16f4cb15e3b6f63c5ac913ddaac3f SHA1 4cc928ce2fc328cf6aefbf0c7161484405dbbb5e SHA256 932a0206e9598eb10056f94622e9c0a64afc93542b43694568df810208a1e3b2
DIST seamonkey-2.7-be.xpi 800745 RMD160 68a1b31fa7624b0decc967b7b362e6858cd49221 SHA1 2c8a5ed8aea053f050e3b96d3113cde703b505ec SHA256 02951e90e36f5f5e37bdaf663dea41b8d50534cc3060902b7479e73b32a05f9e
DIST seamonkey-2.7-ca.xpi 818013 RMD160 8ac8e44f515454d28c26234b072a5de8bd4d3ed5 SHA1 2273f660a0e66456ec1cc1db6f67c3f52faeed59 SHA256 996a4e3a2c27479664e6b93d2629d6ff0a3db59e77d9e4bf68491b705bd96ade
@@ -21,7 +18,6 @@ DIST seamonkey-2.7-ja.xpi 868187 RMD160 7913984fd29dbf511e1393189e28f3589d8175aa
DIST seamonkey-2.7-lt.xpi 961272 RMD160 9773d9e8c1ff155dd5bda052fd363a1aa3fece59 SHA1 c3296aa87c3f7da308697e19d5943e83e6953f7b SHA256 66bd557ac7e55426f946d3ab28617acae3877d7274aed3f6f690413cfecc198d
DIST seamonkey-2.7-nb-NO.xpi 811691 RMD160 72cf79b1d7a346b83410c702bc5888a6700c03d3 SHA1 7293d8d72513cb196f21ba5b7ff05aff8ae0a006 SHA256 0fdb4f45b3e46556e89c2a32545cee43b36560b4c40964d07b28a4272da010bf
DIST seamonkey-2.7-nl.xpi 810216 RMD160 ae6c1287697d459c028f8d38fa1629c89bf0a36c SHA1 8e2516295c3aae8655f3268712e15c9abbce9a95 SHA256 69aa91de5c1d1c6c1c7e9f55833add25538b1df70dd99f0185c982285c528314
-DIST seamonkey-2.7-patches-01.tar.xz 8424 RMD160 e6006fb04235d43a247183c341c37b136f5411e9 SHA1 ae2228d1d6222fe790e995a5d61a4ecf0781c89b SHA256 98e43ea3dab4ef6ea7fb14a242d7d21581781c2c1b4595d1fb8be81bccffc3f8
DIST seamonkey-2.7-patches-02.tar.xz 14652 RMD160 960dd419e072912c6c7937ebe29066839b11939b SHA1 1db5994786346f0c6cdd6dcd6f11c0e4e44293c2 SHA256 bed1f10ea00be91650d687368e6b5282cdff2eaabe436463cad3aaf619b9d542
DIST seamonkey-2.7-pl.xpi 832577 RMD160 3e838f2369e129af5822a24282420178ca50f9b5 SHA1 61499be54442a5ba88d8f9f52149022d270789ec SHA256 d8449c3d337f71a07fad7d1d0acc375a473f2ec25b2eb58240a3ee7cb0cc80bd
DIST seamonkey-2.7-pt-PT.xpi 849093 RMD160 a4858eadf60a3d9f9cdd24534b43f150db443e25 SHA1 2962286bbcfb81d77c17cc7e9126d2dd4a9962ef SHA256 6ab8eca4e7d5dc27bb4702845bb7d7cd493795fec12fb19cfef0c39ad9928a74
@@ -31,30 +27,4 @@ DIST seamonkey-2.7-sv-SE.xpi 875470 RMD160 6a4451fd6a815460e46f1096f747f630c2bd3
DIST seamonkey-2.7-tr.xpi 813356 RMD160 de9fb4fd401ba36dd3e09ba7c6e78e4778794d26 SHA1 0babba594aeaec2f01eeb9f9bdf92d1ff4b07b46 SHA256 07a67c6707f7a918d33e2ccebfe15aca6e4123046d4669eb76aedad6225a9780
DIST seamonkey-2.7-zh-CN.xpi 842340 RMD160 bdadbb97da6536a7d8ff9dfb9363941f4499fba9 SHA1 0c26e89e297c4958900a498c4540a9a1d2a7063a SHA256 dd656ade4233c51cd75c51739a5b770f26d6fe6ee6f5151da5823dd529cac063
DIST seamonkey-2.7.source.tar.bz2 98045633 RMD160 a7c731fd281d8924732d726cb6e4267384e11947 SHA1 72d3e8d928ba29b40b00f735083cbfc48589eb9b SHA256 695c3e4767262fac35bcf80f71dcbdfbc1172cdd323338ea530f6680283aea2f
-DIST seamonkey-2.7_beta5-be.xpi 800738 RMD160 94292d438ad514546f969f1d8bd4ce0638afeec1 SHA1 fd4122dc8f3d17628b7699e06070cd3a849080e0 SHA256 710c7a363cc2ee8f4468663c4fad7bfcf2c49d0e17d90be026091845ead8fe62
-DIST seamonkey-2.7_beta5-ca.xpi 818013 RMD160 1b04f916cd8837109c7b26df517b4c1638c45634 SHA1 4193412d437d7c78aa1f844a57b6471df91da19b SHA256 13f5b544aaba20d2eb7f99c604a61b4ef167d5a797fe1dbf74f64f837e093a90
-DIST seamonkey-2.7_beta5-cs.xpi 823251 RMD160 5b58a274ef0335dd8117f643a42469a09c99dd51 SHA1 27a73c6761aa84883c91a4ad2fca510e7d61344f SHA256 625c661739dc4119700bcd2f213bf21f3671d51d495ce904c2640ce13116b820
-DIST seamonkey-2.7_beta5-de.xpi 864268 RMD160 8ceeb2929e12ff16b2dda15237ead510ca4396a2 SHA1 55678020f7f93a17ef026d0ba42531edeffd0997 SHA256 4efe393b05fd3fa2ac35feff36aa00813e8f2b547d1ef035512a93787ee8e18c
-DIST seamonkey-2.7_beta5-en-GB.xpi 793485 RMD160 d58a684667ebca5550ca10adaa0d87e46fe2d8ad SHA1 de6b99c4cc6ba991e127c4e08a00c2d64b5e6594 SHA256 a62f403748e74843b7ae5430b14faea95c09ded9c8749c6b25452e5af3b3d179
-DIST seamonkey-2.7_beta5-en-US.xpi 793094 RMD160 2459bdecc43438ce35f8f7e7503fedf275bda85a SHA1 a0d9be908005e4934434ad90f1c1a46ab11b66cb SHA256 07937c8022c08206a7a942bb41d216b25d9822352eaac224631b6f5daed18b83
-DIST seamonkey-2.7_beta5-es-AR.xpi 864071 RMD160 84e4bb98dcc25ef181649cac58ae5c465ea89c5b SHA1 65bd4305712ec5f73649ecd273f329ad561c198e SHA256 26436eccbaf42d9e3c1ecf3e0259cf47e965a3ceb9e48d518d6614ff0647e8e2
-DIST seamonkey-2.7_beta5-es-ES.xpi 793320 RMD160 7fa9ed56b009b99d6fa9a900f3308c25b0ed3b1b SHA1 c145d9e0c05e3981d37edb729146252592624a96 SHA256 9a5e6221db1ae8184318dfbb94bf7c5b943db77bca37b5ac1f7974f07eec69d5
-DIST seamonkey-2.7_beta5-fi.xpi 813471 RMD160 4721ff0cba447334415da1bebeaafdbda13a55d7 SHA1 c338c273fa0f063576cf7461ec8560e1d2eb84ab SHA256 0daa04a960c40ed0459a844298d23d66a79812102c5bab2b93f0cc7173ffb904
-DIST seamonkey-2.7_beta5-fr.xpi 819341 RMD160 ca1c72fc668cd8734dce5710a2df37182a5cbfd5 SHA1 34005879375426dfd87711f7d2d00659f79958b9 SHA256 8a109d1efe53e29dd8b4758daee4c054df9a2b1f3a5cce51b3b2791a556d08b0
-DIST seamonkey-2.7_beta5-gl.xpi 813287 RMD160 1e551bdf4cd33d4aa75040c36bea1c847c4bf62e SHA1 b4bde2a1c8d72c0551c4270a9edf5139837296fc SHA256 8537a9d5185e4fb5d0ddad452b76b3bbd4cb156f8331e48da71619b4e5af9fc3
-DIST seamonkey-2.7_beta5-hu.xpi 837466 RMD160 8c6f72917f33964b4731c9894e47d386088f3fcb SHA1 8c2ee811973257512923cdb089905edfd8f57536 SHA256 2d11a1b8f6389031c6c76a0bbb91759105f37bcc2058d8a25448b9c080ad892c
-DIST seamonkey-2.7_beta5-it.xpi 743648 RMD160 4109ff71fa25bfd918fb0deca97e5dcf2f7707c4 SHA1 34d99b126d9ae2ef41dca54ab552e27d4f388951 SHA256 d3bd30482aa62e7de6880f540609b26ca42295bbca7b9c7a4e7d2187e4792d4b
-DIST seamonkey-2.7_beta5-ja.xpi 868187 RMD160 befd4a7cf3473d12efa4f554ae68735250b7747e SHA1 40859a35812421fe4241634cb92792a9d9045e6f SHA256 2fd0817e1b0f6d8a8e8ddd41bd7acbf8423af67c61cde2741ce8bf86c55e62f2
-DIST seamonkey-2.7_beta5-lt.xpi 961272 RMD160 c757cdd2dd08eb1b53d95fa5cb407868698779db SHA1 14942d26abee789acc7340d17206aa3d588dd1cb SHA256 274208e11b0917a3da5dbbf758b6344ecd077d81d05dc097b3ec9b3706fce3be
-DIST seamonkey-2.7_beta5-nb-NO.xpi 811691 RMD160 4c87c7322f28e75bda09cd589d511e72cdb19b19 SHA1 e538fa18a4b04fe8ae843477083d46cffd1ed59f SHA256 8c56d47ab6e032d1a0ba34d9ddba1e6095505674fcd7c6c4fe008ec4a1bfd966
-DIST seamonkey-2.7_beta5-nl.xpi 810216 RMD160 725a3bc0f8168318ad08bfe9b24e3d10a9e0304b SHA1 0a378dda5cd79e700a517bb8892eda9e05fa33ee SHA256 e6341ef954fe8521b386b6043cd3b7acca023834521161560eca0ec2b66c4fb2
-DIST seamonkey-2.7_beta5-pl.xpi 832577 RMD160 3fbc60e6754c5a3f018003579d1e45f21620dbf4 SHA1 44bbda177d06894b62f80104bbf60d6e42521fba SHA256 66b9ba57f829ca5dfb4679b11fdb98f2c5ee1d2648d6468bf22ce9285dd59a09
-DIST seamonkey-2.7_beta5-pt-PT.xpi 849093 RMD160 df7821b4a1402b2ad9978b9dca79dcc0de501f3e SHA1 9ff3a0b857be4c3b901311dfb7cf4179846932b2 SHA256 3c77f58344dc1bfe7ebbadd9398b09961bcb4b8061e6d771986e9f58e2e25791
-DIST seamonkey-2.7_beta5-ru.xpi 897932 RMD160 f36b4dd11032d1584753989652ee2eb1a33a7cae SHA1 a14dbfeb0906d65264dadfe42419c35d354dabeb SHA256 9c21de7e771b02855c3a7defbfee0555b0b7ab57fa2abd90194727389da42a9d
-DIST seamonkey-2.7_beta5-sk.xpi 846756 RMD160 5bca8e3681066ee259af5fc54af4467a3d31b33f SHA1 6ef7157884e1ba37bfda1b827c15ca4c1c949f98 SHA256 7f2d90a5f62fd5959d0af64668995936237a703e4325506c17ac55805af6a0b7
-DIST seamonkey-2.7_beta5-sv-SE.xpi 875470 RMD160 57fe2c7ca3b2fa0a2fb7f1fb6393d7a141ab9ed7 SHA1 f88f2b67863bd4776f3a3eb307c45f98af45f57e SHA256 53f34bf1ce802f64e8ef26bf6d393990e2c7452fa3521762f7a6fc06c18cbe1a
-DIST seamonkey-2.7_beta5-tr.xpi 813356 RMD160 7b0518477bdcfaceb0accf356aa0af9f41562613 SHA1 70ff19f8f9b6ed60db04e63f5d24961344441363 SHA256 be65b4d9991053612d3e7bb0cad857a5202ab99867593ecc42b0bd0a75c8f94b
-DIST seamonkey-2.7_beta5-zh-CN.xpi 842340 RMD160 dbcba7076abf77e68cd1d3b5ed9205589161e01e SHA1 252c8b6e1014a2b8fb0443d9c15c2444a20ada10 SHA256 7edb75ee23e8b76bb93b2ebfe9ad1376bf93ce838a49cd00d28f06dac2d00106
-DIST seamonkey-2.7_beta5.source.tar.bz2 98498151 RMD160 2ca468fb44b87ba03ea8ac3fdbe1b40ddf45782d SHA1 e42ceef6ac638f85d8023080f2692ca68ed95c64 SHA256 0091077c3e9ae8ff29d5e8f8e750d8d6075af0dd2a3e2ba5c3a1b2063988c576
-EBUILD seamonkey-2.7.ebuild 7830 RMD160 a7312c442b07bb4ae163ee1d8af1f0102f0bbbe9 SHA1 ea3446a102b4635dc0b04eba47b2e96590fdd43a SHA256 9524d792bbd4fe0db4a650c0a6ca63b8e569d6e0448d7f37feb0eae8a0b25c9c
-EBUILD seamonkey-2.7_beta5.ebuild 9383 RMD160 23a02eff0ac89fd425a296296d5b8f4479d39c81 SHA1 2b765a1ef3034f27b220571a0b8aa403d451ee5c SHA256 2e494b410a751dfb7a4758a938956213ca98ab7f22cc2548687e4b187da1a456
+EBUILD seamonkey-2.7.ebuild 7832 RMD160 fcbcf45c842f3b89ed6fd8b592b790c71727b1d6 SHA1 ed5d7309564d5a4accc427ea943a97d662349460 SHA256 5ca79986f4144c75539fb8945c46c9ddd1571a9fc1140826b79f55c33dc8ddf3
diff --git a/www-client/seamonkey/files/all-gentoo-1.js b/www-client/seamonkey/files/all-gentoo-1.js
new file mode 100644
index 0000000..86b55ca
--- /dev/null
+++ b/www-client/seamonkey/files/all-gentoo-1.js
@@ -0,0 +1,19 @@
+pref("browser.display.use_system_colors", true);
+pref("general.smoothScroll", true);
+pref("general.useragent.vendor", "Gentoo");
+pref("general.useragent.vendorSub", "SEAMONKEY_PVR");
+pref("update_notifications.enabled", false);
+
+pref("app.update.enabled", false);
+pref("app.update.autoInstallEnabled", false);
+pref("browser.link.open_external", 3);
+pref("general.autoScroll", false);
+pref("browser.tabs.tabMinWidth", 15);
+pref("browser.backspace_action", 0);
+pref("accessibility.typeaheadfind", true);
+pref("browser.EULA.override", true);
+pref("intl.locale.matchOS", true);
+pref("general.useragent.locale", "chrome://global/locale/intl.properties");
+pref("extensions.autoDisableScopes", 0);
+pref("layout.css.dpi", 0);
+pref("browser.tabs.mouseScrollAdvancesTab", 0);
diff --git a/www-client/seamonkey/files/all-gentoo.js b/www-client/seamonkey/files/all-gentoo.js
deleted file mode 100644
index 2969dc5..0000000
--- a/www-client/seamonkey/files/all-gentoo.js
+++ /dev/null
@@ -1,15 +0,0 @@
-pref("browser.display.use_system_colors", true);
-pref("general.smoothScroll", true);
-pref("general.useragent.vendor", "Gentoo");
-pref("general.useragent.vendorSub", "SEAMONKEY_PVR");
-pref("update_notifications.enabled", false);
-
-pref("app.update.enabled", false);
-pref("app.update.autoInstallEnabled", false);
-pref("browser.link.open_external", 3);
-pref("general.autoScroll", false);
-pref("browser.tabs.tabMinWidth", 15);
-pref("browser.backspace_action", 0);
-pref("accessibility.typeaheadfind", true);
-pref("browser.EULA.override", true);
-pref("intl.locale.matchOS", true);
diff --git a/www-client/seamonkey/files/enigmail/enigmail-1.3.3-bug373733.patch b/www-client/seamonkey/files/enigmail/enigmail-1.3.3-bug373733.patch
deleted file mode 100644
index 2b8d6d9..0000000
--- a/www-client/seamonkey/files/enigmail/enigmail-1.3.3-bug373733.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/mailnews/extensions/enigmail/package/enigmail.js 2011-09-19 10:46:49.000000000 -0500
-+++ b/mailnews/extensions/enigmail/package/enigmail.js 2011-11-11 06:30:21.000000000 -0600
-@@ -924,7 +924,7 @@
- Components.classes["@mozilla.org/file/directory_service;1"].
- getService(Components.interfaces.nsIProperties);
-
-- var extensionLoc = directoryService.get("ProfD", Components.interfaces.nsIFile);
-+ var extensionLoc = directoryService.get("CurProcD", Components.interfaces.nsIFile);
- extensionLoc.append("extensions");
- extensionLoc.append(ENIGMAIL_EXTENSION_ID);
- extensionLoc.append("wrappers");
-@@ -1460,7 +1460,7 @@
- Components.classes["@mozilla.org/file/directory_service;1"].
- getService(Components.interfaces.nsIProperties);
- var extensionLoc =
-- directoryService.get("ProfD", Components.interfaces.nsIFile);
-+ directoryService.get("CurProcD", Components.interfaces.nsIFile);
- extensionLoc.append("extensions");
- extensionLoc.append(ENIGMAIL_EXTENSION_ID);
- extensionLoc.append("wrappers");
diff --git a/www-client/seamonkey/files/seamonkey-2.3.1-scrollbar-mouse-interaction-improvement.patch b/www-client/seamonkey/files/seamonkey-2.3.1-scrollbar-mouse-interaction-improvement.patch
deleted file mode 100644
index 64da373..0000000
--- a/www-client/seamonkey/files/seamonkey-2.3.1-scrollbar-mouse-interaction-improvement.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-# HG changeset patch
-# User Philip Chee <philip.chee@gmail.com>
-# Date 1314371784 -28800
-# Node ID bce6138fb07449887e0e791965f90af87c28ca98
-# Parent a11ec626d4ab7088f8d9753e8fec90197e6b899b
-Bug 673878 Use SHIFT+DOMMouseScroll to advance the selected tab.
-This will allow plain DOMMouseScroll to scroll the tabbar without changing the selected tab.
-
-diff --git a/suite/browser/browser-prefs.js b/suite/browser/browser-prefs.js
---- a/suite/browser/browser-prefs.js
-+++ b/suite/browser/browser-prefs.js
-@@ -279,16 +279,21 @@ pref("browser.tabs.tabClipWidth", 140);
-
- // Where to show tab close buttons:
- // 0 on active tab only
- // 1 on all tabs until tabClipWidth is reached, then active tab only
- // 2 no close buttons at all
- // 3 at the end of the tabstrip
- pref("browser.tabs.closeButtons", 3);
-
-+// Mouse wheel action when over the tab bar:
-+// false The mouse wheel scrolls the whole tab bar like Firefox (default).
-+// true The mouse wheel advances the selected tab.
-+pref("browser.tabs.mouseScrollAdvance", false);
-+
- // lets new tab/window load something different than first window
- // -1 - use navigator startup preference
- // 0 - loads blank page
- // 1 - loads home page
- // 2 - loads last page visited
- pref("browser.tabs.loadOnNewTab", 0);
- pref("browser.windows.loadOnNewWindow", 1);
-
-diff --git a/suite/browser/tabbrowser.xml b/suite/browser/tabbrowser.xml
---- a/suite/browser/tabbrowser.xml
-+++ b/suite/browser/tabbrowser.xml
-@@ -2999,16 +2999,17 @@
- <constructor>
- <![CDATA[
- var tab = this.firstChild;
- // set the tabstrip's minWidth too, otherwise it immediately overflows
- this.mTabstrip.style.minWidth =
- tab.style.minWidth = this.mPrefs.getIntPref("browser.tabs.tabMinWidth") + "px";
- tab.style.maxWidth = this.mPrefs.getIntPref("browser.tabs.tabMaxWidth") + "px";
- window.addEventListener("resize", this, false);
-+ this.mScrollSelectedTab = this.mPrefs.getBoolPref("browser.tabs.mouseScrollAdvance");
- ]]>
- </constructor>
-
- <destructor>
- <![CDATA[
- window.removeEventListener("resize", this, false);
- ]]>
- </destructor>
-@@ -3116,32 +3117,48 @@
- * if a tab was inserted to the overflow area or removed from it
- * without any scrolling and when the tabbar has already
- * overflowed.
- */
- this.mTabstrip._updateScrollButtonsDisabledState();
- ]]>
- </body>
- </method>
-+
-+ <field name="mScrollSelectedTab">
-+ false
-+ </field>
-+
-+ <method name="_handleMouseScroll">
-+ <parameter name="aEvent"/>
-+ <body>
-+ <![CDATA[
-+ // Javascript does not have a logical XOR operator.
-+ if (aEvent.shiftKey != this.mScrollSelectedTab) {
-+ this.advanceSelectedTab(aEvent.detail < 0 ? -1 : 1);
-+ aEvent.stopPropagation();
-+ }
-+ ]]>
-+ </body>
-+ </method>
- </implementation>
-
- <handlers>
- <handler event="TabSelect" action="this._handleTabSelect();"/>
-
- <handler event="transitionend">
- <![CDATA[
- if (event.propertyName == "max-width")
- this._handleNewTab(event.target);
- ]]>
- </handler>
-
- <handler event="DOMMouseScroll" phase="capturing">
- <![CDATA[
-- this.advanceSelectedTab(event.detail < 0 ? -1 : 1);
-- event.stopPropagation();
-+ this._handleMouseScroll(event);
- ]]>
- </handler>
- </handlers>
- </binding>
-
- <binding id="tabbrowser-alltabs-popup"
- extends="chrome://global/content/bindings/popup.xml#popup">
- <implementation implements="nsIDOMEventListener">
diff --git a/www-client/seamonkey/files/seamonkey-2.6b1-bug682677.diff b/www-client/seamonkey/files/seamonkey-2.6b1-bug682677.diff
deleted file mode 100644
index 29f085b..0000000
--- a/www-client/seamonkey/files/seamonkey-2.6b1-bug682677.diff
+++ /dev/null
@@ -1,71 +0,0 @@
-Mozilla Bug 682677 - Eliminated direct access to mInfo->pixel_depth, which is not allowed in libpng15. We access pixel_depth via png_get_IHDR() instead; r=joedrew
-
---- comm-beta/mozilla/modules/libpr0n/decoders/nsICODecoder.cpp
-+++ comm-beta/mozilla/modules/libpr0n/decoders/nsICODecoder.cpp
-@@ -380,18 +380,17 @@
- return;
- }
- mPos += aCount;
- aBuffer += aCount;
- aCount = 0;
-
- // Raymond Chen says that 32bpp only are valid PNG ICOs
- // http://blogs.msdn.com/b/oldnewthing/archive/2010/10/22/10079192.aspx
-- if (static_cast<nsPNGDecoder*>(mContainedDecoder.get())->HasValidInfo() &&
-- static_cast<nsPNGDecoder*>(mContainedDecoder.get())->GetPixelDepth() != 32) {
-+ if (!static_cast<nsPNGDecoder*>(mContainedDecoder.get())->IsValidICO()) {
- PostDataError();
- }
- return;
- }
-
- // We've processed all of the icon dir entries and are within the
- // bitmap info size
- if (!mIsPNG && mCurrIcon == mNumIcons && mPos >= mImageOffset &&
---- comm-beta/mozilla/modules/libpr0n/decoders/nsPNGDecoder.h
-+++ comm-beta/mozilla/modules/libpr0n/decoders/nsPNGDecoder.h
-@@ -69,28 +69,35 @@
- void CreateFrame(png_uint_32 x_offset, png_uint_32 y_offset,
- PRInt32 width, PRInt32 height,
- gfxASurface::gfxImageFormat format);
- void SetAnimFrameInfo();
-
- void EndImageFrame();
-
- // Checks if the info header contains valid information
-- bool HasValidInfo() const
-+ // Check if PNG is valid ICO (32bpp RGBA)
-+ // http://blogs.msdn.com/b/oldnewthing/archive/2010/10/22/10079192.aspx
-+ bool IsValidICO() const
- {
-- return mInfo && mInfo->valid;
-- }
-+ png_uint_32
-+ png_width, // Unused
-+ png_height; // Unused
-
-- // Obtain the pixel depth if available or 0 otherwise
-- PRInt32 GetPixelDepth() const
-- {
-- if (!mInfo) {
-- return 0;
-+ int png_bit_depth,
-+ png_color_type;
-+
-+ if (png_get_IHDR(mPNG, mInfo, &png_width, &png_height, &png_bit_depth,
-+ &png_color_type, NULL, NULL, NULL)) {
-+
-+ return (png_color_type == PNG_COLOR_TYPE_RGB_ALPHA &&
-+ png_bit_depth == 8);
-+ } else {
-+ return false;
- }
-- return mInfo->pixel_depth;
- }
-
- public:
- png_structp mPNG;
- png_infop mInfo;
- nsIntRect mFrameRect;
- PRUint8 *mCMSLine;
- PRUint8 *interlacebuf;
diff --git a/www-client/seamonkey/seamonkey-2.7.ebuild b/www-client/seamonkey/seamonkey-2.7.ebuild
index 8f25db4..2c7c54b 100644
--- a/www-client/seamonkey/seamonkey-2.7.ebuild
+++ b/www-client/seamonkey/seamonkey-2.7.ebuild
@@ -1,13 +1,12 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.6.1.ebuild,v 1.4 2012/01/12 15:30:12 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.7.ebuild,v 1.2 2012/02/07 21:59:39 polynomial-c Exp $
EAPI="3"
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-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)
+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 zh-CN)
MOZ_PV="${PV/_pre*}"
MOZ_PV="${MOZ_PV/_alpha/a}"
@@ -17,10 +16,11 @@ MOZ_P="${PN}-${MOZ_PV}"
if [[ ${PV} == *_pre* ]] ; then
MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${PN}/nightly/${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="${MOZ_PV}/langpack/${MOZ_P}."
+ MOZ_LANGPACK_PREFIX="langpack/${MOZ_P}."
MOZ_LANGPACK_SUFFIX=".langpack.xpi"
fi
@@ -34,17 +34,19 @@ HOMEPAGE="http://www.seamonkey-project.org"
if [[ ${PV} == *_pre* ]] ; then
# pre-releases. No need for arch teams to change KEYWORDS here.
+
KEYWORDS=""
else
# This is where arch teams should change the KEYWORDS.
+
KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86"
fi
SLOT="0"
LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE="+alsa +chatzilla +crypt +ipc +methodjit +roaming system-sqlite +webm"
+IUSE="+alsa +chatzilla +crypt +ipc +roaming system-sqlite +webm"
-SRC_URI="${SRC_URI}
+SRC_URI+="${SRC_URI}
${MOZ_FTP_URI}/source/${MOZ_P}.source.tar.bz2 -> ${P}.source.tar.bz2
http://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz
crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-${EMVER}.tar.gz )"
@@ -54,7 +56,7 @@ 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.1
- >=dev-libs/nspr-4.8.8
+ >=dev-libs/nspr-4.8.9
>=dev-libs/glib-2.26
>=media-libs/mesa-7.10
>=media-libs/libpng-1.4.1[apng]
@@ -64,7 +66,7 @@ RDEPEND=">=sys-devel/binutils-2.16.1
virtual/libffi
system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,unlock-notify,debug=] )
crypt? ( >=app-crypt/gnupg-1.4 )
- webm? ( media-libs/libvpx
+ webm? ( >=media-libs/libvpx-0.9.7
media-libs/alsa-lib )"
DEPEND="${RDEPEND}
@@ -93,12 +95,6 @@ pkg_setup() {
fi
moz_pkgsetup
-
- if ! use methodjit ; then
- einfo
- ewarn "You are disabling the method-based JIT in JägerMonkey."
- ewarn "This will greatly slowdown JavaScript in ${PN}!"
- fi
}
src_prepare() {
@@ -160,7 +156,9 @@ src_configure() {
# It doesn't compile on alpha without this LDFLAGS
use alpha && append-ldflags "-Wl,--no-relax"
- if ! use chatzilla ; then
+ if use chatzilla ; then
+ MEXTENSIONS+=",irc"
+ else
MEXTENSIONS+=",-irc"
fi
if ! use roaming ; then
@@ -173,25 +171,19 @@ src_configure() {
mozconfig_annotate '' --enable-canvas
mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
mozconfig_annotate '' --enable-system-ffi
-
+ mozconfig_annotate '' --with-system-png
mozconfig_annotate '' --target="${CTARGET:-${CHOST}}"
mozconfig_use_enable system-sqlite
mozconfig_use_enable methodjit
- if use crypt ; then
- mozconfig_annotate "mail crypt" --enable-chrome-format=jar
- fi
-
- mozconfig_annotate '' --with-system-png
-
# Finalize and report settings
mozconfig_final
- if [[ $(gcc-major-version) -lt 4 ]]; then
+ 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
+ elif [[ $(gcc-major-version) -gt 4 || $(gcc-minor-version) -gt 3 ]] ; then
+ if use amd64 || use x86 ; then
append-flags -mno-avx
fi
fi
@@ -222,6 +214,8 @@ src_install() {
declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
declare emid
+ pax-mark m "${S}"/dist/bin/xpcshell
+
emake DESTDIR="${D}" install || die "emake install failed"
cp -f "${FILESDIR}"/icon/${PN}.desktop "${T}" || die
@@ -254,10 +248,13 @@ src_install() {
domenu "${T}"/${PN}.desktop || die
# Add our default prefs
- sed "s|SEAMONKEY_PVR|${PVR}|" "${FILESDIR}"/all-gentoo.js \
+ sed "s|SEAMONKEY_PVR|${PVR}|" "${FILESDIR}"/all-gentoo-1.js \
> "${D}"${MOZILLA_FIVE_HOME}/defaults/pref/all-gentoo.js \
|| die
+ # Required in order to use plugins and even run firefox on hardened.
+ pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{seamonkey,seamonkey-bin,plugin-container}
+
# Handle plugins dir through nsplugins.eclass
share_plugins_dir
diff --git a/www-client/seamonkey/seamonkey-2.7_beta5.ebuild b/www-client/seamonkey/seamonkey-2.7_beta5.ebuild
deleted file mode 100644
index 70ad99a..0000000
--- a/www-client/seamonkey/seamonkey-2.7_beta5.ebuild
+++ /dev/null
@@ -1,334 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.6.1.ebuild,v 1.4 2012/01/12 15:30:12 phajdan.jr Exp $
-
-EAPI="3"
-WANT_AUTOCONF="2.1"
-
-inherit flag-o-matic toolchain-funcs eutils mozconfig-3 multilib pax-utils fdo-mime autotools mozextension versionator python nsplugins
-
-PATCH="${PN}-2.7-patches-01"
-EMVER="1.3.5"
-
-MY_PV="${PV/_pre*}"
-MY_PV="${MY_PV/_alpha/a}"
-MY_PV="${MY_PV/_beta/b}"
-MY_PV="${MY_PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-
-LANGPACK_PREFIX="${MY_P}."
-LANGPACK_SUFFIX=".langpack"
-if [[ ${PV} == *_pre* ]] ; then
- # pre-releases. No need for arch teams to change KEYWORDS here.
-
- REL_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${PN}/nightly/${MY_PV}-candidates/build${PV##*_pre}"
- LANG_URI="${REL_URI}/linux-i686/xpi"
- LANGPACK_PREFIX=""
- LANGPACK_SUFFIX=""
- KEYWORDS=""
-else
- # This is where arch teams should change the KEYWORDS.
-
- #REL_URI="http://releases.mozilla.org/pub/mozilla.org/${PN}/releases/${MY_PV}"
- REL_URI="ftp://ftp.mozilla.org/pub/${PN}/releases/${MY_PV}"
- LANG_URI="${REL_URI}/langpack"
- KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86"
-fi
-
-DESCRIPTION="Seamonkey Web Browser"
-HOMEPAGE="http://www.seamonkey-project.org"
-
-SLOT="0"
-LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE="+alsa +chatzilla +crypt +ipc +methodjit +roaming system-sqlite +webm"
-
-SRC_URI="${REL_URI}/source/${MY_P}.source.tar.bz2 -> ${P}.source.tar.bz2
- http://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz
- crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-${EMVER}.tar.gz )"
-
-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)
-
-for X in "${LANGS[@]}" ; do
- # en is handled internally
- if [[ ${X} != en ]] ; then
- SRC_URI+="
- linguas_${X/-/_}? ( ${LANG_URI}/${LANGPACK_PREFIX}${X}${LANGPACK_SUFFIX}.xpi -> ${P}-${X}.xpi )"
- fi
- IUSE+=" linguas_${X/-/_}"
- # Install all the specific locale xpis if there's no generic locale xpi
- # Example: there's no pt.xpi, so install all pt-*.xpi
- if ! has ${X%%-*} "${LANGS[@]}"; then
- SRC_URI+="
- linguas_${X%%-*}? ( ${LANG_URI}/${LANGPACK_PREFIX}${X}${LANGPACK_SUFFIX}.xpi -> ${P}-${X}.xpi )"
- IUSE+=" linguas_${X%%-*}"
- fi
-done
-
-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.1
- >=dev-libs/nspr-4.8.8
- >=dev-libs/glib-2.26
- >=media-libs/mesa-7.10
- >=media-libs/libpng-1.4.1[apng]
- >=x11-libs/cairo-1.10
- >=x11-libs/pango-1.14.0
- >=x11-libs/gtk+-2.14
- virtual/libffi
- system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,unlock-notify,debug=] )
- crypt? ( >=app-crypt/gnupg-1.4 )
- webm? ( media-libs/libvpx
- media-libs/alsa-lib )"
-
-DEPEND="${RDEPEND}
- dev-util/pkgconfig
- webm? ( amd64? ( ${ASM_DEPEND} )
- x86? ( ${ASM_DEPEND} ) )"
-
-if [[ ${PV} == *beta* ]] ; then
- S="${WORKDIR}/comm-beta"
-else
- S="${WORKDIR}/comm-release"
-fi
-
-# TODO: Move all the linguas crap to an eclass
-linguas() {
- # Generate the list of language packs called "linguas"
- # This list is used to install the xpi language packs
- local LINGUA
- for LINGUA in ${LINGUAS}; do
- if has ${LINGUA} en ; then
- # For mozilla products, en and en_US are handled internally
- continue
- # If this language is supported by ${P},
- elif has ${LINGUA} "${LANGS[@]//-/_}"; then
- # Add the language to linguas, if it isn't already there
- has ${LINGUA//_/-} "${linguas[@]}" || linguas+=(${LINGUA//_/-})
- continue
- # For each short LINGUA that isn't in LANGS,
- # add *all* long LANGS to the linguas list
- elif ! has ${LINGUA%%-*} "${LANGS[@]}"; then
- for LANG in "${LANGS[@]}"; do
- if [[ ${LANG} == ${LINGUA}-* ]]; then
- has ${LANG} "${linguas[@]}" || linguas+=(${LANG})
- continue 2
- fi
- done
- fi
- ewarn "Sorry, but ${P} does not support the ${LINGUA} locale"
- done
-}
-
-src_unpack() {
- unpack ${A}
-
- linguas
- for X in "${linguas[@]}"; do
- # FIXME: Add support for unpacking xpis to portage
- xpi_unpack "${P}-${X}.xpi"
- done
-}
-
-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
-
- if ! use methodjit ; then
- einfo
- ewarn "You are disabling the method-based JIT in JägerMonkey."
- ewarn "This will greatly slowdown JavaScript in ${PN}!"
- fi
-}
-
-src_prepare() {
- # Apply our patches
- EPATCH_SUFFIX="patch" \
- EPATCH_FORCE="yes" \
- epatch "${WORKDIR}/_seamonkey"
-
- # browser patches go here
- pushd "${S}"/mozilla &>/dev/null || die
- EPATCH_SUFFIX="patch" \
- EPATCH_FORCE="yes" \
- epatch "${WORKDIR}/_mozilla"
- popd &>/dev/null || die
-
- # mailnews patches go here
- pushd "${S}"/mailnews &>/dev/null || die
- EPATCH_SUFFIX="patch" \
- EPATCH_FORCE="yes" \
- epatch "${WORKDIR}/_mailnews"
- popd &>/dev/null || die
-
- # Allow user to apply any additional patches without modifing ebuild
- epatch_user
-
- if use crypt ; then
- mv "${WORKDIR}"/enigmail "${S}"/mailnews/extensions/enigmail
- cd "${S}"/mailnews/extensions/enigmail || die
- ./makemake -r 2&>/dev/null
- sed -e 's:@srcdir@:${S}/mailnews/extensions/enigmail:' \
- -i Makefile.in || die
- cd "${S}"
- fi
-
- #Ensure we disable javaxpcom by default to prevent configure breakage
- sed -i -e s:MOZ_JAVAXPCOM\=1::g "${S}"/mozilla/xulrunner/confvars.sh \
- || die "sed javaxpcom"
-
- # Disable gnomevfs extension
- sed -i -e "s:gnomevfs::" "${S}/"suite/confvars.sh \
- || die "Failed to remove gnomevfs extension"
-
- eautoreconf
-}
-
-src_configure() {
- declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
- MEXTENSIONS=""
-
- ####################################
- #
- # 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"
- fi
- if ! use roaming ; then
- MEXTENSIONS+=",-sroaming"
- fi
-
- mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
- mozconfig_annotate '' --disable-gconf
- mozconfig_annotate '' --enable-jsd
- mozconfig_annotate '' --enable-canvas
- mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
- mozconfig_annotate '' --enable-system-ffi
-
- mozconfig_annotate '' --target="${CTARGET:-${CHOST}}"
-
- mozconfig_use_enable system-sqlite
- mozconfig_use_enable methodjit
-
- if use crypt ; then
- mozconfig_annotate "mail crypt" --enable-chrome-format=jar
- fi
-
- mozconfig_annotate '' --with-system-png
-
- # 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
-
- ####################################
- #
- # Configure and build
- #
- ####################################
-
- # Work around breakage in makeopts with --no-print-directory
- MAKEOPTS="${MAKEOPTS/--no-print-directory/}"
-
- CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" PYTHON="$(PYTHON)" econf
-}
-
-src_compile() {
- emake || die
-
- # Only build enigmail extension if conditions are met.
- if use crypt ; then
- emake -C "${S}"/mailnews/extensions/enigmail || die "make enigmail failed"
- emake -j1 -C "${S}"/mailnews/extensions/enigmail xpi || die "make enigmail xpi failed"
- fi
-}
-
-src_install() {
- declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
- declare emid
-
- emake DESTDIR="${D}" install || die "emake install failed"
- cp -f "${FILESDIR}"/icon/${PN}.desktop "${T}" || die
-
- if use crypt ; then
- cd "${T}" || die
- unzip "${S}"/mozilla/dist/bin/enigmail*.xpi install.rdf || die
- emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' install.rdf)
-
- dodir ${MOZILLA_FIVE_HOME}/extensions/${emid} || die
- cd "${D}"${MOZILLA_FIVE_HOME}/extensions/${emid} || die
- unzip "${S}"/mozilla/dist/bin/enigmail*.xpi || 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
-
- linguas
- for X in ${linguas}; do
- [[ ${X} != "en" ]] && xpi_install "${WORKDIR}"/"${P}-${X}"
- done
-
- # Add StartupNotify=true bug 290401
- if use startup-notification ; then
- echo "StartupNotify=true" >> "${T}"/${PN}.desktop
- fi
-
- # Install icon and .desktop for menu entry
- newicon "${S}"/suite/branding/nightly/content/icon64.png ${PN}.png \
- || die
- domenu "${T}"/${PN}.desktop || die
-
- # Add our default prefs
- sed "s|SEAMONKEY_PVR|${PVR}|" "${FILESDIR}"/all-gentoo.js \
- > "${D}"${MOZILLA_FIVE_HOME}/defaults/pref/all-gentoo.js \
- || die
-
- # Handle plugins dir through nsplugins.eclass
- share_plugins_dir
-
- doman "${S}"/suite/app/${PN}.1 || die
-}
-
-pkg_preinst() {
- declare MOZILLA_FIVE_HOME="${ROOT}/usr/$(get_libdir)/${PN}"
-
- if [ -d ${MOZILLA_FIVE_HOME}/plugins ] ; then
- rm ${MOZILLA_FIVE_HOME}/plugins -rf
- fi
-}
-
-pkg_postinst() {
- declare 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
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2012-02-09 5:55 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-13 11:47 [gentoo-commits] proj/mozilla:master commit in: www-client/seamonkey/files/enigmail/, www-client/seamonkey/, Lars Wendler
-- strict thread matches above, loose matches on Subject: below --
2011-03-01 22:51 Lars Wendler
2011-04-10 6:56 Lars Wendler
2011-06-23 10:07 Lars Wendler
2012-02-09 5:55 Lars Wendler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox