From: Lars Wendler Date: Tue, 13 Dec 2011 17:20:18 +0000 (+0000) Subject: Revision bump to add changes from ff-8.0. X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=7d6aed83455e90941dd7894f08b96fd84a202cac;p=gentoo.git Revision bump to add changes from ff-8.0. Package-Manager: portage-2.2.0_alpha80/cvs/Linux x86_64 --- diff --git a/www-client/icecat/ChangeLog b/www-client/icecat/ChangeLog index 125d41f97611..11864b961eff 100644 --- a/www-client/icecat/ChangeLog +++ b/www-client/icecat/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for www-client/icecat # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/icecat/ChangeLog,v 1.106 2011/10/08 18:26:42 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/icecat/ChangeLog,v 1.107 2011/12/13 17:20:18 polynomial-c Exp $ + +*icecat-7.0.1-r1 (13 Dec 2011) + + 13 Dec 2011; Lars Wendler icecat-7.0.1.ebuild, + +icecat-7.0.1-r1.ebuild: + Revision bump to add changes from ff-8.0. *icecat-7.0.1 (08 Oct 2011) diff --git a/www-client/icecat/Manifest b/www-client/icecat/Manifest index 742940a0abc0..0deb60dfc26b 100644 --- a/www-client/icecat/Manifest +++ b/www-client/icecat/Manifest @@ -12,9 +12,10 @@ DIST ff3617.diff.xz 255324 RMD160 0bb953b177d1fcc1e9083fe6b9495e2294183aa2 SHA1 DIST ff3618.diff.xz 20160 RMD160 7ed6b8d143b01e3998d867a2789e3116b541b472 SHA1 4a754fb15a10e5399f50f5eaef7fc4c3ac506ddd SHA256 1b2346f9bfde56a342e73a2a0c3a4f29a9873ea0b18137a60fd978fd11b62176 DIST ff3620.diff.xz 10564 RMD160 28be395a11c49377b2110858334f8b3f499f344a SHA1 74bcd3dd30780355d683f904b380d4b1444c8379 SHA256 66150e1ec8d7735d356d49909a6990468ab19f2bcff8d72fe6f5efe244dea328 DIST ff3621.diff.xz 9984 RMD160 112873cbf3c192e39d773d1eae934d1a2487ce4e SHA1 d902971b07d284ec43e5d1bd93bfeac16a724867 SHA256 cd4d2a1033ba05679354b6fd5e0a82b3d09b831655432657993da6410b855b4f -DIST ff701.diff.xz 1972 RMD160 5efe61169b84b4ec8b3bd2463b1f09666bbd1cce SHA1 e10454183863fd446accaf0f689f724a9eaa0264 SHA256 5bd8a5363a4db45a7936e10a63b785b0e659ad541ffb84c62b361af8ac26a72f +DIST ff80.diff.xz 5602508 RMD160 6e7a5a87c76976c94d4fbf61ccd82860d86dfbc9 SHA1 c37c59523defaf0b6bb7c7990fe51d3011844e15 SHA256 cf3f429c2afcf752e4f285a58e6aff6fd65a387d99e101c903f3a31feb03427d DIST firefox-3.6-patches-0.4.tar.bz2 5791 RMD160 17944b3605138c3b651b31fcad306a432b73b80c SHA1 4ddff9a613cc703b34667aab3aea993187405920 SHA256 39bbbe412f70b50e8870e11dbd3f9e74ed7cbeaa23ed47dea1ea6ff72f48e54f DIST firefox-7.0-patches-0.5.tar.xz 14652 RMD160 94593a3e01247b4e5fe9c01a80e902937ed3b32b SHA1 c9cfd5e46a18e4e6adfa8334936f854c3e14a687 SHA256 e2f1de9cfbb87cd982ed205b3b5f33e3bcd952b2093a9969281a761cc0a9e293 +DIST firefox-8.0-patches-0.2.tar.xz 8032 RMD160 221500ed4f56e9c139f563d598bf38df448e5652 SHA1 f41c04c659a253d464ab9bb2c169c1b99b22d443 SHA256 52d351133187dfb7b367950f4da543b06b9f0666f6c07b8bbb5b21cd3d40b0c3 DIST icecat-3.6.16-af.xpi 122498 RMD160 e697cd77c0d38ed7568bf2b0af8816ca70cdeca8 SHA1 9eb46b333ea44cecd4f431fcbeb53f1b1bc74a07 SHA256 8f47667318c75b36755bcb4d1ba700ea622fdabd46b3fa97475b54bf49591730 DIST icecat-3.6.16-ar.xpi 133542 RMD160 cc6786228a479342b23cda51d4f6008188bad992 SHA1 fae0950500a26ee8d4311c22f66541b192e4273e SHA256 a42fea02793a6a9ef50854959fe5293a0851c8b2bf61ca9c94f28865b3fd8d4d DIST icecat-3.6.16-as.xpi 136725 RMD160 7eb162d472ba909214956e1d22d50c6c2ad6f9bf SHA1 534e85951bac6e718685b0a2e7a74b06b15ea2d9 SHA256 44725fea3ab711fb46eac81040058de39c41d502bfd26151836223771e0b6240 @@ -167,23 +168,24 @@ DIST icecat-7.0.1-zu.xpi 244500 RMD160 ab5a052dd6ae9c6b18a076dafe879fc755627386 DIST icecat-7.0.1.tar.bz2 67744420 RMD160 1930f09f2e02c40a2936cd9264d99406a8225d27 SHA1 309a7bc4f688357856ddcc5ab8133a6aee8a6753 SHA256 9efbc72bd42c27d7071006a3762637180269831ed01f698e827d613313cc48b1 EBUILD icecat-3.6.16-r3.ebuild 9115 RMD160 e70a3e23a2d6474cf42a71c4e83a5772f6a870db SHA1 20f6d591be59a3afc36ff57e329db245f363818d SHA256 3aad416e07f379553b74d15a7570a8760a872c43d528426dd19f60c8fa690ba8 EBUILD icecat-3.6.16-r4.ebuild 9213 RMD160 56755ebb14999e01b2a078b8d6a7caf85862b8b1 SHA1 26b48038af1b393e3756e803e02d736134d2a80c SHA256 81934db382b5d8237c43e83f1930b6f3c00b075692022931a5ba9fc75af96cf3 -EBUILD icecat-7.0.1.ebuild 10002 RMD160 fd02c6433f619fa86a303eeafcc232e742fc1e73 SHA1 72e05ca7602875207e1955c1776f212b4d9924d5 SHA256 1222ff65658a2242c4b99b0acc45e875c80b1ef223ae479b58a620e274cc3bb4 -MISC ChangeLog 16169 RMD160 608b7d2797cbe4050acc1f33e9c751b7e0ac5558 SHA1 4296a33c3bc3e17dbe6851da7d40b1387605c99d SHA256 a218b86ae06af94c66b703eafd6c72bdbe881969e3c46f8cf0fe933f0ba4cb17 +EBUILD icecat-7.0.1-r1.ebuild 10010 RMD160 94d0e4b7a224f3c9e5f6af4394e7a3315080bb8c SHA1 1580af2d987ba91befb52430104a2c537b95f001 SHA256 52967aef9c579f0789873943e4943cb8676808699eeb9aba8076acfb4e16f287 +EBUILD icecat-7.0.1.ebuild 9943 RMD160 4f304ad5e492561c10c6218cce1b923aa5151dfd SHA1 5d9a117bcd556983ca7e04ccf44a9333dd964676 SHA256 c06991f0260b7a208a14235522914ca79ee6a13a0009eb1a359a3e3a4f28ba65 +MISC ChangeLog 16348 RMD160 220fdcdba972b3bb95b07b1f94382e5c70eb78a9 SHA1 453e4a9b0592fd5f9527e4b8b4754bc7514068be SHA256 66c4429068bedae59999eab6734f57288668de85dae70a21b5583f1210940e42 MISC metadata.xml 899 RMD160 8c753a2a29261c6fe457ed89bc94580c0b3214eb SHA1 abe8a66e482e32175679f57f1f39d5f4a23586ea SHA256 cf7fe5167aea0244d424a28b8a6d2620df6829c03d024bcc6e8e13b7c30c9cf1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQIcBAEBCgAGBQJOkJXpAAoJEPiazRVxLXTFkZQP/1k0IgJgIJXM0HFNXL0hrNON -U43d9Qq4reK9ovFcfSVQzYAU6RnHxJtMFjmE53yQbwZWL2bU/uBFsHYx6e7BFtc1 -sYvrRWTADk1Mszz4SB1MVKBOR24PrLppKmWOtvqxDhLX05dRqLdYwX0dd/N6W0nm -pKJc0jk9ttlyDcbpiK6xcPVD/Ny+VTRmP+x569dblUlyTQN25OSyxzgrH2IfVFPi -WArj9mXwUYmIBWDpHleAuxdIT8WTQHP5Nm1fRJ1+fDdLGxNNYK4d2zSLmhdvRER8 -/yCIqsqR4lj89NyoibALSAuZOsCVsxuCUGrB0ke//8gtQlLmCYwon+8kZqx/6EwM -Q6UBm8F+kybhspk0UzJ5jgFFUEcFCsu/4KllK+ngqB0Mymlrahg0jKsTr0nudPyn -zKPWXtAsnU1/Ga2RfmPbLOd3emkwDdyOIkrEPg0H3vrHbpPnKdhFTDl5mp+5CsZs -8SiS+gXI6kkz8S/TwAY4SYgLSEh+A+bb10G0D7ocxsYwx+bSyGY1wLKtC2LcUcU7 -bl4K0JbmkSqsolQ5tIB075rrSc1BhYr4rDdZUjbKuMX288NcsoCxd4/0sp5EactU -rBWDxlRfxNkU+7z3FefzRTxJypQoW6VcNbDYxPgKGcEOgtoYDElF2km7D96itS9a -tM1bBKwyIMME7CwOQkvI -=Nf+q +iQIcBAEBCgAGBQJO54laAAoJEPiazRVxLXTFAmUP+wVzsRBQr0fx/lacM0f4g/n8 +ZZmeFx0ok8ZUUnUp5OHrRaKaBnjgTeBCE1DsMFWE2XVX334GSeELeLjf5qT5a//3 +C0EPbcRsj12dKH8iPxkyUwMhjNeGnQVLSTONkJE/emN0HYh6tB2P8/6dkCMkaLNk +8TfYeisdllS7GAM113enioC0OYIoQvHOy/DgN3EuE3qkeF/hUbJMjJO1HMRoAoJm +C/H9ph8PM8TbZNeHpopkMUvIaf+0tXby4aq0KBoL/oahb7AjD8aCrP7ZcwGaVwn0 +pFBE6XquN/fYkrETfr9L6b5caxYHFuD8N0z/WnKaIrTZ7Sf7YnbNWh8EwyhMBfnm +7SyFVD9uwl7OFYZUJA4t73grgCbgeurQVd8xUK+IcHcmwSvmbItKadRFHSZqNjdb +5QtmB/bJL4Wdql9H9oMAzzjDa7jCcx6d1LfJ93Bkslfn5ejJerthLDY7F4CNihe2 +oFPFfvL8X7MUt4yQmYPwZQeNiHstXnvF7Pumi7y0Okx6HNucl816OCtJQFpdyatK +7FX15YjPC/DsFbKXRlhUkiLJsLUiZsdJbM+Yzmk6Yip1QF5AfqR1zhfgfiQbOZTM +swOF8JDHJT+0hedl9E5BVMOC/EtoEXEBowC6HZId8WKywM60iE9VNjdpl17yOuqX +5IY4eHafqwkFm/ZgTBnU +=dsH0 -----END PGP SIGNATURE----- diff --git a/www-client/icecat/icecat-7.0.1-r1.ebuild b/www-client/icecat/icecat-7.0.1-r1.ebuild new file mode 100644 index 000000000000..6ba1bb443de0 --- /dev/null +++ b/www-client/icecat/icecat-7.0.1-r1.ebuild @@ -0,0 +1,332 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-client/icecat/icecat-7.0.1-r1.ebuild,v 1.1 2011/12/13 17:20:18 polynomial-c Exp $ + +EAPI="3" +VIRTUALX_REQUIRED="pgo" +WANT_AUTOCONF="2.1" + +inherit flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-3 multilib pax-utils fdo-mime autotools mozextension versionator python virtualx + +MAJ_FF_PV="$(get_version_component_range 1-2)" # 3.5, 3.6, 4.0, etc. +FF_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI +FF_PV="${FF_PV/_beta/b}" # Handle beta for SRC_URI +FF_PV="${FF_PV/_rc/rc}" # Handle rc for SRC_URI +PATCH="firefox-8.0-patches-0.2" + +DESCRIPTION="GNU project's edition of Mozilla Firefox" +HOMEPAGE="http://www.gnu.org/software/gnuzilla/" + +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +SLOT="0" +LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )" +IUSE="+crashreporter +ipc pgo system-sqlite +webm" + +# More URIs appended below... +SRC_URI="mirror://gnu/gnuzilla/${FF_PV}/${PN}-${FF_PV}.tar.bz2 + http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.xz + http://dev.gentoo.org/~polynomial-c/mozilla/ff80.diff.xz" +LANGPACK_URI="http://gnuzilla.gnu.org/download/langpacks/${FF_PV}" + +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.12.10 + >=dev-libs/nspr-4.8.8 + >=dev-libs/glib-2.26:2 + >=media-libs/mesa-7.10 + media-libs/libpng[apng] + virtual/libffi + system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete,unlock-notify,debug=] ) + webm? ( media-libs/libvpx + media-libs/alsa-lib ) + crashreporter? ( net-misc/curl )" +# We don't use PYTHON_DEPEND/PYTHON_USE_WITH for some silly reason +DEPEND="${RDEPEND} + dev-util/pkgconfig + pgo? ( + =dev-lang/python-2*[sqlite] + >=sys-devel/gcc-4.5 ) + webm? ( x86? ( ${ASM_DEPEND} ) + amd64? ( ${ASM_DEPEND} ) )" + +# No language packs for alphas +if ! [[ ${PV} =~ alpha|beta ]]; then + # This list can be updated with scripts/get_langs.sh from mozilla overlay + LANGS="af ak ar ast be bg bn-BD bn-IN br bs ca cs cy da de + el en eo es-ES et eu fa fi fr fy-NL ga-IE gd gl gu-IN + he hi-IN hr hu hy-AM id is it ja kk kn ko ku lg lt lv mai mk + ml mr nb-NO nl nn-NO nso or pa-IN pl pt-PT rm ro ru si sk sl + son sq sr sv-SE ta ta-LK te th tr uk vi zu" + NOSHORTLANGS="en-GB en-ZA es-AR es-CL es-MX pt-BR zh-CN zh-TW" + + for X in ${LANGS} ; do + if [ "${X}" != "en" ] && [ "${X}" != "en-US" ]; then + SRC_URI="${SRC_URI} + linguas_${X/-/_}? ( ${LANGPACK_URI}/${X}.xpi -> ${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%%-*}? ( ${LANGPACK_URI}/${X}.xpi -> ${P}-${X}.xpi )" + fi + IUSE="${IUSE} linguas_${X%%-*}" + fi + done +fi + +QA_PRESTRIPPED="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="${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 ${P} does not support the ${LANG} LINGUA" + done +} + +pkg_setup() { + moz_pkgsetup + + # Avoid PGO profiling problems due to enviroment leakage + # These should *always* be cleaned up anyway + unset DBUS_SESSION_BUS_ADDRESS \ + DISPLAY \ + ORBIT_SOCKETDIR \ + SESSION_MANAGER \ + XDG_SESSION_COOKIE \ + XAUTHORITY + + if use pgo ; then + einfo + ewarn "You will do a double build for profile guided optimization." + ewarn "This will result in your build taking at least twice as long as before." + fi +} + +src_unpack() { + unpack ${A} + + linguas + for X in ${linguas}; do + # FIXME: Add support for unpacking xpis to portage + [[ ${X} != "en" ]] && xpi_unpack "${P}-${X}.xpi" + done +} + +src_prepare() { + # Make this a 8.0 version + epatch "${DISTDIR}"/ff80.diff.xz + + # Fix preferences location + sed -i 's|defaults/pref/|defaults/preferences/|' browser/installer/packages-static || die "sed failed" + + # Apply our patches + # + EPATCH_EXCLUDE="2000-firefox_gentoo_install_dirs.patch" \ + EPATCH_SUFFIX="patch" \ + EPATCH_FORCE="yes" \ + epatch "${WORKDIR}/firefox" + + epatch "${FILESDIR}"/2000-icecat-6_gentoo_install_dirs.patch + + # Allow user to apply any additional patches without modifing ebuild + epatch_user + + # Fix rebranding + sed -i 's|\$(DIST)/bin/firefox|\$(DIST)/bin/icecat|' browser/app/Makefile.in + + # Enable gnomebreakpad + if use debug ; then + sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \ + "${S}"/build/unix/run-mozilla.sh || die "sed failed!" + fi + + # Disable gnomevfs extension + sed -i -e "s:gnomevfs::" "${S}/"browser/confvars.sh \ + -e "s:gnomevfs::" "${S}/"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:" \ + "${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path!" + + # Fix sandbox violations during make clean, bug 372817 + sed -e "s:\(/no-such-file\):${T}\1:g" \ + -i "${S}"/config/rules.mk \ + -i "${S}"/js/src/config/rules.mk \ + -i "${S}"/nsprpub/configure{.in,} \ + || die + + eautoreconf + + cd js/src + eautoreconf +} + +src_configure() { + # We will build our own .mozconfig + rm "${S}"/.mozconfig + + 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" + + # Specific settings for icecat + echo "export MOZ_PHOENIX=1" >> "${S}"/.mozconfig + echo "mk_add_options MOZ_PHOENIX=1" "${S}"/.mozconfig + mozconfig_annotate '' --with-branding=browser/branding/unofficial + mozconfig_annotate '' --disable-official-branding + mozconfig_annotate '' --with-user-appdir=.icecat + + mozconfig_annotate '' --prefix="${EPREFIX}"/usr + mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir) + mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}" + mozconfig_annotate '' --disable-gconf + mozconfig_annotate '' --disable-mailnews + mozconfig_annotate '' --enable-canvas + mozconfig_annotate '' --enable-safe-browsing + mozconfig_annotate '' --with-system-png + + # Other browser-specific settings + mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME} + + mozconfig_annotate '' --target="${CTARGET:-${CHOST}}" + + mozconfig_use_enable system-sqlite + + # Allow for a proper pgo build + if use pgo ; then + echo "mk_add_options PROFILE_GEN_SCRIPT='\$(PYTHON) \$(OBJDIR)/_profile/pgo/profileserver.py'" >> "${S}"/.mozconfig + fi + + # 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 +} + +src_compile() { + if use pgo; then + addpredict /root + addpredict /etc/gconf + # icecat tries to dri stuff when it's run, see bug 380283 + shopt -s nullglob + local cards=$(echo -n /dev/{dri,ati}/card* /dev/nvidiactl* | sed 's/ /:/g') + shopt -u nullglob + test -n "${cards}" && addpredict "${cards}" + + CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \ + MOZ_MAKE_FLAGS="${MAKEOPTS}" \ + Xemake -f client.mk profiledbuild || die "Xemake failed" + else + CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \ + MOZ_MAKE_FLAGS="${MAKEOPTS}" \ + emake -f client.mk || die "emake failed" + fi + +} + +src_install() { + MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" + + # MOZ_BUILD_ROOT, and hence OBJ_DIR change depending on arch, compiler, pgo, etc. + local obj_dir="$(echo */config.log)" + obj_dir="${obj_dir%/*}" + cd "${S}/${obj_dir}" + + # Pax mark xpcshell for hardened support, only used for startupcache creation. + pax-mark m "${S}/${obj_dir}"/dist/bin/xpcshell + + # Add our default prefs for firefox + xulrunner + cp "${FILESDIR}"/gentoo-default-prefs.js \ + "${S}/${obj_dir}/dist/bin/defaults/pref/all-gentoo.js" || die + + MOZ_MAKE_FLAGS="${MAKEOPTS}" \ + emake DESTDIR="${D}" install || die "emake install failed" + + linguas + for X in ${linguas}; do + [[ ${X} != "en" ]] && xpi_install "${WORKDIR}/${P}-${X}" + done + + local size sizes icon_path icon name + sizes="16 32 48" + icon_path="${S}/browser/branding/unofficial" + + # Install icons and .desktop for menu entry + for size in ${sizes}; do + insinto "/usr/share/icons/hicolor/${size}x${size}/apps" + newins "${icon_path}/default${size}.png" "${PN}.png" || die + done + # The 128x128 icon has a different name + insinto "/usr/share/icons/hicolor/128x128/apps" + newins "${icon_path}/mozicon128.png" "${PN}.png" || die + # Install a 48x48 icon into /usr/share/pixmaps for legacy DEs + newicon "${icon_path}/content/icon48.png" "${PN}.png" || die + newmenu "${FILESDIR}/icon/${PN}.desktop" "${PN}.desktop" || die + sed -e "/^Icon/s:${PN}-icon:${PN}:" -i \ + "${ED}/usr/share/applications/${PN}.desktop" || die + + # Add StartupNotify=true bug 237317 + if use startup-notification ; then + echo "StartupNotify=true" >> "${ED}/usr/share/applications/${PN}.desktop" + fi + + # Required in order to use plugins and even run firefox on hardened. + pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/{${PN},${PN}-bin,plugin-container} + + # Plugins dir + dosym ../nsbrowser/plugins "${MOZILLA_FIVE_HOME}"/plugins \ + || die "failed to symlink" + +} + +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postinst() { + # Update mimedb for the new .desktop file + fdo-mime_desktop_database_update + gnome2_icon_cache_update +} + +pkg_postrm() { + gnome2_icon_cache_update +} diff --git a/www-client/icecat/icecat-7.0.1.ebuild b/www-client/icecat/icecat-7.0.1.ebuild index cca8970a155b..35ecfa2ed702 100644 --- a/www-client/icecat/icecat-7.0.1.ebuild +++ b/www-client/icecat/icecat-7.0.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/icecat/icecat-7.0.1.ebuild,v 1.1 2011/10/08 18:26:42 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/icecat/icecat-7.0.1.ebuild,v 1.2 2011/12/13 17:20:18 polynomial-c Exp $ EAPI="3" VIRTUALX_REQUIRED="pgo" @@ -24,8 +24,7 @@ IUSE="+crashreporter +ipc pgo system-sqlite +webm" # More URIs appended below... SRC_URI="mirror://gnu/gnuzilla/${FF_PV}/${PN}-${FF_PV}.tar.bz2 - http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.xz - http://dev.gentoo.org/~polynomial-c/mozilla/ff701.diff.xz" + http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.xz" LANGPACK_URI="http://gnuzilla.gnu.org/download/langpacks/${FF_PV}" ASM_DEPEND=">=dev-lang/yasm-1.1"