| 1 |
polynomial-c 11/05/03 09:28:06 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: icecat-3.6.16-r1.ebuild |
| 5 |
Log: |
| 6 |
Security bump |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha30/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.80 www-client/icecat/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/icecat/ChangeLog?rev=1.80&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/icecat/ChangeLog?rev=1.80&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/icecat/ChangeLog?r1=1.79&r2=1.80 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/www-client/icecat/ChangeLog,v |
| 20 |
retrieving revision 1.79 |
| 21 |
retrieving revision 1.80 |
| 22 |
diff -u -r1.79 -r1.80 |
| 23 |
--- ChangeLog 18 Apr 2011 15:06:25 -0000 1.79 |
| 24 |
+++ ChangeLog 3 May 2011 09:28:06 -0000 1.80 |
| 25 |
@@ -1,6 +1,11 @@ |
| 26 |
# ChangeLog for www-client/icecat |
| 27 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/www-client/icecat/ChangeLog,v 1.79 2011/04/18 15:06:25 anarchy Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/www-client/icecat/ChangeLog,v 1.80 2011/05/03 09:28:06 polynomial-c Exp $ |
| 30 |
+ |
| 31 |
+*icecat-3.6.16-r1 (03 May 2011) |
| 32 |
+ |
| 33 |
+ 03 May 2011; Lars Wendler <polynomial-c@g.o> +icecat-3.6.16-r1.ebuild: |
| 34 |
+ Security bump. This revision contains the same fixes firefox-3.6.17 has. |
| 35 |
|
| 36 |
18 Apr 2011; Jory A. Pratt <anarchy@g.o> icecat-4.0.ebuild: |
| 37 |
remove unused sed, bug #363867 |
| 38 |
|
| 39 |
|
| 40 |
|
| 41 |
1.1 www-client/icecat/icecat-3.6.16-r1.ebuild |
| 42 |
|
| 43 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/icecat/icecat-3.6.16-r1.ebuild?rev=1.1&view=markup |
| 44 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/icecat/icecat-3.6.16-r1.ebuild?rev=1.1&content-type=text/plain |
| 45 |
|
| 46 |
Index: icecat-3.6.16-r1.ebuild |
| 47 |
=================================================================== |
| 48 |
# Copyright 1999-2011 Gentoo Foundation |
| 49 |
# Distributed under the terms of the GNU General Public License v2 |
| 50 |
# $Header: /var/cvsroot/gentoo-x86/www-client/icecat/icecat-3.6.16-r1.ebuild,v 1.1 2011/05/03 09:28:06 polynomial-c Exp $ |
| 51 |
EAPI="3" |
| 52 |
WANT_AUTOCONF="2.1" |
| 53 |
|
| 54 |
inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib pax-utils fdo-mime autotools mozextension java-pkg-opt-2 python |
| 55 |
|
| 56 |
LANGS="af ar as ast be bg bn-BD bn-IN ca cs cy da de el en en-GB en-US eo es-AR |
| 57 |
es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gl gu-IN he hi-IN hr hu id is it |
| 58 |
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 rm ro |
| 59 |
ru si sk sl sq sr sv-SE ta ta-LK te th tr uk vi zh-CN zh-TW" |
| 60 |
# Malformed install.rdf: ta-LK |
| 61 |
|
| 62 |
NOSHORTLANGS="en-GB es-AR es-CL es-MX pt-BR zh-CN zh-TW" |
| 63 |
|
| 64 |
MAJ_XUL_PV="1.9.2" |
| 65 |
MAJ_PV="${PV/_*/}" # Without the _rc and _beta stuff |
| 66 |
DESKTOP_PV="3.6" |
| 67 |
MY_PV="${PV/_rc/rc}" # Handle beta for SRC_URI |
| 68 |
#XUL_PV="${MAJ_XUL_PV}${MAJ_PV/${DESKTOP_PV}/}" # Major + Minor version no.s |
| 69 |
XUL_PV="${MAJ_XUL_PV}.17" |
| 70 |
FIREFOX_PN="firefox" |
| 71 |
FIREFOX_P="${FIREFOX_PN}-${PV}" |
| 72 |
PATCH="${FIREFOX_PN}-3.6-patches-0.4" |
| 73 |
|
| 74 |
DESCRIPTION="GNU project's edition of Mozilla Firefox" |
| 75 |
HOMEPAGE="http://www.gnu.org/software/gnuzilla/" |
| 76 |
|
| 77 |
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" |
| 78 |
SLOT="0" |
| 79 |
LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )" |
| 80 |
IUSE="+alsa +ipc gnome java libnotify system-sqlite wifi" |
| 81 |
|
| 82 |
SRC_URI="mirror://gnu/gnuzilla/${MY_PV}/${PN}-${MY_PV}.tar.bz2 |
| 83 |
http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.bz2 |
| 84 |
http://dev.gentoo.org/~polynomial-c/mozilla/ff3617.diff.xz" |
| 85 |
LANGPACK_URI="http://gnuzilla.gnu.org/download/langpacks/${MY_PV}" |
| 86 |
|
| 87 |
for X in ${LANGS} ; do |
| 88 |
if [ "${X}" != "en" ] && [ "${X}" != "en-US" ]; then |
| 89 |
SRC_URI="${SRC_URI} |
| 90 |
linguas_${X/-/_}? ( ${LANGPACK_URI}/${X}.xpi -> ${P}-${X}.xpi )" |
| 91 |
fi |
| 92 |
IUSE="${IUSE} linguas_${X/-/_}" |
| 93 |
# english is handled internally |
| 94 |
if [ "${#X}" == 5 ] && ! has ${X} ${NOSHORTLANGS}; then |
| 95 |
if [ "${X}" != "en-US" ]; then |
| 96 |
SRC_URI="${SRC_URI} |
| 97 |
linguas_${X%%-*}? ( ${LANGPACK_URI}/${X}.xpi -> ${P}-${X}.xpi )" |
| 98 |
fi |
| 99 |
IUSE="${IUSE} linguas_${X%%-*}" |
| 100 |
fi |
| 101 |
done |
| 102 |
|
| 103 |
RDEPEND=" |
| 104 |
>=sys-devel/binutils-2.16.1 |
| 105 |
>=dev-libs/nss-3.12.8 |
| 106 |
>=dev-libs/nspr-4.8.6 |
| 107 |
>=app-text/hunspell-1.2 |
| 108 |
system-sqlite? ( >=dev-db/sqlite-3.7.1[fts3,secure-delete] ) |
| 109 |
alsa? ( media-libs/alsa-lib ) |
| 110 |
>=x11-libs/cairo-1.8.8[X] |
| 111 |
x11-libs/pango[X] |
| 112 |
gnome? ( >=gnome-base/gnome-vfs-2.16.3 |
| 113 |
>=gnome-base/libgnomeui-2.16.1 |
| 114 |
>=gnome-base/gconf-2.16.0 |
| 115 |
>=gnome-base/libgnome-2.16.0 ) |
| 116 |
wifi? ( net-wireless/wireless-tools ) |
| 117 |
libnotify? ( >=x11-libs/libnotify-0.4 ) |
| 118 |
~net-libs/xulrunner-${XUL_PV}[ipc=,java=,wifi=,libnotify=,system-sqlite=]" |
| 119 |
|
| 120 |
DEPEND="${RDEPEND} |
| 121 |
java? ( >=virtual/jdk-1.4 ) |
| 122 |
=dev-lang/python-2*[threads] |
| 123 |
dev-util/pkgconfig" |
| 124 |
|
| 125 |
RDEPEND="${RDEPEND} java? ( >=virtual/jre-1.4 )" |
| 126 |
|
| 127 |
# This is a copy of the launcher program installed as part of xulrunner, so has |
| 128 |
# already been stripped. Bug #332071 for details. |
| 129 |
QA_PRESTRIPPED="usr/$(get_libdir)/${PN}/${PN}" |
| 130 |
|
| 131 |
linguas() { |
| 132 |
local LANG SLANG |
| 133 |
for LANG in ${LINGUAS}; do |
| 134 |
if has ${LANG} en en_US; then |
| 135 |
has en ${linguas} || linguas="${linguas:+"${linguas} "}en" |
| 136 |
continue |
| 137 |
elif has ${LANG} ${LANGS//-/_}; then |
| 138 |
has ${LANG//_/-} ${linguas} || linguas="${linguas:+"${linguas} "}${LANG//_/-}" |
| 139 |
continue |
| 140 |
elif [[ " ${LANGS} " == *" ${LANG}-"* ]]; then |
| 141 |
for X in ${LANGS}; do |
| 142 |
if [[ "${X}" == "${LANG}-"* ]] && \ |
| 143 |
[[ " ${NOSHORTLANGS} " != *" ${X} "* ]]; then |
| 144 |
has ${X} ${linguas} || linguas="${linguas:+"${linguas} "}${X}" |
| 145 |
continue 2 |
| 146 |
fi |
| 147 |
done |
| 148 |
fi |
| 149 |
ewarn "Sorry, but ${PN} does not support the ${LANG} LINGUA" |
| 150 |
done |
| 151 |
} |
| 152 |
|
| 153 |
pkg_setup() { |
| 154 |
# Ensure we always build with C locale. |
| 155 |
export LANG="C" |
| 156 |
export LC_ALL="C" |
| 157 |
export LC_MESSAGES="C" |
| 158 |
export LC_CTYPE="C" |
| 159 |
|
| 160 |
java-pkg-opt-2_pkg_setup |
| 161 |
|
| 162 |
python_set_active_version 2 |
| 163 |
} |
| 164 |
|
| 165 |
src_unpack() { |
| 166 |
#xz -dc -- "${DISTDIR}/icecat-${MY_PV}.tar.xz" | tar xof - || die "failed to unpack" |
| 167 |
unpack ${A} #${PATCH}.tar.bz2 |
| 168 |
|
| 169 |
linguas |
| 170 |
for X in ${linguas}; do |
| 171 |
# FIXME: Add support for unpacking xpis to portage |
| 172 |
[[ ${X} != "en" ]] && xpi_unpack "${P}-${X}.xpi" |
| 173 |
done |
| 174 |
} |
| 175 |
|
| 176 |
src_prepare() { |
| 177 |
# Make this a 3.6.17 version |
| 178 |
epatch "${DISTDIR}"/ff3617.diff.xz |
| 179 |
|
| 180 |
# Integrate rebranding |
| 181 |
sed -i "s|/firefox|/icecat|" \ |
| 182 |
"${WORKDIR}"/001-firefox_gentoo_install_dirs.patch |
| 183 |
|
| 184 |
# Fix preferences location |
| 185 |
sed -i 's|defaults/pref/|defaults/preferences/|' browser/installer/packages-static || die "sed failed" |
| 186 |
|
| 187 |
# Apply our patches |
| 188 |
EPATCH_SUFFIX="patch" \ |
| 189 |
EPATCH_FORCE="yes" \ |
| 190 |
epatch "${WORKDIR}" |
| 191 |
|
| 192 |
# Fix rebranding |
| 193 |
sed -i 's|\$(DIST)/bin/firefox|\$(DIST)/bin/icecat|' browser/app/Makefile.in |
| 194 |
|
| 195 |
eautoreconf |
| 196 |
|
| 197 |
cd js/src |
| 198 |
eautoreconf |
| 199 |
} |
| 200 |
|
| 201 |
src_configure() { |
| 202 |
# We will build our own .mozconfig |
| 203 |
rm "${S}"/.mozconfig |
| 204 |
|
| 205 |
MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" |
| 206 |
MEXTENSIONS="default" |
| 207 |
|
| 208 |
#################################### |
| 209 |
# |
| 210 |
# mozconfig, CFLAGS and CXXFLAGS setup |
| 211 |
# |
| 212 |
#################################### |
| 213 |
|
| 214 |
mozconfig_init |
| 215 |
mozconfig_config |
| 216 |
|
| 217 |
# It doesn't compile on alpha without this LDFLAGS |
| 218 |
use alpha && append-ldflags "-Wl,--no-relax" |
| 219 |
|
| 220 |
# Specific settings for icecat |
| 221 |
echo "export MOZ_PHOENIX=1" >> "${S}"/.mozconfig |
| 222 |
echo "mk_add_options MOZ_PHOENIX=1" "${S}"/.mozconfig |
| 223 |
mozconfig_annotate '' --with-branding=browser/branding/unofficial |
| 224 |
mozconfig_annotate '' --disable-official-branding |
| 225 |
mozconfig_annotate '' --with-user-appdir=.icecat |
| 226 |
|
| 227 |
mozconfig_annotate '' --enable-crypto |
| 228 |
mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}" |
| 229 |
mozconfig_annotate '' --enable-application=browser |
| 230 |
mozconfig_annotate '' --disable-mailnews |
| 231 |
mozconfig_annotate 'broken' --disable-crashreporter |
| 232 |
mozconfig_annotate '' --enable-image-encoder=all |
| 233 |
mozconfig_annotate '' --enable-canvas |
| 234 |
mozconfig_annotate 'gtk' --enable-default-toolkit=cairo-gtk2 |
| 235 |
# Bug 60668: Galeon doesn't build without oji enabled, so enable it |
| 236 |
# regardless of java setting. |
| 237 |
mozconfig_annotate '' --enable-oji --enable-mathml |
| 238 |
mozconfig_annotate 'places' --enable-storage --enable-places |
| 239 |
mozconfig_annotate '' --enable-safe-browsing |
| 240 |
|
| 241 |
# Build mozdevelop permately |
| 242 |
mozconfig_annotate '' --enable-jsd --enable-xpctools |
| 243 |
|
| 244 |
# System-wide install specs |
| 245 |
mozconfig_annotate '' --disable-installer |
| 246 |
mozconfig_annotate '' --disable-updater |
| 247 |
mozconfig_annotate '' --disable-strip |
| 248 |
mozconfig_annotate '' --disable-install-strip |
| 249 |
|
| 250 |
# Use system libraries |
| 251 |
mozconfig_annotate '' --enable-system-cairo |
| 252 |
mozconfig_annotate '' --enable-system-hunspell |
| 253 |
mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${EPREFIX}"/usr |
| 254 |
mozconfig_annotate '' --with-system-nss --with-nss-prefix="${EPREFIX}"/usr |
| 255 |
mozconfig_annotate '' --with-system-bz2 |
| 256 |
mozconfig_annotate '' --with-system-libxul |
| 257 |
mozconfig_annotate '' --with-libxul-sdk="${EPREFIX}"/usr/$(get_libdir)/xulrunner-devel-${MAJ_XUL_PV} |
| 258 |
|
| 259 |
mozconfig_use_enable gnome gnomevfs |
| 260 |
mozconfig_use_enable gnome gnomeui |
| 261 |
mozconfig_use_enable ipc # +ipc, upstream default |
| 262 |
mozconfig_use_enable libnotify |
| 263 |
mozconfig_use_enable java javaxpcom |
| 264 |
mozconfig_use_enable wifi necko-wifi |
| 265 |
mozconfig_use_enable alsa ogg |
| 266 |
mozconfig_use_enable alsa wave |
| 267 |
mozconfig_use_enable system-sqlite |
| 268 |
|
| 269 |
# Other browser-specific settings |
| 270 |
mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME} |
| 271 |
|
| 272 |
# Finalize and report settings |
| 273 |
mozconfig_final |
| 274 |
|
| 275 |
if [[ $(gcc-major-version) -lt 4 ]]; then |
| 276 |
append-cxxflags -fno-stack-protector |
| 277 |
fi |
| 278 |
|
| 279 |
#################################### |
| 280 |
# |
| 281 |
# Configure and build |
| 282 |
# |
| 283 |
#################################### |
| 284 |
|
| 285 |
CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" PYTHON="$(PYTHON)" econf |
| 286 |
} |
| 287 |
|
| 288 |
src_compile() { |
| 289 |
# Should the build use multiprocessing? Not enabled by default, as it tends to break |
| 290 |
[ "${WANT_MP}" = "true" ] && jobs=${MAKEOPTS} || jobs="-j1" |
| 291 |
emake ${jobs} || die |
| 292 |
} |
| 293 |
|
| 294 |
src_install() { |
| 295 |
MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" |
| 296 |
|
| 297 |
emake DESTDIR="${D}" install || die "emake install failed" |
| 298 |
|
| 299 |
linguas |
| 300 |
for X in ${linguas}; do |
| 301 |
[[ ${X} != "en" ]] && xpi_install "${WORKDIR}"/"${P}-${X}" |
| 302 |
done |
| 303 |
|
| 304 |
# Install icon and .desktop for menu entry |
| 305 |
newicon "${S}"/browser/branding/unofficial/default48.png icecat-icon.png |
| 306 |
newmenu "${FILESDIR}"/icon/icecat.desktop ${PN}-${DESKTOP_PV}.desktop |
| 307 |
|
| 308 |
# Add StartupNotify=true bug 237317 |
| 309 |
if use startup-notification ; then |
| 310 |
echo "StartupNotify=true" >> "${ED}"/usr/share/applications/${PN}-${DESKTOP_PV}.desktop |
| 311 |
fi |
| 312 |
|
| 313 |
pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/${PN} |
| 314 |
|
| 315 |
# Enable very specific settings not inherited from xulrunner |
| 316 |
cp "${FILESDIR}"/firefox-default-prefs.js \ |
| 317 |
"${ED}/${MOZILLA_FIVE_HOME}/defaults/preferences/all-gentoo.js" || \ |
| 318 |
die "failed to cp icecat-default-prefs.js" |
| 319 |
# Plugins dir |
| 320 |
dosym ../nsbrowser/plugins "${MOZILLA_FIVE_HOME}"/plugins \ |
| 321 |
|| die "failed to symlink" |
| 322 |
} |
| 323 |
|
| 324 |
pkg_postinst() { |
| 325 |
ewarn "All the packages built against ${PN} won't compile," |
| 326 |
ewarn "any package that fails to build warrants a bug report." |
| 327 |
elog |
| 328 |
|
| 329 |
# Update mimedb for the new .desktop file |
| 330 |
fdo-mime_desktop_database_update |
| 331 |
} |
Archives