1 |
polynomial-c 10/10/28 13:53:46 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: xulrunner-1.9.2.12.ebuild |
5 |
Removed: xulrunner-1.9.2.8.ebuild |
6 |
Log: |
7 |
Security bump (bug #342847). |
8 |
|
9 |
(Portage version: 2.2.0_alpha2/cvs/Linux x86_64) |
10 |
|
11 |
Revision Changes Path |
12 |
1.370 net-libs/xulrunner/ChangeLog |
13 |
|
14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/xulrunner/ChangeLog?rev=1.370&view=markup |
15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/xulrunner/ChangeLog?rev=1.370&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/xulrunner/ChangeLog?r1=1.369&r2=1.370 |
17 |
|
18 |
Index: ChangeLog |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v |
21 |
retrieving revision 1.369 |
22 |
retrieving revision 1.370 |
23 |
diff -u -r1.369 -r1.370 |
24 |
--- ChangeLog 25 Oct 2010 00:31:24 -0000 1.369 |
25 |
+++ ChangeLog 28 Oct 2010 13:53:46 -0000 1.370 |
26 |
@@ -1,6 +1,23 @@ |
27 |
# ChangeLog for net-libs/xulrunner |
28 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.369 2010/10/25 00:31:24 fauli Exp $ |
30 |
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.370 2010/10/28 13:53:46 polynomial-c Exp $ |
31 |
+ |
32 |
+*xulrunner-1.9.2.12 (28 Oct 2010) |
33 |
+ |
34 |
+ 28 Oct 2010; Lars Wendler <polynomial-c@g.o> |
35 |
+ -files/000_flex-configure-LANG.patch, |
36 |
+ -files/xulrunner-1.9-solaris64.patch, |
37 |
+ -files/066-fix-includedir-mozilla-js.patch, |
38 |
+ -files/xulrunner-1.9.1.5-solaris-undef-regs.patch, |
39 |
+ -files/1000_fix_alignment.patch, -files/xulrunner-1.9.2-arm-fixes.patch, |
40 |
+ -files/1002_fix-system-hunspell-dict-detections.patch, |
41 |
+ -files/xulrunner-1.9.2-fix-pkgconfig-file.patch, |
42 |
+ -files/1009-armv4t-nanojit-v2.patch, |
43 |
+ +files/xulrunner-1.9.2-gtk+-2.21.patch, |
44 |
+ -files/301-xulrunner-xpctools.diff, -xulrunner-1.9.2.8.ebuild, |
45 |
+ -files/801-enable-x86_64-tracemonkey.patch, +xulrunner-1.9.2.12.ebuild, |
46 |
+ -files/xulrunner-1.9-no_sunstudio.patch: |
47 |
+ Security bump (bug #342847). |
48 |
|
49 |
25 Oct 2010; Christian Faulhammer <fauli@g.o> |
50 |
xulrunner-1.9.2.11.ebuild: |
51 |
|
52 |
|
53 |
|
54 |
1.1 net-libs/xulrunner/xulrunner-1.9.2.12.ebuild |
55 |
|
56 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.2.12.ebuild?rev=1.1&view=markup |
57 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.2.12.ebuild?rev=1.1&content-type=text/plain |
58 |
|
59 |
Index: xulrunner-1.9.2.12.ebuild |
60 |
=================================================================== |
61 |
# Copyright 1999-2010 Gentoo Foundation |
62 |
# Distributed under the terms of the GNU General Public License v2 |
63 |
# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.2.12.ebuild,v 1.1 2010/10/28 13:53:46 polynomial-c Exp $ |
64 |
|
65 |
EAPI="3" |
66 |
WANT_AUTOCONF="2.1" |
67 |
|
68 |
inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib java-pkg-opt-2 autotools python prefix pax-utils |
69 |
|
70 |
MY_PV="${PV/_rc/rc}" # Handle beta |
71 |
MY_PV="${MY_PV/1.9.2/3.6}" |
72 |
MAJ_PV="1.9.2" # from mozilla-* branch name |
73 |
PATCH="${PN}-1.9.2-patches-0.7" |
74 |
|
75 |
DESCRIPTION="Mozilla runtime package that can be used to bootstrap XUL+XPCOM applications" |
76 |
HOMEPAGE="http://developer.mozilla.org/en/docs/XULRunner" |
77 |
SRC_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${MY_PV}/source/firefox-${MY_PV}.source.tar.bz2 |
78 |
http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.bz2" |
79 |
|
80 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" |
81 |
SLOT="1.9" |
82 |
LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )" |
83 |
IUSE="+alsa debug +ipc libnotify system-sqlite wifi" |
84 |
|
85 |
RDEPEND=" |
86 |
>=sys-devel/binutils-2.16.1 |
87 |
>=dev-libs/nss-3.12.8 |
88 |
>=dev-libs/nspr-4.8.6 |
89 |
system-sqlite? ( >=dev-db/sqlite-3.7.1[fts3,secure-delete] ) |
90 |
alsa? ( media-libs/alsa-lib ) |
91 |
>=app-text/hunspell-1.2 |
92 |
>=x11-libs/cairo-1.8.8[X] |
93 |
x11-libs/pango[X] |
94 |
x11-libs/libXt |
95 |
x11-libs/pixman |
96 |
>=dev-libs/libevent-1.4.7 |
97 |
wifi? ( net-wireless/wireless-tools ) |
98 |
libnotify? ( >=x11-libs/libnotify-0.4 )" |
99 |
|
100 |
DEPEND="java? ( >=virtual/jdk-1.4 ) |
101 |
${RDEPEND} |
102 |
=dev-lang/python-2*[threads] |
103 |
dev-util/pkgconfig" |
104 |
|
105 |
# virtual/jre should not be in DEPEND. bug 325981 |
106 |
RDEPEND="java? ( >=virtual/jre-1.4 ) ${RDEPEND}" |
107 |
|
108 |
S="${WORKDIR}/mozilla-${MAJ_PV}" |
109 |
|
110 |
pkg_setup() { |
111 |
# Ensure we always build with C locale. |
112 |
export LANG="C" |
113 |
export LC_ALL="C" |
114 |
export LC_MESSAGES="C" |
115 |
export LC_CTYPE="C" |
116 |
|
117 |
java-pkg-opt-2_pkg_setup |
118 |
|
119 |
python_set_active_version 2 |
120 |
} |
121 |
|
122 |
src_prepare() { |
123 |
# Apply our patches |
124 |
EPATCH_EXCLUDE="2001_mozilla_ps_pdf_simplify_operators.patch" \ |
125 |
EPATCH_SUFFIX="patch" \ |
126 |
EPATCH_FORCE="yes" \ |
127 |
epatch "${WORKDIR}" |
128 |
|
129 |
epatch "${FILESDIR}/bug-606109.patch" |
130 |
epatch "${FILESDIR}/${PN}-1.9.2-gtk+-2.21.patch" |
131 |
|
132 |
eprefixify \ |
133 |
extensions/java/xpcom/interfaces/org/mozilla/xpcom/Mozilla.java \ |
134 |
xpcom/build/nsXPCOMPrivate.h \ |
135 |
xulrunner/installer/Makefile.in \ |
136 |
xulrunner/app/nsRegisterGREUnix.cpp |
137 |
|
138 |
# fix double symbols due to double -ljemalloc |
139 |
sed -i -e '/^LIBS += $(JEMALLOC_LIBS)/s/^/#/' \ |
140 |
xulrunner/stub/Makefile.in || die |
141 |
|
142 |
# Allow user to apply additional patches without modifing ebuild |
143 |
epatch_user |
144 |
|
145 |
# Same as in config/autoconf.mk.in |
146 |
MOZLIBDIR="/usr/$(get_libdir)/${PN}-${MAJ_PV}" |
147 |
SDKDIR="/usr/$(get_libdir)/${PN}-devel-${MAJ_PV}/sdk" |
148 |
|
149 |
# Gentoo install dirs |
150 |
sed -i -e "s:@PV@:${MAJ_PV}:" "${S}"/config/autoconf.mk.in \ |
151 |
|| die "${MAJ_PV} sed failed!" |
152 |
|
153 |
# Enable gnomebreakpad |
154 |
if use debug ; then |
155 |
sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \ |
156 |
"${S}"/build/unix/run-mozilla.sh || die "sed failed!" |
157 |
fi |
158 |
|
159 |
eautoreconf |
160 |
|
161 |
cd js/src |
162 |
eautoreconf |
163 |
} |
164 |
|
165 |
src_configure() { |
166 |
#################################### |
167 |
# |
168 |
# mozconfig, CFLAGS and CXXFLAGS setup |
169 |
# |
170 |
#################################### |
171 |
|
172 |
mozconfig_init |
173 |
mozconfig_config |
174 |
|
175 |
MEXTENSIONS="default" |
176 |
|
177 |
MOZLIBDIR="/usr/$(get_libdir)/${PN}-${MAJ_PV}" |
178 |
|
179 |
# It doesn't compile on alpha without this LDFLAGS |
180 |
use alpha && append-ldflags "-Wl,--no-relax" |
181 |
|
182 |
mozconfig_annotate '' --with-default-mozilla-five-home="${MOZLIBDIR}" |
183 |
mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}" |
184 |
mozconfig_annotate '' --enable-application=xulrunner |
185 |
mozconfig_annotate '' --disable-mailnews |
186 |
mozconfig_annotate 'broken' --disable-crashreporter |
187 |
mozconfig_annotate '' --enable-image-encoder=all |
188 |
mozconfig_annotate '' --enable-canvas |
189 |
mozconfig_annotate 'gtk' --enable-default-toolkit=cairo-gtk2 |
190 |
# Bug 60668: Galeon doesn't build without oji enabled, so enable it |
191 |
# regardless of java setting. |
192 |
mozconfig_annotate '' --enable-oji --enable-mathml |
193 |
mozconfig_annotate 'places' --enable-storage --enable-places |
194 |
mozconfig_annotate '' --enable-safe-browsing |
195 |
|
196 |
# Build mozdevelop permately |
197 |
mozconfig_annotate '' --enable-jsd --enable-xpctools |
198 |
|
199 |
# System-wide install specs |
200 |
mozconfig_annotate '' --disable-installer |
201 |
mozconfig_annotate '' --disable-updater |
202 |
mozconfig_annotate '' --disable-strip |
203 |
mozconfig_annotate '' --disable-install-strip |
204 |
|
205 |
# Use system libraries |
206 |
mozconfig_annotate '' --enable-system-cairo |
207 |
mozconfig_annotate '' --enable-system-hunspell |
208 |
mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${EPREFIX}"/usr |
209 |
mozconfig_annotate '' --with-system-nss --with-nss-prefix="${EPREFIX}"/usr |
210 |
mozconfig_annotate '' --x-includes="${EPREFIX}"/usr/include --x-libraries="${EPREFIX}"/usr/$(get_libdir) |
211 |
mozconfig_annotate '' --with-system-bz2 |
212 |
mozconfig_annotate '' --with-system-libevent="${EPREFIX}"/usr |
213 |
|
214 |
mozconfig_use_enable ipc # +ipc, upstream default |
215 |
mozconfig_use_enable libnotify |
216 |
mozconfig_use_enable java javaxpcom |
217 |
mozconfig_use_enable wifi necko-wifi |
218 |
mozconfig_use_enable alsa ogg |
219 |
mozconfig_use_enable alsa wave |
220 |
mozconfig_use_enable system-sqlite |
221 |
|
222 |
# Debug |
223 |
if use debug ; then |
224 |
mozconfig_annotate 'debug' --disable-optimize |
225 |
mozconfig_annotate 'debug' --enable-debug=-ggdb |
226 |
mozconfig_annotate 'debug' --enable-debug-modules=all |
227 |
mozconfig_annotate 'debug' --enable-debugger-info-modules |
228 |
fi |
229 |
|
230 |
# Finalize and report settings |
231 |
mozconfig_final |
232 |
|
233 |
if [[ $(gcc-major-version) -lt 4 ]]; then |
234 |
append-flags -fno-stack-protector |
235 |
fi |
236 |
|
237 |
#################################### |
238 |
# |
239 |
# Configure and build |
240 |
# |
241 |
#################################### |
242 |
|
243 |
# Disable no-print-directory |
244 |
MAKEOPTS=${MAKEOPTS/--no-print-directory/} |
245 |
|
246 |
# Ensure that are plugins dir is enabled as default |
247 |
sed -i -e "s:/usr/lib/mozilla/plugins:/usr/$(get_libdir)/nsbrowser/plugins:" \ |
248 |
"${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path!" |
249 |
|
250 |
# hack added to workaround bug 299905 on hosts with libc that doesn't |
251 |
# support tls, (probably will only hit this condition with Gentoo Prefix) |
252 |
tc-has-tls -l || export ac_cv_thread_keyword=no |
253 |
|
254 |
CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" PYTHON="$(PYTHON)" econf |
255 |
} |
256 |
|
257 |
src_install() { |
258 |
emake DESTDIR="${D}" install || die "emake install failed" |
259 |
|
260 |
rm "${ED}"/usr/bin/xulrunner |
261 |
|
262 |
MOZLIBDIR="/usr/$(get_libdir)/${PN}-${MAJ_PV}" |
263 |
SDKDIR="/usr/$(get_libdir)/${PN}-devel-${MAJ_PV}/sdk" |
264 |
|
265 |
if has_multilib_profile; then |
266 |
local config |
267 |
for config in "${ED}"/etc/gre.d/*.system.conf ; do |
268 |
mv "${config}" "${config%.conf}.${CHOST}.conf" |
269 |
done |
270 |
fi |
271 |
|
272 |
dodir /usr/bin |
273 |
dosym "${MOZLIBDIR}/xulrunner" "/usr/bin/xulrunner-${MAJ_PV}" || die |
274 |
|
275 |
# env.d file for ld search path |
276 |
dodir /etc/env.d |
277 |
echo "LDPATH=${EPREFIX}/${MOZLIBDIR}" > "${ED}"/etc/env.d/08xulrunner || die "env.d failed" |
278 |
|
279 |
# Add our defaults to xulrunner and out of firefox |
280 |
cp "${FILESDIR}"/xulrunner-default-prefs.js \ |
281 |
"${ED}/${MOZLIBDIR}/defaults/pref/all-gentoo.js" || \ |
282 |
die "failed to cp xulrunner-default-prefs.js" |
283 |
|
284 |
pax-mark m "${D}"/${MOZLIBDIR}/plugin-container |
285 |
|
286 |
if use java ; then |
287 |
java-pkg_regjar "${ED}/${MOZLIBDIR}/javaxpcom.jar" |
288 |
java-pkg_regso "${ED}/${MOZLIBDIR}/libjavaxpcomglue.so" |
289 |
java-pkg_regjar "${ED}/${SDKDIR}/lib/MozillaGlue.jar" |
290 |
java-pkg_regjar "${ED}/${SDKDIR}/lib/MozillaInterfaces.jar" |
291 |
fi |
292 |
} |
293 |
|
294 |
pkg_postinst() { |
295 |
ewarn "If firefox fails to start with \"failed to load xpcom\", run revdep-rebuild" |
296 |
ewarn "If that does not fix the problem, rebuild dev-libs/nss" |
297 |
ewarn "Try dev-util/lafilefixer if you get build failures related to .la files" |
298 |
|
299 |
einfo |
300 |
einfo "All prefs can be overridden by the user. The preferences are to make" |
301 |
einfo "use of xulrunner out of the box on an average system without the user" |
302 |
einfo "having to go through and enable the basics." |
303 |
|
304 |
einfo |
305 |
ewarn "Any package that requires xulrunner:1.9 slot could and most likely will" |
306 |
ewarn "have issues. These issues should be reported to maintainer, and mozilla herd" |
307 |
ewarn "should be cc'd on the bug report. Thank you anarchy@g.o ." |
308 |
} |