| 1 |
polynomial-c 11/09/26 15:58:51 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: icecat-6.0.2.ebuild |
| 5 |
Removed: icecat-3.6.16-r1.ebuild |
| 6 |
Log: |
| 7 |
Security bump. Removed old |
| 8 |
|
| 9 |
(Portage version: 2.2.0_alpha59/cvs/Linux x86_64) |
| 10 |
|
| 11 |
Revision Changes Path |
| 12 |
1.103 www-client/icecat/ChangeLog |
| 13 |
|
| 14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/icecat/ChangeLog?rev=1.103&view=markup |
| 15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/icecat/ChangeLog?rev=1.103&content-type=text/plain |
| 16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/icecat/ChangeLog?r1=1.102&r2=1.103 |
| 17 |
|
| 18 |
Index: ChangeLog |
| 19 |
=================================================================== |
| 20 |
RCS file: /var/cvsroot/gentoo-x86/www-client/icecat/ChangeLog,v |
| 21 |
retrieving revision 1.102 |
| 22 |
retrieving revision 1.103 |
| 23 |
diff -u -r1.102 -r1.103 |
| 24 |
--- ChangeLog 4 Sep 2011 00:32:00 -0000 1.102 |
| 25 |
+++ ChangeLog 26 Sep 2011 15:58:51 -0000 1.103 |
| 26 |
@@ -1,6 +1,12 @@ |
| 27 |
# ChangeLog for www-client/icecat |
| 28 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 29 |
-# $Header: /var/cvsroot/gentoo-x86/www-client/icecat/ChangeLog,v 1.102 2011/09/04 00:32:00 phajdan.jr Exp $ |
| 30 |
+# $Header: /var/cvsroot/gentoo-x86/www-client/icecat/ChangeLog,v 1.103 2011/09/26 15:58:51 polynomial-c Exp $ |
| 31 |
+ |
| 32 |
+*icecat-6.0.2 (26 Sep 2011) |
| 33 |
+ |
| 34 |
+ 26 Sep 2011; Lars Wendler <polynomial-c@g.o> -icecat-3.6.16-r1.ebuild, |
| 35 |
+ +icecat-6.0.2.ebuild: |
| 36 |
+ Security bump. Removed old. |
| 37 |
|
| 38 |
04 Sep 2011; Pawel Hajdan jr <phajdan.jr@g.o> icecat-3.6.16-r3.ebuild: |
| 39 |
x86 stable wrt security bug #379549 |
| 40 |
|
| 41 |
|
| 42 |
|
| 43 |
1.1 www-client/icecat/icecat-6.0.2.ebuild |
| 44 |
|
| 45 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/icecat/icecat-6.0.2.ebuild?rev=1.1&view=markup |
| 46 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/icecat/icecat-6.0.2.ebuild?rev=1.1&content-type=text/plain |
| 47 |
|
| 48 |
Index: icecat-6.0.2.ebuild |
| 49 |
=================================================================== |
| 50 |
# Copyright 1999-2011 Gentoo Foundation |
| 51 |
# Distributed under the terms of the GNU General Public License v2 |
| 52 |
# $Header: /var/cvsroot/gentoo-x86/www-client/icecat/icecat-6.0.2.ebuild,v 1.1 2011/09/26 15:58:51 polynomial-c Exp $ |
| 53 |
|
| 54 |
EAPI="3" |
| 55 |
VIRTUALX_REQUIRED="pgo" |
| 56 |
WANT_AUTOCONF="2.1" |
| 57 |
|
| 58 |
inherit flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-3 multilib pax-utils fdo-mime autotools mozextension versionator python virtualx |
| 59 |
|
| 60 |
MAJ_FF_PV="$(get_version_component_range 1-2)" # 3.5, 3.6, 4.0, etc. |
| 61 |
FF_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI |
| 62 |
FF_PV="${FF_PV/_beta/b}" # Handle beta for SRC_URI |
| 63 |
FF_PV="${FF_PV/_rc/rc}" # Handle rc for SRC_URI |
| 64 |
PATCH="firefox-6.0-patches-0.1" |
| 65 |
|
| 66 |
DESCRIPTION="GNU project's edition of Mozilla Firefox" |
| 67 |
HOMEPAGE="http://www.gnu.org/software/gnuzilla/" |
| 68 |
|
| 69 |
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" |
| 70 |
SLOT="0" |
| 71 |
LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )" |
| 72 |
IUSE="+crashreporter +methodjit +ipc pgo system-sqlite +webm" |
| 73 |
|
| 74 |
# More URIs appended below... |
| 75 |
SRC_URI="mirror://gnu/gnuzilla/${FF_PV}/${PN}-${FF_PV}.tar.bz2 |
| 76 |
http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.bz2" |
| 77 |
LANGPACK_URI="http://gnuzilla.gnu.org/download/langpacks/${FF_PV}" |
| 78 |
|
| 79 |
ASM_DEPEND=">=dev-lang/yasm-1.1" |
| 80 |
|
| 81 |
# Mesa 7.10 needed for WebGL + bugfixes |
| 82 |
RDEPEND=" |
| 83 |
>=sys-devel/binutils-2.16.1 |
| 84 |
>=dev-libs/nss-3.12.10 |
| 85 |
>=dev-libs/nspr-4.8.8 |
| 86 |
>=dev-libs/glib-2.26 |
| 87 |
>=media-libs/mesa-7.10 |
| 88 |
media-libs/libpng[apng] |
| 89 |
dev-libs/libffi |
| 90 |
system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete,unlock-notify,debug=] ) |
| 91 |
webm? ( media-libs/libvpx |
| 92 |
media-libs/alsa-lib ) |
| 93 |
crashreporter? ( net-misc/curl )" |
| 94 |
# We don't use PYTHON_DEPEND/PYTHON_USE_WITH for some silly reason |
| 95 |
DEPEND="${RDEPEND} |
| 96 |
dev-util/pkgconfig |
| 97 |
pgo? ( |
| 98 |
=dev-lang/python-2*[sqlite] |
| 99 |
>=sys-devel/gcc-4.5 ) |
| 100 |
webm? ( x86? ( ${ASM_DEPEND} ) |
| 101 |
amd64? ( ${ASM_DEPEND} ) )" |
| 102 |
|
| 103 |
# No language packs for alphas |
| 104 |
if ! [[ ${PV} =~ alpha|beta ]]; then |
| 105 |
# This list can be updated with scripts/get_langs.sh from mozilla overlay |
| 106 |
LANGS="af ak ar ast be bg bn-BD bn-IN br bs ca cs cy da de |
| 107 |
el en eo es-ES et eu fa fi fr fy-NL ga-IE gd gl gu-IN |
| 108 |
he hi-IN hr hu hy-AM id is it ja kk kn ko ku lg lt lv mai mk |
| 109 |
ml mr nb-NO nl nn-NO nso or pa-IN pl pt-PT rm ro ru si sk sl |
| 110 |
son sq sr sv-SE ta ta-LK te th tr uk vi zu" |
| 111 |
NOSHORTLANGS="en-GB en-ZA es-AR es-CL es-MX pt-BR zh-CN zh-TW" |
| 112 |
|
| 113 |
for X in ${LANGS} ; do |
| 114 |
if [ "${X}" != "en" ] && [ "${X}" != "en-US" ]; then |
| 115 |
SRC_URI="${SRC_URI} |
| 116 |
linguas_${X/-/_}? ( ${LANGPACK_URI}/${X}.xpi -> ${P}-${X}.xpi )" |
| 117 |
fi |
| 118 |
IUSE="${IUSE} linguas_${X/-/_}" |
| 119 |
# english is handled internally |
| 120 |
if [ "${#X}" == 5 ] && ! has ${X} ${NOSHORTLANGS}; then |
| 121 |
if [ "${X}" != "en-US" ]; then |
| 122 |
SRC_URI="${SRC_URI} |
| 123 |
linguas_${X%%-*}? ( ${LANGPACK_URI}/${X}.xpi -> ${P}-${X}.xpi )" |
| 124 |
fi |
| 125 |
IUSE="${IUSE} linguas_${X%%-*}" |
| 126 |
fi |
| 127 |
done |
| 128 |
fi |
| 129 |
|
| 130 |
QA_PRESTRIPPED="usr/$(get_libdir)/${PN}/${PN}" |
| 131 |
|
| 132 |
linguas() { |
| 133 |
local LANG SLANG |
| 134 |
for LANG in ${LINGUAS}; do |
| 135 |
if has ${LANG} en en_US; then |
| 136 |
has en ${linguas} || linguas="${linguas:+"${linguas} "}en" |
| 137 |
continue |
| 138 |
elif has ${LANG} ${LANGS//-/_}; then |
| 139 |
has ${LANG//_/-} ${linguas} || linguas="${linguas:+"${linguas} "}${LANG//_/-}" |
| 140 |
continue |
| 141 |
elif [[ " ${LANGS} " == *" ${LANG}-"* ]]; then |
| 142 |
for X in ${LANGS}; do |
| 143 |
if [[ "${X}" == "${LANG}-"* ]] && \ |
| 144 |
[[ " ${NOSHORTLANGS} " != *" ${X} "* ]]; then |
| 145 |
has ${X} ${linguas} || linguas="${linguas:+"${linguas} "}${X}" |
| 146 |
continue 2 |
| 147 |
fi |
| 148 |
done |
| 149 |
fi |
| 150 |
ewarn "Sorry, but ${P} does not support the ${LANG} LINGUA" |
| 151 |
done |
| 152 |
} |
| 153 |
|
| 154 |
pkg_setup() { |
| 155 |
moz_pkgsetup |
| 156 |
|
| 157 |
# Avoid PGO profiling problems due to enviroment leakage |
| 158 |
# These should *always* be cleaned up anyway |
| 159 |
unset DBUS_SESSION_BUS_ADDRESS \ |
| 160 |
DISPLAY \ |
| 161 |
ORBIT_SOCKETDIR \ |
| 162 |
SESSION_MANAGER \ |
| 163 |
XDG_SESSION_COOKIE \ |
| 164 |
XAUTHORITY |
| 165 |
|
| 166 |
if ! use methodjit ; then |
| 167 |
einfo |
| 168 |
ewarn "You are disabling the method-based JIT in JägerMonkey." |
| 169 |
ewarn "This will greatly slowdown JavaScript in ${PN}!" |
| 170 |
fi |
| 171 |
|
| 172 |
if use pgo ; then |
| 173 |
einfo |
| 174 |
ewarn "You will do a double build for profile guided optimization." |
| 175 |
ewarn "This will result in your build taking at least twice as long as before." |
| 176 |
fi |
| 177 |
} |
| 178 |
|
| 179 |
src_unpack() { |
| 180 |
unpack ${A} |
| 181 |
|
| 182 |
linguas |
| 183 |
for X in ${linguas}; do |
| 184 |
# FIXME: Add support for unpacking xpis to portage |
| 185 |
[[ ${X} != "en" ]] && xpi_unpack "${P}-${X}.xpi" |
| 186 |
done |
| 187 |
} |
| 188 |
|
| 189 |
src_prepare() { |
| 190 |
# Fix preferences location |
| 191 |
sed -i 's|defaults/pref/|defaults/preferences/|' browser/installer/packages-static || die "sed failed" |
| 192 |
|
| 193 |
# Apply our patches |
| 194 |
# |
| 195 |
EPATCH_EXCLUDE="2000-firefox_gentoo_install_dirs.patch" \ |
| 196 |
EPATCH_SUFFIX="patch" \ |
| 197 |
EPATCH_FORCE="yes" \ |
| 198 |
epatch "${WORKDIR}" |
| 199 |
|
| 200 |
epatch "${FILESDIR}"/2000-icecat-6_gentoo_install_dirs.patch \ |
| 201 |
"${FILESDIR}"/${PN}-5.0-curl7217-includes-fix.patch |
| 202 |
|
| 203 |
# Allow user to apply any additional patches without modifing ebuild |
| 204 |
epatch_user |
| 205 |
|
| 206 |
# Fix rebranding |
| 207 |
sed -i 's|\$(DIST)/bin/firefox|\$(DIST)/bin/icecat|' browser/app/Makefile.in |
| 208 |
|
| 209 |
# Enable gnomebreakpad |
| 210 |
if use debug ; then |
| 211 |
sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \ |
| 212 |
"${S}"/build/unix/run-mozilla.sh || die "sed failed!" |
| 213 |
fi |
| 214 |
|
| 215 |
# Disable gnomevfs extension |
| 216 |
sed -i -e "s:gnomevfs::" "${S}/"browser/confvars.sh \ |
| 217 |
-e "s:gnomevfs::" "${S}/"xulrunner/confvars.sh \ |
| 218 |
|| die "Failed to remove gnomevfs extension" |
| 219 |
|
| 220 |
# Ensure that are plugins dir is enabled as default |
| 221 |
sed -i -e "s:/usr/lib/mozilla/plugins:/usr/$(get_libdir)/nsbrowser/plugins:" \ |
| 222 |
"${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path!" |
| 223 |
|
| 224 |
# Fix sandbox violations during make clean, bug 372817 |
| 225 |
sed -e "s:\(/no-such-file\):${T}\1:g" \ |
| 226 |
-i "${S}"/config/rules.mk \ |
| 227 |
-i "${S}"/js/src/config/rules.mk \ |
| 228 |
-i "${S}"/nsprpub/configure{.in,} \ |
| 229 |
|| die |
| 230 |
|
| 231 |
eautoreconf |
| 232 |
|
| 233 |
cd js/src |
| 234 |
eautoreconf |
| 235 |
} |
| 236 |
|
| 237 |
src_configure() { |
| 238 |
# We will build our own .mozconfig |
| 239 |
rm "${S}"/.mozconfig |
| 240 |
|
| 241 |
MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" |
| 242 |
MEXTENSIONS="default" |
| 243 |
|
| 244 |
#################################### |
| 245 |
# |
| 246 |
# mozconfig, CFLAGS and CXXFLAGS setup |
| 247 |
# |
| 248 |
#################################### |
| 249 |
|
| 250 |
mozconfig_init |
| 251 |
mozconfig_config |
| 252 |
|
| 253 |
# It doesn't compile on alpha without this LDFLAGS |
| 254 |
use alpha && append-ldflags "-Wl,--no-relax" |
| 255 |
|
| 256 |
# Specific settings for icecat |
| 257 |
echo "export MOZ_PHOENIX=1" >> "${S}"/.mozconfig |
| 258 |
echo "mk_add_options MOZ_PHOENIX=1" "${S}"/.mozconfig |
| 259 |
mozconfig_annotate '' --with-branding=browser/branding/unofficial |
| 260 |
mozconfig_annotate '' --disable-official-branding |
| 261 |
mozconfig_annotate '' --with-user-appdir=.icecat |
| 262 |
|
| 263 |
mozconfig_annotate '' --prefix="${EPREFIX}"/usr |
| 264 |
mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir) |
| 265 |
mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}" |
| 266 |
mozconfig_annotate '' --disable-gconf |
| 267 |
mozconfig_annotate '' --disable-mailnews |
| 268 |
mozconfig_annotate '' --enable-canvas |
| 269 |
mozconfig_annotate '' --enable-safe-browsing |
| 270 |
mozconfig_annotate '' --with-system-png |
| 271 |
|
| 272 |
# Other browser-specific settings |
| 273 |
mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME} |
| 274 |
|
| 275 |
mozconfig_use_enable system-sqlite |
| 276 |
mozconfig_use_enable methodjit |
| 277 |
|
| 278 |
# Allow for a proper pgo build |
| 279 |
if use pgo ; then |
| 280 |
echo "mk_add_options PROFILE_GEN_SCRIPT='\$(PYTHON) \$(OBJDIR)/_profile/pgo/profileserver.py'" >> "${S}"/.mozconfig |
| 281 |
fi |
| 282 |
|
| 283 |
# Finalize and report settings |
| 284 |
mozconfig_final |
| 285 |
|
| 286 |
if [[ $(gcc-major-version) -lt 4 ]]; then |
| 287 |
append-cxxflags -fno-stack-protector |
| 288 |
elif [[ $(gcc-major-version) -gt 4 || $(gcc-minor-version) -gt 3 ]]; then |
| 289 |
if use amd64 || use x86; then |
| 290 |
append-flags -mno-avx |
| 291 |
fi |
| 292 |
fi |
| 293 |
} |
| 294 |
|
| 295 |
src_compile() { |
| 296 |
if use pgo; then |
| 297 |
addpredict /root |
| 298 |
addpredict /etc/gconf |
| 299 |
addpredict /dev/dri |
| 300 |
CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \ |
| 301 |
MOZ_MAKE_FLAGS="${MAKEOPTS}" \ |
| 302 |
Xemake -f client.mk profiledbuild || die "Xemake failed" |
| 303 |
else |
| 304 |
CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \ |
| 305 |
MOZ_MAKE_FLAGS="${MAKEOPTS}" \ |
| 306 |
emake -f client.mk || die "emake failed" |
| 307 |
fi |
| 308 |
|
| 309 |
} |
| 310 |
|
| 311 |
src_install() { |
| 312 |
MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" |
| 313 |
|
| 314 |
# MOZ_BUILD_ROOT, and hence OBJ_DIR change depending on arch, compiler, pgo, etc. |
| 315 |
local obj_dir="$(echo */config.log)" |
| 316 |
obj_dir="${obj_dir%/*}" |
| 317 |
cd "${S}/${obj_dir}" |
| 318 |
|
| 319 |
# Add our default prefs for firefox + xulrunner |
| 320 |
cp "${FILESDIR}"/gentoo-default-prefs.js \ |
| 321 |
"${S}/${obj_dir}/dist/bin/defaults/pref/all-gentoo.js" || die |
| 322 |
|
| 323 |
MOZ_MAKE_FLAGS="${MAKEOPTS}" \ |
| 324 |
emake DESTDIR="${D}" install || die "emake install failed" |
| 325 |
|
| 326 |
linguas |
| 327 |
for X in ${linguas}; do |
| 328 |
[[ ${X} != "en" ]] && xpi_install "${WORKDIR}/${P}-${X}" |
| 329 |
done |
| 330 |
|
| 331 |
local size sizes icon_path icon name |
| 332 |
sizes="16 32 48" |
| 333 |
icon_path="${S}/browser/branding/unofficial" |
| 334 |
|
| 335 |
# Install icons and .desktop for menu entry |
| 336 |
for size in ${sizes}; do |
| 337 |
insinto "/usr/share/icons/hicolor/${size}x${size}/apps" |
| 338 |
newins "${icon_path}/default${size}.png" "${PN}.png" || die |
| 339 |
done |
| 340 |
# The 128x128 icon has a different name |
| 341 |
insinto "/usr/share/icons/hicolor/128x128/apps" |
| 342 |
newins "${icon_path}/mozicon128.png" "${PN}.png" || die |
| 343 |
# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs |
| 344 |
newicon "${icon_path}/content/icon48.png" "${PN}.png" || die |
| 345 |
newmenu "${FILESDIR}/icon/${PN}.desktop" "${PN}.desktop" || die |
| 346 |
sed -e "/^Icon/s:${PN}-icon:${PN}:" -i \ |
| 347 |
"${ED}/usr/share/applications/${PN}.desktop" || die |
| 348 |
|
| 349 |
# Add StartupNotify=true bug 237317 |
| 350 |
if use startup-notification ; then |
| 351 |
echo "StartupNotify=true" >> "${ED}/usr/share/applications/${PN}.desktop" |
| 352 |
fi |
| 353 |
|
| 354 |
pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/${PN} |
| 355 |
pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/plugin-container |
| 356 |
|
| 357 |
# Plugins dir |
| 358 |
dosym ../nsbrowser/plugins "${MOZILLA_FIVE_HOME}"/plugins \ |
| 359 |
|| die "failed to symlink" |
| 360 |
|
| 361 |
} |
| 362 |
|
| 363 |
pkg_preinst() { |
| 364 |
gnome2_icon_savelist |
| 365 |
} |
| 366 |
|
| 367 |
pkg_postinst() { |
| 368 |
# Update mimedb for the new .desktop file |
| 369 |
fdo-mime_desktop_database_update |
| 370 |
gnome2_icon_cache_update |
| 371 |
} |
| 372 |
|
| 373 |
pkg_postrm() { |
| 374 |
gnome2_icon_cache_update |
| 375 |
} |
Archives