1 |
armin76 08/04/19 10:02:44 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: mozilla-firefox-3.0_beta5-r1.ebuild |
5 |
Log: |
6 |
Stop using mozilla-launcher |
7 |
(Portage version: 2.1.4.4) |
8 |
|
9 |
Revision Changes Path |
10 |
1.391 www-client/mozilla-firefox/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/mozilla-firefox/ChangeLog?rev=1.391&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/mozilla-firefox/ChangeLog?rev=1.391&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/mozilla-firefox/ChangeLog?r1=1.390&r2=1.391 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v |
19 |
retrieving revision 1.390 |
20 |
retrieving revision 1.391 |
21 |
diff -u -r1.390 -r1.391 |
22 |
--- ChangeLog 18 Apr 2008 10:56:11 -0000 1.390 |
23 |
+++ ChangeLog 19 Apr 2008 10:02:43 -0000 1.391 |
24 |
@@ -1,6 +1,12 @@ |
25 |
# ChangeLog for www-client/mozilla-firefox |
26 |
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.390 2008/04/18 10:56:11 armin76 Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.391 2008/04/19 10:02:43 armin76 Exp $ |
29 |
+ |
30 |
+*mozilla-firefox-3.0_beta5-r1 (19 Apr 2008) |
31 |
+ |
32 |
+ 19 Apr 2008; Raúl Porcel <armin76@g.o> |
33 |
+ +mozilla-firefox-3.0_beta5-r1.ebuild: |
34 |
+ Stop using mozilla-launcher |
35 |
|
36 |
18 Apr 2008; Raúl Porcel <armin76@g.o> |
37 |
mozilla-firefox-2.0.0.14.ebuild: |
38 |
|
39 |
|
40 |
|
41 |
1.1 www-client/mozilla-firefox/mozilla-firefox-3.0_beta5-r1.ebuild |
42 |
|
43 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-3.0_beta5-r1.ebuild?rev=1.1&view=markup |
44 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-3.0_beta5-r1.ebuild?rev=1.1&content-type=text/plain |
45 |
|
46 |
Index: mozilla-firefox-3.0_beta5-r1.ebuild |
47 |
=================================================================== |
48 |
# Copyright 1999-2008 Gentoo Foundation |
49 |
# Distributed under the terms of the GNU General Public License v2 |
50 |
# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-3.0_beta5-r1.ebuild,v 1.1 2008/04/19 10:02:43 armin76 Exp $ |
51 |
EAPI="1" |
52 |
WANT_AUTOCONF="2.1" |
53 |
|
54 |
inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib fdo-mime autotools mozextension |
55 |
PATCH="${P}-patches-0.1" |
56 |
|
57 |
LANGS="af ar be ca cs de el en-GB es-AR es-ES eu fi fr fy-NL gu-IN he hu id it ja ka ko ku lt mk mn nb-NO nl nn-NO pa-IN pl pt-BR pt-PT ro ru sk sq sv-SE tr uk zh-CN zh-TW" |
58 |
NOSHORTLANGS="en-GB es-AR pt-BR zh-CN" |
59 |
|
60 |
MY_PV=${PV/_beta/b} |
61 |
MY_P="${PN}-${MY_PV}" |
62 |
MY_PV=${PV/3.0/} |
63 |
|
64 |
DESCRIPTION="Firefox Web Browser" |
65 |
HOMEPAGE="http://www.mozilla.org/projects/firefox/" |
66 |
|
67 |
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
68 |
SLOT="0" |
69 |
LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )" |
70 |
IUSE="java mozdevelop bindist restrict-javascript +xulrunner" |
71 |
|
72 |
SRC_URI="mirror://gentoo/${P}.tar.bz2 |
73 |
mirror://gentoo/${PATCH}.tar.bz2 |
74 |
!xulrunner? ( mirror://gentoo/xulrunner-1.9${MY_PV}.tar.bz2 )" |
75 |
|
76 |
# These are in |
77 |
# |
78 |
# http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/linux-i686/xpi/ |
79 |
# |
80 |
# for i in $LANGS $SHORTLANGS; do wget $i.xpi -O ${P}-$i.xpi; done |
81 |
for X in ${LANGS} ; do |
82 |
SRC_URI="${SRC_URI} |
83 |
linguas_${X/-/_}? ( http://dev.gentooexperimental.org/~armin76/dist/${MY_P}-xpi/${MY_P}-${X}.xpi )" |
84 |
IUSE="${IUSE} linguas_${X/-/_}" |
85 |
# english is handled internally |
86 |
if [ "${#X}" == 5 ] && ! has ${X} ${NOSHORTLANGS}; then |
87 |
SRC_URI="${SRC_URI} |
88 |
linguas_${X%%-*}? ( http://dev.gentooexperimental.org/~armin76/dist/${MY_P}-xpi/${MY_P}-${X}.xpi )" |
89 |
IUSE="${IUSE} linguas_${X%%-*}" |
90 |
fi |
91 |
done |
92 |
|
93 |
RDEPEND="java? ( virtual/jre ) |
94 |
>=sys-devel/binutils-2.16.1 |
95 |
>=dev-libs/nss-3.12_beta3 |
96 |
>=dev-libs/nspr-4.7.1_beta2 |
97 |
>=media-libs/lcms-1.17 |
98 |
>=app-text/hunspell-1.1.9 |
99 |
>=dev-db/sqlite-3.5 |
100 |
xulrunner? ( >=net-libs/xulrunner-1.9${MY_PV} )" |
101 |
|
102 |
DEPEND="${RDEPEND} |
103 |
java? ( >=dev-java/java-config-0.2.0 )" |
104 |
|
105 |
PDEPEND="restrict-javascript? ( x11-plugins/noscript )" |
106 |
|
107 |
S="${WORKDIR}/mozilla" |
108 |
|
109 |
# Needed by src_compile() and src_install(). |
110 |
# Would do in pkg_setup but that loses the export attribute, they |
111 |
# become pure shell variables. |
112 |
export MOZ_CO_PROJECT=browser |
113 |
export BUILD_OFFICIAL=1 |
114 |
export MOZILLA_OFFICIAL=1 |
115 |
|
116 |
linguas() { |
117 |
local LANG SLANG |
118 |
for LANG in ${LINGUAS}; do |
119 |
if has ${LANG} en en_US; then |
120 |
has en ${linguas} || linguas="${linguas:+"${linguas} "}en" |
121 |
continue |
122 |
elif has ${LANG} ${LANGS//-/_}; then |
123 |
has ${LANG//_/-} ${linguas} || linguas="${linguas:+"${linguas} "}${LANG//_/-}" |
124 |
continue |
125 |
elif [[ " ${LANGS} " == *" ${LANG}-"* ]]; then |
126 |
for X in ${LANGS}; do |
127 |
if [[ "${X}" == "${LANG}-"* ]] && \ |
128 |
[[ " ${NOSHORTLANGS} " != *" ${X} "* ]]; then |
129 |
has ${X} ${linguas} || linguas="${linguas:+"${linguas} "}${X}" |
130 |
continue 2 |
131 |
fi |
132 |
done |
133 |
fi |
134 |
ewarn "Sorry, but mozilla-firefox does not support the ${LANG} LINGUA" |
135 |
done |
136 |
} |
137 |
|
138 |
pkg_setup(){ |
139 |
if ! built_with_use x11-libs/cairo X; then |
140 |
eerror "Cairo is not built with X useflag." |
141 |
eerror "Please add 'X' to your USE flags, and re-emerge cairo." |
142 |
die "Cairo needs X" |
143 |
fi |
144 |
|
145 |
if ! use bindist; then |
146 |
elog "You are enabling official branding. You may not redistribute this build" |
147 |
elog "to any users on your network or the internet. Doing so puts yourself into" |
148 |
elog "a legal problem with Mozilla Foundation" |
149 |
elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag" |
150 |
|
151 |
fi |
152 |
} |
153 |
|
154 |
src_unpack() { |
155 |
! use xulrunner && unpack xulrunner-1.9${MY_PV}.tar.bz2 |
156 |
unpack ${P}.tar.bz2 ${PATCH}.tar.bz2 |
157 |
|
158 |
linguas |
159 |
for X in ${linguas}; do |
160 |
[[ ${X} != "en" ]] && xpi_unpack "${MY_P}-${X}.xpi" |
161 |
done |
162 |
if [[ ${linguas} != "" ]]; then |
163 |
einfo "Selected language packs (first will be default): ${linguas}" |
164 |
fi |
165 |
|
166 |
# Remove the patches we don't need |
167 |
use xulrunner && rm "${WORKDIR}"/patch/*noxul* || rm "${WORKDIR}"/patch/*xulonly* |
168 |
|
169 |
# Apply our patches |
170 |
cd "${S}" || die "cd failed" |
171 |
EPATCH_SUFFIX="patch" \ |
172 |
EPATCH_FORCE="yes" \ |
173 |
epatch "${WORKDIR}"/patch |
174 |
|
175 |
eautoreconf || die "failed running eautoreconf" |
176 |
} |
177 |
|
178 |
src_compile() { |
179 |
declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" |
180 |
MEXTENSIONS="default,typeaheadfind" |
181 |
|
182 |
#if use xforms; then |
183 |
# MEXTENSIONS="${MEXTENSIONS},xforms" |
184 |
#fi |
185 |
#################################### |
186 |
# |
187 |
# mozconfig, CFLAGS and CXXFLAGS setup |
188 |
# |
189 |
#################################### |
190 |
|
191 |
mozconfig_init |
192 |
mozconfig_config |
193 |
|
194 |
mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}" |
195 |
mozconfig_annotate '' --disable-mailnews |
196 |
mozconfig_annotate 'broken' --disable-mochitest |
197 |
mozconfig_annotate 'broken' --disable-crashreporter |
198 |
mozconfig_annotate '' --enable-system-hunspell |
199 |
mozconfig_annotate '' --enable-system-sqlite |
200 |
mozconfig_annotate '' --enable-image-encoder=all |
201 |
mozconfig_annotate '' --enable-canvas |
202 |
mozconfig_annotate '' --with-system-nspr |
203 |
mozconfig_annotate '' --with-system-nss |
204 |
mozconfig_annotate '' --enable-system-lcms |
205 |
mozconfig_annotate '' --enable-oji --enable-mathml |
206 |
mozconfig_annotate 'places' --enable-storage --enable-places --enable-places_bookmarks |
207 |
|
208 |
# Other ff-specific settings |
209 |
#mozconfig_use_enable mozdevelop jsd |
210 |
#mozconfig_use_enable mozdevelop xpctools |
211 |
mozconfig_use_extension mozdevelop venkman |
212 |
mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME} |
213 |
if use xulrunner; then |
214 |
# Add xulrunner variable |
215 |
mozconfig_annotate '' --with-libxul-sdk=/usr/$(get_libdir)/xulrunner-1.9 |
216 |
fi |
217 |
|
218 |
if ! use bindist; then |
219 |
mozconfig_annotate '' --enable-official-branding |
220 |
fi |
221 |
|
222 |
# Finalize and report settings |
223 |
mozconfig_final |
224 |
|
225 |
# -fstack-protector breaks us |
226 |
if gcc-version ge 4 1; then |
227 |
gcc-specs-ssp && append-flags -fno-stack-protector |
228 |
else |
229 |
gcc-specs-ssp && append-flags -fno-stack-protector-all |
230 |
fi |
231 |
filter-flags -fstack-protector -fstack-protector-all |
232 |
|
233 |
#################################### |
234 |
# |
235 |
# Configure and build |
236 |
# |
237 |
#################################### |
238 |
|
239 |
CPPFLAGS="${CPPFLAGS} -DARON_WAS_HERE" \ |
240 |
CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \ |
241 |
econf || die |
242 |
|
243 |
# It would be great if we could pass these in via CPPFLAGS or CFLAGS prior |
244 |
# to econf, but the quotes cause configure to fail. |
245 |
sed -i -e \ |
246 |
's|-DARON_WAS_HERE|-DGENTOO_NSPLUGINS_DIR=\\\"/usr/'"$(get_libdir)"'/nsplugins\\\" -DGENTOO_NSBROWSER_PLUGINS_DIR=\\\"/usr/'"$(get_libdir)"'/nsbrowser/plugins\\\"|' \ |
247 |
"${S}"/config/autoconf.mk \ |
248 |
"${S}"/toolkit/content/buildconfig.html |
249 |
|
250 |
# This removes extraneous CFLAGS from the Makefiles to reduce RAM |
251 |
# requirements while compiling |
252 |
edit_makefiles |
253 |
|
254 |
# Should the build use multiprocessing? Not enabled by default, as it tends to break |
255 |
[ "${WANT_MP}" = "true" ] && jobs=${MAKEOPTS} || jobs="-j1" |
256 |
emake ${jobs} || die |
257 |
} |
258 |
|
259 |
pkg_preinst() { |
260 |
declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" |
261 |
|
262 |
einfo "Removing old installs with some really ugly code. It potentially" |
263 |
einfo "eliminates any problems during the install, however suggestions to" |
264 |
einfo "replace this are highly welcome. Send comments and suggestions to" |
265 |
einfo "mozilla@g.o." |
266 |
rm -rf "${ROOT}"${MOZILLA_FIVE_HOME} |
267 |
} |
268 |
|
269 |
src_install() { |
270 |
declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" |
271 |
|
272 |
emake DESTDIR="${D}" install || die "emake install failed" |
273 |
rm "${D}"/usr/bin/firefox |
274 |
|
275 |
linguas |
276 |
for X in ${linguas}; do |
277 |
[[ ${X} != "en" ]] && xpi_install "${WORKDIR}"/"${MY_P}-${X}" |
278 |
done |
279 |
|
280 |
local LANG=${linguas%% *} |
281 |
if [[ -n ${LANG} && ${LANG} != "en" ]]; then |
282 |
elog "Setting default locale to ${LANG}" |
283 |
dosed -e "s:general.useragent.locale\", \"en-US\":general.useragent.locale\", \"${LANG}\":" \ |
284 |
${MOZILLA_FIVE_HOME}/defaults/preferences/firefox.js \ |
285 |
${MOZILLA_FIVE_HOME}/defaults/preferences/firefox-l10n.js || \ |
286 |
die "sed failed to change locale" |
287 |
fi |
288 |
|
289 |
# Install icon and .desktop for menu entry |
290 |
if ! use bindist; then |
291 |
newicon "${S}"/other-licenses/branding/firefox/content/icon48.png firefox-icon.png |
292 |
newmenu "${FILESDIR}"/icon/mozilla-firefox-1.5.desktop \ |
293 |
mozilla-firefox-3.0.desktop |
294 |
else |
295 |
newicon "${S}"/browser/base/branding/firefox/content/icon48.png firefox-icon-unbranded.png |
296 |
newmenu "${FILESDIR}"/icon/mozilla-firefox-1.5-unbranded.desktop \ |
297 |
mozilla-firefox-3.0.desktop |
298 |
fi |
299 |
|
300 |
dodir ${MOZILLA_FIVE_HOME}/defaults/preferences |
301 |
cp "${FILESDIR}"/gentoo-default-prefs.js "${D}"${MOZILLA_FIVE_HOME}/defaults/preferences/all-gentoo.js |
302 |
|
303 |
if use xulrunner; then |
304 |
PKG_CONFIG=`which pkg-config` |
305 |
X_DATE=`date +%Y%m%d` |
306 |
XULRUNNER_VERSION=`${PKG_CONFIG} --modversion libxul` |
307 |
|
308 |
#set the application.ini |
309 |
sed -i -e "s|BuildID=.*$|BuildID=${X_DATE}GentooMozillaFirefox|" "${D}"${MOZILLA_FIVE_HOME}/application.ini |
310 |
sed -i -e "s|MinVersion=.*$|MinVersion=${XULRUNNER_VERSION}|" "${D}"${MOZILLA_FIVE_HOME}/application.ini |
311 |
sed -i -e "s|MaxVersion=.*$|MaxVersion=${XULRUNNER_VERSION}|" "${D}"${MOZILLA_FIVE_HOME}/application.ini |
312 |
# Create /usr/bin/firefox |
313 |
make_wrapper firefox "/usr/bin/xulrunner-1.9 ${MOZILLA_FIVE_HOME}/application.ini" |
314 |
else |
315 |
# Create /usr/bin/firefox |
316 |
make_wrapper firefox "${MOZILLA_FIVE_HOME}/firefox-bin" |
317 |
fi |
318 |
} |
319 |
|
320 |
pkg_postinst() { |
321 |
declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" |
322 |
|
323 |
ewarn "All the packages built against ${PN} won't compile," |
324 |
ewarn "since they should be built against net-libs/xulrunner," |
325 |
ewarn "therefore you should check if your package builds against" |
326 |
ewarn "xulrunner and if it doesn't, file a bug, thanks." |
327 |
|
328 |
# Update mimedb for the new .desktop file |
329 |
fdo-mime_desktop_database_update |
330 |
} |
331 |
|
332 |
|
333 |
|
334 |
-- |
335 |
gentoo-commits@l.g.o mailing list |