summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2011-07-03 18:25:32 +0000
committerLars Wendler <polynomial-c@gentoo.org>2011-07-03 18:25:32 +0000
commit62d63720d8f9987a0e257170d27ee997e9fd5f5c (patch)
treedffe0d5959a258f65eb8e250e1694b94920fd748 /www-client/seamonkey
parentadd spaces around LFLAGS assignment, not to confuse make, bug #352265 (diff)
downloadgentoo-2-62d63720d8f9987a0e257170d27ee997e9fd5f5c.tar.gz
gentoo-2-62d63720d8f9987a0e257170d27ee997e9fd5f5c.tar.bz2
gentoo-2-62d63720d8f9987a0e257170d27ee997e9fd5f5c.zip
New major version
(Portage version: 2.2.0_alpha43/cvs/Linux x86_64)
Diffstat (limited to 'www-client/seamonkey')
-rw-r--r--www-client/seamonkey/ChangeLog12
-rw-r--r--www-client/seamonkey/files/enigmail/enigmail-1.2-seamonkey-2.1-lowercaseequalsliteralfix.patch12
-rw-r--r--www-client/seamonkey/files/seamonkey-2.1b3-restore-tabbar-scrolling-from-2.1b2.diff28
-rw-r--r--www-client/seamonkey/metadata.xml11
-rw-r--r--www-client/seamonkey/seamonkey-2.1.ebuild (renamed from www-client/seamonkey/seamonkey-2.0.14.ebuild)180
5 files changed, 129 insertions, 114 deletions
diff --git a/www-client/seamonkey/ChangeLog b/www-client/seamonkey/ChangeLog
index feba3119dfff..5d8d58359110 100644
--- a/www-client/seamonkey/ChangeLog
+++ b/www-client/seamonkey/ChangeLog
@@ -1,6 +1,16 @@
# ChangeLog for www-client/seamonkey
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/ChangeLog,v 1.314 2011/06/06 14:41:21 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/ChangeLog,v 1.315 2011/07/03 18:25:32 polynomial-c Exp $
+
+*seamonkey-2.1 (03 Jul 2011)
+
+ 03 Jul 2011; Lars Wendler <polynomial-c@gentoo.org>
+ +files/enigmail/enigmail-1.2-seamonkey-2.1-lowercaseequalsliteralfix.patch,
+ -seamonkey-2.0.14.ebuild, +seamonkey-2.1.ebuild,
+ +files/seamonkey-2.1b3-restore-tabbar-scrolling-from-2.1b2.diff,
+ metadata.xml:
+ New version (bug #371801). Dropped ia64 and sparc keywords due to
+ media-libs/libvpx dependency.
*seamonkey-2.0.14-r1 (06 Jun 2011)
diff --git a/www-client/seamonkey/files/enigmail/enigmail-1.2-seamonkey-2.1-lowercaseequalsliteralfix.patch b/www-client/seamonkey/files/enigmail/enigmail-1.2-seamonkey-2.1-lowercaseequalsliteralfix.patch
new file mode 100644
index 000000000000..7fdd20fe4d37
--- /dev/null
+++ b/www-client/seamonkey/files/enigmail/enigmail-1.2-seamonkey-2.1-lowercaseequalsliteralfix.patch
@@ -0,0 +1,12 @@
+--- enigmail/src/nsEnigMsgCompose.cpp 2011-07-03 10:45:45.000000000 +0200
++++ enigmail/src/nsEnigMsgCompose.cpp 2011-07-03 10:45:17.000000000 +0200
+@@ -1092,7 +1092,8 @@
+ nsCString left(tmpStr);
+ left.SetLength(15);
+
+- if (left.LowerCaseEqualsLiteral("x-mozilla-keys:")) {
++ ToLowerCase(left);
++ if (left.EqualsLiteral("x-mozilla-keys:")) {
+ DEBUG_LOG(("nsEnigMimeWriter::OnDataAvailable: workaround for 'X-Mozilla-Keys:' header\n"));
+
+ tmpStr.StripWhitespace();
diff --git a/www-client/seamonkey/files/seamonkey-2.1b3-restore-tabbar-scrolling-from-2.1b2.diff b/www-client/seamonkey/files/seamonkey-2.1b3-restore-tabbar-scrolling-from-2.1b2.diff
new file mode 100644
index 000000000000..2696764974da
--- /dev/null
+++ b/www-client/seamonkey/files/seamonkey-2.1b3-restore-tabbar-scrolling-from-2.1b2.diff
@@ -0,0 +1,28 @@
+# This patch reverts the change from
+# https://bugzilla.mozilla.org/show_bug.cgi?id=643294
+
+--- comm-2.0/suite/browser/tabbrowser.xml
++++ comm-2.0/suite/browser/tabbrowser.xml
+@@ -3000,7 +3000,7 @@
+
+ <destructor>
+ <![CDATA[
+- window.removeEventListener("resize", this, false);
++ document.removeEventListener("resize", this, false);
+ ]]>
+ </destructor>
+
+@@ -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>
+ </handlers>
+ </binding>
+
diff --git a/www-client/seamonkey/metadata.xml b/www-client/seamonkey/metadata.xml
index c6bb5ab5a171..159770e33259 100644
--- a/www-client/seamonkey/metadata.xml
+++ b/www-client/seamonkey/metadata.xml
@@ -7,16 +7,17 @@
<name>Lars Wendler</name>
</maintainer>
<use>
- <!-- New EAPI-1 style USE-flags -->
<flag name='chatzilla'>Build Mozilla's IRC client (default on)</flag>
+ <flag name='custom-optimization'>Fine-tune custom compiler
+ optimizations</flag>
<flag name='composer'>Build Mozilla's HTML editor component (default on)</flag>
+ <flag name="gconf">Add support for setting of default browser using
+ <pkg>gnome-base/gconf</pkg>. Useful only for GNOME 2 users.</flag>
<flag name='mailclient'>Build Mozilla's Mail client (default on)</flag>
<flag name='roaming'>Build roaming extension support (default on)</flag>
-
- <!-- Other USE-flags -->
- <flag name='custom-optimization'>Fine-tune custom compiler
- optimizations</flag>
<flag name='system-sqlite'>Use the system-wide <pkg>dev-db/sqlite</pkg>
installation with secure-delete enabled</flag>
+ <flag name="webm">Use system <pkg>media-libs/libvpx</pkg> for HTML5 WebM
+ video support.</flag>
</use>
</pkgmetadata>
diff --git a/www-client/seamonkey/seamonkey-2.0.14.ebuild b/www-client/seamonkey/seamonkey-2.1.ebuild
index 69627ab3d8ef..e692d2b3476d 100644
--- a/www-client/seamonkey/seamonkey-2.0.14.ebuild
+++ b/www-client/seamonkey/seamonkey-2.1.ebuild
@@ -1,17 +1,17 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.0.14.ebuild,v 1.9 2011/05/07 18:25:47 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.1.ebuild,v 1.1 2011/07/03 18:25:32 polynomial-c Exp $
-EAPI="2"
+EAPI="3"
WANT_AUTOCONF="2.1"
-inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib fdo-mime autotools mozextension java-pkg-opt-2 python
+inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib fdo-mime autotools mozextension python
-PATCH="${PN}-2.0.11-patches-01"
-EMVER="1.0.1"
+PATCH="${PN}-2.1-patches-01"
+EMVER="1.2"
-LANGS="be ca cs de en-GB en-US es-AR es-ES fi fr gl hu it ja ka lt nb-NO nl pl pt-PT ru sk sv-SE tr zh-CN"
-NOSHORTLANGS="en-GB es-AR"
+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"
+NOSHORTLANGS="en-GB en-US es-AR"
MY_PV="${PV/_pre*}"
MY_PV="${MY_PV/_alpha/a}"
@@ -25,14 +25,14 @@ 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="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
- KEYWORDS=""
+ #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"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
[[ ${PV} == *alpha* ]] && HAS_LANGS="false"
fi
@@ -41,51 +41,47 @@ HOMEPAGE="http://www.seamonkey-project.org"
SLOT="0"
LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE="+alsa +chatzilla +composer +crypt gnome java ldap +mailclient +roaming system-sqlite"
+IUSE="+alsa +chatzilla +crypt gconf +roaming +webm"
SRC_URI="${REL_URI}/source/${MY_P}.source.tar.bz2
- http://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.bz2
- crypt? ( mailclient? ( http://www.mozilla-enigmail.org/download/source/enigmail-${EMVER}.tar.gz ) )"
+ http://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz
+ crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-${EMVER}.tar.gz )"
if ${HAS_LANGS} ; then
for X in ${LANGS} ; do
- if [ "${X}" != "en" ] && [ "${X}" != "en-US" ]; then
+ if [ "${X}" != "en" ] ; then
SRC_URI="${SRC_URI}
- linguas_${X/-/_}? ( ${REL_URI}/langpack/${MY_P}.${X}.langpack.xpi -> ${MY_P}-${X}.xpi )"
+ linguas_${X/-/_}? ( ${REL_URI/build?/build1}/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
+ #if [ "${X}" != "en-US" ]; then
SRC_URI="${SRC_URI}
- linguas_${X%%-*}? ( ${REL_URI}/langpack/${MY_P}.${X}.langpack.xpi -> ${MY_P}-${X}.xpi )"
- fi
+ linguas_${X%%-*}? ( ${REL_URI/build?/build1}/langpack/${MY_P}.${X}.langpack.xpi -> ${MY_P}-${X}.xpi )"
+ #fi
IUSE="${IUSE} linguas_${X%%-*}"
fi
done
fi
-RDEPEND="java? ( virtual/jre )
- >=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.6.22-r2[fts3,secure-delete] )
- >=app-text/hunspell-1.2
- >=x11-libs/gtk+-2.10.0:2
- >=x11-libs/pango-1.14.0[X]
- crypt? ( mailclient? ( >=app-crypt/gnupg-1.4 ) )
- gnome? ( >=gnome-base/gnome-vfs-2.16.3
- >=gnome-base/libgnomeui-2.16.1
- >=gnome-base/gconf-2.16.0
- >=gnome-base/libgnome-2.16.0 )"
+ASM_DEPEND=">=dev-lang/yasm-1.1"
+
+RDEPEND=">=sys-devel/binutils-2.16.1
+ >=dev-libs/nss-3.12.9
+ >=dev-libs/nspr-4.8.7
+ >=media-libs/libpng-1.4.1[apng]
+ gconf? ( >=gnome-base/gconf-1.2.1:2 )
+ crypt? ( >=app-crypt/gnupg-1.4 )
+ webm? ( media-libs/libvpx
+ media-libs/alsa-lib )"
DEPEND="${RDEPEND}
- =dev-lang/python-2*[threads]
dev-util/pkgconfig
- java? ( >=virtual/jdk-1.4 )"
+ webm? ( amd64? ( ${ASM_DEPEND} )
+ x86? ( ${ASM_DEPEND} ) )"
-S="${WORKDIR}/comm-1.9.1"
+S="${WORKDIR}/comm-2.0"
linguas() {
local LANG SLANG
@@ -131,37 +127,39 @@ pkg_setup() {
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
-
- java-pkg-opt-2_pkg_setup
-
- python_set_active_version 2
+ moz_pkgsetup
}
src_prepare() {
- java-pkg-opt-2_src_prepare
-
# Apply our patches
- EPATCH_EXCLUDE="1008-seamonkey-cups-1.4.4-fixup.patch" \
EPATCH_SUFFIX="patch" \
EPATCH_FORCE="yes" \
epatch "${WORKDIR}/patch"
- if use crypt && use mailclient ; then
+ epatch "${FILESDIR}"/${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/70_enigmail-fix.patch
- makemake2
+ epatch "${FILESDIR}"/enigmail/enigmail-1.2-seamonkey-2.1-lowercaseequalsliteralfix.patch
+ ./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
+ cd "${S}"/mozilla || die
+ eautoreconf
+ cd "${S}"/mozilla/js/src || die
eautoreconf
}
@@ -178,12 +176,6 @@ src_configure() {
mozconfig_init
mozconfig_config
- # seamonkey has issues with >=x11-libs/cairo-1.10.0 (bug #337813).
- # If you don't like this blame upstream as they don't care about
- # anything than their damned bundled shit!!!
- sed '/--enable-system-cairo/s:enable:disable:' -i "${S}"/.mozconfig \
- || die
-
# It doesn't compile on alpha without this LDFLAGS
use alpha && append-ldflags "-Wl,--no-relax"
@@ -194,44 +186,18 @@ src_configure() {
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-crypto
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 gnome gnomevfs
- mozconfig_use_enable gnome gnomeui
- mozconfig_use_enable java javaxpcom
- mozconfig_use_enable ldap
- mozconfig_use_enable ldap ldap-experimental
- mozconfig_use_enable mailclient mailnews
- mozconfig_use_enable system-sqlite
+
+ mozconfig_use_enable gconf
+
+ if use crypt ; then
+ mozconfig_annotate "mail crypt" --enable-chrome-format=jar
+ fi
+
+ mozconfig_annotate '' --with-system-png
# Finalize and report settings
mozconfig_final
@@ -249,16 +215,15 @@ src_configure() {
# Work around breakage in makeopts with --no-print-directory
MAKEOPTS="${MAKEOPTS/--no-print-directory/}"
- CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" econf
+ 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
+ emake || die
# Only build enigmail extension if conditions are met.
- if use crypt && use mailclient ; then
+ 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
@@ -269,9 +234,9 @@ src_install() {
declare emid
emake DESTDIR="${D}" install || die "emake install failed"
- cp -f "${FILESDIR}"/icon/seamonkey.desktop "${T}" || die
+ cp -f "${FILESDIR}"/icon/${PN}.desktop "${T}" || die
- if use crypt && use mailclient ; then
+ 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)
@@ -281,12 +246,10 @@ src_install() {
unzip "${S}"/mozilla/dist/bin/enigmail*.xpi || die
fi
- if use mailclient ; then
- 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
- 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
if ${HAS_LANGS} ; then
linguas
@@ -301,18 +264,19 @@ src_install() {
fi
# Install icon and .desktop for menu entry
- newicon "${S}"/suite/branding/content/icon64.png seamonkey.png || die
+ 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
+ > "${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
- # shiny new man page
doman "${S}"/suite/app/${PN}.1 || die
}