* [gentoo-commits] gentoo-x86 commit in www-client/seamonkey: metadata.xml ChangeLog seamonkey-2.15-r1.ebuild seamonkey-2.15.ebuild
@ 2013-01-16 17:02 Jory Pratt (anarchy)
0 siblings, 0 replies; only message in thread
From: Jory Pratt (anarchy) @ 2013-01-16 17:02 UTC (permalink / raw
To: gentoo-commits
anarchy 13/01/16 17:02:00
Modified: metadata.xml ChangeLog
Added: seamonkey-2.15-r1.ebuild
Removed: seamonkey-2.15.ebuild
Log:
Fix bug #451180, adds system-jpeg useflag, add support for hardened
(Portage version: 2.1.11.42/cvs/Linux x86_64, signed Manifest commit with key 0xB4D088B4)
Revision Changes Path
1.14 www-client/seamonkey/metadata.xml
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/seamonkey/metadata.xml?rev=1.14&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/seamonkey/metadata.xml?rev=1.14&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/seamonkey/metadata.xml?r1=1.13&r2=1.14
Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-client/seamonkey/metadata.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- metadata.xml 31 Aug 2011 21:04:57 -0000 1.13
+++ metadata.xml 16 Jan 2013 17:02:00 -0000 1.14
@@ -18,6 +18,8 @@
JS performance. Hardened users can disable this USE-flag to use MPROTECT
on grsecurity kernels.</flag>
<flag name='roaming'>Build roaming extension support (default on)</flag>
+ <flag name="system-jpeg">Use the system-wide <pkg>media-libs/libjpeg-turbo</pkg>
+ Use system jpeg instead of bundled.</flag>
<flag name='system-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
1.423 www-client/seamonkey/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/seamonkey/ChangeLog?rev=1.423&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/seamonkey/ChangeLog?rev=1.423&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/seamonkey/ChangeLog?r1=1.422&r2=1.423
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-client/seamonkey/ChangeLog,v
retrieving revision 1.422
retrieving revision 1.423
diff -u -r1.422 -r1.423
--- ChangeLog 16 Jan 2013 16:06:15 -0000 1.422
+++ ChangeLog 16 Jan 2013 17:02:00 -0000 1.423
@@ -1,6 +1,12 @@
# ChangeLog for www-client/seamonkey
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/ChangeLog,v 1.422 2013/01/16 16:06:15 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/ChangeLog,v 1.423 2013/01/16 17:02:00 anarchy Exp $
+
+*seamonkey-2.15-r1 (16 Jan 2013)
+
+ 16 Jan 2013; <anarchy@gentoo.org> -seamonkey-2.15.ebuild,
+ +seamonkey-2.15-r1.ebuild, metadata.xml:
+ Fix bug #451180, adds system-jpeg useflag, add support for hardened
16 Jan 2013; <anarchy@gentoo.org> seamonkey-2.15.ebuild:
Remove pysqlite dep, use python[sqlite]
1.1 www-client/seamonkey/seamonkey-2.15-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/seamonkey/seamonkey-2.15-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/seamonkey/seamonkey-2.15-r1.ebuild?rev=1.1&content-type=text/plain
Index: seamonkey-2.15-r1.ebuild
===================================================================
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.15-r1.ebuild,v 1.1 2013/01/16 17:02:00 anarchy 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 en-GB en-US es-AR es-ES fi fr gl hu it ja lt nb-NO nl
pl pt-PT ru sk sv-SE tr uk zh-CN zh-TW)
MOZ_PV="${PV/_pre*}"
MOZ_PV="${MOZ_PV/_alpha/a}"
MOZ_PV="${MOZ_PV/_beta/b}"
MOZ_PV="${MOZ_PV/_rc/rc}"
MOZ_P="${P}"
MY_MOZ_P="${PN}-${MOZ_PV}"
if [[ ${PV} == *_pre* ]] ; then
MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/${PN}/candidates/${MOZ_PV}-candidates/build${PV##*_pre}"
MOZ_LANGPACK_PREFIX="linux-i686/xpi/"
# And the langpack stuff stays at eclass defaults
else
MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/${PN}/releases/${MOZ_PV}"
MOZ_LANGPACK_PREFIX="langpack/${MY_MOZ_P}."
MOZ_LANGPACK_SUFFIX=".langpack.xpi"
fi
inherit check-reqs flag-o-matic toolchain-funcs eutils mozconfig-3 multilib pax-utils fdo-mime autotools mozextension python nsplugins mozlinguas
PATCHFF="firefox-18.0-patches-0.6"
PATCH="${PN}-2.14-patches-01"
EMVER="1.5.0"
DESCRIPTION="Seamonkey Web Browser"
HOMEPAGE="http://www.seamonkey-project.org"
if [[ ${PV} == *_pre* ]] ; then
# pre-releases. No need for arch teams to change KEYWORDS here.
KEYWORDS=""
else
# This is where arch teams should change the KEYWORDS.
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
fi
SLOT="0"
LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
IUSE="+chatzilla +crypt gstreamer +ipc +jit +roaming system-jpeg system-sqlite"
SRC_URI+="${SRC_URI}
${MOZ_FTP_URI}/source/${MY_MOZ_P}.source.tar.bz2 -> ${P}.source.tar.bz2
http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCHFF}.tar.xz
http://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz
crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-${EMVER}.tar.gz )"
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.14.1
>=dev-libs/nspr-4.9.4
>=dev-libs/glib-2.26:2
>=media-libs/mesa-7.10
>=media-libs/libpng-1.5.11[apng]
>=media-libs/libvpx-1.0.0
>=x11-libs/cairo-1.10
>=x11-libs/pango-1.14.0
>=x11-libs/gtk+-2.14
virtual/libffi
gstreamer? (
>=media-libs/gstreamer-0.10.33:0.10
>=media-libs/gst-plugins-base-0.10.33:0.10
)
system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
system-sqlite? ( >=dev-db/sqlite-3.7.13[fts3,secure-delete,threadsafe,unlock-notify,debug=] )
crypt? ( >=app-crypt/gnupg-1.4 )
kernel_linux? ( media-libs/alsa-lib )
selinux? ( sec-policy/selinux-mozilla )"
DEPEND="${RDEPEND}
!elibc_glibc? ( dev-libs/libexecinfo )
virtual/pkgconfig
amd64? ( ${ASM_DEPEND}
virtual/opengl )
x86? ( ${ASM_DEPEND}
virtual/opengl )"
if [[ ${PV} == *beta* ]] ; then
S="${WORKDIR}/comm-beta"
else
S="${WORKDIR}/comm-release"
fi
src_unpack() {
unpack ${A}
# Unpack language packs
mozlinguas_src_unpack
}
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
# Ensure we have enough disk space to compile
if use debug || use test ; then
CHECKREQS_DISK_BUILD="8G"
else
CHECKREQS_DISK_BUILD="4G"
fi
check-reqs_pkg_setup
}
src_prepare() {
# Apply our patches
EPATCH_SUFFIX="patch" \
EPATCH_FORCE="yes" \
epatch "${WORKDIR}/seamonkey"
# browser patches go here
pushd "${S}"/mozilla &>/dev/null || die
EPATCH_EXCLUDE="2000-firefox_gentoo_install_dirs.patch" \
EPATCH_SUFFIX="patch" \
EPATCH_FORCE="yes" \
epatch "${WORKDIR}/firefox"
popd &>/dev/null || die
# Shell scripts sometimes contain DOS line endings; bug 391889
grep -rlZ --include="*.sh" $'\r$' . |
while read -r -d $'\0' file ; do
einfo edos2unix "${file}"
edos2unix "${file}" || die
done
# 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
#cd "${S}"
fi
local ms="${S}/mozilla"
# Enable gnomebreakpad
if use debug ; then
sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
"${ms}"/build/unix/run-mozilla.sh || die "sed failed!"
fi
# Disable gnomevfs extension
sed -i -e "s:gnomevfs::" "${S}"/suite/confvars.sh \
-e "s:gnomevfs::" "${ms}"/browser/confvars.sh \
-e "s:gnomevfs::" "${ms}"/xulrunner/confvars.sh \
|| die "Failed to remove gnomevfs extension"
# Ensure that are plugins dir is enabled as default
sed -i -e "s:/usr/lib/mozilla/plugins:/usr/$(get_libdir)/nsbrowser/plugins:" \
"${ms}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path!"
# Don't exit with error when some libs are missing which we have in
# system.
sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
-i "${S}"/suite/installer/Makefile.in || die
# Don't error out when there's no files to be removed:
sed 's@\(xargs rm\)$@\1 -f@' \
-i "${ms}"/toolkit/mozapps/installer/packager.mk || die
eautoreconf
cd "${S}"/mozilla
eautoconf
}
src_configure() {
MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
MEXTENSIONS="default"
####################################
#
# mozconfig, CFLAGS and CXXFLAGS setup
#
####################################
mozconfig_init
mozconfig_config
# It doesn't compile on alpha without this LDFLAGS
use alpha && append-ldflags "-Wl,--no-relax"
if use chatzilla ; then
MEXTENSIONS+=",irc"
else
MEXTENSIONS+=",-irc"
fi
if ! use roaming ; then
MEXTENSIONS+=",-sroaming"
fi
# We must force enable jemalloc 3 threw .mozconfig
echo "export MOZ_JEMALLOC=1" >> ${S}/.mozconfig
mozconfig_annotate '' --prefix="${EPREFIX}"/usr
mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
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 '' --with-system-png
mozconfig_annotate '' --target="${CTARGET:-${CHOST}}"
mozconfig_annotate '' --enable-safe-browsing
mozconfig_annotate '' --build="${CTARGET:-${CHOST}}"
mozconfig_use_enable gstreamer
mozconfig_use_enable system-sqlite
mozconfig_use_with system-jpeg
# Feature is know to cause problems on hardened
mozconfig_use_enable jit methodjit
mozconfig_use_enable jit tracejit
# Use an objdir to keep things organized.
echo "mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/seamonk" \
>> "${S}"/.mozconfig
# Finalize and report settings
mozconfig_final
# Work around breakage in makeopts with --no-print-directory
MAKEOPTS="${MAKEOPTS/--no-print-directory/}"
if [[ $(gcc-major-version) -lt 4 ]] ; then
append-cxxflags -fno-stack-protector
elif [[ $(gcc-major-version) -gt 4 || $(gcc-minor-version) -gt 3 ]] ; then
if use amd64 || use x86 ; then
append-flags -mno-avx
fi
fi
}
src_compile() {
CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
MOZ_MAKE_FLAGS="${MAKEOPTS}" \
emake -f client.mk || die
# Only build enigmail extension if conditions are met.
if use crypt ; then
cd "${S}"/mailnews/extensions/enigmail || die
./makemake -r 2&> /dev/null
cd "${S}"/seamonk/mailnews/extensions/enigmail
emake || die "make enigmail failed"
emake xpi || die "make enigmail xpi failed"
fi
}
src_install() {
MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
local emid obj_dir="seamonk"
cd "${S}/${obj_dir}"
# Copy our preference before omnijar is created.
sed "s|SEAMONKEY_PVR|${PVR}|" "${FILESDIR}"/all-gentoo-1.js > \
"${S}/${obj_dir}/mozilla/dist/bin/defaults/pref/all-gentoo.js" \
|| die
echo 'pref("extensions.autoDisableScopes", 3);' >> \
"${S}/${obj_dir}/mozilla/dist/bin/defaults/pref/all-gentoo.js" \
|| die
# Without methodjit and tracejit there's no conflict with PaX
if use jit ; then
# Pax mark xpcshell for hardened support, only used for startupcache creation.
pax-mark m "${S}"/dist/bin/xpcshell
fi
MOZ_MAKE_FLAGS="${MAKEOPTS}" \
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}"/${obj_dir}/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}"/${obj_dir}/mozilla/dist/bin/enigmail*.xpi || die
cd "${S}" || die
fi
sed 's|^\(MimeType=.*\)$|\1text/x-vcard;text/directory;application/mbox;message/rfc822;x-scheme-handler/mailto;|' \
-i "${T}"/${PN}.desktop || die
sed 's|^\(Categories=.*\)$|\1Email;|' -i "${T}"/${PN}.desktop \
|| die
# Install language packs
mozlinguas_src_install
# Add StartupNotify=true bug 290401
if use startup-notification ; then
echo "StartupNotify=true" >> "${T}"/${PN}.desktop
fi
# Install icon and .desktop for menu entry
newicon "${S}"/suite/branding/nightly/content/icon64.png ${PN}.png \
|| die
domenu "${T}"/${PN}.desktop || die
# Without methodjit and tracejit there's no conflict with PaX
if use jit ; then
# Required in order to use plugins and even run firefox on hardened.
pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{seamonkey,seamonkey-bin}
fi
# Plugin-container needs to be pax-marked for hardened to ensure plugins such as flash
# continue to work as expected.
pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/plugin-container
# Handle plugins dir through nsplugins.eclass
share_plugins_dir
doman "${S}"/${obj_dir}/suite/app/${PN}.1 || die
}
pkg_preinst() {
MOZILLA_FIVE_HOME="${ROOT}/usr/$(get_libdir)/${PN}"
if [ -d ${MOZILLA_FIVE_HOME}/plugins ] ; then
rm ${MOZILLA_FIVE_HOME}/plugins -rf
fi
}
pkg_postinst() {
MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
# Update mimedb for the new .desktop file
fdo-mime_desktop_database_update
if use chatzilla ; then
elog "chatzilla is now an extension which can be en-/disabled and configured via"
elog "the Add-on manager."
fi
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2013-01-16 17:02 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-16 17:02 [gentoo-commits] gentoo-x86 commit in www-client/seamonkey: metadata.xml ChangeLog seamonkey-2.15-r1.ebuild seamonkey-2.15.ebuild Jory Pratt (anarchy)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox