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