1 |
suka 09/04/20 13:44:17 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: openoffice-3.1.0_beta5.ebuild |
5 |
Removed: openoffice-3.1.0_beta4.ebuild |
6 |
Log: |
7 |
Bump to newer beta release for OOo 3.1 |
8 |
(Portage version: 2.1.6.11/cvs/Linux i686) |
9 |
|
10 |
Revision Changes Path |
11 |
1.454 app-office/openoffice/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/ChangeLog?rev=1.454&view=markup |
14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/ChangeLog?rev=1.454&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/ChangeLog?r1=1.453&r2=1.454 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v |
20 |
retrieving revision 1.453 |
21 |
retrieving revision 1.454 |
22 |
diff -u -r1.453 -r1.454 |
23 |
--- ChangeLog 11 Apr 2009 21:53:25 -0000 1.453 |
24 |
+++ ChangeLog 20 Apr 2009 13:44:16 -0000 1.454 |
25 |
@@ -1,6 +1,13 @@ |
26 |
# ChangeLog for app-office/openoffice |
27 |
# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.453 2009/04/11 21:53:25 suka Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.454 2009/04/20 13:44:16 suka Exp $ |
30 |
+ |
31 |
+*openoffice-3.1.0_beta5 (20 Apr 2009) |
32 |
+ |
33 |
+ 20 Apr 2009; Andreas Proschofsky <suka@g.o> |
34 |
+ -files/gentoo-3.1.0_beta4.diff, +files/gentoo-3.1.0_beta5.diff, |
35 |
+ -openoffice-3.1.0_beta4.ebuild, +openoffice-3.1.0_beta5.ebuild: |
36 |
+ Bump to newer beta release for OOo 3.1 |
37 |
|
38 |
*openoffice-3.1.0_beta4 (11 Apr 2009) |
39 |
|
40 |
|
41 |
|
42 |
|
43 |
1.1 app-office/openoffice/openoffice-3.1.0_beta5.ebuild |
44 |
|
45 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/openoffice-3.1.0_beta5.ebuild?rev=1.1&view=markup |
46 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/openoffice-3.1.0_beta5.ebuild?rev=1.1&content-type=text/plain |
47 |
|
48 |
Index: openoffice-3.1.0_beta5.ebuild |
49 |
=================================================================== |
50 |
# Copyright 1999-2009 Gentoo Foundation |
51 |
# Distributed under the terms of the GNU General Public License v2 |
52 |
# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.1.0_beta5.ebuild,v 1.1 2009/04/20 13:44:16 suka Exp $ |
53 |
|
54 |
WANT_AUTOMAKE="1.9" |
55 |
EAPI="2" |
56 |
|
57 |
inherit bash-completion check-reqs db-use eutils fdo-mime flag-o-matic java-pkg-opt-2 kde-functions mono multilib toolchain-funcs |
58 |
|
59 |
IUSE="binfilter cups dbus debug eds gnome gstreamer gtk kde ldap mono nsplugin odk opengl pam templates" |
60 |
|
61 |
MY_PV=3.0.99.5 |
62 |
PATCHLEVEL=OOO310 |
63 |
SRC=OOo_${PV}_src |
64 |
MST=ooo310-m9 |
65 |
DEVPATH=http://download.go-oo.org/${PATCHLEVEL}/${MST} |
66 |
S=${WORKDIR}/ooo |
67 |
S_OLD=${WORKDIR}/ooo-build-${MY_PV} |
68 |
CONFFILE=${S}/distro-configs/Gentoo.conf.in |
69 |
BASIS=basis3.1 |
70 |
DESCRIPTION="OpenOffice.org, a full office productivity suite." |
71 |
|
72 |
SRC_URI="${DEVPATH}-artwork.tar.bz2 |
73 |
${DEVPATH}-base.tar.bz2 |
74 |
${DEVPATH}-bootstrap.tar.bz2 |
75 |
${DEVPATH}-calc.tar.bz2 |
76 |
${DEVPATH}-components.tar.bz2 |
77 |
${DEVPATH}-extensions.tar.bz2 |
78 |
${DEVPATH}-extras.tar.bz2 |
79 |
${DEVPATH}-filters.tar.bz2 |
80 |
${DEVPATH}-help.tar.bz2 |
81 |
${DEVPATH}-impress.tar.bz2 |
82 |
${DEVPATH}-libs-core.tar.bz2 |
83 |
${DEVPATH}-libs-extern.tar.bz2 |
84 |
${DEVPATH}-libs-extern-sys.tar.bz2 |
85 |
${DEVPATH}-libs-gui.tar.bz2 |
86 |
${DEVPATH}-postprocess.tar.bz2 |
87 |
${DEVPATH}-sdk.tar.bz2 |
88 |
${DEVPATH}-testing.tar.bz2 |
89 |
${DEVPATH}-ure.tar.bz2 |
90 |
${DEVPATH}-writer.tar.bz2 |
91 |
templates? ( http://extensions.services.openoffice.org/files/273/0/Sun_ODF_Template_Pack_en-US.oxt |
92 |
http://extensions.services.openoffice.org/files/295/1/Sun_ODF_Template_Pack_de.oxt |
93 |
http://extensions.services.openoffice.org/files/299/0/Sun_ODF_Template_Pack_it.oxt |
94 |
http://extensions.services.openoffice.org/files/297/0/Sun_ODF_Template_Pack_fr.oxt |
95 |
http://extensions.services.openoffice.org/files/301/1/Sun_ODF_Template_Pack_es.oxt ) |
96 |
http://download.go-oo.org/${PATCHLEVEL}/ooo-build-${MY_PV}.tar.gz |
97 |
odk? ( java? ( http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll ) ) |
98 |
http://download.go-oo.org/SRC680/extras-3.tar.bz2 |
99 |
http://download.go-oo.org/SRC680/biblio.tar.bz2 |
100 |
http://download.go-oo.org/SRC680/lp_solve_5.5.0.12_source.tar.gz |
101 |
http://download.go-oo.org/DEV300/scsolver.2008-10-30.tar.bz2 |
102 |
http://download.go-oo.org/SRC680/libwps-0.1.2.tar.gz |
103 |
http://download.go-oo.org/SRC680/libwpg-0.1.3.tar.gz" |
104 |
|
105 |
LANGS1="af ar as_IN be_BY bg bn br bs ca cs cy da de dz el en_GB en_ZA eo es et fa fi fr ga gl gu he hi_IN hr hu it ja ka kk km ko ku lt lv mk ml_IN mn mr_IN nb ne nl nn nr ns or_IN pa_IN pl pt pt_BR ru rw sh sk sl sr ss st sv sw_TZ ta te_IN tg th ti_ER tn tr ts uk ur_IN ve vi xh zh_CN zh_TW zu" |
106 |
LANGS="${LANGS1} en en_US" |
107 |
|
108 |
for X in ${LANGS} ; do |
109 |
IUSE="${IUSE} linguas_${X}" |
110 |
done |
111 |
|
112 |
HOMEPAGE="http://go-oo.org" |
113 |
|
114 |
LICENSE="LGPL-2" |
115 |
SLOT="0" |
116 |
KEYWORDS="~amd64 ~ppc ~sparc ~x86" |
117 |
|
118 |
COMMON_DEPEND="!app-office/openoffice-bin |
119 |
x11-libs/libXaw |
120 |
x11-libs/libXinerama |
121 |
>=dev-lang/perl-5.0 |
122 |
dbus? ( >=dev-libs/dbus-glib-0.71 ) |
123 |
gnome? ( >=x11-libs/gtk+-2.10 |
124 |
>=gnome-base/gnome-vfs-2.6 |
125 |
>=gnome-base/gconf-2.0 |
126 |
>=x11-libs/cairo-1.0.2 ) |
127 |
gtk? ( >=x11-libs/gtk+-2.10 |
128 |
>=x11-libs/cairo-1.0.2 ) |
129 |
eds? ( >=gnome-extra/evolution-data-server-1.2 ) |
130 |
gstreamer? ( >=media-libs/gstreamer-0.10 |
131 |
>=media-libs/gst-plugins-base-0.10 ) |
132 |
kde? ( kde-base/kdelibs:3.5 ) |
133 |
java? ( >=dev-java/bsh-2.0_beta4 |
134 |
>=dev-db/hsqldb-1.8.0.9 ) |
135 |
mono? ( >=dev-lang/mono-1.2.3.1 ) |
136 |
nsplugin? ( || ( net-libs/xulrunner:1.8 net-libs/xulrunner:1.9 =www-client/seamonkey-1* ) |
137 |
>=dev-libs/nspr-4.6.6 |
138 |
>=dev-libs/nss-3.11-r1 ) |
139 |
opengl? ( virtual/opengl |
140 |
virtual/glu ) |
141 |
>=net-misc/neon-0.24.7 |
142 |
>=dev-libs/openssl-0.9.8g |
143 |
>=media-libs/freetype-2.1.10-r2 |
144 |
>=media-libs/fontconfig-2.3.0 |
145 |
cups? ( net-print/cups ) |
146 |
media-libs/jpeg |
147 |
media-libs/libpng |
148 |
app-arch/zip |
149 |
app-arch/unzip |
150 |
>=app-text/hunspell-1.1.4-r1 |
151 |
dev-libs/expat |
152 |
>=dev-libs/icu-4.0 |
153 |
>=sys-libs/db-4.3 |
154 |
>=app-text/libwpd-0.8.8 |
155 |
>=media-libs/vigra-1.4 |
156 |
>=virtual/poppler-0.8.0" |
157 |
|
158 |
RDEPEND="java? ( >=virtual/jre-1.5 ) |
159 |
${COMMON_DEPEND}" |
160 |
|
161 |
DEPEND="${COMMON_DEPEND} |
162 |
x11-libs/libXrender |
163 |
x11-libs/libXtst |
164 |
x11-proto/printproto |
165 |
x11-proto/xextproto |
166 |
x11-proto/xproto |
167 |
x11-proto/xineramaproto |
168 |
>=sys-apps/findutils-4.1.20-r1 |
169 |
dev-perl/Archive-Zip |
170 |
virtual/perl-Compress-Zlib |
171 |
>=virtual/perl-Compress-Raw-Zlib-2.002 |
172 |
virtual/perl-IO-Compress-Base |
173 |
dev-util/pkgconfig |
174 |
dev-util/intltool |
175 |
>=dev-libs/boost-1.33.1 |
176 |
sys-devel/flex |
177 |
sys-devel/bison |
178 |
dev-libs/libxslt |
179 |
>=dev-libs/libxml2-2.0 |
180 |
>=dev-util/gperf-3 |
181 |
>=net-misc/curl-7.12 |
182 |
sys-libs/zlib |
183 |
sys-apps/coreutils |
184 |
pam? ( sys-libs/pam |
185 |
sys-apps/shadow[pam] ) |
186 |
>=dev-lang/python-2.3.4[threads] |
187 |
java? ( || ( =virtual/jdk-1.6* =virtual/jdk-1.5* ) |
188 |
>=dev-java/ant-core-1.7 ) |
189 |
ldap? ( net-nds/openldap )" |
190 |
|
191 |
PROVIDE="virtual/ooo" |
192 |
|
193 |
pkg_setup() { |
194 |
|
195 |
ewarn |
196 |
ewarn " It is important to note that OpenOffice.org is a very fragile " |
197 |
ewarn " build when it comes to CFLAGS. A number of flags have already " |
198 |
ewarn " been filtered out. If you experience difficulty merging this " |
199 |
ewarn " package and use agressive CFLAGS, lower the CFLAGS and try to " |
200 |
ewarn " merge again. Also note that building OOo takes a lot of time and " |
201 |
ewarn " hardware ressources: 4-6 GB free diskspace and 256 MB RAM are " |
202 |
ewarn " the minimum requirements. If you have less, use openoffice-bin " |
203 |
ewarn " instead. " |
204 |
ewarn |
205 |
ewarn " Also if you experience a build break, please make sure to retry " |
206 |
ewarn " with MAKEOPTS="-j1" before filing a bug. " |
207 |
ewarn |
208 |
|
209 |
# Check if we have enough RAM and free diskspace to build this beast |
210 |
CHECKREQS_MEMORY="512" |
211 |
use debug && CHECKREQS_DISK_BUILD="8192" || CHECKREQS_DISK_BUILD="6144" |
212 |
check_reqs |
213 |
|
214 |
strip-linguas ${LANGS} |
215 |
|
216 |
if [[ -z "${LINGUAS}" ]]; then |
217 |
export LINGUAS_OOO="en-US" |
218 |
ewarn |
219 |
ewarn " To get a localized build, set the according LINGUAS variable(s). " |
220 |
ewarn |
221 |
else |
222 |
export LINGUAS_OOO=$(echo ${LINGUAS} | sed -e 's/\ben\b/en_US/g;s/_/-/g') |
223 |
fi |
224 |
|
225 |
if use !java; then |
226 |
ewarn " You are building with java-support disabled, this results in some " |
227 |
ewarn " of the OpenOffice.org functionality being disabled. " |
228 |
ewarn " If something you need does not work for you, rebuild with " |
229 |
ewarn " java in your USE-flags. " |
230 |
ewarn |
231 |
fi |
232 |
|
233 |
if use !gtk && use !gnome; then |
234 |
ewarn " If you want the OpenOffice.org systray quickstarter to work " |
235 |
ewarn " activate either the 'gtk' or 'gnome' use flags. " |
236 |
ewarn |
237 |
fi |
238 |
|
239 |
if is-flagq -ffast-math ; then |
240 |
eerror " You are using -ffast-math, which is known to cause problems. " |
241 |
eerror " Please remove it from your CFLAGS, using this globally causes " |
242 |
eerror " all sorts of problems. " |
243 |
eerror " After that you will also have to - at least - rebuild python otherwise " |
244 |
eerror " the openoffice build will break. " |
245 |
die |
246 |
fi |
247 |
|
248 |
if use nsplugin; then |
249 |
if pkg-config --exists libxul; then |
250 |
BRWS="libxul" |
251 |
elif pkg-config --exists xulrunner-xpcom; then |
252 |
BRWS="xulrunner" |
253 |
elif pkg-config --exists seamonkey-xpcom; then |
254 |
BRWS="seamonkey" |
255 |
else |
256 |
die "USE flag [nsplugin] set but no installed xulrunner or seamonkey found!" |
257 |
fi |
258 |
fi |
259 |
|
260 |
java-pkg-opt-2_pkg_setup |
261 |
|
262 |
# sys-libs/db version used |
263 |
local db_ver=$(db_findver '>=sys-libs/db-4.3') |
264 |
|
265 |
} |
266 |
|
267 |
src_unpack() { |
268 |
|
269 |
unpack ooo-build-${MY_PV}.tar.gz |
270 |
|
271 |
# Hackish workaround for overlong path problem, see bug #130837 |
272 |
mv "${S_OLD}" "${S}" || die |
273 |
|
274 |
#Some fixes for our patchset |
275 |
cd "${S}" |
276 |
epatch "${FILESDIR}/gentoo-${PV}.diff" |
277 |
epatch "${FILESDIR}/ooo-env_log.diff" |
278 |
cp -f "${FILESDIR}/buildfix-mono-2-2.diff" "${S}/patches/dev300" || die |
279 |
cp -f "${FILESDIR}/base64.diff" "${S}/patches/hotfixes" || die |
280 |
|
281 |
#Use flag checks |
282 |
if use java ; then |
283 |
echo "--with-ant-home=${ANT_HOME}" >> ${CONFFILE} |
284 |
echo "--with-jdk-home=$(java-config --jdk-home 2>/dev/null)" >> ${CONFFILE} |
285 |
echo "--with-java-target-version=$(java-pkg_get-target)" >> ${CONFFILE} |
286 |
echo "--with-jvm-path=/usr/$(get_libdir)/" >> ${CONFFILE} |
287 |
echo "--with-system-beanshell" >> ${CONFFILE} |
288 |
echo "--with-system-hsqldb" >> ${CONFFILE} |
289 |
echo "--with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)" >> ${CONFFILE} |
290 |
echo "--with-hsqldb-jar=$(java-pkg_getjar hsqldb hsqldb.jar)" >> ${CONFFILE} |
291 |
fi |
292 |
|
293 |
if use nsplugin ; then |
294 |
echo "--enable-mozilla" >> ${CONFFILE} |
295 |
echo "--with-system-mozilla=${BRWS}" >> ${CONFFILE} |
296 |
else |
297 |
echo "--disable-mozilla" >> ${CONFFILE} |
298 |
echo "--without-system-mozilla" >> ${CONFFILE} |
299 |
fi |
300 |
|
301 |
echo $(use_enable binfilter) >> ${CONFFILE} |
302 |
echo $(use_enable cups) >> ${CONFFILE} |
303 |
echo $(use_enable dbus) >> ${CONFFILE} |
304 |
echo $(use_enable eds evolution2) >> ${CONFFILE} |
305 |
echo $(use_enable gnome gnome-vfs) >> ${CONFFILE} |
306 |
echo $(use_enable gnome lockdown) >> ${CONFFILE} |
307 |
echo $(use_enable gstreamer) >> ${CONFFILE} |
308 |
echo $(use_enable gtk systray) >> ${CONFFILE} |
309 |
echo $(use_enable ldap) >> ${CONFFILE} |
310 |
echo $(use_enable opengl) >> ${CONFFILE} |
311 |
echo $(use_with ldap openldap) >> ${CONFFILE} |
312 |
echo $(use_enable debug crashdump) >> ${CONFFILE} |
313 |
echo $(use_enable debug strip-solver) >> ${CONFFILE} |
314 |
|
315 |
# Extension stuff |
316 |
echo "--with-extension-integration" >> ${CONFFILE} |
317 |
echo "--enable-minimizer" >> ${CONFFILE} |
318 |
echo "--enable-pdfimport" >> ${CONFFILE} |
319 |
echo "--enable-presenter-console" >> ${CONFFILE} |
320 |
|
321 |
echo "--without-writer2latex" >> ${CONFFILE} |
322 |
|
323 |
# Use splash screen without Sun logo |
324 |
echo "--with-intro-bitmaps=\\\"${S}/build/${MST}/ooo_custom_images/nologo/introabout/intro.bmp\\\"" >> ${CONFFILE} |
325 |
|
326 |
} |
327 |
|
328 |
src_configure() { |
329 |
|
330 |
# Use multiprocessing by default now, it gets tested by upstream |
331 |
export JOBS=$(echo "${MAKEOPTS}" | sed -e "s/.*-j\([0-9]\+\).*/\1/") |
332 |
|
333 |
# Compile problems with these ... |
334 |
filter-flags "-funroll-loops" |
335 |
filter-flags "-fprefetch-loop-arrays" |
336 |
filter-flags "-fno-default-inline" |
337 |
filter-flags "-fstack-protector" |
338 |
filter-flags "-fstack-protector-all" |
339 |
filter-flags "-ftracer" |
340 |
filter-flags "-fforce-addr" |
341 |
|
342 |
filter-flags "-O[s2-9]" |
343 |
|
344 |
if [[ $(gcc-major-version) -lt 4 ]]; then |
345 |
replace-flags "-fomit-frame-pointer" "-momit-leaf-frame-pointer" |
346 |
fi |
347 |
|
348 |
# Build with NVidia cards breaks otherwise |
349 |
use opengl && append-flags "-DGL_GLEXT_PROTOTYPES" |
350 |
|
351 |
# Now for our optimization flags ... |
352 |
export ARCH_FLAGS="${CXXFLAGS}" |
353 |
use debug || export LINKFLAGSOPTIMIZE="${LDFLAGS}" |
354 |
|
355 |
# Make sure gnome-users get gtk-support |
356 |
local GTKFLAG="--disable-gtk --disable-cairo --without-system-cairo" |
357 |
{ use gtk || use gnome; } && GTKFLAG="--enable-gtk --enable-cairo --with-system-cairo" |
358 |
|
359 |
cd "${S}" |
360 |
./configure --with-distro="Gentoo" \ |
361 |
--with-arch="${ARCH}" \ |
362 |
--with-srcdir="${DISTDIR}" \ |
363 |
--with-lang="${LINGUAS_OOO}" \ |
364 |
--with-num-cpus="${JOBS}" \ |
365 |
--without-binsuffix \ |
366 |
--with-installed-ooo-dirname="openoffice" \ |
367 |
--with-tag="${MST}" \ |
368 |
${GTKFLAG} \ |
369 |
$(use_enable mono) \ |
370 |
$(use_enable kde) \ |
371 |
$(use_enable !debug strip) \ |
372 |
$(use_enable odk) \ |
373 |
$(use_enable pam) \ |
374 |
$(use_with java) \ |
375 |
$(use_with templates sun-templates) \ |
376 |
--disable-access \ |
377 |
--disable-post-install-scripts \ |
378 |
--enable-extensions \ |
379 |
--with-system-libwpd \ |
380 |
--mandir=/usr/share/man \ |
381 |
--libdir=/usr/$(get_libdir) \ |
382 |
|| die "Configuration failed!" |
383 |
|
384 |
} |
385 |
|
386 |
src_compile() { |
387 |
|
388 |
use kde && set-kdedir 3 |
389 |
make || die "Build failed" |
390 |
|
391 |
} |
392 |
|
393 |
src_install() { |
394 |
|
395 |
export PYTHONPATH="" |
396 |
|
397 |
einfo "Preparing Installation" |
398 |
make DESTDIR="${D}" install || die "Installation failed!" |
399 |
|
400 |
# Fix the permissions for security reasons |
401 |
# chown -RP root:0 "${D}" |
402 |
|
403 |
# record java libraries |
404 |
if use java; then |
405 |
java-pkg_regjar "${D}"/usr/$(get_libdir)/openoffice/${BASIS}/program/classes/*.jar |
406 |
java-pkg_regjar "${D}"/usr/$(get_libdir)/openoffice/ure/share/java/*.jar |
407 |
fi |
408 |
|
409 |
# Upstream places the bash-completion module in /etc. Gentoo places them in |
410 |
# /usr/share/bash-completion. bug 226061 |
411 |
dobashcompletion "${D}"/etc/bash_completion.d/ooffice.sh ooffice |
412 |
rm -rf "${D}"/etc/bash_completion.d/ || die "rm failed" |
413 |
|
414 |
} |
415 |
|
416 |
pkg_postinst() { |
417 |
|
418 |
fdo-mime_desktop_database_update |
419 |
fdo-mime_mime_database_update |
420 |
bash-completion_pkg_postinst |
421 |
|
422 |
[[ -x /sbin/chpax ]] && [[ -e /usr/$(get_libdir)/openoffice/${BASIS}/program/soffice.bin ]] && chpax -zm /usr/$(get_libdir)/openoffice/${BASIS}/program/soffice.bin |
423 |
|
424 |
# Add available & useful jars to openoffice classpath |
425 |
use java && /usr/$(get_libdir)/openoffice/${BASIS}/program/java-set-classpath $(java-config --classpath=jdbc-mysql 2>/dev/null) >/dev/null |
426 |
|
427 |
elog |
428 |
elog " Spell checking is provided through our own myspell-ebuilds, " |
429 |
elog " if you want to use it, please install the correct myspell package " |
430 |
elog " according to your language needs. " |
431 |
elog |
432 |
|
433 |
elog " Some aditional functionality can be installed via Extension Manager: " |
434 |
elog " *) PDF Import " |
435 |
elog " *) Presentation Console " |
436 |
elog " *) Presentation Minimizer " |
437 |
elog |
438 |
elog " Please use the packages provided in " |
439 |
elog " /usr/$(get_libdir)/openoffice/share/extension/install/ " |
440 |
elog " instead of those from the SUN extension site. " |
441 |
elog |
442 |
|
443 |
} |