From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1OtQ12-0007TY-GU for garchives@archives.gentoo.org; Wed, 08 Sep 2010 19:09:04 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8FEF2E0B5E; Wed, 8 Sep 2010 19:09:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 46ECAE0B58 for ; Wed, 8 Sep 2010 19:09:03 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9EA6F1B408B for ; Wed, 8 Sep 2010 19:09:02 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2245) id 348EC20051; Wed, 8 Sep 2010 19:08:59 +0000 (UTC) From: "Lars Wendler (polynomial-c)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, polynomial-c@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in www-client/icecat: ChangeLog icecat-3.6.9.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog icecat-3.6.9.ebuild X-VCS-Directories: www-client/icecat X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler Content-Type: text/plain; charset=utf8 Message-Id: <20100908190859.348EC20051@flycatcher.gentoo.org> Date: Wed, 8 Sep 2010 19:08:59 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 83e26216-ef9c-4726-af71-4430fa98f40c X-Archives-Hash: 91153caaabe27556590c023bb01e4cf0 polynomial-c 10/09/08 19:08:59 Modified: ChangeLog Added: icecat-3.6.9.ebuild Log: Security bump =20 (Portage version: 2.2_rc77/cvs/Linux x86_64) Revision Changes Path 1.38 www-client/icecat/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/icecat/= ChangeLog?rev=3D1.38&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/icecat/= ChangeLog?rev=3D1.38&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/icecat/= ChangeLog?r1=3D1.37&r2=3D1.38 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/www-client/icecat/ChangeLog,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- ChangeLog 8 Sep 2010 02:14:46 -0000 1.37 +++ ChangeLog 8 Sep 2010 19:08:58 -0000 1.38 @@ -1,6 +1,11 @@ # ChangeLog for www-client/icecat # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/icecat/ChangeLog,v 1.37 20= 10/09/08 02:14:46 anarchy Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/icecat/ChangeLog,v 1.38 20= 10/09/08 19:08:58 polynomial-c Exp $ + +*icecat-3.6.9 (08 Sep 2010) + + 08 Sep 2010; Lars Wendler +icecat-3.6.9.ebui= ld: + Security bump =20 08 Sep 2010; Jory A. Pratt -icecat-3.6.4.ebuild, icecat-3.6.8.ebuild, -icecat-3.6.8-r1.ebuild: 1.1 www-client/icecat/icecat-3.6.9.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/icecat/= icecat-3.6.9.ebuild?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/icecat/= icecat-3.6.9.ebuild?rev=3D1.1&content-type=3Dtext/plain Index: icecat-3.6.9.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/www-client/icecat/icecat-3.6.9.ebuild,= v 1.1 2010/09/08 19:08:58 polynomial-c Exp $ EAPI=3D"2" WANT_AUTOCONF=3D"2.1" inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib= pax-utils fdo-mime autotools mozextension java-pkg-opt-2 LANGS=3D"af ar as be bg bn-BD bn-IN ca cs cy da de el en en-GB en-US eo e= s-AR es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gl gu-IN he hi-IN hr hu id i= s it ja ka kk kn ko ku lt lv mk ml mr nb-NO nl nn-NO oc or pa-IN pl pt-BR pt-PT r= m ro ru si sk sl sq sr sv-SE ta te th tr uk vi zh-CN zh-TW" # Malformed install.rdf: ta-LK NOSHORTLANGS=3D"en-GB es-AR es-CL es-MX pt-BR zh-CN zh-TW" MAJ_XUL_PV=3D"1.9.2" MAJ_PV=3D"${PV/_*/}" # Without the _rc and _beta stuff DESKTOP_PV=3D"3.6" MY_PV=3D"${PV/_rc/rc}" # Handle beta for SRC_URI XUL_PV=3D"${MAJ_XUL_PV}${MAJ_PV/${DESKTOP_PV}/}" # Major + Minor version = no.s FIREFOX_PN=3D"mozilla-firefox" FIREFOX_P=3D"${FIREFOX_PN}-${PV}" PATCH=3D"${FIREFOX_PN}-3.6-patches-0.6" DESCRIPTION=3D"GNU project's edition of Mozilla Firefox" HOMEPAGE=3D"http://www.gnu.org/software/gnuzilla/" KEYWORDS=3D"~amd64 ~ppc ~ppc64 ~x86" SLOT=3D"0" LICENSE=3D"|| ( MPL-1.1 GPL-2 LGPL-2.1 )" IUSE=3D"+alsa +ipc java libnotify system-sqlite wifi" SRC_URI=3D"mirror://gnu/gnuzilla/${MY_PV}/${PN}-${MY_PV}.tar.bz2 http://dev.gentoo.org/~anarchy/dist/${PATCH}.tar.bz2" LANGPACK_URI=3D"http://gnuzilla.gnu.org/download/langpacks/" for X in ${LANGS} ; do if [ "${X}" !=3D "en" ] && [ "${X}" !=3D "en-US" ]; then SRC_URI=3D"${SRC_URI} linguas_${X/-/_}? ( ${LANGPACK_URI}/${MY_PV}/${X}.xpi -> ${P}-${X}.xpi= )" fi IUSE=3D"${IUSE} linguas_${X/-/_}" # english is handled internally if [ "${#X}" =3D=3D 5 ] && ! has ${X} ${NOSHORTLANGS}; then if [ "${X}" !=3D "en-US" ]; then SRC_URI=3D"${SRC_URI} linguas_${X%%-*}? ( ${LANGPACK_URI}/${MY_PV}/${X}.xpi -> ${P}-${X}.xp= i )" fi IUSE=3D"${IUSE} linguas_${X%%-*}" fi done RDEPEND=3D" >=3Dsys-devel/binutils-2.16.1 >=3Ddev-libs/nss-3.12.7 >=3Ddev-libs/nspr-4.8.6 >=3Dapp-text/hunspell-1.2 system-sqlite? ( >=3Ddev-db/sqlite-3.6.22-r2[fts3,secure-delete] ) alsa? ( media-libs/alsa-lib ) >=3Dx11-libs/cairo-1.8.8[X] x11-libs/pango[X] wifi? ( net-wireless/wireless-tools ) libnotify? ( >=3Dx11-libs/libnotify-0.4 ) ~net-libs/xulrunner-${XUL_PV}[ipc=3D,java=3D,wifi=3D,libnotify=3D,system= -sqlite=3D]" DEPEND=3D"${RDEPEND} java? ( >=3Dvirtual/jdk-1.4 ) dev-util/pkgconfig" RDEPEND=3D"${RDEPEND} java? ( >=3Dvirtual/jre-1.4 )" # This is a copy of the launcher program installed as part of xulrunner, = so has # already been stripped. Bug #332071 for details. QA_PRESTRIPPED=3D"usr/$(get_libdir)/${PN}/${PN}" linguas() { local LANG SLANG for LANG in ${LINGUAS}; do if has ${LANG} en en_US; then has en ${linguas} || linguas=3D"${linguas:+"${linguas} "}en" continue elif has ${LANG} ${LANGS//-/_}; then has ${LANG//_/-} ${linguas} || linguas=3D"${linguas:+"${linguas} "}${L= ANG//_/-}" continue elif [[ " ${LANGS} " =3D=3D *" ${LANG}-"* ]]; then for X in ${LANGS}; do if [[ "${X}" =3D=3D "${LANG}-"* ]] && \ [[ " ${NOSHORTLANGS} " !=3D *" ${X} "* ]]; then has ${X} ${linguas} || linguas=3D"${linguas:+"${linguas} "}${X}" continue 2 fi done fi ewarn "Sorry, but ${PN} does not support the ${LANG} LINGUA" done } pkg_setup() { # Ensure we always build with C locale. export LANG=3D"C" export LC_ALL=3D"C" export LC_MESSAGES=3D"C" export LC_CTYPE=3D"C" java-pkg-opt-2_pkg_setup } src_unpack() { #xz -dc -- "${DISTDIR}/icecat-${MY_PV}.tar.xz" | tar xof - || die "faile= d to unpack" unpack ${A} #${PATCH}.tar.bz2 linguas for X in ${linguas}; do # FIXME: Add support for unpacking xpis to portage [[ ${X} !=3D "en" ]] && xpi_unpack "${P}-${X}.xpi" done } src_prepare() { # Integrate rebranding sed -i "s|/mozilla-firefox|/icecat|" \ "${WORKDIR}"/001-firefox_gentoo_install_dirs.patch # Fix preferences location sed -i 's|defaults/pref/|defaults/preferences/|' browser/installer/packa= ges-static || die "sed failed" # Apply our patches EPATCH_SUFFIX=3D"patch" \ EPATCH_FORCE=3D"yes" \ EPATCH_EXCLUDE=3D"137-bz460917_att350845_reload_new_plugins-gentoo-updat= e.patch" \ epatch "${WORKDIR}" # The patch excluded above failed, ported patch is applied below epatch "${FILESDIR}/137-bz460917_reload_new_plugins-gentoo-update-3.6.4.= patch" # Enable tracemonkey for amd64 (bug #315997) epatch "${FILESDIR}/801-enable-x86_64-tracemonkey.patch" # Fix rebranding sed -i 's|\$(DIST)/bin/firefox|\$(DIST)/bin/icecat|' browser/app/Makefil= e.in eautoreconf cd js/src eautoreconf } src_configure() { # We will build our own .mozconfig rm "${S}"/.mozconfig MOZILLA_FIVE_HOME=3D"/usr/$(get_libdir)/${PN}" MEXTENSIONS=3D"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" # Specific settings for icecat echo "export MOZ_PHOENIX=3D1" >> "${S}"/.mozconfig echo "mk_add_options MOZ_PHOENIX=3D1" "${S}"/.mozconfig mozconfig_annotate '' --with-branding=3Dbrowser/branding/unofficial mozconfig_annotate '' --disable-official-branding mozconfig_annotate '' --with-user-appdir=3D.icecat mozconfig_annotate '' --enable-extensions=3D"${MEXTENSIONS}" mozconfig_annotate '' --enable-application=3Dbrowser mozconfig_annotate '' --disable-mailnews mozconfig_annotate 'broken' --disable-crashreporter mozconfig_annotate '' --enable-image-encoder=3Dall mozconfig_annotate '' --enable-canvas mozconfig_annotate 'gtk' --enable-default-toolkit=3Dcairo-gtk2 # Bug 60668: Galeon doesn't build without oji enabled, so enable it # regardless of java setting. mozconfig_annotate '' --enable-oji --enable-mathml mozconfig_annotate 'places' --enable-storage --enable-places mozconfig_annotate '' --enable-safe-browsing # Build mozdevelop permately mozconfig_annotate '' --enable-jsd --enable-xpctools # System-wide install specs mozconfig_annotate '' --disable-installer mozconfig_annotate '' --disable-updater mozconfig_annotate '' --disable-strip mozconfig_annotate '' --disable-install-strip # Use system libraries mozconfig_annotate '' --enable-system-cairo mozconfig_annotate '' --enable-system-hunspell mozconfig_annotate '' --with-system-nspr mozconfig_annotate '' --with-system-nss mozconfig_annotate '' --with-system-bz2 mozconfig_annotate '' --with-system-libxul mozconfig_annotate '' --with-libxul-sdk=3D/usr/$(get_libdir)/xulrunner-d= evel-${MAJ_XUL_PV} mozconfig_use_enable ipc # +ipc, upstream default mozconfig_use_enable libnotify mozconfig_use_enable java javaxpcom mozconfig_use_enable wifi necko-wifi mozconfig_use_enable alsa ogg mozconfig_use_enable alsa wave mozconfig_use_enable system-sqlite # Other browser-specific settings mozconfig_annotate '' --with-default-mozilla-five-home=3D${MOZILLA_FIVE_= HOME} # Finalize and report settings mozconfig_final if [[ $(gcc-major-version) -lt 4 ]]; then append-cxxflags -fno-stack-protector fi #################################### # # Configure and build # #################################### CC=3D"$(tc-getCC)" CXX=3D"$(tc-getCXX)" LD=3D"$(tc-getLD)" econf } src_compile() { # Should the build use multiprocessing? Not enabled by default, as it te= nds to break [ "${WANT_MP}" =3D "true" ] && jobs=3D${MAKEOPTS} || jobs=3D"-j1" emake ${jobs} || die } src_install() { MOZILLA_FIVE_HOME=3D"/usr/$(get_libdir)/${PN}" emake DESTDIR=3D"${D}" install || die "emake install failed" linguas for X in ${linguas}; do [[ ${X} !=3D "en" ]] && xpi_install "${WORKDIR}"/"${P}-${X}" done # Install icon and .desktop for menu entry newicon "${S}"/browser/branding/unofficial/default48.png icecat-icon.png newmenu "${FILESDIR}"/icon/icecat.desktop ${PN}-${DESKTOP_PV}.desktop # Add StartupNotify=3Dtrue bug 237317 if use startup-notification ; then echo "StartupNotify=3Dtrue" >> "${D}"/usr/share/applications/${PN}-${DE= SKTOP_PV}.desktop fi pax-mark m "${D}"/${MOZILLA_FIVE_HOME}/${PN} # Enable very specific settings not inherited from xulrunner cp "${FILESDIR}"/firefox-default-prefs.js \ "${D}/${MOZILLA_FIVE_HOME}/defaults/preferences/all-gentoo.js" || \ die "failed to cp icecat-default-prefs.js" # Plugins dir dosym ../nsbrowser/plugins "${MOZILLA_FIVE_HOME}"/plugins \ || die "failed to symlink" } pkg_postinst() { ewarn "All the packages built against ${PN} won't compile," ewarn "any package that fails to build warrants a bug report." elog # Update mimedb for the new .desktop file fdo-mime_desktop_database_update }