From owner-svn-ports-all@FreeBSD.ORG Wed Jun 11 14:45:20 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F17F12BA; Wed, 11 Jun 2014 14:45:19 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DD53E2FA4; Wed, 11 Jun 2014 14:45:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5BEjJM2014592; Wed, 11 Jun 2014 14:45:19 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5BEjIiN014584; Wed, 11 Jun 2014 14:45:18 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201406111445.s5BEjIiN014584@svn.freebsd.org> From: Baptiste Daroussin Date: Wed, 11 Jun 2014 14:45:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r357485 - in head/editors/libreoffice: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Jun 2014 14:45:20 -0000 Author: bapt Date: Wed Jun 11 14:45:18 2014 New Revision: 357485 URL: http://svnweb.freebsd.org/changeset/ports/357485 QAT: https://qat.redports.org/buildarchive/r357485/ Log: Forgot libreoffice itself in previous commit Added: head/editors/libreoffice/files/extra-fix-ldl (contents, props changed) head/editors/libreoffice/files/extra-icu53-crash.diff (contents, props changed) head/editors/libreoffice/files/extra-icu53.diff (contents, props changed) head/editors/libreoffice/files/extra-libc++ (contents, props changed) head/editors/libreoffice/files/patch-Makefile.in (contents, props changed) head/editors/libreoffice/files/patch-bridges__Module_bridges.mk (contents, props changed) head/editors/libreoffice/files/patch-configure (contents, props changed) Deleted: head/editors/libreoffice/files/extra-patch-libc++ head/editors/libreoffice/files/patch-bridges__Library_cpp_uno.mk head/editors/libreoffice/files/patch-bridges__source__cpp_uno__gcc3_linux_x86-64__callvirtualmethod.cxx head/editors/libreoffice/files/patch-configure.ac head/editors/libreoffice/files/patch-extensions__Library_npsoplugin.mk head/editors/libreoffice/files/patch-filter__source__graphicfilter__ipbm__ipbm.cxx head/editors/libreoffice/files/patch-filter__source__graphicfilter__ipcd__ipcd.cxx head/editors/libreoffice/files/patch-filter__source__graphicfilter__ipcx__ipcx.cxx head/editors/libreoffice/files/patch-filter__source__graphicfilter__iras__iras.cxx head/editors/libreoffice/files/patch-filter__source__graphicfilter__itga__itga.cxx head/editors/libreoffice/files/patch-libcmis-0.4.x head/editors/libreoffice/files/patch-mdds-0.9.x head/editors/libreoffice/files/patch-sw__inc__unotbl.hxx head/editors/libreoffice/files/patch-sw__inc__viewsh.hxx head/editors/libreoffice/files/patch-sw__source__core__inc__frame.hxx head/editors/libreoffice/files/patch-sw__source__core__inc__frmtool.hxx head/editors/libreoffice/files/patch-sw__source__core__unocore__unotbl.cxx head/editors/libreoffice/files/patch-sw__source__core__view__vprint.cxx head/editors/libreoffice/files/patch-sysui__Module_sysui.mk head/editors/libreoffice/files/patch-vcl__headless__svptext.cxx Modified: head/editors/libreoffice/Makefile head/editors/libreoffice/Makefile.common head/editors/libreoffice/distinfo head/editors/libreoffice/files/patch-bin__distro-install-desktop-integration head/editors/libreoffice/files/patch-sysui__desktop__share__create_tree.sh Modified: head/editors/libreoffice/Makefile ============================================================================== --- head/editors/libreoffice/Makefile Wed Jun 11 14:40:31 2014 (r357484) +++ head/editors/libreoffice/Makefile Wed Jun 11 14:45:18 2014 (r357485) @@ -2,7 +2,7 @@ .include "${.CURDIR}/Makefile.common" -PORTREVISION= 1 +PORTREVISION= 0 COMMENT= Full integrated office productivity suite @@ -39,7 +39,7 @@ LIB_DEPENDS= libicutu.so:${PORTSDIR}/dev libnss3.so:${PORTSDIR}/security/nss \ libclucene-core.so:${PORTSDIR}/textproc/clucene \ libexpat.so:${PORTSDIR}/textproc/expat2 \ - libmwaw-0.1.so:${PORTSDIR}/textproc/libmwaw \ + libmwaw-0.2.so:${PORTSDIR}/textproc/libmwaw \ libodfgen-0.0.so:${PORTSDIR}/textproc/libodfgen \ libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell \ libhyphen.so:${PORTSDIR}/textproc/hyphen \ @@ -50,7 +50,10 @@ LIB_DEPENDS= libicutu.so:${PORTSDIR}/dev libwpd-0.9.so:${PORTSDIR}/textproc/libwpd \ libwps-0.2.so:${PORTSDIR}/textproc/libwps \ libmythes-1.2.so:${PORTSDIR}/textproc/mythes \ - librdf.so:${PORTSDIR}/textproc/redland + librdf.so:${PORTSDIR}/textproc/redland \ + libabw-0.0.so:${PORTSDIR}/textproc/libabw00 \ + libfreehand-0.0.so:${PORTSDIR}/graphics/libfreehand00 \ + libe-book-0.0.so:${PORTSDIR}/textproc/libe-book00 RUN_DEPENDS= ${LOCALBASE}/lib/X11/fonts/Caladea/Caladea-Bold.ttf:${PORTSDIR}/x11-fonts/crosextrafonts-caladea-ttf \ ${LOCALBASE}/lib/X11/fonts/Carlito/Carlito-Bold.ttf:${PORTSDIR}/x11-fonts/crosextrafonts-carlito-ttf \ @@ -59,30 +62,30 @@ RUN_DEPENDS= ${LOCALBASE}/lib/X11/fonts/ ${LOCALBASE}/lib/X11/fonts/Liberation/LiberationMono-Bold.ttf:${PORTSDIR}/x11-fonts/liberation-fonts-ttf \ ${LOCALBASE}/lib/X11/fonts/LinLibertineG/LinLibertine_DR_G.ttf:${PORTSDIR}/x11-fonts/linuxlibertine-g -CONFLICTS_INSTALL= libreoffice-legacy-[0-9]* - _MAKE_JOBS= # GNU_CONFIGURE= yes -USE_AUTOTOOLS= autoconf aclocal USE_GL= gl glu USE_OPENLDAP= yes USE_PERL5= build USE_PYTHON= yes USE_QT4= # empty but required USE_XORG= xaw xrandr -USES= bison compiler:c++11-lang gmake perl5 pkgconfig tar:xz +USES= bison compiler:c++11-lang gmake perl5 pkgconfig shared-mime-info tar:xz WANT_GNOME= yes DISTFILES+= ${PORTNAME}-${LOVERSION}${EXTRACT_SUFX} DISTFILES+= ${PORTNAME}-help-${LOVERSION}${EXTRACT_SUFX} +EXTRA_PATCHES+= ${FILESDIR}/extra-icu53.diff:-p1 \ + ${FILESDIR}/extra-icu53-crash.diff:-p1 \ + ${FILESDIR}/extra-fix-ldl:-p1 + EXTRACT_ONLY:= ${DISTFILES} DISTFILES+= 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz:src DIST_SUBDIR= libreoffice -LODESTDIR= ${WRKDIR}/loinstall WRKSRC= ${WRKDIR}/${PORTNAME}-${LOVERSION} CONFIGURE_ENV= DMAKE=${LOCALBASE}/bin/dmake \ @@ -90,7 +93,9 @@ CONFIGURE_ENV= DMAKE=${LOCALBASE}/bin/d GPERF=${LOCALBASE}/bin/gperf \ PYTHON_CFLAGS="`${PYTHON_VERSION}-config --cflags`" \ PYTHON_LIBS="`${PYTHON_VERSION}-config --libs`" \ - TMPDIR=${WRKDIR} + TMPDIR=${WRKDIR} \ + OPENSSL_CFLAGS="-I/usr/include" \ + OPENSSL_LIBS="-lcrypto -lssl" CONFIGURE_ARGS+= --disable-dependency-tracking \ --disable-fetch-external \ @@ -109,8 +114,8 @@ CONFIGURE_ARGS+= --disable-epm \ --disable-gstreamer \ --disable-kde \ --disable-kdeab \ - --disable-linkoo \ --disable-mergelibs \ + --disable-firebird-sdbc \ --enable-cairo-canvas \ --enable-graphite \ --enable-python=system \ @@ -132,9 +137,13 @@ CONFIGURE_ARGS+= --disable-epm \ --with-system-icu \ --with-system-jpeg \ --with-system-lcms2 \ + --with-system-libabw \ --with-system-libcdr \ --with-system-libcmis \ + --with-system-libebook \ + --with-system-libetonyek \ --with-system-libexttextcat \ + --with-system-libfreehand \ --with-system-liblangtag \ --with-system-libmspub \ --with-system-libmwaw \ @@ -163,6 +172,8 @@ CONFIGURE_ARGS+= --disable-epm \ --without-myspell-dicts \ --without-system-npapi-headers +#XXX add: --with-system-libeot or --with-system-libatomic_ops + OPTIONS_DEFINE= CUPS DEBUG GNOME GTK2 GTK3 JAVA KDE4 MMEDIA PGSQL SDK \ SYSTRAY TEST VERBOSE WEBDAV OPTIONS_DEFAULT=CUPS GTK2 @@ -176,14 +187,10 @@ TEST_DESC= Run all regression tests VERBOSE_DESC= Increase build verbosity WEBDAV_DESC= Enable webdav protocol -.include +CUPS_LIB_DEPENDS= libcups.so:${PORTSDIR}/print/cups-client +CUPS_CONFIGURE_ENABLE= cups -.if ${PORT_OPTIONS:MCUPS} -LIB_DEPENDS+= libcups.so:${PORTSDIR}/print/cups-client -CONFIGURE_ARGS+= --enable-cups -.else -CONFIGURE_ARGS+= --disable-cups -.endif +.include .if ${PORT_OPTIONS:MDEBUG} IGNORE= known as broken @@ -232,11 +239,9 @@ INSTALLS_ICONS= yes CONFLICTS_BUILD= classpath-[0-9]* #additionnal distfiles needed for java DISTFILES+= 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip:src \ - 2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz:src \ 2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz:src \ 2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz:src \ 3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip:src \ - 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip:src \ 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip:src \ 3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip:src \ 3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz:src \ @@ -335,7 +340,7 @@ LDFLAGS= -B${LOCALBASE}/bin .endif .if ${COMPILER_FEATURES:Mlibc++} -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libc++ +EXTRA_PATCHES+= ${FILESDIR}/extra-libc++:-p1 .endif .if ${OSVERSION} < 900506 @@ -351,49 +356,45 @@ MAKE_ENV+= ENVLINKFLAGS="${LDFLAGS}" MAKE_ENV+= LANG=C LC_ALL=C MAKE_ENV+= SED="${LOCALBASE}/bin/gsed" USE_GMAKE=1 +INSTALL_TARGET= distro-pack-install + pre-configure: @${TOUCH} ${WRKSRC}/autogen.lastrun post-configure: @${TOUCH} ${WRKSRC}/src.downloaded -do-build: - @cd ${WRKSRC} && ${SETENV} DESTDIR="" ${MAKE_ENV} ${GMAKE} - -do-install: - @cd ${WRKSRC} && ${SETENV} DESTDIR="${LODESTDIR}" \ - ${GMAKE} distro-pack-install - +post-install: @${RM} -f ${PLISTF} ${PLISTD} # It seems that the empty directories are necessary for libreoffice keep them for now - @cd ${LODESTDIR}${PREFIX} && ${FIND} -d lib/libreoffice -type d \ + @cd ${STAGEDIR}${PREFIX} && ${FIND} -d lib/libreoffice -type d \ -empty -exec ${ECHO_CMD} "@exec ${MKDIR} %D/{}" \; >> ${PLISTD} - @cd ${LODESTDIR}${PREFIX} && ${FIND} -H -s bin lib man \ + @cd ${STAGEDIR}${PREFIX} && ${FIND} -H -s bin lib man \ \( -type f -o -type l \) -print >> ${PLISTF} - @cd ${LODESTDIR}${PREFIX} && ${FIND} -d lib/libreoffice -type d \ + @cd ${STAGEDIR}${PREFIX} && ${FIND} -d lib/libreoffice -type d \ -exec ${ECHO_CMD} "@dirrm {}" \; >> ${PLISTD} @${ECHO_CMD} etc/bash_completion.d/libreoffice.sh >> ${PLISTF} @${ECHO_CMD} "@dirrmtry etc/bash_completion.d" >> ${PLISTD} .for subdir in applications icons mime mimelnk - @cd ${LODESTDIR}${PREFIX} && ${FIND} -H -s share/${subdir} \ + @cd ${STAGEDIR}${PREFIX} && ${FIND} -H -s share/${subdir} \ \( -type f -o -type l \) -print >> ${PLISTF} - @cd ${LODESTDIR}${PREFIX} && ${FIND} -d share/${subdir} -type d \ + @cd ${STAGEDIR}${PREFIX} && ${FIND} -d share/${subdir} -type d \ -exec ${ECHO_CMD} "@dirrmtry {}" \; >> ${PLISTD} .endfor # do not add the subdir itself as dirrmtry .for subdir in application-registry mime-info - @cd ${LODESTDIR}${PREFIX} && ${FIND} -H -s share/${subdir} \ + @cd ${STAGEDIR}${PREFIX} && ${FIND} -H -s share/${subdir} \ \( -type f -o -type l \) -print >> ${PLISTF} .endfor .if ${PORT_OPTIONS:MSDK} .for subdir in include share share/doc share/idl - @cd ${LODESTDIR}${PREFIX} && ${FIND} -H -s ${subdir}/libreoffice \ + @cd ${STAGEDIR}${PREFIX} && ${FIND} -H -s ${subdir}/libreoffice \ \( -type f -o -type l \) -print >> ${PLISTF} - @cd ${LODESTDIR}${PREFIX} && ${FIND} -d ${subdir}/libreoffice \ + @cd ${STAGEDIR}${PREFIX} && ${FIND} -d ${subdir}/libreoffice \ -type d -exec echo "@dirrm {}" \; >> ${PLISTD} .endfor @${ECHO_CMD} "@dirrmtry share/idl" >> ${PLISTD} @@ -405,9 +406,8 @@ do-install: @${GREP} '^@dirrmtry ' ${PLISTD} | ${SORT} -ru | \ ${SED} -e '${PLIST_REINPLACE_DIRRMTRY}' >> ${TMPPLIST} - @cd ${LODESTDIR}${PREFIX} ; ${PAX} -rw . ${STAGEDIR}${PREFIX} @${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d - @${INSTALL_SCRIPT} ${LODESTDIR}/etc/bash_completion.d/libreoffice.sh \ + @${INSTALL_SCRIPT} ${STAGEDIR}/etc/bash_completion.d/libreoffice.sh \ ${STAGEDIR}${PREFIX}/etc/bash_completion.d .include Modified: head/editors/libreoffice/Makefile.common ============================================================================== --- head/editors/libreoffice/Makefile.common Wed Jun 11 14:40:31 2014 (r357484) +++ head/editors/libreoffice/Makefile.common Wed Jun 11 14:45:18 2014 (r357485) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= libreoffice -PORTVERSION= 4.1.6 +PORTVERSION= 4.2.4 RCVER= 2 #PRERELEASE= yes LOVERSION= ${PORTVERSION}.${RCVER} @@ -14,26 +14,7 @@ LICENSE_COMB= dual .if defined(PRERELEASE) MASTER_SITES?= http://dev-builds.libreoffice.org/pre-releases/${MASTER_SITE_SUBDIR} .else -MASTER_SITES?= http://ftp.rediris.es/mirror/TDF/libreoffice/${MASTER_SITE_SUBDIR} \ - http://mirrors.supportex.net/tdf/libreoffice/${MASTER_SITE_SUBDIR} \ - http://mirror.netcologne.de/tdf/libreoffice/${MASTER_SITE_SUBDIR} \ - http://mirror.informatik.uni-mannheim.de/pub/mirrors/tdf/libreoffice/${MASTER_SITE_SUBDIR} \ - http://ftp.uni-muenster.de/pub/software/DocumentFoundation/libreoffice/${MASTER_SITE_SUBDIR} \ - http://ftp.rz.tu-bs.de/pub/mirror/tdf/tdf-pub/libreoffice/${MASTER_SITE_SUBDIR} \ - http://artfiles.org/documentfoundation.org/libreoffice/${MASTER_SITE_SUBDIR} \ - http://mirror.galpon.org/tdf/libreoffice/${MASTER_SITE_SUBDIR} \ - http://ftp.tu-chemnitz.de/pub/tdf/libreoffice/${MASTER_SITE_SUBDIR} \ - http://tdf.panu.it/libreoffice/${MASTER_SITE_SUBDIR} \ - http://ftp.wh2.tu-dresden.de/pub/mirrors/tdf/libreoffice/${MASTER_SITE_SUBDIR} \ - http://ftp.klid.dk/ftp/tdf/libreoffice/${MASTER_SITE_SUBDIR} \ - http://gd.tuwien.ac.at/tdf/libreoffice/${MASTER_SITE_SUBDIR} \ - http://archive.sunet.se/pub/Office/tdf/libreoffice/${MASTER_SITE_SUBDIR} \ - http://ftp.astral.ro/mirrors/tdf/libreoffice/${MASTER_SITE_SUBDIR} \ - http://ftp.roedu.net/mirrors/tdf/libreoffice/${MASTER_SITE_SUBDIR} \ - http://ftp.unicamp.br/pub/tdf/libreoffice/${MASTER_SITE_SUBDIR} \ - http://mirror.yongbok.net/tdf/libreoffice/${MASTER_SITE_SUBDIR} \ - http://mirror3.mirrors.tds.net/pub/documentfoundation.org/libreoffice/${MASTER_SITE_SUBDIR} \ - http://ftp.osuosl.org/pub/tdf/libreoffice/${MASTER_SITE_SUBDIR} +MASTER_SITES?= http://download.documentfoundation.org/libreoffice/${MASTER_SITE_SUBDIR}/ .endif ONLY_FOR_ARCH= i386 amd64 Modified: head/editors/libreoffice/distinfo ============================================================================== --- head/editors/libreoffice/distinfo Wed Jun 11 14:40:31 2014 (r357484) +++ head/editors/libreoffice/distinfo Wed Jun 11 14:45:18 2014 (r357485) @@ -1,21 +1,17 @@ -SHA256 (libreoffice/libreoffice-4.1.6.2.tar.xz) = 68dde9756732ddb5f7ce8a42100799ada65a538f32f420c400a28ce100f411f4 -SIZE (libreoffice/libreoffice-4.1.6.2.tar.xz) = 122048924 -SHA256 (libreoffice/libreoffice-help-4.1.6.2.tar.xz) = f2da2b9aedfc34626123b294ac24cfe550e2f5589df0c11fc1c93f8e29cc342f -SIZE (libreoffice/libreoffice-help-4.1.6.2.tar.xz) = 1849372 +SHA256 (libreoffice/libreoffice-4.2.4.2.tar.xz) = d166ffa1f2cd336a2f668ea3a912aaf98873757c67e1bcde1ac6f57c6cc605a0 +SIZE (libreoffice/libreoffice-4.2.4.2.tar.xz) = 123378868 +SHA256 (libreoffice/libreoffice-help-4.2.4.2.tar.xz) = a372efb0f82eeed56b7232d15a2d80a522174c3127986f6210239bbbfc342a3d +SIZE (libreoffice/libreoffice-help-4.2.4.2.tar.xz) = 1855080 SHA256 (libreoffice/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz) = 390a5085651828b8fe12aa978b200f59b9155eedbb91a4be89bf7cf39eefdd4a SIZE (libreoffice/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz) = 1652670 SHA256 (libreoffice/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip) = d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370 SIZE (libreoffice/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip) = 3519470 -SHA256 (libreoffice/2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz) = 556921bf0de5c508985c95eef77b73a4388a7da1b7e703060c79c58385483bf4 -SIZE (libreoffice/2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz) = 3568559 SHA256 (libreoffice/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz) = f9a496d3418b0e15894fb351652cd4fa5ca434ebfc3ce3bb8da40defd8b097f2 SIZE (libreoffice/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz) = 1882664 SHA256 (libreoffice/2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz) = ae7bc26118cf1b58d8bed62ed364612d5a2380ad14acb03ca88ff3bab22b2e8b SIZE (libreoffice/2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz) = 262206 SHA256 (libreoffice/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip) = 5826d1551bf599b85742545f6e01a0079b93c1b2c8434bf409eddb3a29e4726b SIZE (libreoffice/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip) = 1180582 -SHA256 (libreoffice/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip) = 64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1 -SIZE (libreoffice/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip) = 9796 SHA256 (libreoffice/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip) = 085f2112c51fa8c1783fac12fbd452650596415121348393bb51f0f7e85a9045 SIZE (libreoffice/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip) = 153157 SHA256 (libreoffice/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip) = e0531091787c0f16c83965fdcbc49162c059d7f0c64669e7f119699321549743 Added: head/editors/libreoffice/files/extra-fix-ldl ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/libreoffice/files/extra-fix-ldl Wed Jun 11 14:45:18 2014 (r357485) @@ -0,0 +1,57 @@ +From a5a17ccdbc870b475e6a2dc076a780b55e16ccab Mon Sep 17 00:00:00 2001 +From: Baptiste Daroussin +Date: Tue, 10 Jun 2014 16:32:51 +0000 +Subject: Filter out OS not needing -ldl + +Change-Id: I5863de6d8b1f0fe2419ea7419b1ff90087bb513d +Reviewed-on: https://gerrit.libreoffice.org/9715 +Tested-by: Michael Stahl +Reviewed-by: Michael Stahl +--- +diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk +index f56a1d3..c6ab9a0 100644 +--- a/bridges/Library_cpp_uno.mk ++++ b/bridges/Library_cpp_uno.mk +@@ -199,7 +199,7 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\ + $(if $(filter TRUE,$(HAVE_GCC_AVX)),-mno-avx) \ + )) + +-ifeq ($(filter ANDROID WNT,$(OS)),) ++ifeq ($(filter ANDROID WNT DRAGONFLY FREEBSD NETBSD OPENBSD MACOSX,$(OS)),) + $(eval $(call gb_Library_add_libs,gcc3_uno,\ + -ldl \ + )) +diff --git a/extensions/Library_npsoplugin.mk b/extensions/Library_npsoplugin.mk +index 4f385d9..9178a9d 100644 +--- a/extensions/Library_npsoplugin.mk ++++ b/extensions/Library_npsoplugin.mk +@@ -23,9 +23,11 @@ $(eval $(call gb_Library_use_static_libraries,npsoplugin,\ + + ifneq ($(OS),WNT) + ++ifeq ($(filter ANDROID DRAGONFLY FREEBSD NETBSD OPENBSD MACOSX,$(OS)),) + $(eval $(call gb_Library_add_libs,npsoplugin,\ + -ldl \ + )) ++endif + + $(eval $(call gb_Library_use_external,npsoplugin,gtk)) + +diff --git a/vcl/Executable_xid_fullscreen_on_all_monitors.mk b/vcl/Executable_xid_fullscreen_on_all_monitors.mk +index 5f9c127..ee17162 100644 +--- a/vcl/Executable_xid_fullscreen_on_all_monitors.mk ++++ b/vcl/Executable_xid_fullscreen_on_all_monitors.mk +@@ -9,9 +9,11 @@ + + $(eval $(call gb_Executable_Executable,xid-fullscreen-on-all-monitors)) + ++ifeq ($(filter ANDROID WNT DRAGONFLY FREEBSD NETBSD OPENBSD MACOSX,$(OS)),) + $(eval $(call gb_Executable_add_libs,xid-fullscreen-on-all-monitors,\ + -ldl \ + )) ++endif + + $(eval $(call gb_Executable_add_cobjects,xid-fullscreen-on-all-monitors,\ + vcl/unx/gtk/window/xid_fullscreen_on_all_monitors \ +-- +cgit v0.9.0.2-2-gbebe Added: head/editors/libreoffice/files/extra-icu53-crash.diff ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/libreoffice/files/extra-icu53-crash.diff Wed Jun 11 14:45:18 2014 (r357485) @@ -0,0 +1,271 @@ +From 1ce42d1001139a9168e9451dbd48a6daef95c691 Mon Sep 17 00:00:00 2001 +From: Eike Rathke +Date: Wed, 30 Apr 2014 16:51:05 +0000 +Subject: resolve crashes with ICU 53.1 in locales with collator data, fdo#77071 + +ICU 53.1 changed API behavior: +https://ssl.icu-project.org/apiref/icu4c/classicu_1_1RuleBasedCollator.html#a2f4c7eeaf020ad68e3bd9722dd272357 +isn't correct anymore: + +length: size of the image. If negative, the API will try to figure out the + length of the image + + NO, IT WILL NOT! It bails out with an error instead. + Introduced a function to obtain the length for each collator data. + +base: collator, usually root. The base is required to be present through the + lifetime of the collator. Currently it cannot be NULL. + + NOT "usually root"! There's a check now that bails out if + if(base->tailoring != CollationRoot::getRoot(errorCode)) + So using an instance created with icu::Locale::getRoot() + +(cherry picked from commit a3c627fe38236e82bc6008075d862b3cbfbd9ce3) + +Conflicts: + i18npool/source/collator/collator_unicode.cxx + +Backported. + +make DISABLE_DYNLOADING on Android happy, fdo#77071 related + +(cherry picked from commit dc7ba1af236ec28d399eff833d56608fde9fb70d) + +Change-Id: Ia9c4e27d5ef4f8083bbe57e4e2f4b3ff63bb42ed +Reviewed-on: https://gerrit.libreoffice.org/9215 +Reviewed-by: Caolán McNamara +Tested-by: Caolán McNamara +--- +diff --git a/i18npool/source/collator/collator_unicode.cxx b/i18npool/source/collator/collator_unicode.cxx +index 90dd2f3b..42dfef3 100644 +--- a/i18npool/source/collator/collator_unicode.cxx ++++ b/i18npool/source/collator/collator_unicode.cxx +@@ -84,6 +84,27 @@ const sal_uInt8* get_collator_data_zh_radical(); + const sal_uInt8* get_collator_data_zh_stroke(); + const sal_uInt8* get_collator_data_zh_zhuyin(); + ++size_t get_collator_data_ca_charset_length(); ++size_t get_collator_data_dz_charset_length(); ++size_t get_collator_data_hu_charset_length(); ++size_t get_collator_data_ja_charset_length(); ++size_t get_collator_data_ja_phonetic_alphanumeric_first_length(); ++size_t get_collator_data_ja_phonetic_alphanumeric_last_length(); ++size_t get_collator_data_ko_charset_length(); ++size_t get_collator_data_ku_alphanumeric_length(); ++size_t get_collator_data_ln_charset_length(); ++size_t get_collator_data_my_dictionary_length(); ++size_t get_collator_data_ne_charset_length(); ++size_t get_collator_data_sid_charset_length(); ++size_t get_collator_data_zh_TW_charset_length(); ++size_t get_collator_data_zh_TW_radical_length(); ++size_t get_collator_data_zh_TW_stroke_length(); ++size_t get_collator_data_zh_charset_length(); ++size_t get_collator_data_zh_pinyin_length(); ++size_t get_collator_data_zh_radical_length(); ++size_t get_collator_data_zh_stroke_length(); ++size_t get_collator_data_zh_zhuyin_length(); ++ + } + + #endif +@@ -120,6 +141,7 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString& rAlgorithm, const lang:: + } + if (!collator && OUString::createFromAscii(LOCAL_RULE_LANGS).indexOf(rLocale.Language) >= 0) { + const sal_uInt8* (*func)() = NULL; ++ size_t (*funclen)() = NULL; + + #ifndef DISABLE_DYNLOADING + OUStringBuffer aBuf; +@@ -132,11 +154,21 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString& rAlgorithm, const lang:: + aBuf.appendAscii("get_").append(rLocale.Language).appendAscii("_"); + if ( rLocale.Language == "zh" ) { + OUString func_base = aBuf.makeStringAndClear(); ++ OUString funclen_base = func_base + "_length"; + if (OUString("TW HK MO").indexOf(rLocale.Country) >= 0) +- func=(const sal_uInt8* (*)()) osl_getFunctionSymbol(hModule, ++ { ++ func = (const sal_uInt8* (*)()) osl_getFunctionSymbol(hModule, + OUString(func_base + "TW_" + rAlgorithm).pData); ++ funclen = (size_t (*)()) osl_getFunctionSymbol(hModule, ++ OUString(funclen_base + "TW_" + rAlgorithm).pData); ++ } + if (!func) +- func=(const sal_uInt8* (*)()) osl_getFunctionSymbol(hModule, OUString(func_base + rAlgorithm).pData); ++ { ++ func = (const sal_uInt8* (*)()) osl_getFunctionSymbol( ++ hModule, OUString(func_base + rAlgorithm).pData); ++ funclen = (size_t (*)()) osl_getFunctionSymbol( ++ hModule, OUString(funclen_base + rAlgorithm).pData); ++ } + } else { + if ( rLocale.Language == "ja" ) { + // replace algorithm name to implementation name. +@@ -149,72 +181,147 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString& rAlgorithm, const lang:: + } else { + aBuf.append(rAlgorithm); + } +- func=(const sal_uInt8* (*)()) osl_getFunctionSymbol(hModule, aBuf.makeStringAndClear().pData); ++ OUString func_base = aBuf.makeStringAndClear(); ++ OUString funclen_base = func_base + "_length"; ++ func = (const sal_uInt8* (*)()) osl_getFunctionSymbol(hModule, func_base.pData); ++ funclen = (size_t (*)()) osl_getFunctionSymbol(hModule, funclen_base.pData); + } + } + #else + if ( rLocale.Language == "ca" ) { + if ( rAlgorithm == "charset" ) ++ { + func = get_collator_data_ca_charset; ++ funclen = get_collator_data_ca_charset_length; ++ } + } else if ( rLocale.Language == "dz" || rLocale.Language == "bo" ) { + // 'bo' Tibetan uses the same collation rules as 'dz' Dzongkha + if ( rAlgorithm == "charset" ) ++ { + func = get_collator_data_dz_charset; ++ funclen = get_collator_data_dz_charset_length; ++ } + } else if ( rLocale.Language == "hu" ) { + if ( rAlgorithm == "charset" ) ++ { + func = get_collator_data_hu_charset; ++ funclen = get_collator_data_hu_charset_length; ++ } + } else if ( rLocale.Language == "ja" ) { + if ( rAlgorithm == "charset" ) ++ { + func = get_collator_data_ja_charset; ++ funclen = get_collator_data_ja_charset_length; ++ } + else if ( rAlgorithm == "phonetic (alphanumeric first)" ) ++ { + func = get_collator_data_ja_phonetic_alphanumeric_first; ++ funclen = get_collator_data_ja_phonetic_alphanumeric_first_length; ++ } + else if ( rAlgorithm == "phonetic (alphanumeric last)" ) ++ { + func = get_collator_data_ja_phonetic_alphanumeric_last; ++ funclen = get_collator_data_ja_phonetic_alphanumeric_last_length; ++ } + #if (U_ICU_VERSION_MAJOR_NUM < 53) + } else if ( rLocale.Language == "ko" ) { + if ( rAlgorithm == "charset" ) ++ { + func = get_collator_data_ko_charset; ++ funclen = get_collator_data_ko_charset_length; ++ } + #endif + } else if ( rLocale.Language == "ku" ) { + if ( rAlgorithm == "alphanumeric" ) ++ { + func = get_collator_data_ku_alphanumeric; ++ funclen = get_collator_data_ku_alphanumeric_length; ++ } + } else if ( rLocale.Language == "ln" ) { + if ( rAlgorithm == "charset" ) ++ { + func = get_collator_data_ln_charset; ++ funclen = get_collator_data_ln_charset_length; ++ } + } else if ( rLocale.Language == "my" ) { + if ( rAlgorithm == "dictionary" ) ++ { + func = get_collator_data_my_dictionary; ++ funclen = get_collator_data_my_dictionary_length; ++ } + } else if ( rLocale.Language == "ne" ) { + if ( rAlgorithm == "charset" ) ++ { + func = get_collator_data_ne_charset; ++ funclen = get_collator_data_ne_charset_length; ++ } + } else if ( rLocale.Language == "sid" ) { + if ( rAlgorithm == "charset" ) ++ { + func = get_collator_data_sid_charset; ++ funclen = get_collator_data_sid_charset_length; ++ } + } else if ( rLocale.Language == "zh" && (rLocale.Country == "TW" || rLocale.Country == "HK" || rLocale.Country == "MO") ) { + if ( rAlgorithm == "charset" ) ++ { + func = get_collator_data_zh_TW_charset; ++ funclen = get_collator_data_zh_TW_charset_length; ++ } + else if ( rAlgorithm == "radical" ) ++ { + func = get_collator_data_zh_TW_radical; ++ funclen = get_collator_data_zh_TW_radical_length; ++ } + else if ( rAlgorithm == "stroke" ) ++ { + func = get_collator_data_zh_TW_stroke; ++ funclen = get_collator_data_zh_TW_stroke_length; ++ } + } else if ( rLocale.Language == "zh" ) { + if ( rAlgorithm == "charset" ) ++ { + func = get_collator_data_zh_charset; ++ funclen = get_collator_data_zh_charset_length; ++ } + else if ( rAlgorithm == "pinyin" ) ++ { + func = get_collator_data_zh_pinyin; ++ funclen = get_collator_data_zh_pinyin_length; ++ } + else if ( rAlgorithm == "radical" ) ++ { + func = get_collator_data_zh_radical; ++ funclen = get_collator_data_zh_radical_length; ++ } + else if ( rAlgorithm == "stroke" ) ++ { + func = get_collator_data_zh_stroke; ++ funclen = get_collator_data_zh_stroke_length; ++ } + else if ( rAlgorithm == "zhuyin" ) ++ { + func = get_collator_data_zh_zhuyin; ++ funclen = get_collator_data_zh_zhuyin_length; ++ } + } + #endif +- if (func) { ++ if (func && funclen) { + const sal_uInt8* ruleImage=func(); +- uca_base = new RuleBasedCollator(static_cast(NULL), status); ++ size_t ruleImageSize = funclen(); ++ // Not only changed ICU 53.1 the API behavior that a negative ++ // length (ruleImageSize) now leads to failure, but also that ++ // the base RuleBasedCollator passed as uca_base here needs to ++ // have a base->tailoring == CollationRoot::getRoot() otherwise ++ // the init bails out as well, as it does for the previously ++ // used "empty" RuleBasedCollator. ++ // The default collator of the en-US locale would also fulfill ++ // the requirement. The collator of the actual locale or the ++ // NULL (default) locale does not. ++ uca_base = static_cast(icu::Collator::createInstance( ++ icu::Locale::getRoot(), status)); + if (! U_SUCCESS(status)) throw RuntimeException(); +- collator = new RuleBasedCollator(reinterpret_cast(ruleImage), -1, uca_base, status); ++ collator = new RuleBasedCollator( ++ reinterpret_cast(ruleImage), ruleImageSize, uca_base, status); + if (! U_SUCCESS(status)) throw RuntimeException(); + } + } +diff --git a/i18npool/source/collator/gencoll_rule.cxx b/i18npool/source/collator/gencoll_rule.cxx +index a801545..5ba9f5d 100644 +--- a/i18npool/source/collator/gencoll_rule.cxx ++++ b/i18npool/source/collator/gencoll_rule.cxx +@@ -65,8 +65,10 @@ void data_write(char* file, char* name, sal_uInt8 *data, sal_Int32 len) + + fprintf(fp, "#ifndef DISABLE_DYNLOADING\n"); + fprintf(fp, "SAL_DLLPUBLIC_EXPORT const sal_uInt8* get_%s() { return %s; }\n", name, name); ++ fprintf(fp, "SAL_DLLPUBLIC_EXPORT size_t get_%s_length() { return sizeof(%s); }\n", name, name); + fprintf(fp, "#else\n"); + fprintf(fp, "SAL_DLLPUBLIC_EXPORT const sal_uInt8* get_collator_data_%s() { return %s; }\n", name, name); ++ fprintf(fp, "SAL_DLLPUBLIC_EXPORT size_t get_collator_data_%s_length() { return sizeof(%s); }\n", name, name); + fprintf(fp, "#endif\n"); + fprintf(fp, "\n"); + fprintf (fp, "}\n"); +-- +cgit v0.9.0.2-2-gbebe Added: head/editors/libreoffice/files/extra-icu53.diff ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/libreoffice/files/extra-icu53.diff Wed Jun 11 14:45:18 2014 (r357485) @@ -0,0 +1,2771 @@ +From 32a9c19bf79b99ae3b6cdae7ccc07499094a5603 Mon Sep 17 00:00:00 2001 +From: Eike Rathke +Date: Tue, 29 Apr 2014 15:34:05 +0000 +Subject: adapt i18npool to ICU 53, fdo#77071 + +Korean charset collator can't be built from ko_charset.txt because of + +"The runtime code decomposes Hangul syllables on the fly, with recursive +processing but without making the Jamo pieces visible for matching. It +does not work with certain types of contextual mappings." +"While handling a Hangul syllable, contractions starting with Jamo L or +V would not see the following Jamo of that syllable." (this is where we +bail out already with the first syllable of ko_charset.txt) +Another condition to fail is described as "A contraction ending with +Jamo L or L+V would require generating Hangul syllables in +addTailComposites() (588 for a Jamo L), or decomposing a following +Hangul syllable on the fly, during contraction matching." + +Excluded the file from the build for ICU >=53 and hope that ICU in the +mean time handles Korean collation correctly. + +Additionally, ICU 53 took ages (if it would had finished at all) to +build the collator from zh_TW_charset.txt because of the \u#### escaped +notation. Converted the file's content to characters using +http://www.rishida.net/tools/conversion/ + +Change-Id: I6520a362b94428eac42085e2740aee2c468ed693 +Reviewed-on: https://gerrit.libreoffice.org/9205 +Reviewed-by: Caolán McNamara +Tested-by: Caolán McNamara +--- +diff --git a/i18npool/CustomTarget_collator.mk b/i18npool/CustomTarget_collator.mk +index 04527bb..bf57ae3 100644 +--- a/i18npool/CustomTarget_collator.mk ++++ b/i18npool/CustomTarget_collator.mk +@@ -9,6 +9,7 @@ + + $(eval $(call gb_CustomTarget_CustomTarget,i18npool/collator)) + ++i18npool_ICULT53 := $(filter 1, $(shell expr $(ICU_MAJOR) \< 53)) + i18npool_CODIR := $(call gb_CustomTarget_get_workdir,i18npool/collator) + i18npool_COTXTS := \ + ca_charset.txt \ +@@ -17,7 +18,9 @@ i18npool_COTXTS := \ + ja_charset.txt \ + ja_phonetic_alphanumeric_first.txt \ + ja_phonetic_alphanumeric_last.txt \ +- ko_charset.txt \ ++ $(if $(i18npool_ICULT53), \ ++ ko_charset.txt \ ++ ) \ + ku_alphanumeric.txt \ + ln_charset.txt \ + my_dictionary.txt \ +@@ -44,7 +47,7 @@ $(i18npool_CODIR)/collator_%.cxx : \ + $(call gb_Helper_abbreviate_dirs, \ + $(call gb_Helper_execute,gencoll_rule) $< $@ $*) + +-$(i18npool_CODIR)/lrl_include.hxx : \ ++$(i18npool_CODIR)/lrl_include.hxx : $(SRCDIR)/i18npool/CustomTarget_collator.mk \ + $(SRCDIR)/i18npool/source/collator/data | $(i18npool_CODIR)/.dir + $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) + echo '#define LOCAL_RULE_LANGS "$(sort $(foreach txt,$(i18npool_COTXTS), \ +diff --git a/i18npool/Library_collator_data.mk b/i18npool/Library_collator_data.mk +index f1063db..52741ac 100644 +--- a/i18npool/Library_collator_data.mk ++++ b/i18npool/Library_collator_data.mk +@@ -7,6 +7,10 @@ + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + # + ++i18npool_ICULT53 := $(filter 1, $(shell expr $(ICU_MAJOR) \< 53)) ++i18npool_LCDALL := $(wildcard $(SRCDIR)/i18npool/source/collator/data/*.txt) ++i18npool_LCDTXTS := $(if $(i18npool_ICULT53), $(i18npool_LCDALL), $(filter-out %/ko_charset.txt, $(i18npool_LCDALL))) ++ + $(eval $(call gb_Library_Library,collator_data)) + + $(eval $(call gb_Library_use_libraries,collator_data,\ +@@ -14,7 +18,7 @@ $(eval $(call gb_Library_use_libraries,collator_data,\ + )) + + $(eval $(call gb_Library_add_generated_exception_objects,collator_data,\ +- $(foreach txt,$(wildcard $(SRCDIR)/i18npool/source/collator/data/*.txt),\ ++ $(foreach txt,$(i18npool_LCDTXTS),\ + CustomTarget/i18npool/collator/collator_$(notdir $(basename $(txt)))) \ + )) + +diff --git a/i18npool/source/collator/collator_unicode.cxx b/i18npool/source/collator/collator_unicode.cxx +index 2429594..90dd2f3b 100644 +--- a/i18npool/source/collator/collator_unicode.cxx ++++ b/i18npool/source/collator/collator_unicode.cxx +@@ -170,9 +170,11 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString& rAlgorithm, const lang:: + func = get_collator_data_ja_phonetic_alphanumeric_first; + else if ( rAlgorithm == "phonetic (alphanumeric last)" ) + func = get_collator_data_ja_phonetic_alphanumeric_last; ++#if (U_ICU_VERSION_MAJOR_NUM < 53) + } else if ( rLocale.Language == "ko" ) { + if ( rAlgorithm == "charset" ) + func = get_collator_data_ko_charset; ++#endif + } else if ( rLocale.Language == "ku" ) { + if ( rAlgorithm == "alphanumeric" ) + func = get_collator_data_ku_alphanumeric; +diff --git a/i18npool/source/collator/data/zh_TW_charset.txt b/i18npool/source/collator/data/zh_TW_charset.txt +index 7cfb325..c2a81da 100644 +--- a/i18npool/source/collator/data/zh_TW_charset.txt ++++ b/i18npool/source/collator/data/zh_TW_charset.txt +@@ -19,1332 +19,1332 @@ + # Collation rule for Traditional Chinese charset + + & [top] +-<\u5159<\u515b<\u515e<\u515d<\u5161<\u5163<\u55e7<\u74e9<\u7cce +-<\u3021<\u3022<\u3023<\u3024<\u3025<\u3026<\u3027<\u3028<\u3029<\u5344 +-<\u3105<\u3106<\u3107<\u3108<\u3109<\u310a<\u310b<\u310c<\u310d<\u310e +-<\u310f<\u3110<\u3111<\u3112<\u3113<\u3114<\u3115<\u3116<\u3117<\u3118 +-<\u3119<\u311a<\u311b<\u311c<\u311d<\u311e<\u311f<\u3120<\u3121<\u3122 +-<\u3123<\u3124<\u3125<\u3126<\u3127<\u3128<\u3129<\u4e00<\u4e59<\u4e01 +-<\u4e03<\u4e43<\u4e5d<\u4e86<\u4e8c<\u4eba<\u513f<\u5165<\u516b<\u51e0 +-<\u5200<\u5201<\u529b<\u5315<\u5341<\u535c<\u53c8<\u4e09<\u4e0b<\u4e08 +-<\u4e0a<\u4e2b<\u4e38<\u51e1<\u4e45<\u4e48<\u4e5f<\u4e5e<\u4e8e<\u4ea1 +-<\u5140<\u5203<\u52fa<\u5343<\u53c9<\u53e3<\u571f<\u58eb<\u5915<\u5927 +-<\u5973<\u5b50<\u5b51<\u5b53<\u5bf8<\u5c0f<\u5c22<\u5c38<\u5c71<\u5ddd +-<\u5de5<\u5df1<\u5df2<\u5df3<\u5dfe<\u5e72<\u5efe<\u5f0b<\u5f13<\u624d +-<\u4e11<\u4e10<\u4e0d<\u4e2d<\u4e30<\u4e39<\u4e4b<\u5c39<\u4e88<\u4e91 +-<\u4e95<\u4e92<\u4e94<\u4ea2<\u4ec1<\u4ec0<\u4ec3<\u4ec6<\u4ec7<\u4ecd +-<\u4eca<\u4ecb<\u4ec4<\u5143<\u5141<\u5167<\u516d<\u516e<\u516c<\u5197 +-<\u51f6<\u5206<\u5207<\u5208<\u52fb<\u52fe<\u52ff<\u5316<\u5339<\u5348 +-<\u5347<\u5345<\u535e<\u5384<\u53cb<\u53ca<\u53cd<\u58ec<\u5929<\u592b +-<\u592a<\u592d<\u5b54<\u5c11<\u5c24<\u5c3a<\u5c6f<\u5df4<\u5e7b<\u5eff +-<\u5f14<\u5f15<\u5fc3<\u6208<\u6236<\u624b<\u624e<\u652f<\u6587<\u6597 +-<\u65a4<\u65b9<\u65e5<\u66f0<\u6708<\u6728<\u6b20<\u6b62<\u6b79<\u6bcb +-<\u6bd4<\u6bdb<\u6c0f<\u6c34<\u706b<\u722a<\u7236<\u723b<\u7247<\u7259 +-<\u725b<\u72ac<\u738b<\u4e19<\u4e16<\u4e15<\u4e14<\u4e18<\u4e3b<\u4e4d +-<\u4e4f<\u4e4e<\u4ee5<\u4ed8<\u4ed4<\u4ed5<\u4ed6<\u4ed7<\u4ee3<\u4ee4 +-<\u4ed9<\u4ede<\u5145<\u5144<\u5189<\u518a<\u51ac<\u51f9<\u51fa<\u51f8 +-<\u520a<\u52a0<\u529f<\u5305<\u5306<\u5317<\u531d<\u4edf<\u534a<\u5349 +-<\u5361<\u5360<\u536f<\u536e<\u53bb<\u53ef<\u53e4<\u53f3<\u53ec<\u53ee +-<\u53e9<\u53e8<\u53fc<\u53f8<\u53f5<\u53eb<\u53e6<\u53ea<\u53f2<\u53f1 +-<\u53f0<\u53e5<\u53ed<\u53fb<\u56db<\u56da<\u5916<\u592e<\u5931<\u5974 +-<\u5976<\u5b55<\u5b83<\u5c3c<\u5de8<\u5de7<\u5de6<\u5e02<\u5e03<\u5e73 +-<\u5e7c<\u5f01<\u5f18<\u5f17<\u5fc5<\u620a<\u6253<\u6254<\u6252<\u6251 +-<\u65a5<\u65e6<\u672e<\u672c<\u672a<\u672b<\u672d<\u6b63<\u6bcd<\u6c11 +-<\u6c10<\u6c38<\u6c41<\u6c40<\u6c3e<\u72af<\u7384<\u7389<\u74dc<\u74e6 +-<\u7518<\u751f<\u7528<\u7529<\u7530<\u7531<\u7532<\u7533<\u758b<\u767d +-<\u76ae<\u76bf<\u76ee<\u77db<\u77e2<\u77f3<\u793a<\u79be<\u7a74<\u7acb +-<\u4e1e<\u4e1f<\u4e52<\u4e53<\u4e69<\u4e99<\u4ea4<\u4ea6<\u4ea5<\u4eff +-<\u4f09<\u4f19<\u4f0a<\u4f15<\u4f0d<\u4f10<\u4f11<\u4f0f<\u4ef2<\u4ef6 +-<\u4efb<\u4ef0<\u4ef3<\u4efd<\u4f01<\u4f0b<\u5149<\u5147<\u5146<\u5148 +-<\u5168<\u5171<\u518d<\u51b0<\u5217<\u5211<\u5212<\u520e<\u5216<\u52a3 +-<\u5308<\u5321<\u5320<\u5370<\u5371<\u5409<\u540f<\u540c<\u540a<\u5410 +-<\u5401<\u540b<\u5404<\u5411<\u540d<\u5408<\u5403<\u540e<\u5406<\u5412 +-<\u56e0<\u56de<\u56dd<\u5733<\u5730<\u5728<\u572d<\u572c<\u572f<\u5729 +-<\u5919<\u591a<\u5937<\u5938<\u5984<\u5978<\u5983<\u597d<\u5979<\u5982 +-<\u5981<\u5b57<\u5b58<\u5b87<\u5b88<\u5b85<\u5b89<\u5bfa<\u5c16<\u5c79 +-<\u5dde<\u5e06<\u5e76<\u5e74<\u5f0f<\u5f1b<\u5fd9<\u5fd6<\u620e<\u620c +-<\u620d<\u6210<\u6263<\u625b<\u6258<\u6536<\u65e9<\u65e8<\u65ec<\u65ed +-<\u66f2<\u66f3<\u6709<\u673d<\u6734<\u6731<\u6735<\u6b21<\u6b64<\u6b7b +-<\u6c16<\u6c5d<\u6c57<\u6c59<\u6c5f<\u6c60<\u6c50<\u6c55<\u6c61<\u6c5b +-<\u6c4d<\u6c4e<\u7070<\u725f<\u725d<\u767e<\u7af9<\u7c73<\u7cf8<\u7f36 +-<\u7f8a<\u7fbd<\u8001<\u8003<\u800c<\u8012<\u8033<\u807f<\u8089<\u808b +-<\u808c<\u81e3<\u81ea<\u81f3<\u81fc<\u820c<\u821b<\u821f<\u826e<\u8272 +-<\u827e<\u866b<\u8840<\u884c<\u8863<\u897f<\u9621<\u4e32<\u4ea8<\u4f4d +-<\u4f4f<\u4f47<\u4f57<\u4f5e<\u4f34<\u4f5b<\u4f55<\u4f30<\u4f50<\u4f51 +-<\u4f3d<\u4f3a<\u4f38<\u4f43<\u4f54<\u4f3c<\u4f46<\u4f63<\u4f5c<\u4f60 +-<\u4f2f<\u4f4e<\u4f36<\u4f59<\u4f5d<\u4f48<\u4f5a<\u514c<\u514b<\u514d +-<\u5175<\u51b6<\u51b7<\u5225<\u5224<\u5229<\u522a<\u5228<\u52ab<\u52a9 +-<\u52aa<\u52ac<\u5323<\u5373<\u5375<\u541d<\u542d<\u541e<\u543e<\u5426 +-<\u544e<\u5427<\u5446<\u5443<\u5433<\u5448<\u5442<\u541b<\u5429<\u544a +-<\u5439<\u543b<\u5438<\u542e<\u5435<\u5436<\u5420<\u543c<\u5440<\u5431 +-<\u542b<\u541f<\u542c<\u56ea<\u56f0<\u56e4<\u56eb<\u574a<\u5751<\u5740 +-<\u574d<\u5747<\u574e<\u573e<\u5750<\u574f<\u573b<\u58ef<\u593e<\u599d +-<\u5992<\u59a8<\u599e<\u59a3<\u5999<\u5996<\u598d<\u59a4<\u5993<\u598a +-<\u59a5<\u5b5d<\u5b5c<\u5b5a<\u5b5b<\u5b8c<\u5b8b<\u5b8f<\u5c2c<\u5c40 +-<\u5c41<\u5c3f<\u5c3e<\u5c90<\u5c91<\u5c94<\u5c8c<\u5deb<\u5e0c<\u5e8f +-<\u5e87<\u5e8a<\u5ef7<\u5f04<\u5f1f<\u5f64<\u5f62<\u5f77<\u5f79<\u5fd8 +-<\u5fcc<\u5fd7<\u5fcd<\u5ff1<\u5feb<\u5ff8<\u5fea<\u6212<\u6211<\u6284 +-<\u6297<\u6296<\u6280<\u6276<\u6289<\u626d<\u628a<\u627c<\u627e<\u6279 +-<\u6273<\u6292<\u626f<\u6298<\u626e<\u6295<\u6293<\u6291<\u6286<\u6539 +-<\u653b<\u6538<\u65f1<\u66f4<\u675f<\u674e<\u674f<\u6750<\u6751<\u675c +-<\u6756<\u675e<\u6749<\u6746<\u6760<\u6753<\u6757<\u6b65<\u6bcf<\u6c42 +-<\u6c5e<\u6c99<\u6c81<\u6c88<\u6c89<\u6c85<\u6c9b<\u6c6a<\u6c7a<\u6c90 +-<\u6c70<\u6c8c<\u6c68<\u6c96<\u6c92<\u6c7d<\u6c83<\u6c72<\u6c7e<\u6c74 +-<\u6c86<\u6c76<\u6c8d<\u6c94<\u6c98<\u6c82<\u7076<\u707c<\u707d<\u7078 +-<\u7262<\u7261<\u7260<\u72c4<\u72c2<\u7396<\u752c<\u752b<\u7537<\u7538 +-<\u7682<\u76ef<\u77e3<\u79c1<\u79c0<\u79bf<\u7a76<\u7cfb<\u7f55<\u8096 +-<\u8093<\u809d<\u8098<\u809b<\u809a<\u80b2<\u826f<\u8292<\u828b<\u828d +-<\u898b<\u89d2<\u8a00<\u8c37<\u8c46<\u8c55<\u8c9d<\u8d64<\u8d70<\u8db3 +-<\u8eab<\u8eca<\u8f9b<\u8fb0<\u8fc2<\u8fc6<\u8fc5<\u8fc4<\u5de1<\u9091 +-<\u90a2<\u90aa<\u90a6<\u90a3<\u9149<\u91c6<\u91cc<\u9632<\u962e<\u9631 +-<\u962a<\u962c<\u4e26<\u4e56<\u4e73<\u4e8b<\u4e9b<\u4e9e<\u4eab<\u4eac +-<\u4f6f<\u4f9d<\u4f8d<\u4f73<\u4f7f<\u4f6c<\u4f9b<\u4f8b<\u4f86<\u4f83 +-<\u4f70<\u4f75<\u4f88<\u4f69<\u4f7b<\u4f96<\u4f7e<\u4f8f<\u4f91<\u4f7a +-<\u5154<\u5152<\u5155<\u5169<\u5177<\u5176<\u5178<\u51bd<\u51fd<\u523b +-<\u5238<\u5237<\u523a<\u5230<\u522e<\u5236<\u5241<\u52be<\u52bb<\u5352 +-<\u5354<\u5353<\u5351<\u5366<\u5377<\u5378<\u5379<\u53d6<\u53d4<\u53d7 +-<\u5473<\u5475<\u5496<\u5478<\u5495<\u5480<\u547b<\u5477<\u5484<\u5492 +-<\u5486<\u547c<\u5490<\u5471<\u5476<\u548c<\u549a<\u5462<\u5468<\u548b +-<\u547d<\u548e<\u56fa<\u5783<\u5777<\u576a<\u5769<\u5761<\u5766<\u5764 +-<\u577c<\u591c<\u5949<\u5947<\u5948<\u5944<\u5954<\u59be<\u59bb<\u59d4 +-<\u59b9<\u59ae<\u59d1<\u59c6<\u59d0<\u59cd<\u59cb<\u59d3<\u59ca<\u59af +-<\u59b3<\u59d2<\u59c5<\u5b5f<\u5b64<\u5b63<\u5b97<\u5b9a<\u5b98<\u5b9c +-<\u5b99<\u5b9b<\u5c1a<\u5c48<\u5c45<\u5c46<\u5cb7<\u5ca1<\u5cb8<\u5ca9 +-<\u5cab<\u5cb1<\u5cb3<\u5e18<\u5e1a<\u5e16<\u5e15<\u5e1b<\u5e11<\u5e78 +-<\u5e9a<\u5e97<\u5e9c<\u5e95<\u5e96<\u5ef6<\u5f26<\u5f27<\u5f29<\u5f80 +-<\u5f81<\u5f7f<\u5f7c<\u5fdd<\u5fe0<\u5ffd<\u5ff5<\u5fff<\u600f<\u6014 +-<\u602f<\u6035<\u6016<\u602a<\u6015<\u6021<\u6027<\u6029<\u602b<\u601b +-<\u6216<\u6215<\u623f<\u623e<\u6240<\u627f<\u62c9<\u62cc<\u62c4<\u62bf +-<\u62c2<\u62b9<\u62d2<\u62db<\u62ab<\u62d3<\u62d4<\u62cb<\u62c8<\u62a8 +-<\u62bd<\u62bc<\u62d0<\u62d9<\u62c7<\u62cd<\u62b5<\u62da<\u62b1<\u62d8 +-<\u62d6<\u62d7<\u62c6<\u62ac<\u62ce<\u653e<\u65a7<\u65bc<\u65fa<\u6614 +-<\u6613<\u660c<\u6606<\u6602<\u660e<\u6600<\u660f<\u6615<\u660a<\u6607 +-<\u670d<\u670b<\u676d<\u678b<\u6795<\u6771<\u679c<\u6773<\u6777<\u6787 +-<\u679d<\u6797<\u676f<\u6770<\u677f<\u6789<\u677e<\u6790<\u6775<\u679a +-<\u6793<\u677c<\u676a<\u6772<\u6b23<\u6b66<\u6b67<\u6b7f<\u6c13<\u6c1b +-<\u6ce3<\u6ce8<\u6cf3<\u6cb1<\u6ccc<\u6ce5<\u6cb3<\u6cbd<\u6cbe<\u6cbc +-<\u6ce2<\u6cab<\u6cd5<\u6cd3<\u6cb8<\u6cc4<\u6cb9<\u6cc1<\u6cae<\u6cd7 +-<\u6cc5<\u6cf1<\u6cbf<\u6cbb<\u6ce1<\u6cdb<\u6cca<\u6cac<\u6cef<\u6cdc +-<\u6cd6<\u6ce0<\u7095<\u708e<\u7092<\u708a<\u7099<\u722c<\u722d<\u7238 +-<\u7248<\u7267<\u7269<\u72c0<\u72ce<\u72d9<\u72d7<\u72d0<\u73a9<\u73a8 +-<\u739f<\u73ab<\u73a5<\u753d<\u759d<\u7599<\u759a<\u7684<\u76c2<\u76f2 +-<\u76f4<\u77e5<\u77fd<\u793e<\u7940<\u7941<\u79c9<\u79c8<\u7a7a<\u7a79 +-<\u7afa<\u7cfe<\u7f54<\u7f8c<\u7f8b<\u8005<\u80ba<\u80a5<\u80a2<\u80b1 +-<\u80a1<\u80ab<\u80a9<\u80b4<\u80aa<\u80af<\u81e5<\u81fe<\u820d<\u82b3 +-<\u829d<\u8299<\u82ad<\u82bd<\u829f<\u82b9<\u82b1<\u82ac<\u82a5<\u82af +-<\u82b8<\u82a3<\u82b0<\u82be<\u82b7<\u864e<\u8671<\u521d<\u8868<\u8ecb +-<\u8fce<\u8fd4<\u8fd1<\u90b5<\u90b8<\u90b1<\u90b6<\u91c7<\u91d1<\u9577 +-<\u9580<\u961c<\u9640<\u963f<\u963b<\u9644<\u9642<\u96b9<\u96e8<\u9752 +-<\u975e<\u4e9f<\u4ead<\u4eae<\u4fe1<\u4fb5<\u4faf<\u4fbf<\u4fe0<\u4fd1 +-<\u4fcf<\u4fdd<\u4fc3<\u4fb6<\u4fd8<\u4fdf<\u4fca<\u4fd7<\u4fae<\u4fd0 +-<\u4fc4<\u4fc2<\u4fda<\u4fce<\u4fde<\u4fb7<\u5157<\u5192<\u5191<\u51a0 +-<\u524e<\u5243<\u524a<\u524d<\u524c<\u524b<\u5247<\u52c7<\u52c9<\u52c3 +-<\u52c1<\u530d<\u5357<\u537b<\u539a<\u53db<\u54ac<\u54c0<\u54a8<\u54ce +-<\u54c9<\u54b8<\u54a6<\u54b3<\u54c7<\u54c2<\u54bd<\u54aa<\u54c1<\u54c4 +-<\u54c8<\u54af<\u54ab<\u54b1<\u54bb<\u54a9<\u54a7<\u54bf<\u56ff<\u5782 +-<\u578b<\u57a0<\u57a3<\u57a2<\u57ce<\u57ae<\u5793<\u5955<\u5951<\u594f +-<\u594e<\u5950<\u59dc<\u59d8<\u59ff<\u59e3<\u59e8<\u5a03<\u59e5<\u59ea +-<\u59da<\u59e6<\u5a01<\u59fb<\u5b69<\u5ba3<\u5ba6<\u5ba4<\u5ba2<\u5ba5 +-<\u5c01<\u5c4e<\u5c4f<\u5c4d<\u5c4b<\u5cd9<\u5cd2<\u5df7<\u5e1d<\u5e25 +-<\u5e1f<\u5e7d<\u5ea0<\u5ea6<\u5efa<\u5f08<\u5f2d<\u5f65<\u5f88<\u5f85 +-<\u5f8a<\u5f8b<\u5f87<\u5f8c<\u5f89<\u6012<\u601d<\u6020<\u6025<\u600e +-<\u6028<\u604d<\u6070<\u6068<\u6062<\u6046<\u6043<\u606c<\u606b<\u606a +-<\u6064<\u6241<\u62dc<\u6316<\u6309<\u62fc<\u62ed<\u6301<\u62ee<\u62fd +-<\u6307<\u62f1<\u62f7<\u62ef<\u62ec<\u62fe<\u62f4<\u6311<\u6302<\u653f +-<\u6545<\u65ab<\u65bd<\u65e2<\u6625<\u662d<\u6620<\u6627<\u662f<\u661f +-<\u6628<\u6631<\u6624<\u66f7<\u67ff<\u67d3<\u67f1<\u67d4<\u67d0<\u67ec +-<\u67b6<\u67af<\u67f5<\u67e9<\u67ef<\u67c4<\u67d1<\u67b4<\u67da<\u67e5 +-<\u67b8<\u67cf<\u67de<\u67f3<\u67b0<\u67d9<\u67e2<\u67dd<\u67d2<\u6b6a +-<\u6b83<\u6b86<\u6bb5<\u6bd2<\u6bd7<\u6c1f<\u6cc9<\u6d0b<\u6d32<\u6d2a +-<\u6d41<\u6d25<\u6d0c<\u6d31<\u6d1e<\u6d17<\u6d3b<\u6d3d<\u6d3e<\u6d36 +-<\u6d1b<\u6cf5<\u6d39<\u6d27<\u6d38<\u6d29<\u6d2e<\u6d35<\u6d0e<\u6d2b +-<\u70ab<\u70ba<\u70b3<\u70ac<\u70af<\u70ad<\u70b8<\u70ae<\u70a4<\u7230 +-<\u7272<\u726f<\u7274<\u72e9<\u72e0<\u72e1<\u73b7<\u73ca<\u73bb<\u73b2 +-<\u73cd<\u73c0<\u73b3<\u751a<\u752d<\u754f<\u754c<\u754e<\u754b<\u75ab +-<\u75a4<\u75a5<\u75a2<\u75a3<\u7678<\u7686<\u7687<\u7688<\u76c8<\u76c6 +-<\u76c3<\u76c5<\u7701<\u76f9<\u76f8<\u7709<\u770b<\u76fe<\u76fc<\u7707 +-<\u77dc<\u7802<\u7814<\u780c<\u780d<\u7946<\u7949<\u7948<\u7947<\u79b9 +-<\u79ba<\u79d1<\u79d2<\u79cb<\u7a7f<\u7a81<\u7aff<\u7afd<\u7c7d<\u7d02 +-<\u7d05<\u7d00<\u7d09<\u7d07<\u7d04<\u7d06<\u7f38<\u7f8e<\u7fbf<\u8004 +-<\u8010<\u800d<\u8011<\u8036<\u80d6<\u80e5<\u80da<\u80c3<\u80c4<\u80cc +-<\u80e1<\u80db<\u80ce<\u80de<\u80e4<\u80dd<\u81f4<\u8222<\u82e7<\u8303 +-<\u8305<\u82e3<\u82db<\u82e6<\u8304<\u82e5<\u8302<\u8309<\u82d2<\u82d7 +-<\u82f1<\u8301<\u82dc<\u82d4<\u82d1<\u82de<\u82d3<\u82df<\u82ef<\u8306 +-<\u8650<\u8679<\u867b<\u867a<\u884d<\u886b<\u8981<\u89d4<\u8a08<\u8a02 +-<\u8a03<\u8c9e<\u8ca0<\u8d74<\u8d73<\u8db4<\u8ecd<\u8ecc<\u8ff0<\u8fe6 +-<\u8fe2<\u8fea<\u8fe5<\u8fed<\u8feb<\u8fe4<\u8fe8<\u90ca<\u90ce<\u90c1 +-<\u90c3<\u914b<\u914a<\u91cd<\u9582<\u9650<\u964b<\u964c<\u964d<\u9762 +-<\u9769<\u97cb<\u97ed<\u97f3<\u9801<\u98a8<\u98db<\u98df<\u9996<\u9999 +-<\u4e58<\u4eb3<\u500c<\u500d<\u5023<\u4fef<\u5026<\u5025<\u4ff8<\u5029 +-<\u5016<\u5006<\u503c<\u501f<\u501a<\u5012<\u5011<\u4ffa<\u5000<\u5014 +-<\u5028<\u4ff1<\u5021<\u500b<\u5019<\u5018<\u4ff3<\u4fee<\u502d<\u502a +-<\u4ffe<\u502b<\u5009<\u517c<\u51a4<\u51a5<\u51a2<\u51cd<\u51cc<\u51c6 +-<\u51cb<\u5256<\u525c<\u5254<\u525b<\u525d<\u532a<\u537f<\u539f<\u539d +-<\u53df<\u54e8<\u5510<\u5501<\u5537<\u54fc<\u54e5<\u54f2<\u5506<\u54fa +-<\u5514<\u54e9<\u54ed<\u54e1<\u5509<\u54ee<\u54ea<\u54e6<\u5527<\u5507 +-<\u54fd<\u550f<\u5703<\u5704<\u57c2<\u57d4<\u57cb<\u57c3<\u5809<\u590f +-<\u5957<\u5958<\u595a<\u5a11<\u5a18<\u5a1c<\u5a1f<\u5a1b<\u5a13<\u59ec +-<\u5a20<\u5a23<\u5a29<\u5a25<\u5a0c<\u5a09<\u5b6b<\u5c58<\u5bb0<\u5bb3 +-<\u5bb6<\u5bb4<\u5bae<\u5bb5<\u5bb9<\u5bb8<\u5c04<\u5c51<\u5c55<\u5c50 +-<\u5ced<\u5cfd<\u5cfb<\u5cea<\u5ce8<\u5cf0<\u5cf6<\u5d01<\u5cf4<\u5dee +-<\u5e2d<\u5e2b<\u5eab<\u5ead<\u5ea7<\u5f31<\u5f92<\u5f91<\u5f90<\u6059 +-<\u6063<\u6065<\u6050<\u6055<\u606d<\u6069<\u606f<\u6084<\u609f<\u609a +-<\u608d<\u6094<\u608c<\u6085<\u6096<\u6247<\u62f3<\u6308<\u62ff<\u634e +-<\u633e<\u632f<\u6355<\u6342<\u6346<\u634f<\u6349<\u633a<\u6350<\u633d +-<\u632a<\u632b<\u6328<\u634d<\u634c<\u6548<\u6549<\u6599<\u65c1<\u65c5 +-<\u6642<\u6649<\u664f<\u6643<\u6652<\u664c<\u6645<\u6641<\u66f8<\u6714 +-<\u6715<\u6717<\u6821<\u6838<\u6848<\u6846<\u6853<\u6839<\u6842<\u6854 +-<\u6829<\u68b3<\u6817<\u684c<\u6851<\u683d<\u67f4<\u6850<\u6840<\u683c +-<\u6843<\u682a<\u6845<\u6813<\u6818<\u6841<\u6b8a<\u6b89<\u6bb7<\u6c23 +-<\u6c27<\u6c28<\u6c26<\u6c24<\u6cf0<\u6d6a<\u6d95<\u6d88<\u6d87<\u6d66 +-<\u6d78<\u6d77<\u6d59<\u6d93<\u6d6c<\u6d89<\u6d6e<\u6d5a<\u6d74<\u6d69 +-<\u6d8c<\u6d8a<\u6d79<\u6d85<\u6d65<\u6d94<\u70ca<\u70d8<\u70e4<\u70d9 +-<\u70c8<\u70cf<\u7239<\u7279<\u72fc<\u72f9<\u72fd<\u72f8<\u72f7<\u7386 +-<\u73ed<\u7409<\u73ee<\u73e0<\u73ea<\u73de<\u7554<\u755d<\u755c<\u755a +-<\u7559<\u75be<\u75c5<\u75c7<\u75b2<\u75b3<\u75bd<\u75bc<\u75b9<\u75c2 +-<\u75b8<\u768b<\u76b0<\u76ca<\u76cd<\u76ce<\u7729<\u771f<\u7720<\u7728 +-<\u77e9<\u7830<\u7827<\u7838<\u781d<\u7834<\u7837<\u7825<\u782d<\u7820 +-<\u781f<\u7832<\u7955<\u7950<\u7960<\u795f<\u7956<\u795e<\u795d<\u7957 +-<\u795a<\u79e4<\u79e3<\u79e7<\u79df<\u79e6<\u79e9<\u79d8<\u7a84<\u7a88 +-<\u7ad9<\u7b06<\u7b11<\u7c89<\u7d21<\u7d17<\u7d0b<\u7d0a<\u7d20<\u7d22 +-<\u7d14<\u7d10<\u7d15<\u7d1a<\u7d1c<\u7d0d<\u7d19<\u7d1b<\u7f3a<\u7f5f +-<\u7f94<\u7fc5<\u7fc1<\u8006<\u8018<\u8015<\u8019<\u8017<\u803d<\u803f +-<\u80f1<\u8102<\u80f0<\u8105<\u80ed<\u80f4<\u8106<\u80f8<\u80f3<\u8108 +-<\u80fd<\u810a<\u80fc<\u80ef<\u81ed<\u81ec<\u8200<\u8210<\u822a<\u822b +-<\u8228<\u822c<\u82bb<\u832b<\u8352<\u8354<\u834a<\u8338<\u8350<\u8349 +-<\u8335<\u8334<\u834f<\u8332<\u8339<\u8336<\u8317<\u8340<\u8331<\u8328 +-<\u8343<\u8654<\u868a<\u86aa<\u8693<\u86a4<\u86a9<\u868c<\u86a3<\u869c +-<\u8870<\u8877<\u8881<\u8882<\u887d<\u8879<\u8a18<\u8a10<\u8a0e<\u8a0c +-<\u8a15<\u8a0a<\u8a17<\u8a13<\u8a16<\u8a0f<\u8a11<\u8c48<\u8c7a<\u8c79 +-<\u8ca1<\u8ca2<\u8d77<\u8eac<\u8ed2<\u8ed4<\u8ecf<\u8fb1<\u9001<\u9006 +-<\u8ff7<\u9000<\u8ffa<\u8ff4<\u9003<\u8ffd<\u9005<\u8ff8<\u9095<\u90e1 +-<\u90dd<\u90e2<\u9152<\u914d<\u914c<\u91d8<\u91dd<\u91d7<\u91dc<\u91d9 +-<\u9583<\u9662<\u9663<\u9661<\u965b<\u965d<\u9664<\u9658<\u965e<\u96bb +-<\u98e2<\u99ac<\u9aa8<\u9ad8<\u9b25<\u9b32<\u9b3c<\u4e7e<\u507a<\u507d +-<\u505c<\u5047<\u5043<\u504c<\u505a<\u5049<\u5065<\u5076<\u504e<\u5055 +-<\u5075<\u5074<\u5077<\u504f<\u500f<\u506f<\u506d<\u515c<\u5195<\u51f0 +-<\u526a<\u526f<\u52d2<\u52d9<\u52d8<\u52d5<\u5310<\u530f<\u5319<\u533f +-<\u5340<\u533e<\u53c3<\u66fc<\u5546<\u556a<\u5566<\u5544<\u555e<\u5561 +-<\u5543<\u554a<\u5531<\u5556<\u554f<\u5555<\u552f<\u5564<\u5538<\u552e +-<\u555c<\u552c<\u5563<\u5533<\u5541<\u5557<\u5708<\u570b<\u5709<\u57df +-<\u5805<\u580a<\u5806<\u57e0<\u57e4<\u57fa<\u5802<\u5835<\u57f7<\u57f9 +-<\u5920<\u5962<\u5a36<\u5a41<\u5a49<\u5a66<\u5a6a<\u5a40<\u5a3c<\u5a62 +-<\u5a5a<\u5a46<\u5a4a<\u5b70<\u5bc7<\u5bc5<\u5bc4<\u5bc2<\u5bbf<\u5bc6 +-<\u5c09<\u5c08<\u5c07<\u5c60<\u5c5c<\u5c5d<\u5d07<\u5d06<\u5d0e<\u5d1b +-<\u5d16<\u5d22<\u5d11<\u5d29<\u5d14<\u5d19<\u5d24<\u5d27<\u5d17<\u5de2 +-<\u5e38<\u5e36<\u5e33<\u5e37<\u5eb7<\u5eb8<\u5eb6<\u5eb5<\u5ebe<\u5f35 +-<\u5f37<\u5f57<\u5f6c<\u5f69<\u5f6b<\u5f97<\u5f99<\u5f9e<\u5f98<\u5fa1 +-<\u5fa0<\u5f9c<\u607f<\u60a3<\u6089<\u60a0<\u60a8<\u60cb<\u60b4<\u60e6 +-<\u60bd<\u60c5<\u60bb<\u60b5<\u60dc<\u60bc<\u60d8<\u60d5<\u60c6<\u60df +-<\u60b8<\u60da<\u60c7<\u621a<\u621b<\u6248<\u63a0<\u63a7<\u6372<\u6396 +-<\u63a2<\u63a5<\u6377<\u6367<\u6398<\u63aa<\u6371<\u63a9<\u6389<\u6383 +-<\u639b<\u636b<\u63a8<\u6384<\u6388<\u6399<\u63a1<\u63ac<\u6392<\u638f +-<\u6380<\u637b<\u6369<\u6368<\u637a<\u655d<\u6556<\u6551<\u6559<\u6557 +-<\u555f<\u654f<\u6558<\u6555<\u6554<\u659c<\u659b<\u65ac<\u65cf<\u65cb +-<\u65cc<\u65ce<\u665d<\u665a<\u6664<\u6668<\u6666<\u665e<\u66f9<\u52d7 +-<\u671b<\u6881<\u68af<\u68a2<\u6893<\u68b5<\u687f<\u6876<\u68b1<\u68a7 +-<\u6897<\u68b0<\u6883<\u68c4<\u68ad<\u6886<\u6885<\u6894<\u689d<\u68a8 +-<\u689f<\u68a1<\u6882<\u6b32<\u6bba<\u6beb<\u6bec<\u6c2b<\u6d8e<\u6dbc +-<\u6df3<\u6dd9<\u6db2<\u6de1<\u6dcc<\u6de4<\u6dfb<\u6dfa<\u6e05<\u6dc7 +-<\u6dcb<\u6daf<\u6dd1<\u6dae<\u6dde<\u6df9<\u6db8<\u6df7<\u6df5<\u6dc5 +-<\u6dd2<\u6e1a<\u6db5<\u6dda<\u6deb<\u6dd8<\u6dea<\u6df1<\u6dee<\u6de8 +-<\u6dc6<\u6dc4<\u6daa<\u6dec<\u6dbf<\u6de6<\u70f9<\u7109<\u710a<\u70fd +-<\u70ef<\u723d<\u727d<\u7281<\u731c<\u731b<\u7316<\u7313<\u7319<\u7387 +-<\u7405<\u740a<\u7403<\u7406<\u73fe<\u740d<\u74e0<\u74f6<\u74f7<\u751c +-<\u7522<\u7565<\u7566<\u7562<\u7570<\u758f<\u75d4<\u75d5<\u75b5<\u75ca +-<\u75cd<\u768e<\u76d4<\u76d2<\u76db<\u7737<\u773e<\u773c<\u7736<\u7738 +-<\u773a<\u786b<\u7843<\u784e<\u7965<\u7968<\u796d<\u79fb<\u7a92<\u7a95 +-<\u7b20<\u7b28<\u7b1b<\u7b2c<\u7b26<\u7b19<\u7b1e<\u7b2e<\u7c92<\u7c97 +-<\u7c95<\u7d46<\u7d43<\u7d71<\u7d2e<\u7d39<\u7d3c<\u7d40<\u7d30<\u7d33 +-<\u7d44<\u7d2f<\u7d42<\u7d32<\u7d31<\u7f3d<\u7f9e<\u7f9a<\u7fcc<\u7fce +-<\u7fd2<\u801c<\u804a<\u8046<\u812f<\u8116<\u8123<\u812b<\u8129<\u8130 +-<\u8124<\u8202<\u8235<\u8237<\u8236<\u8239<\u838e<\u839e<\u8398<\u8378 +-<\u83a2<\u8396<\u83bd<\u83ab<\u8392<\u838a<\u8393<\u8389<\u83a0<\u8377 +-<\u837b<\u837c<\u8386<\u83a7<\u8655<\u5f6a<\u86c7<\u86c0<\u86b6<\u86c4 +-<\u86b5<\u86c6<\u86cb<\u86b1<\u86af<\u86c9<\u8853<\u889e<\u8888<\u88ab +-<\u8892<\u8896<\u888d<\u888b<\u8993<\u898f<\u8a2a<\u8a1d<\u8a23<\u8a25 +-<\u8a31<\u8a2d<\u8a1f<\u8a1b<\u8a22<\u8c49<\u8c5a<\u8ca9<\u8cac<\u8cab +-<\u8ca8<\u8caa<\u8ca7<\u8d67<\u8d66<\u8dbe<\u8dba<\u8edb<\u8edf<\u9019 +-<\u900d<\u901a<\u9017<\u9023<\u901f<\u901d<\u9010<\u9015<\u901e<\u9020 +-<\u900f<\u9022<\u9016<\u901b<\u9014<\u90e8<\u90ed<\u90fd<\u9157<\u91ce +-<\u91f5<\u91e6<\u91e3<\u91e7<\u91ed<\u91e9<\u9589<\u966a<\u9675<\u9673 +-<\u9678<\u9670<\u9674<\u9676<\u9677<\u966c<\u96c0<\u96ea<\u96e9<\u7ae0 +-<\u7adf<\u9802<\u9803<\u9b5a<\u9ce5<\u9e75<\u9e7f<\u9ea5<\u9ebb<\u50a2 +-<\u508d<\u5085<\u5099<\u5091<\u5080<\u5096<\u5098<\u509a<\u6700<\u51f1 +-<\u5272<\u5274<\u5275<\u5269<\u52de<\u52dd<\u52db<\u535a<\u53a5<\u557b +-<\u5580<\u55a7<\u557c<\u558a<\u559d<\u5598<\u5582<\u559c<\u55aa<\u5594 +-<\u5587<\u558b<\u5583<\u55b3<\u55ae<\u559f<\u553e<\u55b2<\u559a<\u55bb +-<\u55ac<\u55b1<\u557e<\u5589<\u55ab<\u5599<\u570d<\u582f<\u582a<\u5834 +-<\u5824<\u5830<\u5831<\u5821<\u581d<\u5820<\u58f9<\u58fa<\u5960<\u5a77 +-<\u5a9a<\u5a7f<\u5a92<\u5a9b<\u5aa7<\u5b73<\u5b71<\u5bd2<\u5bcc<\u5bd3 +-<\u5bd0<\u5c0a<\u5c0b<\u5c31<\u5d4c<\u5d50<\u5d34<\u5d47<\u5dfd<\u5e45 +-<\u5e3d<\u5e40<\u5e43<\u5e7e<\u5eca<\u5ec1<\u5ec2<\u5ec4<\u5f3c<\u5f6d +-<\u5fa9<\u5faa<\u5fa8<\u60d1<\u60e1<\u60b2<\u60b6<\u60e0<\u611c<\u6123 +-<\u60fa<\u6115<\u60f0<\u60fb<\u60f4<\u6168<\u60f1<\u610e<\u60f6<\u6109 *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***