diff options
217 files changed, 3 insertions, 20551 deletions
@@ -3522,3 +3522,6 @@ devel/subversion-perl|devel/p5-subversion|2008-06-30|Rename to reflect official devel/subversion-python|devel/py-subversion|2008-06-30|Rename to reflect official python modules naming scheme. devel/subversion-ruby|devel/ruby-subversion|2008-06-30|Rename to reflect official ruby modules naming scheme. misc/goblin|math/goblin|2008-06-30|repo move to a better category +editors/openoffice.org-1.0||2008-07-02|Removed +editors/openoffice.org-1.1||2008-07-02|Removed +editors/openoffice.org-1.1-devel||2008-07-02|Removed diff --git a/editors/Makefile b/editors/Makefile index 2d2e860f8d30..f210b2eb4826 100644 --- a/editors/Makefile +++ b/editors/Makefile @@ -112,9 +112,6 @@ SUBDIR += nxml SUBDIR += nxml-emacs21 SUBDIR += ooo-build - SUBDIR += openoffice.org-1.0 - SUBDIR += openoffice.org-1.1 - SUBDIR += openoffice.org-1.1-devel SUBDIR += openoffice.org-2 SUBDIR += openoffice.org-2-RC SUBDIR += openoffice.org-2-devel diff --git a/editors/openoffice.org-1.0/Makefile b/editors/openoffice.org-1.0/Makefile deleted file mode 100644 index bf8ed1902dbe..000000000000 --- a/editors/openoffice.org-1.0/Makefile +++ /dev/null @@ -1,282 +0,0 @@ -# New ports collection makefile for: OpenOffice.org -# Date created: 28 Februar 2002 -# Whom: Martin Blapp -# -# $FreeBSD$ -# - -PORTNAME= openoffice.org -PORTVERSION= 1.0.3 -PORTREVISION= 12 -CATEGORIES+= editors java -MASTER_SITES+= http://openoffice.lunarshells.com/sources/:moz,ru,src,help \ - ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/1.0.3/:moz,ru,src,help \ - ${MASTER_SITE_LOCAL:S/$/:moz/} \ - ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \ - ${MASTER_SITE_MOZILLA:S/$/:mozsrc/} \ - ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/1.0.3/:help \ - http://openoffice.lunarshells.com/sources/helpcontent/:help \ - ${MASTER_SITE_LOCAL:S/$/:ru/} -MASTER_SITE_SUBDIR+= maho/openoffice.org/:moz,ru \ - mozilla/releases/mozilla${MOZILLA_VERSION}/src/:mozsrc -DISTFILES+= OOo_${RELEASE_NR}_source.tar.gz:src patch-translation-ru-1.0.3.bz2:ru -.if defined(WITH_GPC) -DISTFILES+= gpc231.tar.Z:gpc -.endif -EXTRACT_ONLY= OOo_${RELEASE_NR}_source.tar.gz - -MAINTAINER= openoffice@FreeBSD.org -COMMENT?= Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser - -MOZILLA_PROJECT= cws_srx645_mozooo.20040203.tar.gz -MOZILLA_VERSION= 1.0 -MOZILLA_SOURCE= mozilla-source-${MOZILLA_VERSION}.tar.gz -DISTFILES+= ${MOZILLA_PROJECT}:moz ${MOZILLA_SOURCE}:mozsrc -USE_GNOME= orbit -USE_PERL5= yes -USE_BISON= build -USE_GMAKE= yes -USE_JAVA= yes -JAVA_VENDOR= bsdjava -JAVA_VERSION= 1.3 -JAVA_BUILD= jdk -NO_LATEST_LINK= yes -WITHOUT_CPU_CFLAGS= true - -ONLY_FOR_ARCHS= i386 - -.include <bsd.port.pre.mk> -.include <${FILESDIR}/Makefile.localized> - -LANG_EXT?= 01 -LANG_CONFIGURE_ARG?= ENUS -L10NHELP?= helpcontent_01_unix.tgz - -DISTFILES+= ${L10NHELP}:help -.if defined(ALL_LOCALIZED_LANGS) -DISTFILES+= helpcontent_07_unix.tgz:help \ - helpcontent_30_unix.tgz:help helpcontent_33_unix.tgz:help \ - helpcontent_34_unix.tgz:help helpcontent_35_unix.tgz:help \ - helpcontent_39_unix.tgz:help helpcontent_42_unix.tgz:help \ - helpcontent_46_unix.tgz:help helpcontent_49_unix.tgz:help \ - helpcontent_81_unix.tgz:help helpcontent_82_unix.tgz:help \ - helpcontent_86_unix.tgz:help helpcontent_88_unix.tgz:help -L10NHELPS= helpcontent_01_unix.tgz helpcontent_07_unix.tgz \ - helpcontent_30_unix.tgz helpcontent_33_unix.tgz \ - helpcontent_34_unix.tgz helpcontent_35_unix.tgz \ - helpcontent_39_unix.tgz helpcontent_42_unix.tgz \ - helpcontent_46_unix.tgz helpcontent_49_unix.tgz \ - helpcontent_81_unix.tgz helpcontent_82_unix.tgz \ - helpcontent_86_unix.tgz helpcontent_88_unix.tgz -.endif - -CODELINE= 641 -RELEASE_NR= 1.0.3 -INSTALLATION_BASEDIR= OpenOffice.org${RELEASE_NR} -EXECBASE= openoffice.org-${RELEASE_NR} -DIST_SUBDIR= openoffice.org1.0 -SIMPLEOSVER= ${OSREL:C/\.//g} -PACKAGE_BASENAME= OOo_${RELEASE_NR}_${OPSYS}${SIMPLEOSVER}Intel -DICT_DIR= ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/ - -# FIXME (Somehow INDEX build fails) -.if defined(LANG_PKGNAME) -PKGNAMEPREFIX= ${LANG_PKGNAME}- -.endif -.if defined(LANG_SUFFIX) -PKGNAMESUFFIX?= -${LANG_SUFFIX} -.endif - -# This port might build with gcc 2.95.2+ -USE_GCC= 3.2 -.if defined(WITH_CCACHE) -BUILD_DEPENDS+= ccache:${PORTSDIR}/devel/ccache -CCACHE_PREFIX= ccache -OOOCC= ${CCACHE_PREFIX} ${CC} -OOOCXX= ${CCACHE_PREFIX} ${CXX} -.else -OOOCC= ${CC} -OOOCXX= ${CXX} -.endif -CONFIGURE_ENV+= CC="${OOOCC}" CXX="${OOOCXX}" \ - CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" - -BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \ - unzip:${PORTSDIR}/archivers/unzip \ - imake:${PORTSDIR}/devel/imake \ - gcp:${PORTSDIR}/sysutils/coreutils \ - Xvfb:${X_VFBSERVER_PORT} \ - ${LOCALBASE}/lib/X11/fonts/misc/cursor.pcf.gz:${X_FONTS_MISC_PORT} -GNU_CONFIGURE= yes -USE_AUTOTOOLS= autoconf:261 -WRKSRC= ${WRKDIR}/oo_${PORTVERSION}_src -CONFIGURE_WRKSRC= ${WRKSRC}/config_office -TCSH?= /bin/tcsh -PKGMESSAGE= ${WRKDIR}/pkg-message - -CONFIGURE_ENV+= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \ - PTHREAD_LIBS=${PTHREAD_LIBS} -CONFIGURE_ARGS+= --with-jdk-home="${JAVA_HOME}" \ - --with-os-version=${OSVERSION} -.include <${FILESDIR}/Makefile.knobs> - -pre-everything:: -# really tweak, extremely useful when you build all localized language versions -# needed after when you build with ALL_LOCALIZED_LANGS. -.if defined(TWEAK_L10N) - @${RM} -f ${WRKDIR}/.PLIST* - @${RM} -f ${WRKDIR}/.install_done.* - @${RM} -f ${WRKDIR}/.package_done.* - @${RM} -f ${WRKDIR}/.extract_done.* - @${RM} -f ${WRKDIR}/.patch_done.* - @${RM} -f ${WRKDIR}/.configure_done.* - @${RM} -f ${WRKDIR}/.build_done.* - @${TOUCH} ${EXTRACT_COOKIE} - @${TOUCH} ${PATCH_COOKIE} - @${TOUCH} ${CONFIGURE_COOKIE} - @${TOUCH} ${BUILD_COOKIE} -.endif -post-extract: -.if defined(WITH_TTF_BYTECODE_ENABLED) - @cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/optpatch-freetype -.endif -#XXX not yet: fix for gnome/kde wrapper - @#${REINPLACE_CMD} -e 's|"Exec", "\\"\<progpath\>/program/|"Exec", "\\"${PREFIX}/bin/openoffice.org-|' ${WRKSRC}/sysui/oounix/office/kde2/kdeint - @#${REINPLACE_CMD} -e 's|"Exec", "<progpath>/program/|"Exec", "${PREFIX}/bin/openoffice.org-|' ${WRKSRC}/sysui/oounix/office/gnome/gnomeint - @cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/patch-translation-ru-1.0.3.bz2 | ${BZIP2_CMD} | ${PATCH} -.if defined(WITH_GPC) - @cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/gpc231.tar.Z | ${TAR} xfz - - @${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/external/gpc/ - @${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/external/gpc/ -.endif -.if !defined(WITH_GPC) - @cd ${WRKSRC} ; ${PATCH} -p0 < ${FILESDIR}/gpc-libart-patch -.endif - @${CHMOD} +x ${WRKSRC}/solenv/bin/zipdep.pl - - @${MKDIR} ${WRKDIR}/L10NHELP - @cd ${WRKDIR}/L10NHELP ; \ - ${CAT} ${DISTDIR}/${DIST_SUBDIR}/${L10NHELP} | ${GZIP_CMD} -d | ${TAR} xf - -.if defined(ALL_LOCALIZED_LANGS) - @cd ${WRKDIR}/L10NHELP ; \ - for helpfile in ${L10NHELPS}; do \ - ${CAT} ${DISTDIR}/${DIST_SUBDIR}/$$helpfile | ${GZIP_CMD} -d | ${TAR} xf - ; \ - done -.endif - @cd ${WRKSRC} ; ${MV} moz moz.old ; ${TAR} xfz ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_PROJECT} ; ${PATCH} < ${FILESDIR}/moz-patch - @${MKDIR} ${WRKSRC}/moz/download - @${CP} ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_SOURCE} ${WRKSRC}/moz/download - -post-patch: -#patch for SDK - @${REINPLACE_CMD} 's|%%GNUTR%%|${LOCALBASE}/bin/gtr|g' ${WRKSRC}/odk/util/makefile.pmk - @${REINPLACE_CMD} 's|%%GNUCOPY%%|${LOCALBASE}/bin/gcp|g' ${WRKSRC}/solenv/inc/unitools.mk - @${REINPLACE_CMD} -e 's|%%PTHREAD_CFLAGS%%|${PTHREAD_CFLAGS}|g' \ - -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g' \ - ${WRKSRC}/product/settings/settings.mk -pre-configure: -#Workaround for moz project, it uses gcc directly. - @${LN} -sf `which ${CC}` ${WRKSRC}/solenv/bin/gcc - @${LN} -sf `which ${CC}` ${WRKSRC}/solenv/bin/cc - @${LN} -sf `which ${CXX}` ${WRKSRC}/solenv/bin/g++ - @${LN} -sf `which ${CXX}` ${WRKSRC}/solenv/bin/c++ - -do-build: - @cd ${WRKSRC} ; ./bootstrap - @cd ${WRKSRC}/moz ; ${SETENV} "BUILD_MOZAB=TRUE" ${TCSH} -c 'source ../FreeBSDEnv.Set ; build.pl ; dmake zip' ; ${CP} unxfbsd.pro/zipped/FREEBSD*.zip ../moz/zipped - @${MKDIR} ${WRKSRC}/solver/${CODELINE}/unxfbsd.pro/pck - @${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/solver/${CODELINE}/unxfbsd.pro/pck -.if exists(${WRKDIR}/.Xvfb.pid) - @-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill - @${RM} -f ${WRKDIR}/.Xvfb.pid -.endif - ${LOCALBASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid - @sleep 5 - @cd ${WRKSRC} ; ${SETENV} "LC_ALL=C" "LANG=C" ${TCSH} -c 'source FreeBSDEnv.Set ; ${BUILD}' - @-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill - @${RM} -f ${WRKDIR}/.Xvfb.pid - -do-install: -.if exists(${WRKDIR}/.Xvfb.pid) - @-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill - @${RM} -f ${WRKDIR}/.Xvfb.pid -.endif - @${LOCALBASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid - @sleep 5 - @${SETENV} "LC_ALL=C" "LANG=C" DISPLAY="localhost:1001" ${TCSH} -c "cd ${WRKSRC}/instsetoo/*.pro/${LANG_EXT}/normal ; ./install --prefix=${PREFIX}" - @-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill - @${RM} -f ${WRKDIR}/.Xvfb.pid -#XXX temporary hack (contains space in dir name) - @${RM} -rf ${PREFIX}/${INSTALLATION_BASEDIR}/share/kde/net/applnk - -install-user: - @${PREFIX}/${INSTALLATION_BASEDIR}/program/setup - -post-install: - @${ECHO_MSG} "===> Add wrapper scripts"; - @${CP} ${FILESDIR}/openoffice.org-wrapper ${WRKDIR}/ - @${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \ - -e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \ - -e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \ - ${WRKDIR}/openoffice.org-wrapper - @${INSTALL_SCRIPT} ${WRKDIR}/openoffice.org-wrapper \ - ${PREFIX}/bin/${EXECBASE} - @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/openoffice.org - @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sagenda - @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-scalc - @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sdraw - @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-setup - @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sfax - @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-smath - @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-simpress - @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-spadmin - @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sweb - @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-swriter - @${PRINTF} "bin/openoffice.org\n" > ${TMPPLIST} - @cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} >> ${TMPPLIST} - @cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} ${EXECBASE} >> ${TMPPLIST} - @cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST} - @cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST} - @cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp - @${SORT} -r ${WRKDIR}/dir.tmp | ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST} - @${CP} ${FILESDIR}/pkg-message.in ${PKGMESSAGE} - @${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \ - -e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \ - -e 's#%%EXECBASE%%#${EXECBASE}#g' \ - -e 's#%%MILESTONE%%#${MILESTONE}#g' \ - -e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \ - ${PKGMESSAGE} - @${ECHO_CMD} - @${CAT} ${PKGMESSAGE} - @${ECHO_CMD} - -package-rename: - @${ECHO_MSG} "===> Rename package for OOo mirror upload"; -.if defined(LANG_SUFFIX) - @${MV} ${PKGFILE} \ - ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel_install_${LANG_PKGNAME}-${LANG_SUFFIX}${PKG_SUFX} -.elif defined(LANG_PKGNAME) - @${MV} ${PKGFILE} ${WRKDIR}/../${PACKAGE_BASENAME}_install_${LANG_PKGNAME}${PKG_SUFX} -.else - @${MV} ${PKGFILE} ${WRKDIR}/../${PACKAGE_BASENAME}_install${PKG_SUFX} -.endif - -sdk: - @${ECHO_MSG} "===> Make SDK of OpenOffice.org" - @cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd odk/source/bean/native/unix ; dmake ; deliver.pl' - @cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd odk/source/bean/com/sun/star/beans ; dmake ; deliver.pl' - @cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd netbeans_integration ; build.pl ; deliver.pl' - @cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd odk/source/OOSupport ; dmake ; deliver.pl' - @${MKDIR} ${WRKSRC}/odk/unxfbsd.pro/bin/OpenOffice.org1.0.2SDK/freebsd/lib - @${TOUCH} ${WRKSRC}/odk/unxfbsd.pro/misc/deltree.txt - @cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd odk/pack/copying ; dmake ; deliver.pl' - @cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd odk/util ; dmake ; deliver.pl' -#somehow SDK's version is 1.0.2 and not 1.0.3 - ${MV} ${WRKSRC}/odk/unxfbsd.pro/bin/OpenOffice.org1.0.2SDK.tar.gz ${WRKDIR}/../${PACKAGE_BASENAME}_sdk.tar.gz - -solver: - @${ECHO_MSG} "===> Make Solver of OpenOffice.org" - @cd ${WRKSRC} ; ${TAR} cfz ${WRKDIR}/../${PACKAGE_BASENAME}_solver.tar.gz solver - -.include <bsd.port.post.mk> diff --git a/editors/openoffice.org-1.0/distinfo b/editors/openoffice.org-1.0/distinfo deleted file mode 100644 index 0e2ba90d3a50..000000000000 --- a/editors/openoffice.org-1.0/distinfo +++ /dev/null @@ -1,57 +0,0 @@ -MD5 (openoffice.org1.0/OOo_1.0.3_source.tar.gz) = e85acb04b2906a460dfdd19a309c1aea -SHA256 (openoffice.org1.0/OOo_1.0.3_source.tar.gz) = 323040c2e4eb88484e1ae0220fe60b3028a615224eb4b4228dd8d1e521d037c5 -SIZE (openoffice.org1.0/OOo_1.0.3_source.tar.gz) = 184856160 -MD5 (openoffice.org1.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 -SHA256 (openoffice.org1.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e -SIZE (openoffice.org1.0/gpc231.tar.Z) = 27917 -MD5 (openoffice.org1.0/patch-translation-ru-1.0.3.bz2) = 2b8091f8fe3201c6763715f6eb3872f4 -SHA256 (openoffice.org1.0/patch-translation-ru-1.0.3.bz2) = e45dd2f9bed3d4b3e87fb1d1bb17643f6767005e8ac7e2da33f5fe45ca2415c2 -SIZE (openoffice.org1.0/patch-translation-ru-1.0.3.bz2) = 11247 -MD5 (openoffice.org1.0/cws_srx645_mozooo.20040203.tar.gz) = 1239aad43c65d6808b6261ea9d60fb67 -SHA256 (openoffice.org1.0/cws_srx645_mozooo.20040203.tar.gz) = 842984e791f0e674f7daa42ab368e2f32acfedad3b97e99e3ea84309f4cc227f -SIZE (openoffice.org1.0/cws_srx645_mozooo.20040203.tar.gz) = 39708 -MD5 (openoffice.org1.0/mozilla-source-1.0.tar.gz) = 35a7524c2fbb773e23449179c5cb1f20 -SHA256 (openoffice.org1.0/mozilla-source-1.0.tar.gz) = 9440b80a02ab87d4fb0f7116d43784e45c48782ebefb4ac7c53f5dbadbf92eea -SIZE (openoffice.org1.0/mozilla-source-1.0.tar.gz) = 39881558 -MD5 (openoffice.org1.0/helpcontent_01_unix.tgz) = ff3eb5095a74ae7a9b2918ef5874288f -SHA256 (openoffice.org1.0/helpcontent_01_unix.tgz) = 51a3af6d3e58c72b14ed030870942691fbc014be4fdfd734a7072db1af336eea -SIZE (openoffice.org1.0/helpcontent_01_unix.tgz) = 12693536 -MD5 (openoffice.org1.0/helpcontent_07_unix.tgz) = e3ab37cbf2407d909953f06467b27611 -SHA256 (openoffice.org1.0/helpcontent_07_unix.tgz) = a6ae171dbd159be1e6c2d739e779b9cb88e20e29366909587a361aa0842bd85c -SIZE (openoffice.org1.0/helpcontent_07_unix.tgz) = 13820401 -MD5 (openoffice.org1.0/helpcontent_30_unix.tgz) = ef9d577e467b54d07cf443e1ed5e904f -SHA256 (openoffice.org1.0/helpcontent_30_unix.tgz) = 14ca2ea0a5c7d1a5f716ab361f2ca091a13e01f18480e13de1694c9fc2ac0f5e -SIZE (openoffice.org1.0/helpcontent_30_unix.tgz) = 16754161 -MD5 (openoffice.org1.0/helpcontent_33_unix.tgz) = 20dcbf3211c20afb27fc5677ab8f69e5 -SHA256 (openoffice.org1.0/helpcontent_33_unix.tgz) = 46f1f4ef8c78df2c0a6bbc73f6a387f34846206c342966bed0b3ecc9f5a54078 -SIZE (openoffice.org1.0/helpcontent_33_unix.tgz) = 13190241 -MD5 (openoffice.org1.0/helpcontent_34_unix.tgz) = ba6adc71dc5cb766dd75f5b13a7c6bc8 -SHA256 (openoffice.org1.0/helpcontent_34_unix.tgz) = 006934cd252ee17cf663f32a4198fbc524f090198b6198ca70f6bac3f5273253 -SIZE (openoffice.org1.0/helpcontent_34_unix.tgz) = 13208085 -MD5 (openoffice.org1.0/helpcontent_35_unix.tgz) = cf90274a2e46ddd04422c08157575780 -SHA256 (openoffice.org1.0/helpcontent_35_unix.tgz) = 757ee3768c67f4cba2b1aeef4d2255f5460b45376e886efa9f17fcb43702c098 -SIZE (openoffice.org1.0/helpcontent_35_unix.tgz) = 12221016 -MD5 (openoffice.org1.0/helpcontent_39_unix.tgz) = 4c33e3f9f8a64be68c63f33ff1e0e4a7 -SHA256 (openoffice.org1.0/helpcontent_39_unix.tgz) = a1d28e497e639a59588455eb0a0d951016ada0d0e9542778aa49415a769fbd31 -SIZE (openoffice.org1.0/helpcontent_39_unix.tgz) = 13045311 -MD5 (openoffice.org1.0/helpcontent_42_unix.tgz) = a7bcb51e5bff1673b32113308a026563 -SHA256 (openoffice.org1.0/helpcontent_42_unix.tgz) = 4cccc852976d59bb6c118ba4c849532ec15c8e7c21c451b1a6f0ff5da6074702 -SIZE (openoffice.org1.0/helpcontent_42_unix.tgz) = 12997234 -MD5 (openoffice.org1.0/helpcontent_46_unix.tgz) = 5183879d8b57850d433351cb8a5634a8 -SHA256 (openoffice.org1.0/helpcontent_46_unix.tgz) = 1ea74dad797569643e4adcab6a8831ab26d27d9a51e54f83a99ba845ee465afb -SIZE (openoffice.org1.0/helpcontent_46_unix.tgz) = 12622320 -MD5 (openoffice.org1.0/helpcontent_49_unix.tgz) = 68f0db91bb091065a4795d47d6ae0b0b -SHA256 (openoffice.org1.0/helpcontent_49_unix.tgz) = beb4de4df469f07dedbca7320e3b82577436b61a5fcae61d6dbfb8adc7646067 -SIZE (openoffice.org1.0/helpcontent_49_unix.tgz) = 14230759 -MD5 (openoffice.org1.0/helpcontent_81_unix.tgz) = df731e483114e1433f799160b2baa942 -SHA256 (openoffice.org1.0/helpcontent_81_unix.tgz) = 45f7c3e82176842d9be0ba879bd64c648a4712d4729f7d777d6ad25165ea21fd -SIZE (openoffice.org1.0/helpcontent_81_unix.tgz) = 13567923 -MD5 (openoffice.org1.0/helpcontent_82_unix.tgz) = ea45780e3027317ec6b4f38f009b579b -SHA256 (openoffice.org1.0/helpcontent_82_unix.tgz) = 999829574d6528349edaf95b2be5029bbeddab5023f92fa85771ca1ddb2d8e8a -SIZE (openoffice.org1.0/helpcontent_82_unix.tgz) = 13259424 -MD5 (openoffice.org1.0/helpcontent_86_unix.tgz) = ea0debc121b6912a42cdc24e1b99b625 -SHA256 (openoffice.org1.0/helpcontent_86_unix.tgz) = 2419513ccdf65cd50937a9f5a96fe5937bf81ca3f6a3a5454c324a1153b66087 -SIZE (openoffice.org1.0/helpcontent_86_unix.tgz) = 13308043 -MD5 (openoffice.org1.0/helpcontent_88_unix.tgz) = 260a17a84a16c18b4371a84b95cea2cb -SHA256 (openoffice.org1.0/helpcontent_88_unix.tgz) = 762266a50a9432b2a2aade185d89aa89805d2af412418c34ab782a2639a83e9b -SIZE (openoffice.org1.0/helpcontent_88_unix.tgz) = 13308769 diff --git a/editors/openoffice.org-1.0/files/Makefile.knobs b/editors/openoffice.org-1.0/files/Makefile.knobs deleted file mode 100644 index c18ad07db1fe..000000000000 --- a/editors/openoffice.org-1.0/files/Makefile.knobs +++ /dev/null @@ -1,68 +0,0 @@ -.if defined(WITH_DEBUG) -CFLAGS+= -g -.if ${WITH_DEBUG} == 2 -BUILD= dmake debug="true" -.else -BUILD= dmake -.endif -.else -BUILD= dmake strip="true" -.endif - -.if defined(WITH_DEBUG) -CONFIGURE_ARGS+= --enable-debug -.endif - -.if defined(ALL_LOCALIZED_LANGS) -CONFIGURE_ARGS+= --with-lang=ALL -.else -CONFIGURE_ARGS+= --with-lang=${LANG_CONFIGURE_ARG} -.endif - -pre-fetch: - @${ECHO} - @${ECHO} "OPTIONS:" -.if !defined(WITH_DEBUG) - @${ECHO} - @${ECHO} "You can compile OO with debug symbols" - @${ECHO} "if you call make with WITH_DEBUG=1" - @${ECHO} - @${ECHO} "If you set WITH_DEBUG=2, you add internal" - @${ECHO} "OO.org debug support." - @${ECHO} -.endif -.if !defined(LOCALIZED_LANG) - @${ECHO} - @${ECHO} "You can select the language for OOo by making it with 'make LOCALIZED_LANG=xx'" - @${ECHO} "while xx can be one of the following:" - @${ECHO} "ar de dk el es fr it ja ko nl pl pt ru" - @${ECHO} "sv tr zh-CN zh-TW" - @${ECHO} -.endif -.if !defined(WITH_TTF_BYTECODE_ENABLED) - @${ECHO} - @${ECHO} "You may set WITH_TTF_BYTECODE_ENABLED=YES" - @${ECHO} "if you like to use the Freetype library to" - @${ECHO} "render TTF fonts. Normally the TTF lib is" - @${ECHO} "not used to render fonts." - @${ECHO} - @${ECHO} "If you have licensed the Apple patents" - @${ECHO} "US05155805 US05159668 and US05325479" - @${ECHO} "you can enable this option to get better" - @${ECHO} "quality of glyphs at small bitmap sizes." - @${ECHO} -.endif -.if !defined(WITH_GPC) - @${ECHO} - @${ECHO} "You can compile OOo with gpc instead by" - @${ECHO} "make -DWITH_GPC" -.endif - @${ECHO} - @${ECHO} "NOTICE:" - @${ECHO} - @${ECHO} "To build Openoffice, you should have a lot" -.if defined(WITH_DEBUG) - @${ECHO} "of free diskspace (~ 8GB)." -.else - @${ECHO} "of free diskspace (~ 4GB)." -.endif diff --git a/editors/openoffice.org-1.0/files/Makefile.localized b/editors/openoffice.org-1.0/files/Makefile.localized deleted file mode 100644 index 44ca594eaf8e..000000000000 --- a/editors/openoffice.org-1.0/files/Makefile.localized +++ /dev/null @@ -1,156 +0,0 @@ -# localized makefile -# Whom: Maho Nakata <maho@FreeBSD.org> -# $FreeBSD$ - -################################################################ -# consult oo_1.0.3_src/config_office/set_soenv.in for -# available localized languages -################################################################ -.if defined(LOCALIZED_LANG) -################################################################ -.if ${LOCALIZED_LANG} == "ar" -CATEGORIES+= arabic -LANG_PKGNAME= ar -LANG_EXT= 96 -LANG_CONFIGURE_ARG= ARAB -.endif -################################################################ -.if ${LOCALIZED_LANG} == "zh-CN" -CATEGORIES+= chinese -LANG_PKGNAME= zh -LANG_SUFFIX= CN -LANG_EXT= 86 -LANG_CONFIGURE_ARG= CHINSIM -BUILD_DEPENDS+= ${PREFIX}/share/fonts/TrueType/gbsn00lp.ttf:${PORTSDIR}/chinese/arphicttf -L10NHELP= helpcontent_${LANG_EXT}_unix.tgz -.endif -################################################################ -.if ${LOCALIZED_LANG} == "zh-TW" -CATEGORIES+= chinese -LANG_PKGNAME= zh -LANG_SUFFIX= TW -LANG_EXT= 88 -LANG_CONFIGURE_ARG= CHINTRAD -BUILD_DEPENDS+= ${PREFIX}/share/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/arphicttf -L10NHELP= helpcontent_${LANG_EXT}_unix.tgz -.endif -################################################################ -.if ${LOCALIZED_LANG} == "dk" -LANG_PKGNAME= dk -LANG_EXT= 45 -LANG_CONFIGURE_ARG= DAN -.endif -################################################################ -.if ${LOCALIZED_LANG} == "nl" -LANG_PKGNAME= nl -LANG_EXT= 31 -LANG_CONFIGURE_ARG= DTCH -.endif -################################################################ -.if ${LOCALIZED_LANG} == "fr" -CATEGORIES+= french -LANG_PKGNAME= fr -LANG_EXT= 33 -L10NHELP= helpcontent_${LANG_EXT}_unix.tgz -LANG_CONFIGURE_ARG= FREN -.endif -################################################################ -.if ${LOCALIZED_LANG} == "el" -LANG_PKGNAME= el -LANG_EXT= 30 -L10NHELP= helpcontent_${LANG_EXT}_unix.tgz -LANG_CONFIGURE_ARG= GREEK -.endif -################################################################ -.if ${LOCALIZED_LANG} == "de" -CATEGORIES+= german -LANG_PKGNAME= de -LANG_EXT= 49 -L10NHELP= helpcontent_${LANG_EXT}_unix.tgz -LANG_CONFIGURE_ARG= GER -COMMENT= Office-Suite mit Textverarbeitung, Tabellenkalkulation, Datenbank und Praesentationsprogramm -.endif -################################################################ -.if ${LOCALIZED_LANG} == "it" -LANG_PKGNAME= it -LANG_EXT= 39 -L10NHELP= helpcontent_${LANG_EXT}_unix.tgz -LANG_CONFIGURE_ARG= ITAL -.endif -################################################################ -.if ${LOCALIZED_LANG} == "ja" -CATEGORIES+= japanese -LANG_PKGNAME= ja -LANG_EXT= 81 -LANG_CONFIGURE_ARG= JAPN -MASTER_SITES+= ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/stable/&,} -RUN_DEPENDS+= ${LOCALBASE}/lib/X11/fonts/TrueType/sazanami-mincho.ttf:${PORTSDIR}/japanese/sazanami-ttf -L10NHELP= helpcontent_${LANG_EXT}_unix.tgz -.endif -################################################################ -.if ${LOCALIZED_LANG} == "ko" -CATEGORIES+= korean -LANG_PKGNAME= ko -LANG_EXT= 82 -LANG_CONFIGURE_ARG= KOREAN -L10NHELP= helpcontent_${LANG_EXT}_unix.tgz -.endif -################################################################ -.if ${LOCALIZED_LANG} == "pl" -CATEGORIES+= polish -LANG_PKGNAME= pl -LANG_EXT= 48 -LANG_CONFIGURE_ARG= POL -.endif -################################################################ -.if ${LOCALIZED_LANG} == "pt" -COMMENT= Editor texto/grBaGico, banco de dados/planilha/navegador integrado -CATEGORIES+= portuguese -LANG_PKGNAME= pt -LANG_EXT= 03 -LANG_CONFIGURE_ARG= PORT -.endif -################################################################ -.if ${LOCALIZED_LANG} == "ru" -CATEGORIES+= russian -LANG_PKGNAME= ru -LANG_EXT= 07 -LANG_CONFIGURE_ARG= RUSS -L10NHELP= helpcontent_${LANG_EXT}_unix.tgz -.endif -################################################################ -.if ${LOCALIZED_LANG} == "es" -LANG_PKGNAME= es -LANG_EXT= 34 -L10NHELP= helpcontent_${LANG_EXT}_unix.tgz -LANG_CONFIGURE_ARG= SPAN -.endif -################################################################ -.if ${LOCALIZED_LANG} == "tr" -LANG_PKGNAME= tr -LANG_EXT= 90 -LANG_CONFIGURE_ARG= TURK -.endif -################################################################ -.if ${LOCALIZED_LANG} == "sv" -LANG_PKGNAME= sv -LANG_EXT= 46 -L10NHELP= helpcontent_${LANG_EXT}_unix.tgz -LANG_CONFIGURE_ARG= SWED -.endif -################################################################ -.if ${LOCALIZED_LANG} == "tr" -LANG_PKGNAME= tr -LANG_EXT= 90 -L10NHELP= helpcontent_${LANG_EXT}_unix.tgz -LANG_CONFIGURE_ARG= TURK -.endif -################################################################ -.if defined(LANG_PKGNAME) -PKGNAMEPREFIX= ${LANG_PKGNAME}- -.endif -.if defined(LANG_SUFFIX) -PKGNAMESUFFIX?= -${LANG_SUFFIX} -.endif -.endif - diff --git a/editors/openoffice.org-1.0/files/generate.pl b/editors/openoffice.org-1.0/files/generate.pl deleted file mode 100644 index 0b01d22bc91b..000000000000 --- a/editors/openoffice.org-1.0/files/generate.pl +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/perl -# generate full build shell script for OpenOffice.org -# Whom: Maho Nakata <maho@FreeBSD.org> -# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-1.0/files/Attic/generate.pl,v 1.4 2005-08-31 04:28:55 maho Exp $ - -print "#!/bin/csh\n"; -print "make deinstall clean\n"; -print "/usr/bin/time -h make WITH_CCACHE=yes install package package-rename solver sdk deinstall >& log.en\n"; -print "rm work/.configure* work/.build* \n"; -print "/usr/bin/time -h make ALL_LOCALIZED_LANGS=yes >& log.all\n"; - -open ( FILE, "< Makefile.localized") ; -while(<FILE>){ -@tmp=split (' ',$_); -@tmp2=split ('"',$tmp[3]); -if ( $tmp[1] eq "\${LOCALIZED_LANG}") { $LANG=$tmp2[1]; - print "make TWEAK_L10N=yes LOCALIZED_LANG=$LANG pre-everything\n"; - print "/usr/bin/time -h make LOCALIZED_LANG=$LANG WITH_CCACHE=yes package package-rename deinstall >& log.$LANG\n"; - } -} -close FILE; diff --git a/editors/openoffice.org-1.0/files/gpc-libart-patch b/editors/openoffice.org-1.0/files/gpc-libart-patch deleted file mode 100644 index 759cbc89249d..000000000000 --- a/editors/openoffice.org-1.0/files/gpc-libart-patch +++ /dev/null @@ -1,4380 +0,0 @@ -taken from -http://cvs.gnome.org/viewcvs/*checkout*/openoffice/patches/OOO_1_0_3/gpc-libart.diff - -diff -u -r1.41.2.7 configure.in ---- config_office/configure.in 2002/08/16 09:59:41 1.41.2.7 -+++ config_office/configure.in 2002/10/02 00:57:24 -@@ -1075,25 +1074,20 @@ - fi - - dnl =================================================================== --dnl Test for the presence of the required gpc.{c,h} files -+dnl Test for the presence of the required libart files - dnl =================================================================== - --AC_MSG_CHECKING([GPC files]) --if test -f ../external/gpc/gpc.h; then -- HAVE_GPC_H="yes" -+AC_MSG_CHECKING([libart files]) -+if test -f ../external/gpc/art_svp.h; then -+ HAVE_LIBART="yes" - else -- HAVE_GPC_H="no" -+ HAVE_LIBART="no" - fi --if test -f ../external/gpc/gpc.c; then -- HAVE_GPC_C="yes" --else -- HAVE_GPC_C="no" --fi - --if test "$HAVE_GPC_H" = "yes" -a "$HAVE_GPC_C" = "yes"; then -- AC_MSG_RESULT([GPC files found]) -+if test "$HAVE_LIBART" = "yes" ; then -+ AC_MSG_RESULT([libart files found]) - else -- AC_MSG_ERROR([GPC files not found]) -+ AC_MSG_ERROR([libart files not found -- did you apply the Ximian patch?]) - fi - - dnl =================================================================== -diff -uNr /oocvs/OOO_STABLE_1-backup/external/gpc/art_config.h external/gpc/art_config.h ---- /oocvs/OOO_STABLE_1-backup/external/gpc/art_config.h Wed Dec 31 18:00:00 1969 -+++ external/gpc/art_config.h Fri Sep 20 21:41:27 2002 -@@ -0,0 +1,8 @@ -+#define ART_SIZEOF_CHAR (sizeof char) -+#define ART_SIZEOF_SHORT (sizeof short) -+#define ART_SIZEOF_INT (sizeof int) -+#define ART_SIZEOF_LONG (sizeof long) -+ -+typedef unsigned char art_u8; -+typedef unsigned short art_u16; -+typedef unsigned int art_u32; -diff -uNr /oocvs/OOO_STABLE_1-backup/external/gpc/art_misc.c external/gpc/art_misc.c ---- /oocvs/OOO_STABLE_1-backup/external/gpc/art_misc.c Wed Dec 31 18:00:00 1969 -+++ external/gpc/art_misc.c Fri Sep 20 16:00:43 2002 -@@ -0,0 +1,78 @@ -+/* Libart_LGPL - library of basic graphic primitives -+ * Copyright (C) 1998 Raph Levien -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Library General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Library General Public License for more details. -+ * -+ * You should have received a copy of the GNU Library General Public -+ * License along with this library; if not, write to the -+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ * Boston, MA 02111-1307, USA. -+ */ -+ -+/* Various utility functions RLL finds useful. */ -+ -+#include "art_misc.h" -+ -+#ifdef HAVE_UINSTD_H -+#include <unistd.h> -+#endif -+#include <stdio.h> -+#include <stdarg.h> -+ -+/** -+ * art_die: Print the error message to stderr and exit with a return code of 1. -+ * @fmt: The printf-style format for the error message. -+ * -+ * Used for dealing with severe errors. -+ **/ -+void -+art_die (const char *fmt, ...) -+{ -+ va_list ap; -+ -+ va_start (ap, fmt); -+ vfprintf (stderr, fmt, ap); -+ va_end (ap); -+ exit (1); -+} -+ -+/** -+ * art_warn: Print the warning message to stderr. -+ * @fmt: The printf-style format for the warning message. -+ * -+ * Used for generating warnings. -+ **/ -+void -+art_warn (const char *fmt, ...) -+{ -+ va_list ap; -+ -+ va_start (ap, fmt); -+ vfprintf (stderr, fmt, ap); -+ va_end (ap); -+} -+ -+/** -+ * art_dprint: Print the debug message to stderr. -+ * @fmt: The printf-style format for the debug message. -+ * -+ * Used for generating debug output. -+ **/ -+void -+art_dprint (const char *fmt, ...) -+{ -+ va_list ap; -+ -+ va_start (ap, fmt); -+ vfprintf (stderr, fmt, ap); -+ va_end (ap); -+} -+ -diff -uNr /oocvs/OOO_STABLE_1-backup/external/gpc/art_misc.h external/gpc/art_misc.h ---- /oocvs/OOO_STABLE_1-backup/external/gpc/art_misc.h Wed Dec 31 18:00:00 1969 -+++ external/gpc/art_misc.h Fri Sep 20 21:36:13 2002 -@@ -0,0 +1,89 @@ -+/* Libart_LGPL - library of basic graphic primitives -+ * Copyright (C) 1998 Raph Levien -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Library General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Library General Public License for more details. -+ * -+ * You should have received a copy of the GNU Library General Public -+ * License along with this library; if not, write to the -+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ * Boston, MA 02111-1307, USA. -+ */ -+ -+/* Simple macros to set up storage allocation and basic types for libart -+ functions. */ -+ -+#ifndef __ART_MISC_H__ -+#define __ART_MISC_H__ -+ -+#include <stdlib.h> /* for malloc, etc. */ -+ -+#include "art_config.h" -+ -+#define art_alloc malloc -+#define art_free free -+#define art_realloc realloc -+ -+/* These aren't, strictly speaking, configuration macros, but they're -+ damn handy to have around, and may be worth playing with for -+ debugging. */ -+#define art_new(type, n) ((type *)art_alloc ((n) * sizeof(type))) -+ -+#define art_renew(p, type, n) ((type *)art_realloc (p, (n) * sizeof(type))) -+ -+/* This one must be used carefully - in particular, p and max should -+ be variables. They can also be pstruct->el lvalues. */ -+#define art_expand(p, type, max) do { if(max) { p = art_renew (p, type, max <<= 1); } else { max = 1; p = art_new(type, 1); } } while (0) -+ -+typedef int art_boolean; -+#define ART_FALSE 0 -+#define ART_TRUE 1 -+ -+/* define pi */ -+#ifndef M_PI -+#define M_PI 3.14159265358979323846 -+#endif /* M_PI */ -+ -+#ifndef M_SQRT2 -+#define M_SQRT2 1.41421356237309504880 /* sqrt(2) */ -+#endif /* M_SQRT2 */ -+ -+/* Provide macros to feature the GCC function attribute. -+ */ -+#if defined(__GNUC__) && (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)) -+#define ART_GNUC_PRINTF( format_idx, arg_idx ) \ -+ __attribute__((format (printf, format_idx, arg_idx))) -+#define ART_GNUC_NORETURN \ -+ __attribute__((noreturn)) -+#else /* !__GNUC__ */ -+#define ART_GNUC_PRINTF( format_idx, arg_idx ) -+#define ART_GNUC_NORETURN -+#endif /* !__GNUC__ */ -+ -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+void ART_GNUC_NORETURN -+art_die (const char *fmt, ...) ART_GNUC_PRINTF (1, 2); -+ -+void -+art_warn (const char *fmt, ...) ART_GNUC_PRINTF (1, 2); -+ -+void -+art_dprint (const char *fmt, ...) ART_GNUC_PRINTF (1, 2); -+ -+#ifdef __cplusplus -+} -+#endif -+ -+#define ART_USE_NEW_INTERSECTOR -+ -+#endif /* __ART_MISC_H__ */ -diff -uNr /oocvs/OOO_STABLE_1-backup/external/gpc/art_pathcode.h external/gpc/art_pathcode.h ---- /oocvs/OOO_STABLE_1-backup/external/gpc/art_pathcode.h Wed Dec 31 18:00:00 1969 -+++ external/gpc/art_pathcode.h Fri Sep 20 15:30:03 2002 -@@ -0,0 +1,39 @@ -+/* Libart_LGPL - library of basic graphic primitives -+ * Copyright (C) 1998 Raph Levien -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Library General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Library General Public License for more details. -+ * -+ * You should have received a copy of the GNU Library General Public -+ * License along with this library; if not, write to the -+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ * Boston, MA 02111-1307, USA. -+ */ -+ -+#ifndef __ART_PATHCODE_H__ -+#define __ART_PATHCODE_H__ -+ -+#ifdef __cplusplus -+extern "C" { -+#endif /* __cplusplus */ -+ -+typedef enum { -+ ART_MOVETO, -+ ART_MOVETO_OPEN, -+ ART_CURVETO, -+ ART_LINETO, -+ ART_END -+} ArtPathcode; -+ -+#ifdef __cplusplus -+} -+#endif /* __cplusplus */ -+ -+#endif /* __ART_PATHCODE_H__ */ -diff -uNr /oocvs/OOO_STABLE_1-backup/external/gpc/art_point.h external/gpc/art_point.h ---- /oocvs/OOO_STABLE_1-backup/external/gpc/art_point.h Wed Dec 31 18:00:00 1969 -+++ external/gpc/art_point.h Fri Sep 20 16:02:16 2002 -@@ -0,0 +1,38 @@ -+/* Libart_LGPL - library of basic graphic primitives -+ * Copyright (C) 1998 Raph Levien -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Library General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Library General Public License for more details. -+ * -+ * You should have received a copy of the GNU Library General Public -+ * License along with this library; if not, write to the -+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ * Boston, MA 02111-1307, USA. -+ */ -+ -+#ifndef __ART_POINT_H__ -+#define __ART_POINT_H__ -+ -+#ifdef __cplusplus -+extern "C" { -+#endif /* __cplusplus */ -+ -+typedef struct _ArtPoint ArtPoint; -+ -+struct _ArtPoint { -+ /*< public >*/ -+ double x, y; -+}; -+ -+#ifdef __cplusplus -+} -+#endif /* __cplusplus */ -+ -+#endif /* __ART_POINT_H__ */ -diff -uNr /oocvs/OOO_STABLE_1-backup/external/gpc/art_rect.c external/gpc/art_rect.c ---- /oocvs/OOO_STABLE_1-backup/external/gpc/art_rect.c Wed Dec 31 18:00:00 1969 -+++ external/gpc/art_rect.c Fri Sep 20 16:01:29 2002 -@@ -0,0 +1,214 @@ -+/* Libart_LGPL - library of basic graphic primitives -+ * Copyright (C) 1998 Raph Levien -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Library General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Library General Public License for more details. -+ * -+ * You should have received a copy of the GNU Library General Public -+ * License along with this library; if not, write to the -+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ * Boston, MA 02111-1307, USA. -+ */ -+ -+#include "art_rect.h" -+ -+#include <math.h> -+ -+#ifndef MAX -+#define MAX(a, b) (((a) > (b)) ? (a) : (b)) -+#endif /* MAX */ -+ -+#ifndef MIN -+#define MIN(a, b) (((a) < (b)) ? (a) : (b)) -+#endif /* MIN */ -+ -+/* rectangle primitives stolen from gzilla */ -+ -+/** -+ * art_irect_copy: Make a copy of an integer rectangle. -+ * @dest: Where the copy is stored. -+ * @src: The source rectangle. -+ * -+ * Copies the rectangle. -+ **/ -+void -+art_irect_copy (ArtIRect *dest, const ArtIRect *src) { -+ dest->x0 = src->x0; -+ dest->y0 = src->y0; -+ dest->x1 = src->x1; -+ dest->y1 = src->y1; -+} -+ -+/** -+ * art_irect_union: Find union of two integer rectangles. -+ * @dest: Where the result is stored. -+ * @src1: A source rectangle. -+ * @src2: Another source rectangle. -+ * -+ * Finds the smallest rectangle that includes @src1 and @src2. -+ **/ -+void -+art_irect_union (ArtIRect *dest, const ArtIRect *src1, const ArtIRect *src2) { -+ if (art_irect_empty (src1)) { -+ art_irect_copy (dest, src2); -+ } else if (art_irect_empty (src2)) { -+ art_irect_copy (dest, src1); -+ } else { -+ dest->x0 = MIN (src1->x0, src2->x0); -+ dest->y0 = MIN (src1->y0, src2->y0); -+ dest->x1 = MAX (src1->x1, src2->x1); -+ dest->y1 = MAX (src1->y1, src2->y1); -+ } -+} -+ -+/** -+ * art_irect_intersection: Find intersection of two integer rectangles. -+ * @dest: Where the result is stored. -+ * @src1: A source rectangle. -+ * @src2: Another source rectangle. -+ * -+ * Finds the intersection of @src1 and @src2. -+ **/ -+void -+art_irect_intersect (ArtIRect *dest, const ArtIRect *src1, const ArtIRect *src2) { -+ dest->x0 = MAX (src1->x0, src2->x0); -+ dest->y0 = MAX (src1->y0, src2->y0); -+ dest->x1 = MIN (src1->x1, src2->x1); -+ dest->y1 = MIN (src1->y1, src2->y1); -+} -+ -+/** -+ * art_irect_empty: Determine whether integer rectangle is empty. -+ * @src: The source rectangle. -+ * -+ * Return value: TRUE if @src is an empty rectangle, FALSE otherwise. -+ **/ -+int -+art_irect_empty (const ArtIRect *src) { -+ return (src->x1 <= src->x0 || src->y1 <= src->y0); -+} -+ -+#if 0 -+gboolean irect_point_inside (ArtIRect *rect, GzwPoint *point) { -+ return (point->x >= rect->x0 && point->y >= rect->y0 && -+ point->x < rect->x1 && point->y < rect->y1); -+} -+#endif -+ -+/** -+ * art_drect_copy: Make a copy of a rectangle. -+ * @dest: Where the copy is stored. -+ * @src: The source rectangle. -+ * -+ * Copies the rectangle. -+ **/ -+void -+art_drect_copy (ArtDRect *dest, const ArtDRect *src) { -+ dest->x0 = src->x0; -+ dest->y0 = src->y0; -+ dest->x1 = src->x1; -+ dest->y1 = src->y1; -+} -+ -+/** -+ * art_drect_union: Find union of two rectangles. -+ * @dest: Where the result is stored. -+ * @src1: A source rectangle. -+ * @src2: Another source rectangle. -+ * -+ * Finds the smallest rectangle that includes @src1 and @src2. -+ **/ -+void -+art_drect_union (ArtDRect *dest, const ArtDRect *src1, const ArtDRect *src2) { -+ if (art_drect_empty (src1)) { -+ art_drect_copy (dest, src2); -+ } else if (art_drect_empty (src2)) { -+ art_drect_copy (dest, src1); -+ } else { -+ dest->x0 = MIN (src1->x0, src2->x0); -+ dest->y0 = MIN (src1->y0, src2->y0); -+ dest->x1 = MAX (src1->x1, src2->x1); -+ dest->y1 = MAX (src1->y1, src2->y1); -+ } -+} -+ -+/** -+ * art_drect_intersection: Find intersection of two rectangles. -+ * @dest: Where the result is stored. -+ * @src1: A source rectangle. -+ * @src2: Another source rectangle. -+ * -+ * Finds the intersection of @src1 and @src2. -+ **/ -+void -+art_drect_intersect (ArtDRect *dest, const ArtDRect *src1, const ArtDRect *src2) { -+ dest->x0 = MAX (src1->x0, src2->x0); -+ dest->y0 = MAX (src1->y0, src2->y0); -+ dest->x1 = MIN (src1->x1, src2->x1); -+ dest->y1 = MIN (src1->y1, src2->y1); -+} -+ -+/** -+ * art_irect_empty: Determine whether rectangle is empty. -+ * @src: The source rectangle. -+ * -+ * Return value: TRUE if @src is an empty rectangle, FALSE otherwise. -+ **/ -+int -+art_drect_empty (const ArtDRect *src) { -+ return (src->x1 <= src->x0 || src->y1 <= src->y0); -+} -+ -+/** -+ * art_drect_affine_transform: Affine transform rectangle. -+ * @dst: Where to store the result. -+ * @src: The source rectangle. -+ * @matrix: The affine transformation. -+ * -+ * Find the smallest rectangle enclosing the affine transformed @src. -+ * The result is exactly the affine transformation of @src when -+ * @matrix specifies a rectilinear affine transformation, otherwise it -+ * is a conservative approximation. -+ **/ -+void -+art_drect_affine_transform (ArtDRect *dst, const ArtDRect *src, const double matrix[6]) -+{ -+ double x00, y00, x10, y10; -+ double x01, y01, x11, y11; -+ -+ x00 = src->x0 * matrix[0] + src->y0 * matrix[2] + matrix[4]; -+ y00 = src->x0 * matrix[1] + src->y0 * matrix[3] + matrix[5]; -+ x10 = src->x1 * matrix[0] + src->y0 * matrix[2] + matrix[4]; -+ y10 = src->x1 * matrix[1] + src->y0 * matrix[3] + matrix[5]; -+ x01 = src->x0 * matrix[0] + src->y1 * matrix[2] + matrix[4]; -+ y01 = src->x0 * matrix[1] + src->y1 * matrix[3] + matrix[5]; -+ x11 = src->x1 * matrix[0] + src->y1 * matrix[2] + matrix[4]; -+ y11 = src->x1 * matrix[1] + src->y1 * matrix[3] + matrix[5]; -+ dst->x0 = MIN (MIN (x00, x10), MIN (x01, x11)); -+ dst->y0 = MIN (MIN (y00, y10), MIN (y01, y11)); -+ dst->x1 = MAX (MAX (x00, x10), MAX (x01, x11)); -+ dst->y1 = MAX (MAX (y00, y10), MAX (y01, y11)); -+} -+ -+/** -+ * art_drect_to_irect: Convert rectangle to integer rectangle. -+ * @dst: Where to store resulting integer rectangle. -+ * @src: The source rectangle. -+ * -+ * Find the smallest integer rectangle that encloses @src. -+ **/ -+void -+art_drect_to_irect (ArtIRect *dst, ArtDRect *src) -+{ -+ dst->x0 = floor (src->x0); -+ dst->y0 = floor (src->y0); -+ dst->x1 = ceil (src->x1); -+ dst->y1 = ceil (src->y1); -+} -diff -uNr /oocvs/OOO_STABLE_1-backup/external/gpc/art_rect.h external/gpc/art_rect.h ---- /oocvs/OOO_STABLE_1-backup/external/gpc/art_rect.h Wed Dec 31 18:00:00 1969 -+++ external/gpc/art_rect.h Fri Sep 20 15:31:32 2002 -@@ -0,0 +1,78 @@ -+/* Libart_LGPL - library of basic graphic primitives -+ * Copyright (C) 1998 Raph Levien -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Library General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Library General Public License for more details. -+ * -+ * You should have received a copy of the GNU Library General Public -+ * License along with this library; if not, write to the -+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ * Boston, MA 02111-1307, USA. -+ */ -+ -+#ifndef __ART_RECT_H__ -+#define __ART_RECT_H__ -+ -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+typedef struct _ArtDRect ArtDRect; -+typedef struct _ArtIRect ArtIRect; -+ -+struct _ArtDRect { -+ /*< public >*/ -+ double x0, y0, x1, y1; -+}; -+ -+struct _ArtIRect { -+ /*< public >*/ -+ int x0, y0, x1, y1; -+}; -+ -+/* Make a copy of the rectangle. */ -+void art_irect_copy (ArtIRect *dest, const ArtIRect *src); -+ -+/* Find the smallest rectangle that includes both source rectangles. */ -+void art_irect_union (ArtIRect *dest, -+ const ArtIRect *src1, const ArtIRect *src2); -+ -+/* Return the intersection of the two rectangles */ -+void art_irect_intersect (ArtIRect *dest, -+ const ArtIRect *src1, const ArtIRect *src2); -+ -+/* Return true if the rectangle is empty. */ -+int art_irect_empty (const ArtIRect *src); -+ -+/* Make a copy of the rectangle. */ -+void art_drect_copy (ArtDRect *dest, const ArtDRect *src); -+ -+/* Find the smallest rectangle that includes both source rectangles. */ -+void art_drect_union (ArtDRect *dest, -+ const ArtDRect *src1, const ArtDRect *src2); -+ -+/* Return the intersection of the two rectangles */ -+void art_drect_intersect (ArtDRect *dest, -+ const ArtDRect *src1, const ArtDRect *src2); -+ -+/* Return true if the rectangle is empty. */ -+int art_drect_empty (const ArtDRect *src); -+ -+void -+art_drect_affine_transform (ArtDRect *dst, const ArtDRect *src, -+ const double matrix[6]); -+ -+void art_drect_to_irect (ArtIRect *dst, ArtDRect *src); -+ -+#ifdef __cplusplus -+} -+#endif -+ -+#endif -diff -uNr /oocvs/OOO_STABLE_1-backup/external/gpc/art_svp.c external/gpc/art_svp.c ---- /oocvs/OOO_STABLE_1-backup/external/gpc/art_svp.c Wed Dec 31 18:00:00 1969 -+++ external/gpc/art_svp.c Fri Sep 20 16:01:49 2002 -@@ -0,0 +1,150 @@ -+/* Libart_LGPL - library of basic graphic primitives -+ * Copyright (C) 1998 Raph Levien -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Library General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Library General Public License for more details. -+ * -+ * You should have received a copy of the GNU Library General Public -+ * License along with this library; if not, write to the -+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ * Boston, MA 02111-1307, USA. -+ */ -+ -+/* Basic constructors and operations for sorted vector paths */ -+ -+#include "art_svp.h" -+#include "art_misc.h" -+ -+/* Add a new segment. The arguments can be zero and NULL if the caller -+ would rather fill them in later. -+ -+ We also realloc one auxiliary array of ints of size n_segs if -+ desired. -+*/ -+/** -+ * art_svp_add_segment: Add a segment to an #ArtSVP structure. -+ * @p_vp: Pointer to where the #ArtSVP structure is stored. -+ * @pn_segs_max: Pointer to the allocated size of *@p_vp. -+ * @pn_points_max: Pointer to where auxiliary array is stored. -+ * @n_points: Number of points for new segment. -+ * @dir: Direction for new segment; 0 is up, 1 is down. -+ * @points: Points for new segment. -+ * @bbox: Bounding box for new segment. -+ * -+ * Adds a new segment to an ArtSVP structure. This routine reallocates -+ * the structure if necessary, updating *@p_vp and *@pn_segs_max as -+ * necessary. -+ * -+ * The new segment is simply added after all other segments. Thus, -+ * this routine should be called in order consistent with the #ArtSVP -+ * sorting rules. -+ * -+ * If the @bbox argument is given, it is simply stored in the new -+ * segment. Otherwise (if it is NULL), the bounding box is computed -+ * from the @points given. -+ **/ -+int -+art_svp_add_segment (ArtSVP **p_vp, int *pn_segs_max, -+ int **pn_points_max, -+ int n_points, int dir, ArtPoint *points, -+ ArtDRect *bbox) -+{ -+ int seg_num; -+ ArtSVP *svp; -+ ArtSVPSeg *seg; -+ -+ svp = *p_vp; -+ seg_num = svp->n_segs++; -+ if (*pn_segs_max == seg_num) -+ { -+ *pn_segs_max <<= 1; -+ svp = (ArtSVP *)art_realloc (svp, sizeof(ArtSVP) + -+ (*pn_segs_max - 1) * sizeof(ArtSVPSeg)); -+ *p_vp = svp; -+ if (pn_points_max != NULL) -+ *pn_points_max = art_renew (*pn_points_max, int, *pn_segs_max); -+ } -+ seg = &svp->segs[seg_num]; -+ seg->n_points = n_points; -+ seg->dir = dir; -+ seg->points = points; -+ if (bbox) -+ seg->bbox = *bbox; -+ else if (points) -+ { -+ double x_min, x_max; -+ int i; -+ -+ x_min = x_max = points[0].x; -+ for (i = 1; i < n_points; i++) -+ { -+ if (x_min > points[i].x) -+ x_min = points[i].x; -+ if (x_max < points[i].x) -+ x_max = points[i].x; -+ } -+ seg->bbox.x0 = x_min; -+ seg->bbox.y0 = points[0].y; -+ -+ seg->bbox.x1 = x_max; -+ seg->bbox.y1 = points[n_points - 1].y; -+ } -+ return seg_num; -+} -+ -+ -+/** -+ * art_svp_free: Free an #ArtSVP structure. -+ * @svp: #ArtSVP to free. -+ * -+ * Frees an #ArtSVP structure and all the segments in it. -+ **/ -+void -+art_svp_free (ArtSVP *svp) -+{ -+ int n_segs = svp->n_segs; -+ int i; -+ -+ for (i = 0; i < n_segs; i++) -+ art_free (svp->segs[i].points); -+ art_free (svp); -+} -+ -+#ifdef ART_USE_NEW_INTERSECTOR -+#define EPSILON 0 -+#else -+#define EPSILON 1e-6 -+#endif -+ -+/** -+ * art_svp_seg_compare: Compare two segments of an svp. -+ * @seg1: First segment to compare. -+ * @seg2: Second segment to compare. -+ * -+ * Compares two segments of an svp. Return 1 if @seg2 is below or to the -+ * right of @seg1, -1 otherwise. -+ **/ -+int -+art_svp_seg_compare (const void *s1, const void *s2) -+{ -+ const ArtSVPSeg *seg1 = s1; -+ const ArtSVPSeg *seg2 = s2; -+ -+ if (seg1->points[0].y - EPSILON > seg2->points[0].y) return 1; -+ else if (seg1->points[0].y + EPSILON < seg2->points[0].y) return -1; -+ else if (seg1->points[0].x - EPSILON > seg2->points[0].x) return 1; -+ else if (seg1->points[0].x + EPSILON < seg2->points[0].x) return -1; -+ else if ((seg1->points[1].x - seg1->points[0].x) * -+ (seg2->points[1].y - seg2->points[0].y) - -+ (seg1->points[1].y - seg1->points[0].y) * -+ (seg2->points[1].x - seg2->points[0].x) > 0) return 1; -+ else return -1; -+} -+ -diff -uNr /oocvs/OOO_STABLE_1-backup/external/gpc/art_svp.h external/gpc/art_svp.h ---- /oocvs/OOO_STABLE_1-backup/external/gpc/art_svp.h Wed Dec 31 18:00:00 1969 -+++ external/gpc/art_svp.h Fri Sep 20 21:36:42 2002 -@@ -0,0 +1,63 @@ -+/* Libart_LGPL - library of basic graphic primitives -+ * Copyright (C) 1998 Raph Levien -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Library General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Library General Public License for more details. -+ * -+ * You should have received a copy of the GNU Library General Public -+ * License along with this library; if not, write to the -+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ * Boston, MA 02111-1307, USA. -+ */ -+ -+#ifndef __ART_SVP_H__ -+#define __ART_SVP_H__ -+ -+/* Basic data structures and constructors for sorted vector paths */ -+ -+#include "art_rect.h" -+#include "art_point.h" -+ -+#ifdef __cplusplus -+extern "C" { -+#endif /* __cplusplus */ -+ -+typedef struct _ArtSVP ArtSVP; -+typedef struct _ArtSVPSeg ArtSVPSeg; -+ -+struct _ArtSVPSeg { -+ int n_points; -+ int dir; /* == 0 for "up", 1 for "down" */ -+ ArtDRect bbox; -+ ArtPoint *points; -+}; -+ -+struct _ArtSVP { -+ int n_segs; -+ ArtSVPSeg segs[1]; -+}; -+ -+int -+art_svp_add_segment (ArtSVP **p_vp, int *pn_segs_max, -+ int **pn_points_max, -+ int n_points, int dir, ArtPoint *points, -+ ArtDRect *bbox); -+ -+void -+art_svp_free (ArtSVP *svp); -+ -+int -+art_svp_seg_compare (const void *s1, const void *s2); -+ -+#ifdef __cplusplus -+} -+#endif /* __cplusplus */ -+ -+#endif /* __ART_SVP_H__ */ -diff -uNr /oocvs/OOO_STABLE_1-backup/external/gpc/art_svp_intersect.c external/gpc/art_svp_intersect.c ---- /oocvs/OOO_STABLE_1-backup/external/gpc/art_svp_intersect.c Wed Dec 31 18:00:00 1969 -+++ external/gpc/art_svp_intersect.c Fri Sep 20 21:42:30 2002 -@@ -0,0 +1,1802 @@ -+/* Libart_LGPL - library of basic graphic primitives -+ * Copyright (C) 2001 Raph Levien -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Library General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Library General Public License for more details. -+ * -+ * You should have received a copy of the GNU Library General Public -+ * License along with this library; if not, write to the -+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ * Boston, MA 02111-1307, USA. -+ */ -+ -+/* This file contains a testbed implementation of the new intersection -+ code. -+*/ -+ -+#include "art_svp_intersect.h" -+ -+#include <math.h> /* for sqrt */ -+ -+/* Sanitychecking verifies the main invariant on every priority queue -+ point. Do not use in production, as it slows things down way too -+ much. */ -+#define noSANITYCHECK -+ -+/* This can be used in production, to prevent hangs. Eventually, it -+ should not be necessary. */ -+#define CHEAP_SANITYCHECK -+ -+#define noVERBOSE -+ -+#include "art_misc.h" -+ -+/* A priority queue - perhaps move to a separate file if it becomes -+ needed somewhere else */ -+ -+#define ART_PRIQ_USE_HEAP -+ -+typedef struct _ArtPriQ ArtPriQ; -+typedef struct _ArtPriPoint ArtPriPoint; -+ -+struct _ArtPriQ { -+ int n_items; -+ int n_items_max; -+ ArtPriPoint **items; -+}; -+ -+struct _ArtPriPoint { -+ double x; -+ double y; -+ void *user_data; -+}; -+ -+static ArtPriQ * -+art_pri_new (void) -+{ -+ ArtPriQ *result = art_new (ArtPriQ, 1); -+ -+ result->n_items = 0; -+ result->n_items_max = 16; -+ result->items = art_new (ArtPriPoint *, result->n_items_max); -+ return result; -+} -+ -+static void -+art_pri_free (ArtPriQ *pq) -+{ -+ art_free (pq->items); -+ art_free (pq); -+} -+ -+static art_boolean -+art_pri_empty (ArtPriQ *pq) -+{ -+ return pq->n_items == 0; -+} -+ -+#ifdef ART_PRIQ_USE_HEAP -+ -+/* This heap implementation is based on Vasek Chvatal's course notes: -+ http://www.cs.rutgers.edu/~chvatal/notes/pq.html#heap */ -+ -+static void -+art_pri_bubble_up (ArtPriQ *pq, int vacant, ArtPriPoint *missing) -+{ -+ ArtPriPoint **items = pq->items; -+ int parent; -+ -+ parent = (vacant - 1) >> 1; -+ while (vacant > 0 && (missing->y < items[parent]->y || -+ (missing->y == items[parent]->y && -+ missing->x < items[parent]->x))) -+ { -+ items[vacant] = items[parent]; -+ vacant = parent; -+ parent = (vacant - 1) >> 1; -+ } -+ -+ items[vacant] = missing; -+} -+ -+static void -+art_pri_insert (ArtPriQ *pq, ArtPriPoint *point) -+{ -+ if (pq->n_items == pq->n_items_max) -+ art_expand (pq->items, ArtPriPoint *, pq->n_items_max); -+ -+ art_pri_bubble_up (pq, pq->n_items++, point); -+} -+ -+static void -+art_pri_sift_down_from_root (ArtPriQ *pq, ArtPriPoint *missing) -+{ -+ ArtPriPoint **items = pq->items; -+ int vacant = 0, child = 2; -+ int n = pq->n_items; -+ -+ while (child < n) -+ { -+ if (items[child - 1]->y < items[child]->y || -+ (items[child - 1]->y == items[child]->y && -+ items[child - 1]->x < items[child]->x)) -+ child--; -+ items[vacant] = items[child]; -+ vacant = child; -+ child = (vacant + 1) << 1; -+ } -+ if (child == n) -+ { -+ items[vacant] = items[n - 1]; -+ vacant = n - 1; -+ } -+ -+ art_pri_bubble_up (pq, vacant, missing); -+} -+ -+static ArtPriPoint * -+art_pri_choose (ArtPriQ *pq) -+{ -+ ArtPriPoint *result = pq->items[0]; -+ -+ art_pri_sift_down_from_root (pq, pq->items[--pq->n_items]); -+ return result; -+} -+ -+#else -+ -+/* Choose least point in queue */ -+static ArtPriPoint * -+art_pri_choose (ArtPriQ *pq) -+{ -+ int i; -+ int best = 0; -+ double best_x, best_y; -+ double y; -+ ArtPriPoint *result; -+ -+ if (pq->n_items == 0) -+ return NULL; -+ -+ best_x = pq->items[best]->x; -+ best_y = pq->items[best]->y; -+ -+ for (i = 1; i < pq->n_items; i++) -+ { -+ y = pq->items[i]->y; -+ if (y < best_y || (y == best_y && pq->items[i]->x < best_x)) -+ { -+ best = i; -+ best_x = pq->items[best]->x; -+ best_y = y; -+ } -+ } -+ result = pq->items[best]; -+ pq->items[best] = pq->items[--pq->n_items]; -+ return result; -+} -+ -+static void -+art_pri_insert (ArtPriQ *pq, ArtPriPoint *point) -+{ -+ if (pq->n_items == pq->n_items_max) -+ art_expand (pq->items, ArtPriPoint *, pq->n_items_max); -+ -+ pq->items[pq->n_items++] = point; -+} -+ -+#endif -+ -+#ifdef TEST_PRIQ -+ -+#include <stdlib.h> /* for rand() */ -+#include <stdio.h> -+ -+static double -+double_rand (double lo, double hi, int quant) -+{ -+ int tmp = rand () / (RAND_MAX * (1.0 / quant)) + 0.5; -+ return lo + tmp * ((hi - lo) / quant); -+} -+ -+/* -+ * This custom allocator for priority queue points is here so I can -+ * test speed. It doesn't look like it will be that significant, but -+ * if I want a small improvement later, it's something. -+ */ -+ -+typedef ArtPriPoint *ArtPriPtPool; -+ -+static ArtPriPtPool * -+art_pri_pt_pool_new (void) -+{ -+ ArtPriPtPool *result = art_new (ArtPriPtPool, 1); -+ *result = NULL; -+ return result; -+} -+ -+static ArtPriPoint * -+art_pri_pt_alloc (ArtPriPtPool *pool) -+{ -+ ArtPriPoint *result = *pool; -+ if (result == NULL) -+ return art_new (ArtPriPoint, 1); -+ else -+ { -+ *pool = result->user_data; -+ return result; -+ } -+} -+ -+static void -+art_pri_pt_free (ArtPriPtPool *pool, ArtPriPoint *pt) -+{ -+ pt->user_data = *pool; -+ *pool = pt; -+} -+ -+static void -+art_pri_pt_pool_free (ArtPriPtPool *pool) -+{ -+ ArtPriPoint *pt = *pool; -+ while (pt != NULL) -+ { -+ ArtPriPoint *next = pt->user_data; -+ art_free (pt); -+ pt = next; -+ } -+ art_free (pool); -+} -+ -+int -+main (int argc, char **argv) -+{ -+ ArtPriPtPool *pool = art_pri_pt_pool_new (); -+ ArtPriQ *pq; -+ int i, j; -+ const int n_iter = 1; -+ const int pq_size = 100; -+ -+ for (j = 0; j < n_iter; j++) -+ { -+ pq = art_pri_new (); -+ -+ for (i = 0; i < pq_size; i++) -+ { -+ ArtPriPoint *pt = art_pri_pt_alloc (pool); -+ pt->x = double_rand (0, 1, 100); -+ pt->y = double_rand (0, 1, 100); -+ pt->user_data = (void *)i; -+ art_pri_insert (pq, pt); -+ } -+ -+ while (!art_pri_empty (pq)) -+ { -+ ArtPriPoint *pt = art_pri_choose (pq); -+ if (n_iter == 1) -+ printf ("(%g, %g), %d\n", pt->x, pt->y, (int)pt->user_data); -+ art_pri_pt_free (pool, pt); -+ } -+ -+ art_pri_free (pq); -+ } -+ art_pri_pt_pool_free (pool); -+ return 0; -+} -+ -+#else /* TEST_PRIQ */ -+ -+/* A virtual class for an "svp writer". A client of this object creates an -+ SVP by repeatedly calling "add segment" and "add point" methods on it. -+*/ -+ -+typedef struct _ArtSvpWriterRewind ArtSvpWriterRewind; -+ -+/* An implementation of the svp writer virtual class that applies the -+ winding rule. */ -+ -+struct _ArtSvpWriterRewind { -+ ArtSvpWriter super; -+ ArtWindRule rule; -+ ArtSVP *svp; -+ int n_segs_max; -+ int *n_points_max; -+}; -+ -+static int -+art_svp_writer_rewind_add_segment (ArtSvpWriter *self, int wind_left, -+ int delta_wind, double x, double y) -+{ -+ ArtSvpWriterRewind *swr = (ArtSvpWriterRewind *)self; -+ ArtSVP *svp; -+ ArtSVPSeg *seg; -+ art_boolean left_filled, right_filled; -+ int wind_right = wind_left + delta_wind; -+ int seg_num; -+ const int init_n_points_max = 4; -+ -+ switch (swr->rule) -+ { -+ case ART_WIND_RULE_NONZERO: -+ left_filled = (wind_left != 0); -+ right_filled = (wind_right != 0); -+ break; -+ case ART_WIND_RULE_INTERSECT: -+ left_filled = (wind_left > 1); -+ right_filled = (wind_right > 1); -+ break; -+ case ART_WIND_RULE_ODDEVEN: -+ left_filled = (wind_left & 1); -+ right_filled = (wind_right & 1); -+ break; -+ case ART_WIND_RULE_POSITIVE: -+ left_filled = (wind_left > 0); -+ right_filled = (wind_right > 0); -+ break; -+ default: -+ art_die ("Unknown wind rule %d\n", swr->rule); -+ } -+ if (left_filled == right_filled) -+ { -+ /* discard segment now */ -+#ifdef VERBOSE -+ art_dprint ("swr add_segment: %d += %d (%g, %g) --> -1\n", -+ wind_left, delta_wind, x, y); -+#endif -+ return -1; -+ } -+ -+ svp = swr->svp; -+ seg_num = svp->n_segs++; -+ if (swr->n_segs_max == seg_num) -+ { -+ swr->n_segs_max <<= 1; -+ svp = (ArtSVP *)art_realloc (svp, sizeof(ArtSVP) + -+ (swr->n_segs_max - 1) * -+ sizeof(ArtSVPSeg)); -+ swr->svp = svp; -+ swr->n_points_max = art_renew (swr->n_points_max, int, -+ swr->n_segs_max); -+ } -+ seg = &svp->segs[seg_num]; -+ seg->n_points = 1; -+ seg->dir = right_filled; -+ swr->n_points_max[seg_num] = init_n_points_max; -+ seg->bbox.x0 = x; -+ seg->bbox.y0 = y; -+ seg->bbox.x1 = x; -+ seg->bbox.y1 = y; -+ seg->points = art_new (ArtPoint, init_n_points_max); -+ seg->points[0].x = x; -+ seg->points[0].y = y; -+#ifdef VERBOSE -+ art_dprint ("swr add_segment: %d += %d (%g, %g) --> %d(%s)\n", -+ wind_left, delta_wind, x, y, seg_num, -+ seg->dir ? "v" : "^"); -+#endif -+ return seg_num; -+} -+ -+static void -+art_svp_writer_rewind_add_point (ArtSvpWriter *self, int seg_id, -+ double x, double y) -+{ -+ ArtSvpWriterRewind *swr = (ArtSvpWriterRewind *)self; -+ ArtSVPSeg *seg; -+ int n_points; -+ -+#ifdef VERBOSE -+ art_dprint ("swr add_point: %d (%g, %g)\n", seg_id, x, y); -+#endif -+ if (seg_id < 0) -+ /* omitted segment */ -+ return; -+ -+ seg = &swr->svp->segs[seg_id]; -+ n_points = seg->n_points++; -+ if (swr->n_points_max[seg_id] == n_points) -+ art_expand (seg->points, ArtPoint, swr->n_points_max[seg_id]); -+ seg->points[n_points].x = x; -+ seg->points[n_points].y = y; -+ if (x < seg->bbox.x0) -+ seg->bbox.x0 = x; -+ if (x > seg->bbox.x1) -+ seg->bbox.x1 = x; -+ seg->bbox.y1 = y; -+} -+ -+static void -+art_svp_writer_rewind_close_segment (ArtSvpWriter *self, int seg_id) -+{ -+ /* Not needed for this simple implementation. A potential future -+ optimization is to merge segments that can be merged safely. */ -+#ifdef SANITYCHECK -+ ArtSvpWriterRewind *swr = (ArtSvpWriterRewind *)self; -+ ArtSVPSeg *seg; -+ -+ if (seg_id >= 0) -+ { -+ seg = &swr->svp->segs[seg_id]; -+ if (seg->n_points < 2) -+ art_warn ("*** closing segment %d with only %d point%s\n", -+ seg_id, seg->n_points, seg->n_points == 1 ? "" : "s"); -+ } -+#endif -+ -+#ifdef VERBOSE -+ art_dprint ("swr close_segment: %d\n", seg_id); -+#endif -+} -+ -+ArtSVP * -+art_svp_writer_rewind_reap (ArtSvpWriter *self) -+{ -+ ArtSvpWriterRewind *swr = (ArtSvpWriterRewind *)self; -+ ArtSVP *result = swr->svp; -+ -+ art_free (swr->n_points_max); -+ art_free (swr); -+ return result; -+} -+ -+ArtSvpWriter * -+art_svp_writer_rewind_new (ArtWindRule rule) -+{ -+ ArtSvpWriterRewind *result = art_new (ArtSvpWriterRewind, 1); -+ -+ result->super.add_segment = art_svp_writer_rewind_add_segment; -+ result->super.add_point = art_svp_writer_rewind_add_point; -+ result->super.close_segment = art_svp_writer_rewind_close_segment; -+ -+ result->rule = rule; -+ result->n_segs_max = 16; -+ result->svp = art_alloc (sizeof(ArtSVP) + -+ (result->n_segs_max - 1) * sizeof(ArtSVPSeg)); -+ result->svp->n_segs = 0; -+ result->n_points_max = art_new (int, result->n_segs_max); -+ -+ return &result->super; -+} -+ -+/* Now, data structures for the active list */ -+ -+typedef struct _ArtActiveSeg ArtActiveSeg; -+ -+/* Note: BNEG is 1 for \ lines, and 0 for /. Thus, -+ x[(flags & BNEG) ^ 1] <= x[flags & BNEG] */ -+#define ART_ACTIVE_FLAGS_BNEG 1 -+ -+/* This flag is set if the segment has been inserted into the active -+ list. */ -+#define ART_ACTIVE_FLAGS_IN_ACTIVE 2 -+ -+/* This flag is set when the segment is to be deleted in the -+ horiz commit process. */ -+#define ART_ACTIVE_FLAGS_DEL 4 -+ -+/* This flag is set if the seg_id is a valid output segment. */ -+#define ART_ACTIVE_FLAGS_OUT 8 -+ -+/* This flag is set if the segment is in the horiz list. */ -+#define ART_ACTIVE_FLAGS_IN_HORIZ 16 -+ -+struct _ArtActiveSeg { -+ int flags; -+ int wind_left, delta_wind; -+ ArtActiveSeg *left, *right; /* doubly linked list structure */ -+ -+ const ArtSVPSeg *in_seg; -+ int in_curs; -+ -+ double x[2]; -+ double y0, y1; -+ double a, b, c; /* line equation; ax+by+c = 0 for the line, a^2 + b^2 = 1, -+ and a>0 */ -+ -+ /* bottom point and intersection point stack */ -+ int n_stack; -+ int n_stack_max; -+ ArtPoint *stack; -+ -+ /* horiz commit list */ -+ ArtActiveSeg *horiz_left, *horiz_right; -+ double horiz_x; -+ int horiz_delta_wind; -+ int seg_id; -+}; -+ -+typedef struct _ArtIntersectCtx ArtIntersectCtx; -+ -+struct _ArtIntersectCtx { -+ const ArtSVP *in; -+ ArtSvpWriter *out; -+ -+ ArtPriQ *pq; -+ -+ ArtActiveSeg *active_head; -+ -+ double y; -+ ArtActiveSeg *horiz_first; -+ ArtActiveSeg *horiz_last; -+ -+ /* segment index of next input segment to be added to pri q */ -+ int in_curs; -+}; -+ -+#define EPSILON_A 1e-5 /* Threshold for breaking lines at point insertions */ -+ -+/** -+ * art_svp_intersect_setup_seg: Set up an active segment from input segment. -+ * @seg: Active segment. -+ * @pri_pt: Priority queue point to initialize. -+ * -+ * Sets the x[], a, b, c, flags, and stack fields according to the -+ * line from the current cursor value. Sets the priority queue point -+ * to the bottom point of this line. Also advances the input segment -+ * cursor. -+ **/ -+static void -+art_svp_intersect_setup_seg (ArtActiveSeg *seg, ArtPriPoint *pri_pt) -+{ -+ const ArtSVPSeg *in_seg = seg->in_seg; -+ int in_curs = seg->in_curs++; -+ double x0, y0, x1, y1; -+ double dx, dy, s; -+ double a, b, r2; -+ -+ x0 = in_seg->points[in_curs].x; -+ y0 = in_seg->points[in_curs].y; -+ x1 = in_seg->points[in_curs + 1].x; -+ y1 = in_seg->points[in_curs + 1].y; -+ pri_pt->x = x1; -+ pri_pt->y = y1; -+ dx = x1 - x0; -+ dy = y1 - y0; -+ r2 = dx * dx + dy * dy; -+ s = r2 == 0 ? 1 : 1 / sqrt (r2); -+ seg->a = a = dy * s; -+ seg->b = b = -dx * s; -+ seg->c = -(a * x0 + b * y0); -+ seg->flags = (seg->flags & ~ART_ACTIVE_FLAGS_BNEG) | (dx > 0); -+ seg->x[0] = x0; -+ seg->x[1] = x1; -+ seg->y0 = y0; -+ seg->y1 = y1; -+ seg->n_stack = 1; -+ seg->stack[0].x = x1; -+ seg->stack[0].y = y1; -+} -+ -+/** -+ * art_svp_intersect_add_horiz: Add point to horizontal list. -+ * @ctx: Intersector context. -+ * @seg: Segment with point to insert into horizontal list. -+ * -+ * Inserts @seg into horizontal list, keeping it in ascending horiz_x -+ * order. -+ * -+ * Note: the horiz_commit routine processes "clusters" of segs in the -+ * horiz list, all sharing the same horiz_x value. The cluster is -+ * processed in active list order, rather than horiz list order. Thus, -+ * the order of segs in the horiz list sharing the same horiz_x -+ * _should_ be irrelevant. Even so, we use b as a secondary sorting key, -+ * as a "belt and suspenders" defensive coding tactic. -+ **/ -+static void -+art_svp_intersect_add_horiz (ArtIntersectCtx *ctx, ArtActiveSeg *seg) -+{ -+ ArtActiveSeg **pp = &ctx->horiz_last; -+ ArtActiveSeg *place; -+ ArtActiveSeg *place_right = NULL; -+ -+ -+#ifdef CHEAP_SANITYCHECK -+ if (seg->flags & ART_ACTIVE_FLAGS_IN_HORIZ) -+ { -+ art_warn ("*** attempt to put segment in horiz list twice\n"); -+ return; -+ } -+ seg->flags |= ART_ACTIVE_FLAGS_IN_HORIZ; -+#endif -+ -+#ifdef VERBOSE -+ art_dprint ("add_horiz %lx, x = %g\n", (unsigned long) seg, seg->horiz_x); -+#endif -+ for (place = *pp; place != NULL && (place->horiz_x > seg->horiz_x || -+ (place->horiz_x == seg->horiz_x && -+ place->b < seg->b)); -+ place = *pp) -+ { -+ place_right = place; -+ pp = &place->horiz_left; -+ } -+ *pp = seg; -+ seg->horiz_left = place; -+ seg->horiz_right = place_right; -+ if (place == NULL) -+ ctx->horiz_first = seg; -+ else -+ place->horiz_right = seg; -+} -+ -+static void -+art_svp_intersect_push_pt (ArtIntersectCtx *ctx, ArtActiveSeg *seg, -+ double x, double y) -+{ -+ ArtPriPoint *pri_pt; -+ int n_stack = seg->n_stack; -+ -+ if (n_stack == seg->n_stack_max) -+ art_expand (seg->stack, ArtPoint, seg->n_stack_max); -+ seg->stack[n_stack].x = x; -+ seg->stack[n_stack].y = y; -+ seg->n_stack++; -+ -+ seg->x[1] = x; -+ seg->y1 = y; -+ -+ pri_pt = art_new (ArtPriPoint, 1); -+ pri_pt->x = x; -+ pri_pt->y = y; -+ pri_pt->user_data = seg; -+ art_pri_insert (ctx->pq, pri_pt); -+} -+ -+typedef enum { -+ ART_BREAK_LEFT = 1, -+ ART_BREAK_RIGHT = 2 -+} ArtBreakFlags; -+ -+/** -+ * art_svp_intersect_break: Break an active segment. -+ * -+ * Note: y must be greater than the top point's y, and less than -+ * the bottom's. -+ * -+ * Return value: x coordinate of break point. -+ */ -+static double -+art_svp_intersect_break (ArtIntersectCtx *ctx, ArtActiveSeg *seg, -+ double x_ref, double y, ArtBreakFlags break_flags) -+{ -+ double x0, y0, x1, y1; -+ const ArtSVPSeg *in_seg = seg->in_seg; -+ int in_curs = seg->in_curs; -+ double x; -+ -+ x0 = in_seg->points[in_curs - 1].x; -+ y0 = in_seg->points[in_curs - 1].y; -+ x1 = in_seg->points[in_curs].x; -+ y1 = in_seg->points[in_curs].y; -+ x = x0 + (x1 - x0) * ((y - y0) / (y1 - y0)); -+ if ((break_flags == ART_BREAK_LEFT && x > x_ref) || -+ (break_flags == ART_BREAK_RIGHT && x < x_ref)) -+ { -+#ifdef VERBOSE -+ art_dprint ("art_svp_intersect_break: limiting x to %f, was %f, %s\n", -+ x_ref, x, break_flags == ART_BREAK_LEFT ? "left" : "right"); -+ x = x_ref; -+#endif -+ } -+ -+ /* I think we can count on min(x0, x1) <= x <= max(x0, x1) with sane -+ arithmetic, but it might be worthwhile to check just in case. */ -+ -+ if (y > ctx->y) -+ art_svp_intersect_push_pt (ctx, seg, x, y); -+ else -+ { -+ seg->x[0] = x; -+ seg->y0 = y; -+ seg->horiz_x = x; -+ art_svp_intersect_add_horiz (ctx, seg); -+ } -+ -+ return x; -+} -+ -+/** -+ * art_svp_intersect_add_point: Add a point, breaking nearby neighbors. -+ * @ctx: Intersector context. -+ * @x: X coordinate of point to add. -+ * @y: Y coordinate of point to add. -+ * @seg: "nearby" segment, or NULL if leftmost. -+ * -+ * Return value: Segment immediately to the left of the new point, or -+ * NULL if the new point is leftmost. -+ **/ -+static ArtActiveSeg * -+art_svp_intersect_add_point (ArtIntersectCtx *ctx, double x, double y, -+ ArtActiveSeg *seg, ArtBreakFlags break_flags) -+{ -+ ArtActiveSeg *left, *right; -+ double x_min = x, x_max = x; -+ art_boolean left_live, right_live; -+ double d; -+ double new_x; -+ ArtActiveSeg *test, *result = NULL; -+ double x_test; -+ -+ left = seg; -+ if (left == NULL) -+ right = ctx->active_head; -+ else -+ right = left->right; -+ left_live = (break_flags & ART_BREAK_LEFT) && (left != NULL); -+ right_live = (break_flags & ART_BREAK_RIGHT) && (right != NULL); -+ while (left_live || right_live) -+ { -+ if (left_live) -+ { -+ if (x <= left->x[left->flags & ART_ACTIVE_FLAGS_BNEG] && -+ /* It may be that one of these conjuncts turns out to be always -+ true. We test both anyway, to be defensive. */ -+ y != left->y0 && y < left->y1) -+ { -+ d = x_min * left->a + y * left->b + left->c; -+ if (d < EPSILON_A) -+ { -+ new_x = art_svp_intersect_break (ctx, left, x_min, y, -+ ART_BREAK_LEFT); -+ if (new_x > x_max) -+ { -+ x_max = new_x; -+ right_live = (right != NULL); -+ } -+ else if (new_x < x_min) -+ x_min = new_x; -+ left = left->left; -+ left_live = (left != NULL); -+ } -+ else -+ left_live = ART_FALSE; -+ } -+ else -+ left_live = ART_FALSE; -+ } -+ else if (right_live) -+ { -+ if (x >= right->x[(right->flags & ART_ACTIVE_FLAGS_BNEG) ^ 1] && -+ /* It may be that one of these conjuncts turns out to be always -+ true. We test both anyway, to be defensive. */ -+ y != right->y0 && y < right->y1) -+ { -+ d = x_max * right->a + y * right->b + right->c; -+ if (d > -EPSILON_A) -+ { -+ new_x = art_svp_intersect_break (ctx, right, x_max, y, -+ ART_BREAK_RIGHT); -+ if (new_x < x_min) -+ { -+ x_min = new_x; -+ left_live = (left != NULL); -+ } -+ else if (new_x >= x_max) -+ x_max = new_x; -+ right = right->right; -+ right_live = (right != NULL); -+ } -+ else -+ right_live = ART_FALSE; -+ } -+ else -+ right_live = ART_FALSE; -+ } -+ } -+ -+ /* Ascending order is guaranteed by break_flags. Thus, we don't need -+ to actually fix up non-ascending pairs. */ -+ -+ /* Now, (left, right) defines an interval of segments broken. Sort -+ into ascending x order. */ -+ test = left == NULL ? ctx->active_head : left->right; -+ result = left; -+ if (test != NULL && test != right) -+ { -+ if (y == test->y0) -+ x_test = test->x[0]; -+ else /* assert y == test->y1, I think */ -+ x_test = test->x[1]; -+ for (;;) -+ { -+ if (x_test <= x) -+ result = test; -+ test = test->right; -+ if (test == right) -+ break; -+ new_x = x_test; -+ if (new_x < x_test) -+ { -+ art_warn ("art_svp_intersect_add_point: non-ascending x\n"); -+ } -+ x_test = new_x; -+ } -+ } -+ return result; -+} -+ -+static void -+art_svp_intersect_swap_active (ArtIntersectCtx *ctx, -+ ArtActiveSeg *left_seg, ArtActiveSeg *right_seg) -+{ -+ right_seg->left = left_seg->left; -+ if (right_seg->left != NULL) -+ right_seg->left->right = right_seg; -+ else -+ ctx->active_head = right_seg; -+ left_seg->right = right_seg->right; -+ if (left_seg->right != NULL) -+ left_seg->right->left = left_seg; -+ left_seg->left = right_seg; -+ right_seg->right = left_seg; -+} -+ -+/** -+ * art_svp_intersect_test_cross: Test crossing of a pair of active segments. -+ * @ctx: Intersector context. -+ * @left_seg: Left segment of the pair. -+ * @right_seg: Right segment of the pair. -+ * @break_flags: Flags indicating whether to break neighbors. -+ * -+ * Tests crossing of @left_seg and @right_seg. If there is a crossing, -+ * inserts the intersection point into both segments. -+ * -+ * Return value: True if the intersection took place at the current -+ * scan line, indicating further iteration is needed. -+ **/ -+static art_boolean -+art_svp_intersect_test_cross (ArtIntersectCtx *ctx, -+ ArtActiveSeg *left_seg, ArtActiveSeg *right_seg, -+ ArtBreakFlags break_flags) -+{ -+ double left_x0, left_y0, left_x1; -+ double left_y1 = left_seg->y1; -+ double right_y1 = right_seg->y1; -+ double d; -+ -+ const ArtSVPSeg *in_seg; -+ int in_curs; -+ double d0, d1, t; -+ double x, y; /* intersection point */ -+ -+#ifdef VERBOSE -+ static int count = 0; -+ -+ art_dprint ("art_svp_intersect_test_cross %lx <-> %lx: count=%d\n", -+ (unsigned long)left_seg, (unsigned long)right_seg, count++); -+#endif -+ -+ if (left_seg->y0 == right_seg->y0 && left_seg->x[0] == right_seg->x[0]) -+ { -+ /* Top points of left and right segments coincide. This case -+ feels like a bit of duplication - we may want to merge it -+ with the cases below. However, this way, we're sure that this -+ logic makes only localized changes. */ -+ -+ if (left_y1 < right_y1) -+ { -+ /* Test left (x1, y1) against right segment */ -+ double left_x1 = left_seg->x[1]; -+ -+ if (left_x1 < -+ right_seg->x[(right_seg->flags & ART_ACTIVE_FLAGS_BNEG) ^ 1] || -+ left_y1 == right_seg->y0) -+ return ART_FALSE; -+ d = left_x1 * right_seg->a + left_y1 * right_seg->b + right_seg->c; -+ if (d < -EPSILON_A) -+ return ART_FALSE; -+ else if (d < EPSILON_A) -+ { -+ /* I'm unsure about the break flags here. */ -+ double right_x1 = art_svp_intersect_break (ctx, right_seg, -+ left_x1, left_y1, -+ ART_BREAK_RIGHT); -+ if (left_x1 <= right_x1) -+ return ART_FALSE; -+ } -+ } -+ else if (left_y1 > right_y1) -+ { -+ /* Test right (x1, y1) against left segment */ -+ double right_x1 = right_seg->x[1]; -+ -+ if (right_x1 > left_seg->x[left_seg->flags & ART_ACTIVE_FLAGS_BNEG] || -+ right_y1 == left_seg->y0) -+ return ART_FALSE; -+ d = right_x1 * left_seg->a + right_y1 * left_seg->b + left_seg->c; -+ if (d > EPSILON_A) -+ return ART_FALSE; -+ else if (d > -EPSILON_A) -+ { -+ /* See above regarding break flags. */ -+ double left_x1 = art_svp_intersect_break (ctx, left_seg, -+ right_x1, right_y1, -+ ART_BREAK_LEFT); -+ if (left_x1 <= right_x1) -+ return ART_FALSE; -+ } -+ } -+ else /* left_y1 == right_y1 */ -+ { -+ double left_x1 = left_seg->x[1]; -+ double right_x1 = right_seg->x[1]; -+ -+ if (left_x1 <= right_x1) -+ return ART_FALSE; -+ } -+ art_svp_intersect_swap_active (ctx, left_seg, right_seg); -+ return ART_TRUE; -+ } -+ -+ if (left_y1 < right_y1) -+ { -+ /* Test left (x1, y1) against right segment */ -+ double left_x1 = left_seg->x[1]; -+ -+ if (left_x1 < -+ right_seg->x[(right_seg->flags & ART_ACTIVE_FLAGS_BNEG) ^ 1] || -+ left_y1 == right_seg->y0) -+ return ART_FALSE; -+ d = left_x1 * right_seg->a + left_y1 * right_seg->b + right_seg->c; -+ if (d < -EPSILON_A) -+ return ART_FALSE; -+ else if (d < EPSILON_A) -+ { -+ double right_x1 = art_svp_intersect_break (ctx, right_seg, -+ left_x1, left_y1, -+ ART_BREAK_RIGHT); -+ if (left_x1 <= right_x1) -+ return ART_FALSE; -+ } -+ } -+ else if (left_y1 > right_y1) -+ { -+ /* Test right (x1, y1) against left segment */ -+ double right_x1 = right_seg->x[1]; -+ -+ if (right_x1 > left_seg->x[left_seg->flags & ART_ACTIVE_FLAGS_BNEG] || -+ right_y1 == left_seg->y0) -+ return ART_FALSE; -+ d = right_x1 * left_seg->a + right_y1 * left_seg->b + left_seg->c; -+ if (d > EPSILON_A) -+ return ART_FALSE; -+ else if (d > -EPSILON_A) -+ { -+ double left_x1 = art_svp_intersect_break (ctx, left_seg, -+ right_x1, right_y1, -+ ART_BREAK_LEFT); -+ if (left_x1 <= right_x1) -+ return ART_FALSE; -+ } -+ } -+ else /* left_y1 == right_y1 */ -+ { -+ double left_x1 = left_seg->x[1]; -+ double right_x1 = right_seg->x[1]; -+ -+ if (left_x1 <= right_x1) -+ return ART_FALSE; -+ } -+ -+ /* The segments cross. Find the intersection point. */ -+ -+ in_seg = left_seg->in_seg; -+ in_curs = left_seg->in_curs; -+ left_x0 = in_seg->points[in_curs - 1].x; -+ left_y0 = in_seg->points[in_curs - 1].y; -+ left_x1 = in_seg->points[in_curs].x; -+ left_y1 = in_seg->points[in_curs].y; -+ d0 = left_x0 * right_seg->a + left_y0 * right_seg->b + right_seg->c; -+ d1 = left_x1 * right_seg->a + left_y1 * right_seg->b + right_seg->c; -+ if (d0 == d1) -+ { -+ x = left_x0; -+ y = left_y0; -+ } -+ else -+ { -+ /* Is this division always safe? It could possibly overflow. */ -+ t = d0 / (d0 - d1); -+ if (t <= 0) -+ { -+ x = left_x0; -+ y = left_y0; -+ } -+ else if (t >= 1) -+ { -+ x = left_x1; -+ y = left_y1; -+ } -+ else -+ { -+ x = left_x0 + t * (left_x1 - left_x0); -+ y = left_y0 + t * (left_y1 - left_y0); -+ } -+ } -+ -+ /* Make sure intersection point is within bounds of right seg. */ -+ if (y < right_seg->y0) -+ { -+ x = right_seg->x[0]; -+ y = right_seg->y0; -+ } -+ else if (y > right_seg->y1) -+ { -+ x = right_seg->x[1]; -+ y = right_seg->y1; -+ } -+ else if (x < right_seg->x[(right_seg->flags & ART_ACTIVE_FLAGS_BNEG) ^ 1]) -+ x = right_seg->x[(right_seg->flags & ART_ACTIVE_FLAGS_BNEG) ^ 1]; -+ else if (x > right_seg->x[right_seg->flags & ART_ACTIVE_FLAGS_BNEG]) -+ x = right_seg->x[right_seg->flags & ART_ACTIVE_FLAGS_BNEG]; -+ -+ if (y == left_seg->y0) -+ { -+ if (y != right_seg->y0) -+ { -+#ifdef VERBOSE -+ art_dprint ("art_svp_intersect_test_cross: intersection (%g, %g) matches former y0 of %lx, %lx\n", -+ x, y, (unsigned long)left_seg, (unsigned long)right_seg); -+#endif -+ art_svp_intersect_push_pt (ctx, right_seg, x, y); -+ if ((break_flags & ART_BREAK_RIGHT) && right_seg->right != NULL) -+ art_svp_intersect_add_point (ctx, x, y, right_seg->right, -+ break_flags); -+ } -+ else -+ { -+ /* Intersection takes place at current scan line; process -+ immediately rather than queueing intersection point into -+ priq. */ -+ ArtActiveSeg *winner, *loser; -+ -+ /* Choose "most vertical" segement */ -+ if (left_seg->a > right_seg->a) -+ { -+ winner = left_seg; -+ loser = right_seg; -+ } -+ else -+ { -+ winner = right_seg; -+ loser = left_seg; -+ } -+ -+ loser->x[0] = winner->x[0]; -+ loser->horiz_x = loser->x[0]; -+ loser->horiz_delta_wind += loser->delta_wind; -+ winner->horiz_delta_wind -= loser->delta_wind; -+ -+ art_svp_intersect_swap_active (ctx, left_seg, right_seg); -+ return ART_TRUE; -+ } -+ } -+ else if (y == right_seg->y0) -+ { -+#ifdef VERBOSE -+ art_dprint ("*** art_svp_intersect_test_cross: intersection (%g, %g) matches latter y0 of %lx, %lx\n", -+ x, y, (unsigned long)left_seg, (unsigned long)right_seg); -+#endif -+ art_svp_intersect_push_pt (ctx, left_seg, x, y); -+ if ((break_flags & ART_BREAK_LEFT) && left_seg->left != NULL) -+ art_svp_intersect_add_point (ctx, x, y, left_seg->left, -+ break_flags); -+ } -+ else -+ { -+#ifdef VERBOSE -+ art_dprint ("Inserting (%g, %g) into %lx, %lx\n", -+ x, y, (unsigned long)left_seg, (unsigned long)right_seg); -+#endif -+ /* Insert the intersection point into both segments. */ -+ art_svp_intersect_push_pt (ctx, left_seg, x, y); -+ art_svp_intersect_push_pt (ctx, right_seg, x, y); -+ if ((break_flags & ART_BREAK_LEFT) && left_seg->left != NULL) -+ art_svp_intersect_add_point (ctx, x, y, left_seg->left, break_flags); -+ if ((break_flags & ART_BREAK_RIGHT) && right_seg->right != NULL) -+ art_svp_intersect_add_point (ctx, x, y, right_seg->right, break_flags); -+ } -+ return ART_FALSE; -+} -+ -+/** -+ * art_svp_intersect_active_delete: Delete segment from active list. -+ * @ctx: Intersection context. -+ * @seg: Segment to delete. -+ * -+ * Deletes @seg from the active list. -+ **/ -+static /* todo inline */ void -+art_svp_intersect_active_delete (ArtIntersectCtx *ctx, ArtActiveSeg *seg) -+{ -+ ArtActiveSeg *left = seg->left, *right = seg->right; -+ -+ if (left != NULL) -+ left->right = right; -+ else -+ ctx->active_head = right; -+ if (right != NULL) -+ right->left = left; -+} -+ -+/** -+ * art_svp_intersect_active_free: Free an active segment. -+ * @seg: Segment to delete. -+ * -+ * Frees @seg. -+ **/ -+static /* todo inline */ void -+art_svp_intersect_active_free (ArtActiveSeg *seg) -+{ -+ art_free (seg->stack); -+#ifdef VERBOSE -+ art_dprint ("Freeing %lx\n", (unsigned long) seg); -+#endif -+ art_free (seg); -+} -+ -+/** -+ * art_svp_intersect_insert_cross: Test crossings of newly inserted line. -+ * -+ * Tests @seg against its left and right neighbors for intersections. -+ * Precondition: the line in @seg is not purely horizontal. -+ **/ -+static void -+art_svp_intersect_insert_cross (ArtIntersectCtx *ctx, -+ ArtActiveSeg *seg) -+{ -+ ArtActiveSeg *left = seg, *right = seg; -+ -+ for (;;) -+ { -+ if (left != NULL) -+ { -+ ArtActiveSeg *leftc; -+ -+ for (leftc = left->left; leftc != NULL; leftc = leftc->left) -+ if (!(leftc->flags & ART_ACTIVE_FLAGS_DEL)) -+ break; -+ if (leftc != NULL && -+ art_svp_intersect_test_cross (ctx, leftc, left, -+ ART_BREAK_LEFT)) -+ { -+ if (left == right || right == NULL) -+ right = left->right; -+ } -+ else -+ { -+ left = NULL; -+ } -+ } -+ else if (right != NULL && right->right != NULL) -+ { -+ ArtActiveSeg *rightc; -+ -+ for (rightc = right->right; rightc != NULL; rightc = rightc->right) -+ if (!(rightc->flags & ART_ACTIVE_FLAGS_DEL)) -+ break; -+ if (rightc != NULL && -+ art_svp_intersect_test_cross (ctx, right, rightc, -+ ART_BREAK_RIGHT)) -+ { -+ if (left == right || left == NULL) -+ left = right->left; -+ } -+ else -+ { -+ right = NULL; -+ } -+ } -+ else -+ break; -+ } -+} -+ -+/** -+ * art_svp_intersect_horiz: Add horizontal line segment. -+ * @ctx: Intersector context. -+ * @seg: Segment on which to add horizontal line. -+ * @x0: Old x position. -+ * @x1: New x position. -+ * -+ * Adds a horizontal line from @x0 to @x1, and updates the current -+ * location of @seg to @x1. -+ **/ -+static void -+art_svp_intersect_horiz (ArtIntersectCtx *ctx, ArtActiveSeg *seg, -+ double x0, double x1) -+{ -+ ArtActiveSeg *hs; -+ -+ if (x0 == x1) -+ return; -+ -+ hs = art_new (ArtActiveSeg, 1); -+ -+ hs->flags = ART_ACTIVE_FLAGS_DEL | (seg->flags & ART_ACTIVE_FLAGS_OUT); -+ if (seg->flags & ART_ACTIVE_FLAGS_OUT) -+ { -+ ArtSvpWriter *swr = ctx->out; -+ -+ swr->add_point (swr, seg->seg_id, x0, ctx->y); -+ } -+ hs->seg_id = seg->seg_id; -+ hs->horiz_x = x0; -+ hs->horiz_delta_wind = seg->delta_wind; -+ hs->stack = NULL; -+ -+ /* Ideally, the (a, b, c) values will never be read. However, there -+ are probably some tests remaining that don't check for _DEL -+ before evaluating the line equation. For those, these -+ initializations will at least prevent a UMR of the values, which -+ can crash on some platforms. */ -+ hs->a = 0.0; -+ hs->b = 0.0; -+ hs->c = 0.0; -+ -+ seg->horiz_delta_wind -= seg->delta_wind; -+ -+ art_svp_intersect_add_horiz (ctx, hs); -+ -+ if (x0 > x1) -+ { -+ ArtActiveSeg *left; -+ art_boolean first = ART_TRUE; -+ -+ for (left = seg->left; left != NULL; left = seg->left) -+ { -+ int left_bneg = left->flags & ART_ACTIVE_FLAGS_BNEG; -+ -+ if (left->x[left_bneg] <= x1) -+ break; -+ if (left->x[left_bneg ^ 1] <= x1 && -+ x1 * left->a + ctx->y * left->b + left->c >= 0) -+ break; -+ if (left->y0 != ctx->y && left->y1 != ctx->y) -+ { -+ art_svp_intersect_break (ctx, left, x1, ctx->y, ART_BREAK_LEFT); -+ } -+#ifdef VERBOSE -+ art_dprint ("x0=%g > x1=%g, swapping %lx, %lx\n", -+ x0, x1, (unsigned long)left, (unsigned long)seg); -+#endif -+ art_svp_intersect_swap_active (ctx, left, seg); -+ if (first && left->right != NULL) -+ { -+ art_svp_intersect_test_cross (ctx, left, left->right, -+ ART_BREAK_RIGHT); -+ first = ART_FALSE; -+ } -+ } -+ } -+ else -+ { -+ ArtActiveSeg *right; -+ art_boolean first = ART_TRUE; -+ -+ for (right = seg->right; right != NULL; right = seg->right) -+ { -+ int right_bneg = right->flags & ART_ACTIVE_FLAGS_BNEG; -+ -+ if (right->x[right_bneg ^ 1] >= x1) -+ break; -+ if (right->x[right_bneg] >= x1 && -+ x1 * right->a + ctx->y * right->b + right->c <= 0) -+ break; -+ if (right->y0 != ctx->y && right->y1 != ctx->y) -+ { -+ art_svp_intersect_break (ctx, right, x1, ctx->y, -+ ART_BREAK_LEFT); -+ } -+#ifdef VERBOSE -+ art_dprint ("[right]x0=%g < x1=%g, swapping %lx, %lx\n", -+ x0, x1, (unsigned long)seg, (unsigned long)right); -+#endif -+ art_svp_intersect_swap_active (ctx, seg, right); -+ if (first && right->left != NULL) -+ { -+ art_svp_intersect_test_cross (ctx, right->left, right, -+ ART_BREAK_RIGHT); -+ first = ART_FALSE; -+ } -+ } -+ } -+ -+ seg->x[0] = x1; -+ seg->x[1] = x1; -+ seg->horiz_x = x1; -+ seg->flags &= ~ART_ACTIVE_FLAGS_OUT; -+} -+ -+/** -+ * art_svp_intersect_insert_line: Insert a line into the active list. -+ * @ctx: Intersector context. -+ * @seg: Segment containing line to insert. -+ * -+ * Inserts the line into the intersector context, taking care of any -+ * intersections, and adding the appropriate horizontal points to the -+ * active list. -+ **/ -+static void -+art_svp_intersect_insert_line (ArtIntersectCtx *ctx, ArtActiveSeg *seg) -+{ -+ if (seg->y1 == seg->y0) -+ { -+#ifdef VERBOSE -+ art_dprint ("art_svp_intersect_insert_line: %lx is horizontal\n", -+ (unsigned long)seg); -+#endif -+ art_svp_intersect_horiz (ctx, seg, seg->x[0], seg->x[1]); -+ } -+ else -+ { -+ art_svp_intersect_insert_cross (ctx, seg); -+ art_svp_intersect_add_horiz (ctx, seg); -+ } -+} -+ -+static void -+art_svp_intersect_process_intersection (ArtIntersectCtx *ctx, -+ ArtActiveSeg *seg) -+{ -+ int n_stack = --seg->n_stack; -+ seg->x[1] = seg->stack[n_stack - 1].x; -+ seg->y1 = seg->stack[n_stack - 1].y; -+ seg->x[0] = seg->stack[n_stack].x; -+ seg->y0 = seg->stack[n_stack].y; -+ seg->horiz_x = seg->x[0]; -+ art_svp_intersect_insert_line (ctx, seg); -+} -+ -+static void -+art_svp_intersect_advance_cursor (ArtIntersectCtx *ctx, ArtActiveSeg *seg, -+ ArtPriPoint *pri_pt) -+{ -+ const ArtSVPSeg *in_seg = seg->in_seg; -+ int in_curs = seg->in_curs; -+ ArtSvpWriter *swr = seg->flags & ART_ACTIVE_FLAGS_OUT ? ctx->out : NULL; -+ -+ if (swr != NULL) -+ swr->add_point (swr, seg->seg_id, seg->x[1], seg->y1); -+ if (in_curs + 1 == in_seg->n_points) -+ { -+ ArtActiveSeg *left = seg->left, *right = seg->right; -+ -+#if 0 -+ if (swr != NULL) -+ swr->close_segment (swr, seg->seg_id); -+ seg->flags &= ~ART_ACTIVE_FLAGS_OUT; -+#endif -+ seg->flags |= ART_ACTIVE_FLAGS_DEL; -+ art_svp_intersect_add_horiz (ctx, seg); -+ art_svp_intersect_active_delete (ctx, seg); -+ if (left != NULL && right != NULL) -+ art_svp_intersect_test_cross (ctx, left, right, -+ ART_BREAK_LEFT | ART_BREAK_RIGHT); -+ art_free (pri_pt); -+ } -+ else -+ { -+ seg->horiz_x = seg->x[1]; -+ -+ art_svp_intersect_setup_seg (seg, pri_pt); -+ art_pri_insert (ctx->pq, pri_pt); -+ art_svp_intersect_insert_line (ctx, seg); -+ } -+} -+ -+static void -+art_svp_intersect_add_seg (ArtIntersectCtx *ctx, const ArtSVPSeg *in_seg) -+{ -+ ArtActiveSeg *seg = art_new (ArtActiveSeg, 1); -+ ArtActiveSeg *test; -+ double x0, y0; -+ ArtActiveSeg *beg_range; -+ ArtActiveSeg *last = NULL; -+ ArtActiveSeg *left, *right; -+ ArtPriPoint *pri_pt = art_new (ArtPriPoint, 1); -+ -+ seg->flags = 0; -+ seg->in_seg = in_seg; -+ seg->in_curs = 0; -+ -+ seg->n_stack_max = 4; -+ seg->stack = art_new (ArtPoint, seg->n_stack_max); -+ -+ seg->horiz_delta_wind = 0; -+ -+ seg->wind_left = 0; -+ -+ pri_pt->user_data = seg; -+ art_svp_intersect_setup_seg (seg, pri_pt); -+ art_pri_insert (ctx->pq, pri_pt); -+ -+ /* Find insertion place for new segment */ -+ /* This is currently a left-to-right scan, but should be replaced -+ with a binary search as soon as it's validated. */ -+ -+ x0 = in_seg->points[0].x; -+ y0 = in_seg->points[0].y; -+ beg_range = NULL; -+ for (test = ctx->active_head; test != NULL; test = test->right) -+ { -+ double d; -+ int test_bneg = test->flags & ART_ACTIVE_FLAGS_BNEG; -+ -+ if (x0 < test->x[test_bneg]) -+ { -+ if (x0 < test->x[test_bneg ^ 1]) -+ break; -+ d = x0 * test->a + y0 * test->b + test->c; -+ if (d < 0) -+ break; -+ } -+ last = test; -+ } -+ -+ left = art_svp_intersect_add_point (ctx, x0, y0, last, ART_BREAK_LEFT | ART_BREAK_RIGHT); -+ seg->left = left; -+ if (left == NULL) -+ { -+ right = ctx->active_head; -+ ctx->active_head = seg; -+ } -+ else -+ { -+ right = left->right; -+ left->right = seg; -+ } -+ seg->right = right; -+ if (right != NULL) -+ right->left = seg; -+ -+ seg->delta_wind = in_seg->dir ? 1 : -1; -+ seg->horiz_x = x0; -+ -+ art_svp_intersect_insert_line (ctx, seg); -+} -+ -+#ifdef SANITYCHECK -+static void -+art_svp_intersect_sanitycheck_winding (ArtIntersectCtx *ctx) -+{ -+#if 0 -+ /* At this point, we seem to be getting false positives, so it's -+ turned off for now. */ -+ -+ ArtActiveSeg *seg; -+ int winding_number = 0; -+ -+ for (seg = ctx->active_head; seg != NULL; seg = seg->right) -+ { -+ /* Check winding number consistency. */ -+ if (seg->flags & ART_ACTIVE_FLAGS_OUT) -+ { -+ if (winding_number != seg->wind_left) -+ art_warn ("*** art_svp_intersect_sanitycheck_winding: seg %lx has wind_left of %d, expected %d\n", -+ (unsigned long) seg, seg->wind_left, winding_number); -+ winding_number = seg->wind_left + seg->delta_wind; -+ } -+ } -+ if (winding_number != 0) -+ art_warn ("*** art_svp_intersect_sanitycheck_winding: non-balanced winding number %d\n", -+ winding_number); -+#endif -+} -+#endif -+ -+/** -+ * art_svp_intersect_horiz_commit: Commit points in horiz list to output. -+ * @ctx: Intersection context. -+ * -+ * The main function of the horizontal commit is to output new -+ * points to the output writer. -+ * -+ * This "commit" pass is also where winding numbers are assigned, -+ * because doing it here provides much greater tolerance for inputs -+ * which are not in strict SVP order. -+ * -+ * Each cluster in the horiz_list contains both segments that are in -+ * the active list (ART_ACTIVE_FLAGS_DEL is false) and that are not, -+ * and are scheduled to be deleted (ART_ACTIVE_FLAGS_DEL is true). We -+ * need to deal with both. -+ **/ -+static void -+art_svp_intersect_horiz_commit (ArtIntersectCtx *ctx) -+{ -+ ArtActiveSeg *seg; -+ int winding_number = 0; /* initialization just to avoid warning */ -+ int horiz_wind = 0; -+ double last_x = 0; /* initialization just to avoid warning */ -+ -+#ifdef VERBOSE -+ art_dprint ("art_svp_intersect_horiz_commit: y=%g\n", ctx->y); -+ for (seg = ctx->horiz_first; seg != NULL; seg = seg->horiz_right) -+ art_dprint (" %lx: %g %+d\n", -+ (unsigned long)seg, seg->horiz_x, seg->horiz_delta_wind); -+#endif -+ -+ /* Output points to svp writer. */ -+ for (seg = ctx->horiz_first; seg != NULL;) -+ { -+ /* Find a cluster with common horiz_x, */ -+ ArtActiveSeg *curs; -+ double x = seg->horiz_x; -+ -+ /* Generate any horizontal segments. */ -+ if (horiz_wind != 0) -+ { -+ ArtSvpWriter *swr = ctx->out; -+ int seg_id; -+ -+ seg_id = swr->add_segment (swr, winding_number, horiz_wind, -+ last_x, ctx->y); -+ swr->add_point (swr, seg_id, x, ctx->y); -+ swr->close_segment (swr, seg_id); -+ } -+ -+ /* Find first active segment in cluster. */ -+ -+ for (curs = seg; curs != NULL && curs->horiz_x == x; -+ curs = curs->horiz_right) -+ if (!(curs->flags & ART_ACTIVE_FLAGS_DEL)) -+ break; -+ -+ if (curs != NULL && curs->horiz_x == x) -+ { -+ /* There exists at least one active segment in this cluster. */ -+ -+ /* Find beginning of cluster. */ -+ for (; curs->left != NULL; curs = curs->left) -+ if (curs->left->horiz_x != x) -+ break; -+ -+ if (curs->left != NULL) -+ winding_number = curs->left->wind_left + curs->left->delta_wind; -+ else -+ winding_number = 0; -+ -+ do -+ { -+#ifdef VERBOSE -+ art_dprint (" curs %lx: winding_number = %d += %d\n", -+ (unsigned long)curs, winding_number, curs->delta_wind); -+#endif -+ if (!(curs->flags & ART_ACTIVE_FLAGS_OUT) || -+ curs->wind_left != winding_number) -+ { -+ ArtSvpWriter *swr = ctx->out; -+ -+ if (curs->flags & ART_ACTIVE_FLAGS_OUT) -+ { -+ swr->add_point (swr, curs->seg_id, -+ curs->horiz_x, ctx->y); -+ swr->close_segment (swr, curs->seg_id); -+ } -+ -+ curs->seg_id = swr->add_segment (swr, winding_number, -+ curs->delta_wind, -+ x, ctx->y); -+ curs->flags |= ART_ACTIVE_FLAGS_OUT; -+ } -+ curs->wind_left = winding_number; -+ winding_number += curs->delta_wind; -+ curs = curs->right; -+ } -+ while (curs != NULL && curs->horiz_x == x); -+ } -+ -+ /* Skip past cluster. */ -+ do -+ { -+ ArtActiveSeg *next = seg->horiz_right; -+ -+ seg->flags &= ~ART_ACTIVE_FLAGS_IN_HORIZ; -+ horiz_wind += seg->horiz_delta_wind; -+ seg->horiz_delta_wind = 0; -+ if (seg->flags & ART_ACTIVE_FLAGS_DEL) -+ { -+ if (seg->flags & ART_ACTIVE_FLAGS_OUT) -+ { -+ ArtSvpWriter *swr = ctx->out; -+ swr->close_segment (swr, seg->seg_id); -+ } -+ art_svp_intersect_active_free (seg); -+ } -+ seg = next; -+ } -+ while (seg != NULL && seg->horiz_x == x); -+ -+ last_x = x; -+ } -+ ctx->horiz_first = NULL; -+ ctx->horiz_last = NULL; -+#ifdef SANITYCHECK -+ art_svp_intersect_sanitycheck_winding (ctx); -+#endif -+} -+ -+#ifdef VERBOSE -+static void -+art_svp_intersect_print_active (ArtIntersectCtx *ctx) -+{ -+ ArtActiveSeg *seg; -+ -+ art_dprint ("Active list (y = %g):\n", ctx->y); -+ for (seg = ctx->active_head; seg != NULL; seg = seg->right) -+ { -+ art_dprint (" %lx: (%g, %g)-(%g, %g), (a, b, c) = (%g, %g, %g)\n", -+ (unsigned long)seg, -+ seg->x[0], seg->y0, seg->x[1], seg->y1, -+ seg->a, seg->b, seg->c); -+ } -+} -+#endif -+ -+#ifdef SANITYCHECK -+static void -+art_svp_intersect_sanitycheck (ArtIntersectCtx *ctx) -+{ -+ ArtActiveSeg *seg; -+ ArtActiveSeg *last = NULL; -+ double d; -+ -+ for (seg = ctx->active_head; seg != NULL; seg = seg->right) -+ { -+ if (seg->left != last) -+ { -+ art_warn ("*** art_svp_intersect_sanitycheck: last=%lx, seg->left=%lx\n", -+ (unsigned long)last, (unsigned long)seg->left); -+ } -+ if (last != NULL) -+ { -+ /* pairwise compare with previous seg */ -+ -+ /* First the top. */ -+ if (last->y0 < seg->y0) -+ { -+ } -+ else -+ { -+ } -+ -+ /* Then the bottom. */ -+ if (last->y1 < seg->y1) -+ { -+ if (!((last->x[1] < -+ seg->x[(seg->flags & ART_ACTIVE_FLAGS_BNEG) ^ 1]) || -+ last->y1 == seg->y0)) -+ { -+ d = last->x[1] * seg->a + last->y1 * seg->b + seg->c; -+ if (d >= -EPSILON_A) -+ art_warn ("*** bottom (%g, %g) of %lx is not clear of %lx to right (d = %g)\n", -+ last->x[1], last->y1, (unsigned long) last, -+ (unsigned long) seg, d); -+ } -+ } -+ else if (last->y1 > seg->y1) -+ -+ { -+ if (!((seg->x[1] > -+ last->x[last->flags & ART_ACTIVE_FLAGS_BNEG]) || -+ seg->y1 == last->y0)) -+ { -+ d = seg->x[1] * last->a + seg->y1 * last->b + last->c; -+ if (d <= EPSILON_A) -+ art_warn ("*** bottom (%g, %g) of %lx is not clear of %lx to left (d = %g)\n", -+ seg->x[1], seg->y1, (unsigned long) seg, -+ (unsigned long) last, d); -+ } -+ } -+ else -+ { -+ if (last->x[1] > seg->x[1]) -+ art_warn ("*** bottoms (%g, %g) of %lx and (%g, %g) of %lx out of order\n", -+ last->x[1], last->y1, (unsigned long)last, -+ seg->x[1], seg->y1, (unsigned long)seg); -+ } -+ } -+ last = seg; -+ } -+} -+#endif -+ -+void -+art_svp_intersector (const ArtSVP *in, ArtSvpWriter *out) -+{ -+ ArtIntersectCtx *ctx; -+ ArtPriQ *pq; -+ ArtPriPoint *first_point; -+#ifdef VERBOSE -+ int count = 0; -+#endif -+ -+ if (in->n_segs == 0) -+ return; -+ -+ ctx = art_new (ArtIntersectCtx, 1); -+ ctx->in = in; -+ ctx->out = out; -+ pq = art_pri_new (); -+ ctx->pq = pq; -+ -+ ctx->active_head = NULL; -+ -+ ctx->horiz_first = NULL; -+ ctx->horiz_last = NULL; -+ -+ ctx->in_curs = 0; -+ first_point = art_new (ArtPriPoint, 1); -+ first_point->x = in->segs[0].points[0].x; -+ first_point->y = in->segs[0].points[0].y; -+ first_point->user_data = NULL; -+ ctx->y = first_point->y; -+ art_pri_insert (pq, first_point); -+ -+ while (!art_pri_empty (pq)) -+ { -+ ArtPriPoint *pri_point = art_pri_choose (pq); -+ ArtActiveSeg *seg = (ArtActiveSeg *)pri_point->user_data; -+ -+#ifdef VERBOSE -+ art_dprint ("\nIntersector step %d\n", count++); -+ art_svp_intersect_print_active (ctx); -+ art_dprint ("priq choose (%g, %g) %lx\n", pri_point->x, pri_point->y, -+ (unsigned long)pri_point->user_data); -+#endif -+#ifdef SANITYCHECK -+ art_svp_intersect_sanitycheck(ctx); -+#endif -+ -+ if (ctx->y != pri_point->y) -+ { -+ art_svp_intersect_horiz_commit (ctx); -+ ctx->y = pri_point->y; -+ } -+ -+ if (seg == NULL) -+ { -+ /* Insert new segment from input */ -+ const ArtSVPSeg *in_seg = &in->segs[ctx->in_curs++]; -+ art_svp_intersect_add_seg (ctx, in_seg); -+ if (ctx->in_curs < in->n_segs) -+ { -+ const ArtSVPSeg *next_seg = &in->segs[ctx->in_curs]; -+ pri_point->x = next_seg->points[0].x; -+ pri_point->y = next_seg->points[0].y; -+ /* user_data is already NULL */ -+ art_pri_insert (pq, pri_point); -+ } -+ else -+ art_free (pri_point); -+ } -+ else -+ { -+ int n_stack = seg->n_stack; -+ -+ if (n_stack > 1) -+ { -+ art_svp_intersect_process_intersection (ctx, seg); -+ art_free (pri_point); -+ } -+ else -+ { -+ art_svp_intersect_advance_cursor (ctx, seg, pri_point); -+ } -+ } -+ } -+ -+ art_svp_intersect_horiz_commit (ctx); -+ -+ art_pri_free (pq); -+ art_free (ctx); -+} -+ -+#endif /* not TEST_PRIQ */ -diff -uNr /oocvs/OOO_STABLE_1-backup/external/gpc/art_svp_intersect.h external/gpc/art_svp_intersect.h ---- /oocvs/OOO_STABLE_1-backup/external/gpc/art_svp_intersect.h Wed Dec 31 18:00:00 1969 -+++ external/gpc/art_svp_intersect.h Fri Sep 20 21:42:19 2002 -@@ -0,0 +1,66 @@ -+/* Libart_LGPL - library of basic graphic primitives -+ * Copyright (C) 2001 Raph Levien -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Library General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Library General Public License for more details. -+ * -+ * You should have received a copy of the GNU Library General Public -+ * License along with this library; if not, write to the -+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ * Boston, MA 02111-1307, USA. -+ */ -+ -+#ifndef __ART_SVP_INTERSECT_H__ -+#define __ART_SVP_INTERSECT_H__ -+ -+/* The funky new SVP intersector. */ -+ -+#include "art_svp.h" -+ -+#ifdef __cplusplus -+extern "C" { -+#endif /* __cplusplus */ -+ -+#ifndef ART_WIND_RULE_DEFINED -+#define ART_WIND_RULE_DEFINED -+typedef enum { -+ ART_WIND_RULE_NONZERO, -+ ART_WIND_RULE_INTERSECT, -+ ART_WIND_RULE_ODDEVEN, -+ ART_WIND_RULE_POSITIVE -+} ArtWindRule; -+#endif -+ -+typedef struct _ArtSvpWriter ArtSvpWriter; -+ -+struct _ArtSvpWriter { -+ int (*add_segment) (ArtSvpWriter *self, int wind_left, int delta_wind, -+ double x, double y); -+ void (*add_point) (ArtSvpWriter *self, int seg_id, double x, double y); -+ void (*close_segment) (ArtSvpWriter *self, int seg_id); -+}; -+ -+ArtSvpWriter * -+art_svp_writer_rewind_new (ArtWindRule rule); -+ -+ArtSVP * -+art_svp_writer_rewind_reap (ArtSvpWriter *self); -+ -+int -+art_svp_seg_compare (const void *s1, const void *s2); -+ -+void -+art_svp_intersector (const ArtSVP *in, ArtSvpWriter *out); -+ -+#ifdef __cplusplus -+} -+#endif /* __cplusplus */ -+ -+#endif /* __ART_SVP_INTERSECT_H__ */ -diff -uNr /oocvs/OOO_STABLE_1-backup/external/gpc/art_svp_ops.c external/gpc/art_svp_ops.c ---- /oocvs/OOO_STABLE_1-backup/external/gpc/art_svp_ops.c Wed Dec 31 18:00:00 1969 -+++ external/gpc/art_svp_ops.c Wed Oct 9 20:16:52 2002 -@@ -0,0 +1,398 @@ -+/* Libart_LGPL - library of basic graphic primitives -+ * Copyright (C) 1998-2000 Raph Levien -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Library General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Library General Public License for more details. -+ * -+ * You should have received a copy of the GNU Library General Public -+ * License along with this library; if not, write to the -+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ * Boston, MA 02111-1307, USA. -+ */ -+ -+#define noVERBOSE -+ -+/* Vector path set operations, over sorted vpaths. */ -+ -+#include "art_svp_ops.h" -+#include "art_misc.h" -+#include "art_svp.h" -+#include "art_vpath.h" -+#include "art_svp_vpath.h" -+#include "art_svp.h" -+#ifdef ART_USE_NEW_INTERSECTOR -+#include "art_svp_intersect.h" -+#else -+#include "art_svp_wind.h" -+#endif -+#include "art_vpath_svp.h" -+ -+/* Merge the segments of the two svp's. The resulting svp will share -+ segments with args passed in, so be super-careful with the -+ allocation. */ -+/** -+ * art_svp_merge: Merge the segments of two svp's. -+ * @svp1: One svp to merge. -+ * @svp2: The other svp to merge. -+ * -+ * Merges the segments of two SVP's into a new one. The resulting -+ * #ArtSVP data structure will share the segments of the argument -+ * svp's, so it is probably a good idea to free it shallowly, -+ * especially if the arguments will be freed with art_svp_free(). -+ * -+ * Return value: The merged #ArtSVP. -+ **/ -+static ArtSVP * -+art_svp_merge (const ArtSVP *svp1, const ArtSVP *svp2) -+{ -+ ArtSVP *svp_new; -+ int ix; -+ int ix1, ix2; -+ -+ svp_new = (ArtSVP *)art_alloc (sizeof(ArtSVP) + -+ (svp1->n_segs + svp2->n_segs - 1) * -+ sizeof(ArtSVPSeg)); -+ ix1 = 0; -+ ix2 = 0; -+ for (ix = 0; ix < svp1->n_segs + svp2->n_segs; ix++) -+ { -+ if (ix1 < svp1->n_segs && -+ (ix2 == svp2->n_segs || -+ art_svp_seg_compare (&svp1->segs[ix1], &svp2->segs[ix2]) < 1)) -+ svp_new->segs[ix] = svp1->segs[ix1++]; -+ else -+ svp_new->segs[ix] = svp2->segs[ix2++]; -+ } -+ -+ svp_new->n_segs = ix; -+ return svp_new; -+} -+ -+#ifdef VERBOSE -+ -+#define XOFF 50 -+#define YOFF 700 -+ -+static void -+print_ps_vpath (ArtVpath *vpath) -+{ -+ int i; -+ -+ printf ("gsave %d %d translate 1 -1 scale\n", XOFF, YOFF); -+ for (i = 0; vpath[i].code != ART_END; i++) -+ { -+ switch (vpath[i].code) -+ { -+ case ART_MOVETO: -+ printf ("%g %g moveto\n", vpath[i].x, vpath[i].y); -+ break; -+ case ART_LINETO: -+ printf ("%g %g lineto\n", vpath[i].x, vpath[i].y); -+ break; -+ default: -+ break; -+ } -+ } -+ printf ("stroke grestore showpage\n"); -+} -+ -+#define DELT 4 -+ -+static void -+print_ps_svp (ArtSVP *vpath) -+{ -+ int i, j; -+ -+ printf ("%% begin\n"); -+ for (i = 0; i < vpath->n_segs; i++) -+ { -+ printf ("%g setgray\n", vpath->segs[i].dir ? 0.7 : 0); -+ for (j = 0; j < vpath->segs[i].n_points; j++) -+ { -+ printf ("%g %g %s\n", -+ XOFF + vpath->segs[i].points[j].x, -+ YOFF - vpath->segs[i].points[j].y, -+ j ? "lineto" : "moveto"); -+ } -+ printf ("%g %g moveto %g %g lineto %g %g lineto %g %g lineto stroke\n", -+ XOFF + vpath->segs[i].points[0].x - DELT, -+ YOFF - DELT - vpath->segs[i].points[0].y, -+ XOFF + vpath->segs[i].points[0].x - DELT, -+ YOFF - vpath->segs[i].points[0].y, -+ XOFF + vpath->segs[i].points[0].x + DELT, -+ YOFF - vpath->segs[i].points[0].y, -+ XOFF + vpath->segs[i].points[0].x + DELT, -+ YOFF - DELT - vpath->segs[i].points[0].y); -+ printf ("%g %g moveto %g %g lineto %g %g lineto %g %g lineto stroke\n", -+ XOFF + vpath->segs[i].points[j - 1].x - DELT, -+ YOFF + DELT - vpath->segs[i].points[j - 1].y, -+ XOFF + vpath->segs[i].points[j - 1].x - DELT, -+ YOFF - vpath->segs[i].points[j - 1].y, -+ XOFF + vpath->segs[i].points[j - 1].x + DELT, -+ YOFF - vpath->segs[i].points[j - 1].y, -+ XOFF + vpath->segs[i].points[j - 1].x + DELT, -+ YOFF + DELT - vpath->segs[i].points[j - 1].y); -+ printf ("stroke\n"); -+ } -+ -+ printf ("showpage\n"); -+} -+#endif -+ -+#ifndef ART_USE_NEW_INTERSECTOR -+static ArtSVP * -+art_svp_merge_perturbed (const ArtSVP *svp1, const ArtSVP *svp2) -+{ -+ ArtVpath *vpath1, *vpath2; -+ ArtVpath *vpath1_p, *vpath2_p; -+ ArtSVP *svp1_p, *svp2_p; -+ ArtSVP *svp_new; -+ -+ vpath1 = art_vpath_from_svp (svp1); -+ vpath1_p = art_vpath_perturb (vpath1); -+ art_free (vpath1); -+ svp1_p = art_svp_from_vpath (vpath1_p); -+ art_free (vpath1_p); -+ -+ vpath2 = art_vpath_from_svp (svp2); -+ vpath2_p = art_vpath_perturb (vpath2); -+ art_free (vpath2); -+ svp2_p = art_svp_from_vpath (vpath2_p); -+ art_free (vpath2_p); -+ -+ svp_new = art_svp_merge (svp1_p, svp2_p); -+#ifdef VERBOSE -+ print_ps_svp (svp1_p); -+ print_ps_svp (svp2_p); -+ print_ps_svp (svp_new); -+#endif -+ art_free (svp1_p); -+ art_free (svp2_p); -+ -+ return svp_new; -+} -+#endif -+ -+/* Compute the union of two vector paths. -+ -+ Status of this routine: -+ -+ Basic correctness: Seems to work. -+ -+ Numerical stability: We cheat (adding random perturbation). Thus, -+ it seems very likely that no numerical stability problems will be -+ seen in practice. -+ -+ Speed: Would be better if we didn't go to unsorted vector path -+ and back to add the perturbation. -+ -+ Precision: The perturbation fuzzes the coordinates slightly. In -+ cases of butting segments, razor thin long holes may appear. -+ -+*/ -+/** -+ * art_svp_union: Compute the union of two sorted vector paths. -+ * @svp1: One sorted vector path. -+ * @svp2: The other sorted vector path. -+ * -+ * Computes the union of the two argument svp's. Given two svp's with -+ * winding numbers of 0 and 1 everywhere, the resulting winding number -+ * will be 1 where either (or both) of the argument svp's has a -+ * winding number 1, 0 otherwise. The result is newly allocated. -+ * -+ * Currently, this routine has accuracy problems pending the -+ * implementation of the new intersector. -+ * -+ * Return value: The union of @svp1 and @svp2. -+ **/ -+ArtSVP * -+art_svp_union (const ArtSVP *svp1, const ArtSVP *svp2) -+{ -+#ifdef ART_USE_NEW_INTERSECTOR -+ ArtSVP *svp3, *svp_new; -+ ArtSvpWriter *swr; -+ -+ svp3 = art_svp_merge (svp1, svp2); -+ swr = art_svp_writer_rewind_new (ART_WIND_RULE_POSITIVE); -+ art_svp_intersector (svp3, swr); -+ svp_new = art_svp_writer_rewind_reap (swr); -+ art_free (svp3); /* shallow free because svp3 contains shared segments */ -+ -+ return svp_new; -+#else -+ ArtSVP *svp3, *svp4, *svp_new; -+ -+ svp3 = art_svp_merge_perturbed (svp1, svp2); -+ svp4 = art_svp_uncross (svp3); -+ art_svp_free (svp3); -+ -+ svp_new = art_svp_rewind_uncrossed (svp4, ART_WIND_RULE_POSITIVE); -+#ifdef VERBOSE -+ print_ps_svp (svp4); -+ print_ps_svp (svp_new); -+#endif -+ art_svp_free (svp4); -+ return svp_new; -+#endif -+} -+ -+/* Compute the intersection of two vector paths. -+ -+ Status of this routine: -+ -+ Basic correctness: Seems to work. -+ -+ Numerical stability: We cheat (adding random perturbation). Thus, -+ it seems very likely that no numerical stability problems will be -+ seen in practice. -+ -+ Speed: Would be better if we didn't go to unsorted vector path -+ and back to add the perturbation. -+ -+ Precision: The perturbation fuzzes the coordinates slightly. In -+ cases of butting segments, razor thin long isolated segments may -+ appear. -+ -+*/ -+ -+/** -+ * art_svp_intersect: Compute the intersection of two sorted vector paths. -+ * @svp1: One sorted vector path. -+ * @svp2: The other sorted vector path. -+ * -+ * Computes the intersection of the two argument svp's. Given two -+ * svp's with winding numbers of 0 and 1 everywhere, the resulting -+ * winding number will be 1 where both of the argument svp's has a -+ * winding number 1, 0 otherwise. The result is newly allocated. -+ * -+ * Currently, this routine has accuracy problems pending the -+ * implementation of the new intersector. -+ * -+ * Return value: The intersection of @svp1 and @svp2. -+ **/ -+ArtSVP * -+art_svp_intersect (const ArtSVP *svp1, const ArtSVP *svp2) -+{ -+#ifdef ART_USE_NEW_INTERSECTOR -+ ArtSVP *svp3, *svp_new; -+ ArtSvpWriter *swr; -+ -+ svp3 = art_svp_merge (svp1, svp2); -+ swr = art_svp_writer_rewind_new (ART_WIND_RULE_INTERSECT); -+ art_svp_intersector (svp3, swr); -+ svp_new = art_svp_writer_rewind_reap (swr); -+ art_free (svp3); /* shallow free because svp3 contains shared segments */ -+ -+ return svp_new; -+#else -+ ArtSVP *svp3, *svp4, *svp_new; -+ -+ svp3 = art_svp_merge_perturbed (svp1, svp2); -+ svp4 = art_svp_uncross (svp3); -+ art_svp_free (svp3); -+ -+ svp_new = art_svp_rewind_uncrossed (svp4, ART_WIND_RULE_INTERSECT); -+ art_svp_free (svp4); -+ return svp_new; -+#endif -+} -+ -+/* Compute the symmetric difference of two vector paths. -+ -+ Status of this routine: -+ -+ Basic correctness: Seems to work. -+ -+ Numerical stability: We cheat (adding random perturbation). Thus, -+ it seems very likely that no numerical stability problems will be -+ seen in practice. -+ -+ Speed: We could do a lot better by scanning through the svp -+ representations and culling out any segments that are exactly -+ identical. It would also be better if we didn't go to unsorted -+ vector path and back to add the perturbation. -+ -+ Precision: Awful. In the case of inputs which are similar (the -+ common case for canvas display), the entire outline is "hairy." In -+ addition, the perturbation fuzzes the coordinates slightly. It can -+ be used as a conservative approximation. -+ -+*/ -+ -+/** -+ * art_svp_diff: Compute the symmetric difference of two sorted vector paths. -+ * @svp1: One sorted vector path. -+ * @svp2: The other sorted vector path. -+ * -+ * Computes the symmetric of the two argument svp's. Given two svp's -+ * with winding numbers of 0 and 1 everywhere, the resulting winding -+ * number will be 1 where either, but not both, of the argument svp's -+ * has a winding number 1, 0 otherwise. The result is newly allocated. -+ * -+ * Currently, this routine has accuracy problems pending the -+ * implementation of the new intersector. -+ * -+ * Return value: The symmetric difference of @svp1 and @svp2. -+ **/ -+ArtSVP * -+art_svp_diff (const ArtSVP *svp1, const ArtSVP *svp2) -+{ -+#ifdef ART_USE_NEW_INTERSECTOR -+ ArtSVP *svp3, *svp_new; -+ ArtSvpWriter *swr; -+ -+ svp3 = art_svp_merge (svp1, svp2); -+ swr = art_svp_writer_rewind_new (ART_WIND_RULE_ODDEVEN); -+ art_svp_intersector (svp3, swr); -+ svp_new = art_svp_writer_rewind_reap (swr); -+ art_free (svp3); /* shallow free because svp3 contains shared segments */ -+ -+ return svp_new; -+#else -+ ArtSVP *svp3, *svp4, *svp_new; -+ -+ svp3 = art_svp_merge_perturbed (svp1, svp2); -+ svp4 = art_svp_uncross (svp3); -+ art_svp_free (svp3); -+ -+ svp_new = art_svp_rewind_uncrossed (svp4, ART_WIND_RULE_ODDEVEN); -+ art_svp_free (svp4); -+ return svp_new; -+#endif -+} -+ -+#ifdef ART_USE_NEW_INTERSECTOR -+ArtSVP * -+art_svp_minus (const ArtSVP *svp1, const ArtSVP *svp2) -+{ -+ ArtSVP *svp2_mod; -+ ArtSVP *svp3, *svp_new; -+ ArtSvpWriter *swr; -+ int i; -+ -+ svp2_mod = (ArtSVP *) svp2; /* get rid of the const for a while */ -+ -+ /* First invert svp2 to "turn it inside out" */ -+ for (i = 0; i < svp2_mod->n_segs; i++) -+ svp2_mod->segs[i].dir = !svp2_mod->segs[i].dir; -+ -+ svp3 = art_svp_merge (svp1, svp2_mod); -+ swr = art_svp_writer_rewind_new (ART_WIND_RULE_POSITIVE); -+ art_svp_intersector (svp3, swr); -+ svp_new = art_svp_writer_rewind_reap (swr); -+ art_free (svp3); /* shallow free because svp3 contains shared segments */ -+ -+ /* Flip svp2 back to its original state */ -+ for (i = 0; i < svp2_mod->n_segs; i++) -+ svp2_mod->segs[i].dir = !svp2_mod->segs[i].dir; -+ -+ return svp_new; -+} -+#endif -diff -uNr /oocvs/OOO_STABLE_1-backup/external/gpc/art_svp_ops.h external/gpc/art_svp_ops.h ---- /oocvs/OOO_STABLE_1-backup/external/gpc/art_svp_ops.h Wed Dec 31 18:00:00 1969 -+++ external/gpc/art_svp_ops.h Fri Sep 20 21:36:53 2002 -@@ -0,0 +1,40 @@ -+/* Libart_LGPL - library of basic graphic primitives -+ * Copyright (C) 1998 Raph Levien -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Library General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Library General Public License for more details. -+ * -+ * You should have received a copy of the GNU Library General Public -+ * License along with this library; if not, write to the -+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ * Boston, MA 02111-1307, USA. -+ */ -+ -+#ifndef __ART_SVP_OPS_H__ -+#define __ART_SVP_OPS_H__ -+ -+#include "art_svp.h" -+ -+#ifdef __cplusplus -+extern "C" { -+#endif /* __cplusplus */ -+ -+/* Vector path set operations, over sorted vpaths. */ -+ -+ArtSVP *art_svp_union (const ArtSVP *svp1, const ArtSVP *svp2); -+ArtSVP *art_svp_intersect (const ArtSVP *svp1, const ArtSVP *svp2); -+ArtSVP *art_svp_diff (const ArtSVP *svp1, const ArtSVP *svp2); -+ArtSVP *art_svp_minus (const ArtSVP *svp1, const ArtSVP *svp2); -+ -+#ifdef __cplusplus -+} -+#endif /* __cplusplus */ -+ -+#endif /* __ART_SVP_OPS_H__ */ -diff -uNr /oocvs/OOO_STABLE_1-backup/external/gpc/art_svp_vpath.c external/gpc/art_svp_vpath.c ---- /oocvs/OOO_STABLE_1-backup/external/gpc/art_svp_vpath.c Wed Dec 31 18:00:00 1969 -+++ external/gpc/art_svp_vpath.c Fri Sep 20 20:33:09 2002 -@@ -0,0 +1,213 @@ -+/* Libart_LGPL - library of basic graphic primitives -+ * Copyright (C) 1998-2000 Raph Levien -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Library General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Library General Public License for more details. -+ * -+ * You should have received a copy of the GNU Library General Public -+ * License along with this library; if not, write to the -+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ * Boston, MA 02111-1307, USA. -+ */ -+ -+/* Sort vector paths into sorted vector paths */ -+ -+#include "art_svp_vpath.h" -+ -+#include <stdlib.h> -+#include <math.h> -+ -+#include "art_misc.h" -+#include "art_vpath.h" -+#include "art_svp.h" -+ -+ -+/* reverse a list of points in place */ -+static void -+reverse_points (ArtPoint *points, int n_points) -+{ -+ int i; -+ ArtPoint tmp_p; -+ -+ for (i = 0; i < (n_points >> 1); i++) -+ { -+ tmp_p = points[i]; -+ points[i] = points[n_points - (i + 1)]; -+ points[n_points - (i + 1)] = tmp_p; -+ } -+} -+ -+/** -+ * art_svp_from_vpath: Convert a vpath to a sorted vector path. -+ * @vpath: #ArtVPath to convert. -+ * -+ * Converts a vector path into sorted vector path form. The svp form is -+ * more efficient for rendering and other vector operations. -+ * -+ * Basically, the implementation is to traverse the vector path, -+ * generating a new segment for each "run" of points in the vector -+ * path with monotonically increasing Y values. All the resulting -+ * values are then sorted. -+ * -+ * Note: I'm not sure that the sorting rule is correct with respect -+ * to numerical stability issues. -+ * -+ * Return value: Resulting sorted vector path. -+ **/ -+ArtSVP * -+art_svp_from_vpath (ArtVpath *vpath) -+{ -+ int n_segs, n_segs_max; -+ ArtSVP *svp; -+ int dir; -+ int new_dir; -+ int i; -+ ArtPoint *points; -+ int n_points, n_points_max; -+ double x, y; -+ double x_min, x_max; -+ -+ n_segs = 0; -+ n_segs_max = 16; -+ svp = (ArtSVP *)art_alloc (sizeof(ArtSVP) + -+ (n_segs_max - 1) * sizeof(ArtSVPSeg)); -+ -+ dir = 0; -+ n_points = 0; -+ n_points_max = 0; -+ points = NULL; -+ i = 0; -+ -+ x = y = 0; /* unnecessary, given "first code must not be LINETO" invariant, -+ but it makes gcc -Wall -ansi -pedantic happier */ -+ x_min = x_max = 0; /* same */ -+ -+ while (vpath[i].code != ART_END) { -+ if (vpath[i].code == ART_MOVETO || vpath[i].code == ART_MOVETO_OPEN) -+ { -+ if (points != NULL && n_points >= 2) -+ { -+ if (n_segs == n_segs_max) -+ { -+ n_segs_max <<= 1; -+ svp = (ArtSVP *)art_realloc (svp, sizeof(ArtSVP) + -+ (n_segs_max - 1) * -+ sizeof(ArtSVPSeg)); -+ } -+ svp->segs[n_segs].n_points = n_points; -+ svp->segs[n_segs].dir = (dir > 0); -+ if (dir < 0) -+ reverse_points (points, n_points); -+ svp->segs[n_segs].points = points; -+ svp->segs[n_segs].bbox.x0 = x_min; -+ svp->segs[n_segs].bbox.x1 = x_max; -+ svp->segs[n_segs].bbox.y0 = points[0].y; -+ svp->segs[n_segs].bbox.y1 = points[n_points - 1].y; -+ n_segs++; -+ points = NULL; -+ } -+ -+ if (points == NULL) -+ { -+ n_points_max = 4; -+ points = art_new (ArtPoint, n_points_max); -+ } -+ -+ n_points = 1; -+ points[0].x = x = vpath[i].x; -+ points[0].y = y = vpath[i].y; -+ x_min = x; -+ x_max = x; -+ dir = 0; -+ } -+ else /* must be LINETO */ -+ { -+ new_dir = (vpath[i].y > y || -+ (vpath[i].y == y && vpath[i].x > x)) ? 1 : -1; -+ if (dir && dir != new_dir) -+ { -+ /* new segment */ -+ x = points[n_points - 1].x; -+ y = points[n_points - 1].y; -+ if (n_segs == n_segs_max) -+ { -+ n_segs_max <<= 1; -+ svp = (ArtSVP *)art_realloc (svp, sizeof(ArtSVP) + -+ (n_segs_max - 1) * -+ sizeof(ArtSVPSeg)); -+ } -+ svp->segs[n_segs].n_points = n_points; -+ svp->segs[n_segs].dir = (dir > 0); -+ if (dir < 0) -+ reverse_points (points, n_points); -+ svp->segs[n_segs].points = points; -+ svp->segs[n_segs].bbox.x0 = x_min; -+ svp->segs[n_segs].bbox.x1 = x_max; -+ svp->segs[n_segs].bbox.y0 = points[0].y; -+ svp->segs[n_segs].bbox.y1 = points[n_points - 1].y; -+ n_segs++; -+ -+ n_points = 1; -+ n_points_max = 4; -+ points = art_new (ArtPoint, n_points_max); -+ points[0].x = x; -+ points[0].y = y; -+ x_min = x; -+ x_max = x; -+ } -+ -+ if (points != NULL) -+ { -+ if (n_points == n_points_max) -+ art_expand (points, ArtPoint, n_points_max); -+ points[n_points].x = x = vpath[i].x; -+ points[n_points].y = y = vpath[i].y; -+ if (x < x_min) x_min = x; -+ else if (x > x_max) x_max = x; -+ n_points++; -+ } -+ dir = new_dir; -+ } -+ i++; -+ } -+ -+ if (points != NULL) -+ { -+ if (n_points >= 2) -+ { -+ if (n_segs == n_segs_max) -+ { -+ n_segs_max <<= 1; -+ svp = (ArtSVP *)art_realloc (svp, sizeof(ArtSVP) + -+ (n_segs_max - 1) * -+ sizeof(ArtSVPSeg)); -+ } -+ svp->segs[n_segs].n_points = n_points; -+ svp->segs[n_segs].dir = (dir > 0); -+ if (dir < 0) -+ reverse_points (points, n_points); -+ svp->segs[n_segs].points = points; -+ svp->segs[n_segs].bbox.x0 = x_min; -+ svp->segs[n_segs].bbox.x1 = x_max; -+ svp->segs[n_segs].bbox.y0 = points[0].y; -+ svp->segs[n_segs].bbox.y1 = points[n_points - 1].y; -+ n_segs++; -+ } -+ else -+ art_free (points); -+ } -+ -+ svp->n_segs = n_segs; -+ -+ qsort (&svp->segs, n_segs, sizeof (ArtSVPSeg), art_svp_seg_compare); -+ -+ return svp; -+} -+ -diff -uNr /oocvs/OOO_STABLE_1-backup/external/gpc/art_svp_vpath.h external/gpc/art_svp_vpath.h ---- /oocvs/OOO_STABLE_1-backup/external/gpc/art_svp_vpath.h Wed Dec 31 18:00:00 1969 -+++ external/gpc/art_svp_vpath.h Fri Sep 20 21:37:06 2002 -@@ -0,0 +1,39 @@ -+/* Libart_LGPL - library of basic graphic primitives -+ * Copyright (C) 1998 Raph Levien -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Library General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Library General Public License for more details. -+ * -+ * You should have received a copy of the GNU Library General Public -+ * License along with this library; if not, write to the -+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ * Boston, MA 02111-1307, USA. -+ */ -+ -+#ifndef __ART_SVP_VPATH_H__ -+#define __ART_SVP_VPATH_H__ -+ -+#include "art_svp.h" -+#include "art_vpath.h" -+ -+/* Sort vector paths into sorted vector paths. */ -+ -+#ifdef __cplusplus -+extern "C" { -+#endif /* __cplusplus */ -+ -+ArtSVP * -+art_svp_from_vpath (ArtVpath *vpath); -+ -+#ifdef __cplusplus -+} -+#endif /* __cplusplus */ -+ -+#endif /* __ART_SVP_VPATH_H__ */ -diff -uNr /oocvs/OOO_STABLE_1-backup/external/gpc/art_vpath.c external/gpc/art_vpath.c ---- /oocvs/OOO_STABLE_1-backup/external/gpc/art_vpath.c Wed Dec 31 18:00:00 1969 -+++ external/gpc/art_vpath.c Fri Sep 20 20:33:38 2002 -@@ -0,0 +1,239 @@ -+/* Libart_LGPL - library of basic graphic primitives -+ * Copyright (C) 1998-2000 Raph Levien -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Library General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Library General Public License for more details. -+ * -+ * You should have received a copy of the GNU Library General Public -+ * License along with this library; if not, write to the -+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ * Boston, MA 02111-1307, USA. -+ */ -+ -+/* Basic constructors and operations for vector paths */ -+ -+#include "art_vpath.h" -+ -+#include <math.h> -+#include <stdlib.h> -+ -+#include "art_misc.h" -+#include "art_rect.h" -+ -+/** -+ * art_vpath_add_point: Add point to vpath. -+ * @p_vpath: Where the pointer to the #ArtVpath structure is stored. -+ * @pn_points: Pointer to the number of points in *@p_vpath. -+ * @pn_points_max: Pointer to the number of points allocated. -+ * @code: The pathcode for the new point. -+ * @x: The X coordinate of the new point. -+ * @y: The Y coordinate of the new point. -+ * -+ * Adds a new point to *@p_vpath, reallocating and updating *@p_vpath -+ * and *@pn_points_max as necessary. *@pn_points is incremented. -+ * -+ * This routine always adds the point after all points already in the -+ * vpath. Thus, it should be called in the order the points are -+ * desired. -+ **/ -+void -+art_vpath_add_point (ArtVpath **p_vpath, int *pn_points, int *pn_points_max, -+ ArtPathcode code, double x, double y) -+{ -+ int i; -+ -+ i = (*pn_points)++; -+ if (i == *pn_points_max) -+ art_expand (*p_vpath, ArtVpath, *pn_points_max); -+ (*p_vpath)[i].code = code; -+ (*p_vpath)[i].x = x; -+ (*p_vpath)[i].y = y; -+} -+ -+/* number of steps should really depend on radius. */ -+#define CIRCLE_STEPS 128 -+ -+/** -+ * art_vpath_new_circle: Create a new circle. -+ * @x: X coordinate of center. -+ * @y: Y coordinate of center. -+ * @r: radius. -+ * -+ * Creates a new polygon closely approximating a circle with center -+ * (@x, @y) and radius @r. Currently, the number of points used in the -+ * approximation is fixed, but that will probably change. -+ * -+ * Return value: The newly created #ArtVpath. -+ **/ -+ArtVpath * -+art_vpath_new_circle (double x, double y, double r) -+{ -+ int i; -+ ArtVpath *vec; -+ double theta; -+ -+ vec = art_new (ArtVpath, CIRCLE_STEPS + 2); -+ -+ for (i = 0; i < CIRCLE_STEPS + 1; i++) -+ { -+ vec[i].code = i ? ART_LINETO : ART_MOVETO; -+ theta = (i & (CIRCLE_STEPS - 1)) * (M_PI * 2.0 / CIRCLE_STEPS); -+ vec[i].x = x + r * cos (theta); -+ vec[i].y = y - r * sin (theta); -+ } -+ vec[i].code = ART_END; -+ -+ return vec; -+} -+ -+/** -+ * art_vpath_affine_transform: Affine transform a vpath. -+ * @src: Source vpath to transform. -+ * @matrix: Affine transform. -+ * -+ * Computes the affine transform of the vpath, using @matrix as the -+ * transform. @matrix is stored in the same format as PostScript, ie. -+ * x' = @matrix[0] * x + @matrix[2] * y + @matrix[4] -+ * y' = @matrix[1] * x + @matrix[3] * y + @matrix[5] -+ * -+ * Return value: the newly allocated vpath resulting from the transform. -+**/ -+ArtVpath * -+art_vpath_affine_transform (const ArtVpath *src, const double matrix[6]) -+{ -+ int i; -+ int size; -+ ArtVpath *new; -+ double x, y; -+ -+ for (i = 0; src[i].code != ART_END; i++); -+ size = i; -+ -+ new = art_new (ArtVpath, size + 1); -+ -+ for (i = 0; i < size; i++) -+ { -+ new[i].code = src[i].code; -+ x = src[i].x; -+ y = src[i].y; -+ new[i].x = matrix[0] * x + matrix[2] * y + matrix[4]; -+ new[i].y = matrix[1] * x + matrix[3] * y + matrix[5]; -+ } -+ new[i].code = ART_END; -+ -+ return new; -+} -+ -+/** -+ * art_vpath_bbox_drect: Determine bounding box of vpath. -+ * @vec: Source vpath. -+ * @drect: Where to store bounding box. -+ * -+ * Determines bounding box of @vec, and stores it in @drect. -+ **/ -+void -+art_vpath_bbox_drect (const ArtVpath *vec, ArtDRect *drect) -+{ -+ int i; -+ double x0, y0, x1, y1; -+ -+ if (vec[0].code == ART_END) -+ { -+ x0 = y0 = x1 = y1 = 0; -+ } -+ else -+ { -+ x0 = x1 = vec[0].x; -+ y0 = y1 = vec[0].y; -+ for (i = 1; vec[i].code != ART_END; i++) -+ { -+ if (vec[i].x < x0) x0 = vec[i].x; -+ if (vec[i].x > x1) x1 = vec[i].x; -+ if (vec[i].y < y0) y0 = vec[i].y; -+ if (vec[i].y > y1) y1 = vec[i].y; -+ } -+ } -+ drect->x0 = x0; -+ drect->y0 = y0; -+ drect->x1 = x1; -+ drect->y1 = y1; -+} -+ -+/** -+ * art_vpath_bbox_irect: Determine integer bounding box of vpath. -+ * @vec: Source vpath. -+ * idrect: Where to store bounding box. -+ * -+ * Determines integer bounding box of @vec, and stores it in @irect. -+ **/ -+void -+art_vpath_bbox_irect (const ArtVpath *vec, ArtIRect *irect) -+{ -+ ArtDRect drect; -+ -+ art_vpath_bbox_drect (vec, &drect); -+ art_drect_to_irect (irect, &drect); -+} -+ -+#define PERTURBATION 2e-3 -+ -+/** -+ * art_vpath_perturb: Perturb each point in vpath by small random amount. -+ * @src: Source vpath. -+ * -+ * Perturbs each of the points by a small random amount. This is -+ * helpful for cheating in cases when algorithms haven't attained -+ * numerical stability yet. -+ * -+ * Return value: Newly allocated vpath containing perturbed @src. -+ **/ -+ArtVpath * -+art_vpath_perturb (ArtVpath *src) -+{ -+ int i; -+ int size; -+ ArtVpath *new; -+ double x, y; -+ double x_start, y_start; -+ int open; -+ -+ for (i = 0; src[i].code != ART_END; i++); -+ size = i; -+ -+ new = art_new (ArtVpath, size + 1); -+ -+ x_start = 0; -+ y_start = 0; -+ open = 0; -+ for (i = 0; i < size; i++) -+ { -+ new[i].code = src[i].code; -+ x = src[i].x + (PERTURBATION * rand ()) / RAND_MAX - PERTURBATION * 0.5; -+ y = src[i].y + (PERTURBATION * rand ()) / RAND_MAX - PERTURBATION * 0.5; -+ if (src[i].code == ART_MOVETO) -+ { -+ x_start = x; -+ y_start = y; -+ open = 0; -+ } -+ else if (src[i].code == ART_MOVETO_OPEN) -+ open = 1; -+ if (!open && (i + 1 == size || src[i + 1].code != ART_LINETO)) -+ { -+ x = x_start; -+ y = y_start; -+ } -+ new[i].x = x; -+ new[i].y = y; -+ } -+ new[i].code = ART_END; -+ -+ return new; -+} -diff -uNr /oocvs/OOO_STABLE_1-backup/external/gpc/art_vpath.h external/gpc/art_vpath.h ---- /oocvs/OOO_STABLE_1-backup/external/gpc/art_vpath.h Wed Dec 31 18:00:00 1969 -+++ external/gpc/art_vpath.h Fri Sep 20 21:37:17 2002 -@@ -0,0 +1,66 @@ -+/* Libart_LGPL - library of basic graphic primitives -+ * Copyright (C) 1998 Raph Levien -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Library General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Library General Public License for more details. -+ * -+ * You should have received a copy of the GNU Library General Public -+ * License along with this library; if not, write to the -+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ * Boston, MA 02111-1307, USA. -+ */ -+ -+#ifndef __ART_VPATH_H__ -+#define __ART_VPATH_H__ -+ -+#include "art_rect.h" -+#include "art_pathcode.h" -+ -+/* Basic data structures and constructors for simple vector paths */ -+ -+#ifdef __cplusplus -+extern "C" { -+#endif /* __cplusplus */ -+ -+typedef struct _ArtVpath ArtVpath; -+ -+/* CURVETO is not allowed! */ -+struct _ArtVpath { -+ ArtPathcode code; -+ double x; -+ double y; -+}; -+ -+/* Some of the functions need to go into their own modules */ -+ -+void -+art_vpath_add_point (ArtVpath **p_vpath, int *pn_points, int *pn_points_max, -+ ArtPathcode code, double x, double y); -+ -+ArtVpath * -+art_vpath_new_circle (double x, double y, double r); -+ -+ArtVpath * -+art_vpath_affine_transform (const ArtVpath *src, const double matrix[6]); -+ -+void -+art_vpath_bbox_drect (const ArtVpath *vec, ArtDRect *drect); -+ -+void -+art_vpath_bbox_irect (const ArtVpath *vec, ArtIRect *irect); -+ -+ArtVpath * -+art_vpath_perturb (ArtVpath *src); -+ -+#ifdef __cplusplus -+} -+#endif /* __cplusplus */ -+ -+#endif /* __ART_VPATH_H__ */ -diff -uNr /oocvs/OOO_STABLE_1-backup/external/gpc/art_vpath_svp.c external/gpc/art_vpath_svp.c ---- /oocvs/OOO_STABLE_1-backup/external/gpc/art_vpath_svp.c Wed Dec 31 18:00:00 1969 -+++ external/gpc/art_vpath_svp.c Fri Sep 20 20:34:11 2002 -@@ -0,0 +1,195 @@ -+/* Libart_LGPL - library of basic graphic primitives -+ * Copyright (C) 1998-2000 Raph Levien -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Library General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Library General Public License for more details. -+ * -+ * You should have received a copy of the GNU Library General Public -+ * License along with this library; if not, write to the -+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ * Boston, MA 02111-1307, USA. -+ */ -+ -+/* "Unsort" a sorted vector path into an ordinary vector path. */ -+ -+#include "art_vpath_svp.h" -+ -+#include <stdio.h> /* for printf - debugging */ -+#include "art_misc.h" -+ -+#include "art_vpath.h" -+#include "art_svp.h" -+ -+typedef struct _ArtVpathSVPEnd ArtVpathSVPEnd; -+ -+struct _ArtVpathSVPEnd { -+ int seg_num; -+ int which; /* 0 = top, 1 = bottom */ -+ double x, y; -+}; -+ -+#define EPSILON 1e-6 -+ -+static int -+art_vpath_svp_point_compare (double x1, double y1, double x2, double y2) -+{ -+ if (y1 - EPSILON > y2) return 1; -+ if (y1 + EPSILON < y2) return -1; -+ if (x1 - EPSILON > x2) return 1; -+ if (x1 + EPSILON < x2) return -1; -+ return 0; -+} -+ -+static int -+art_vpath_svp_compare (const void *s1, const void *s2) -+{ -+ const ArtVpathSVPEnd *e1 = s1; -+ const ArtVpathSVPEnd *e2 = s2; -+ -+ return art_vpath_svp_point_compare (e1->x, e1->y, e2->x, e2->y); -+} -+ -+/* Convert from sorted vector path representation into regular -+ vector path representation. -+ -+ Status of this routine: -+ -+ Basic correctness: Only works with closed paths. -+ -+ Numerical stability: Not known to work when more than two segments -+ meet at a point. -+ -+ Speed: Should be pretty good. -+ -+ Precision: Does not degrade precision. -+ -+*/ -+/** -+ * art_vpath_from_svp: Convert from svp to vpath form. -+ * @svp: Original #ArtSVP. -+ * -+ * Converts the sorted vector path @svp into standard vpath form. -+ * -+ * Return value: the newly allocated vpath. -+ **/ -+ArtVpath * -+art_vpath_from_svp (const ArtSVP *svp) -+{ -+ int n_segs = svp->n_segs; -+ ArtVpathSVPEnd *ends; -+ ArtVpath *new; -+ int *visited; -+ int n_new, n_new_max; -+ int i, k; -+ int j = 0; /* Quiet compiler */ -+ int seg_num; -+ int first; -+ double last_x, last_y; -+ int n_points; -+ int pt_num; -+ -+ last_x = 0; /* to eliminate "uninitialized" warning */ -+ last_y = 0; -+ -+ ends = art_new (ArtVpathSVPEnd, n_segs * 2); -+ for (i = 0; i < svp->n_segs; i++) -+ { -+ int lastpt; -+ -+ ends[i * 2].seg_num = i; -+ ends[i * 2].which = 0; -+ ends[i * 2].x = svp->segs[i].points[0].x; -+ ends[i * 2].y = svp->segs[i].points[0].y; -+ -+ lastpt = svp->segs[i].n_points - 1; -+ ends[i * 2 + 1].seg_num = i; -+ ends[i * 2 + 1].which = 1; -+ ends[i * 2 + 1].x = svp->segs[i].points[lastpt].x; -+ ends[i * 2 + 1].y = svp->segs[i].points[lastpt].y; -+ } -+ qsort (ends, n_segs * 2, sizeof (ArtVpathSVPEnd), art_vpath_svp_compare); -+ -+ n_new = 0; -+ n_new_max = 16; /* I suppose we _could_ estimate this from traversing -+ the svp, so we don't have to reallocate */ -+ new = art_new (ArtVpath, n_new_max); -+ -+ visited = art_new (int, n_segs); -+ for (i = 0; i < n_segs; i++) -+ visited[i] = 0; -+ -+ first = 1; -+ for (i = 0; i < n_segs; i++) -+ { -+ if (!first) -+ { -+ /* search for the continuation of the existing subpath */ -+ /* This could be a binary search (which is why we sorted, above) */ -+ for (j = 0; j < n_segs * 2; j++) -+ { -+ if (!visited[ends[j].seg_num] && -+ art_vpath_svp_point_compare (last_x, last_y, -+ ends[j].x, ends[j].y) == 0) -+ break; -+ } -+ if (j == n_segs * 2) -+ first = 1; -+ } -+ if (first) -+ { -+ /* start a new subpath */ -+ for (j = 0; j < n_segs * 2; j++) -+ if (!visited[ends[j].seg_num]) -+ break; -+ } -+ if (j == n_segs * 2) -+ { -+ printf ("failure\n"); -+ } -+ seg_num = ends[j].seg_num; -+ n_points = svp->segs[seg_num].n_points; -+ for (k = 0; k < n_points; k++) -+ { -+ pt_num = svp->segs[seg_num].dir ? k : n_points - (1 + k); -+ if (k == 0) -+ { -+ if (first) -+ { -+ art_vpath_add_point (&new, &n_new, &n_new_max, -+ ART_MOVETO, -+ svp->segs[seg_num].points[pt_num].x, -+ svp->segs[seg_num].points[pt_num].y); -+ } -+ } -+ else -+ { -+ art_vpath_add_point (&new, &n_new, &n_new_max, -+ ART_LINETO, -+ svp->segs[seg_num].points[pt_num].x, -+ svp->segs[seg_num].points[pt_num].y); -+ if (k == n_points - 1) -+ { -+ last_x = svp->segs[seg_num].points[pt_num].x; -+ last_y = svp->segs[seg_num].points[pt_num].y; -+ /* to make more robust, check for meeting first_[xy], -+ set first if so */ -+ } -+ } -+ first = 0; -+ } -+ visited[seg_num] = 1; -+ } -+ -+ art_vpath_add_point (&new, &n_new, &n_new_max, -+ ART_END, 0, 0); -+ art_free (visited); -+ art_free (ends); -+ return new; -+} -diff -uNr /oocvs/OOO_STABLE_1-backup/external/gpc/art_vpath_svp.h external/gpc/art_vpath_svp.h ---- /oocvs/OOO_STABLE_1-backup/external/gpc/art_vpath_svp.h Wed Dec 31 18:00:00 1969 -+++ external/gpc/art_vpath_svp.h Fri Sep 20 21:37:33 2002 -@@ -0,0 +1,38 @@ -+/* Libart_LGPL - library of basic graphic primitives -+ * Copyright (C) 1998 Raph Levien -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Library General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Library General Public License for more details. -+ * -+ * You should have received a copy of the GNU Library General Public -+ * License along with this library; if not, write to the -+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ * Boston, MA 02111-1307, USA. -+ */ -+ -+#ifndef __ART_VPATH_SVP_H__ -+#define __ART_VPATH_SVP_H__ -+ -+/* "Unsort" a sorted vector path into an ordinary vector path. */ -+ -+#include "art_svp.h" -+#include "art_vpath.h" -+ -+#ifdef __cplusplus -+extern "C" { -+#endif /* __cplusplus */ -+ -+ArtVpath *art_vpath_from_svp (const ArtSVP *svp); -+ -+#ifdef __cplusplus -+} -+#endif /* __cplusplus */ -+ -+#endif /* __ART_VPATH_SVP_H__ */ -diff -uNr /oocvs/OOO_STABLE_1-backup/external/gpc/makefile.mk external/gpc/makefile.mk ---- /oocvs/OOO_STABLE_1-backup/external/gpc/makefile.mk Wed Apr 18 08:41:33 2001 -+++ external/gpc/makefile.mk Fri Sep 20 21:42:54 2002 -@@ -73,7 +73,12 @@ - - # --- Files -------------------------------------------------------- - --SLOFILES = $(SLO)$/gpc.obj -+#SLOFILES = $(SLO)$/gpc.obj -+ -+OBJFILES = $(OBJ)$/art_svp_intersect.obj $(OBJ)$/art_misc.obj $(OBJ)$/art_rect.obj $(OBJ)$/art_svp.obj $(OBJ)$/art_svp_ops.obj $(OBJ)$/art_svp_vpath.obj $(OBJ)$/art_vpath.obj $(OBJ)$/art_vpath_svp.obj -+ -+SLOFILES = $(SLO)$/art_svp_intersect.obj $(SLO)$/art_misc.obj $(SLO)$/art_rect.obj $(SLO)$/art_svp.obj $(SLO)$/art_svp_ops.obj $(SLO)$/art_svp_vpath.obj $(SLO)$/art_vpath.obj $(SLO)$/art_vpath_svp.obj -+ - - - LIB1TARGET=$(SLB)$/$(TARGET).lib -diff -uNr /oocvs/OOO_STABLE_1-backup/external/prj/d.lst external/prj/d.lst ---- /oocvs/OOO_STABLE_1-backup/external/prj/d.lst Tue Jun 26 06:07:02 2001 -+++ external/prj/d.lst Fri Sep 20 22:19:37 2002 -@@ -36,7 +36,7 @@ - ..\dt\rtufiles\*.h %_DEST%\inc%_EXT%\external\dt\*.h - ..\glibc\rtufiles\config.h %_DEST%\inc%_EXT%\external\glibc\config.h - ..\glibc\rtufiles\getopt.h %_DEST%\inc%_EXT%\external\glibc\getopt.h --..\gpc\gpc.h %_DEST%\inc%_EXT%\external\gpc\gpc.h -+..\gpc\*.h %_DEST%\inc%_EXT%\external\gpc\*.h - ..\npsdk\rtufiles\*.h %_DEST%\inc%_EXT%\external\npsdk\*.h - ..\odbc\rtufiles\*.h %_DEST%\inc%_EXT%\external\odbc\*.h - ..\sane\*.h %_DEST%\inc%_EXT%\external\sane\*.h -diff -u -r1.5 poly.hxx ---- poly.hxx 2001/03/22 13:19:21 1.5 -+++ vcl/inc/poly.hxx 2002/10/02 17:00:08 -@@ -250,13 +250,16 @@ - private: - - ImplPolyPolygon* mpImplPolyPolygon; -- -+#if 0 - #if _SOLAR__PRIVATE - - void* ImplCreateGPCPolygon() const; - void ImplDoOperation( const PolyPolygon& rPolyPoly, PolyPolygon& rResult, ULONG nOperation ) const; - - #endif // __PRIVATE -+#endif -+ void *ImplCreateArtVpath () const; -+ void ImplSetFromArtVpath (void *_vpath); - - public: - -diff -u -r1.4.16.1 poly2.cxx ---- poly2.cxx 2002/06/04 12:56:14 1.4.16.1 -+++ vcl/source/gdi/poly2.cxx 2002/10/10 00:47:04 -@@ -60,13 +60,21 @@ - ************************************************************************/ - - #define _SV_POLY2_CXX -- -+#if 0 - #ifndef __gpc_h --extern "C" -+extern "C" - { -- #include <external/gpc/gpc.h> -+ #include <external/gpc/gpc.h> - } - #endif -+#endif -+#include <external/gpc/art_misc.h> -+#include <external/gpc/art_vpath.h> -+#include <external/gpc/art_svp.h> -+#include <external/gpc/art_svp_vpath.h> -+#include <external/gpc/art_vpath_svp.h> -+#include <external/gpc/art_svp_ops.h> -+#include <external/gpc/art_svp_intersect.h> - - #ifdef W31 - #include <tools/svwin.h> -@@ -357,7 +365,7 @@ - if( bEdges ) - { - const Rectangle aBound( GetBoundRect() ); -- -+ - fArea = ( aBound.GetWidth() + aBound.GetHeight() ) * 0.5; - nPercent = pData ? pData->GetPercentValue() : 50; - nOptimizeFlags &= ~POLY_OPTIMIZE_EDGES; -@@ -402,36 +410,133 @@ - } - } - -+/* Converts an arbitrary SVP to an even-odd SVP */ -+static ArtSVP * -+svp_to_even_odd (ArtSVP *svp) -+{ -+ ArtSvpWriter *svw; -+ ArtSVP *result; -+ -+ svw = art_svp_writer_rewind_new (ART_WIND_RULE_ODDEVEN); -+ art_svp_intersector (svp, svw); -+ -+ result = art_svp_writer_rewind_reap (svw); -+ art_free (svp); /* Shallow free because the result contains shared segments */ -+ -+ return result; -+} -+ -+ - // ----------------------------------------------------------------------- - - void PolyPolygon::GetIntersection( const PolyPolygon& rPolyPoly, PolyPolygon& rResult ) const --{ -+{ -+ ArtVpath *a, *b; -+ ArtSVP *sa, *sb, *s; -+ -+ a = (ArtVpath *) ImplCreateArtVpath (); -+ b = (ArtVpath *) rPolyPoly.ImplCreateArtVpath (); -+ -+ sa = svp_to_even_odd (art_svp_from_vpath (a)); -+ sb = svp_to_even_odd (art_svp_from_vpath (b)); -+ -+ art_free (a); -+ art_free (b); -+ -+ s = art_svp_intersect (sa, sb); -+ a = art_vpath_from_svp (s); -+ art_svp_free (s); -+ -+ rResult.ImplSetFromArtVpath (a); -+ art_free (a); -+#if 0 - ImplDoOperation( rPolyPoly, rResult, GPC_INT ); -+#endif - } - - // ----------------------------------------------------------------------- - - void PolyPolygon::GetUnion( const PolyPolygon& rPolyPoly, PolyPolygon& rResult ) const - { -+ ArtVpath *a, *b; -+ ArtSVP *sa, *sb, *s; -+ -+ a = (ArtVpath *) ImplCreateArtVpath (); -+ b = (ArtVpath *) rPolyPoly.ImplCreateArtVpath (); -+ -+ sa = svp_to_even_odd (art_svp_from_vpath (a)); -+ sb = svp_to_even_odd (art_svp_from_vpath (b)); -+ -+ art_free (a); -+ art_free (b); -+ -+ s = art_svp_union (sa, sb); -+ a = art_vpath_from_svp (s); -+ art_svp_free (s); -+ -+ rResult.ImplSetFromArtVpath (a); -+ art_free (a); -+#if 0 - ImplDoOperation( rPolyPoly, rResult, GPC_UNION ); -+#endif - } - - // ----------------------------------------------------------------------- - - void PolyPolygon::GetDifference( const PolyPolygon& rPolyPoly, PolyPolygon& rResult ) const - { -+ ArtVpath *a, *b; -+ ArtSVP *sa, *sb, *s; -+ -+ a = (ArtVpath *) ImplCreateArtVpath (); -+ b = (ArtVpath *) rPolyPoly.ImplCreateArtVpath (); -+ -+ sa = svp_to_even_odd (art_svp_from_vpath (a)); -+ sb = svp_to_even_odd (art_svp_from_vpath (b)); -+ -+ art_free (a); -+ art_free (b); -+ -+ s = art_svp_minus (sa, sb); -+ a = art_vpath_from_svp (s); -+ art_svp_free (s); -+ -+ rResult.ImplSetFromArtVpath (a); -+ art_free (a); -+#if 0 - ImplDoOperation( rPolyPoly, rResult, GPC_DIFF ); -+#endif - } - - // ----------------------------------------------------------------------- - - void PolyPolygon::GetXOR( const PolyPolygon& rPolyPoly, PolyPolygon& rResult ) const - { -+ ArtVpath *a, *b; -+ ArtSVP *sa, *sb, *s; -+ -+ a = (ArtVpath *) ImplCreateArtVpath (); -+ b = (ArtVpath *) rPolyPoly.ImplCreateArtVpath (); -+ -+ sa = svp_to_even_odd (art_svp_from_vpath (a)); -+ sb = svp_to_even_odd (art_svp_from_vpath (b)); -+ -+ art_free (a); -+ art_free (b); -+ -+ s = art_svp_diff (sa, sb); /* symmetric difference, *not* set difference */ -+ a = art_vpath_from_svp (s); -+ art_svp_free (s); -+ -+ rResult.ImplSetFromArtVpath (a); -+ art_free (a); -+#if 0 - ImplDoOperation( rPolyPoly, rResult, GPC_XOR ); -+#endif - } - - // ----------------------------------------------------------------------- -- -+#if 0 - void* PolyPolygon::ImplCreateGPCPolygon() const - { - gpc_polygon* pRet = new gpc_polygon; -@@ -482,6 +587,8 @@ - - gpc_polygon_clip( (gpc_op) nOperation, pGPCPoly1, pGPCPoly2, pResult ); - -+ fprintf (stderr, "PolyPolygon::ImplDoOperation %ld\n", nOperation); -+ - rResult.Clear(); - - for( int i = 0; i < pResult->num_contours; i++ ) -@@ -508,6 +615,178 @@ - gpc_free_polygon( pResult ); - delete pResult; - } -+#endif -+ -+/* Finds the index of the upper rightmost vertex of a polygon */ -+static int -+upper_rightmost_vertex (const Polygon &poly) -+{ -+ int n; -+ int i; -+ double x, y; -+ int k; -+ -+ n = poly.GetSize (); -+ -+ k = 0; -+ x = poly[0].X (); -+ y = poly[0].Y (); -+ -+ for (i = 1; i < n; i++) -+ if (poly[i].Y () < y || (poly[0].Y () == y && poly[i].X () > x)) { -+ k = i; -+ x = poly[i].X (); -+ y = poly[i].Y (); -+ } -+ -+ return k; -+} -+ -+/* Returns whether a polygon is specified in counterclockwise order */ -+static BOOL -+poly_is_ccw (const Polygon &poly) -+{ -+ int n; -+ int k; -+ double cross; -+ -+ n = poly.GetSize (); -+ -+ if (n == 0) -+ return TRUE; -+ -+ k = upper_rightmost_vertex (poly); -+ -+ const Point &a = poly[(k + n - 1) % n]; -+ const Point &b = poly[k]; -+ const Point &c = poly[(k + 1) % n]; -+ -+ cross = -(a.X () * b.Y () - a.Y () * b.X () + -+ a.Y () * c.X () - a.X () * c.Y () + -+ b.X () * c.Y () - c.X () * b.Y ()); -+ -+ return (cross > 0); -+} -+ -+void * -+PolyPolygon::ImplCreateArtVpath () const -+{ -+ ArtVpath *vpath; -+ int n_contours; -+ int n_vertices; -+ int i, v; -+ -+ n_contours = Count (); -+ n_vertices = 0; -+ for (i = 0; i < n_contours; i++) { -+ const Polygon &poly = GetObject (i); -+ n_vertices += poly.GetSize () + 1; /* plus 1 for if we have to close the path */ -+ } -+ -+ n_vertices++; /* for the ART_END terminator */ -+ -+ vpath = art_new (ArtVpath, n_vertices); -+ v = 0; -+ -+ for (i = 0; i < n_contours; i++) { -+ int j, k; -+ int n; -+ const Polygon &poly = GetObject (i); -+ BOOL ccw; -+ -+ n = poly.GetSize (); -+ -+ ccw = poly_is_ccw (poly); -+ -+ /* Holes or inside contours need to be listed out in reverse -+ * clockwise direction to the main outwards contour, but OO.o -+ * does not seem to handle holes at all. So we'll just list all -+ * the contours as non-holes, e.g. in normal counterclockwise -+ * order. -+ */ -+ -+ if (ccw) -+ k = 0; -+ else -+ k = n - 1; -+ -+ for (j = 0; j < n; j++) { -+ const Point &point = poly[k]; -+ vpath[v].code = (j == 0) ? ART_MOVETO : ART_LINETO; -+ vpath[v].x = point.X (); -+ vpath[v].y = point.Y (); -+ -+ if (ccw) -+ k++; -+ else -+ k--; -+ -+ v++; -+ } -+ -+ /* Close the path if needed */ -+ if (n > 0 && -+ (vpath[v - 1].x != vpath[v - n].x || -+ vpath[v - 1].y != vpath[v - n].y)) { -+ vpath[v].code = ART_LINETO; -+ vpath[v].x = vpath[v - n].x; -+ vpath[v].y = vpath[v - n].y; -+ v++; -+ } -+ } -+ -+ vpath[v].code = ART_END; -+ -+ return vpath; -+} -+ -+void -+PolyPolygon::ImplSetFromArtVpath (void *_vpath) -+{ -+ ArtVpath *vpath; -+ -+ vpath = (ArtVpath *) _vpath; -+ -+ Clear (); -+ -+ while (vpath->code != ART_END) { -+ ArtVpath *p; -+ int n, n_vertices; -+ -+ n = 0; -+ for (p = vpath; n == 0 || p->code == ART_LINETO; p++) -+ n++; -+ -+ /* Remove the last duplicated point from closed subpaths */ -+ if (n > 0 && -+ vpath[n - 1].x == vpath[0].x && -+ vpath[n - 1].y == vpath[0].y) -+ n_vertices = n - 1; -+ else -+ n_vertices = n; -+ -+ if (n_vertices != 0) { -+ int i; -+ -+ Polygon poly (n_vertices); -+ -+ p = vpath; -+ for (i = 0; i < n_vertices; i++) { -+ Point &point = poly[i]; -+ -+ point.X () = FRound (p->x); -+ point.Y () = FRound (p->y); -+ -+ p++; -+ } -+ -+ Insert (poly); -+ } -+ -+ vpath += n; -+ } -+} -+ - - // ----------------------------------------------------------------------- - diff --git a/editors/openoffice.org-1.0/files/moz-patch b/editors/openoffice.org-1.0/files/moz-patch deleted file mode 100644 index 1a8d55946a1e..000000000000 --- a/editors/openoffice.org-1.0/files/moz-patch +++ /dev/null @@ -1,289 +0,0 @@ -#iZ 28398 -#iZ 11424 - -http://qa.openoffice.org/issues/show_bug.cgi?id=28398 -http://qa.openoffice.org/issues/show_bug.cgi?id=11424 - -disable freetype2 support since build broken and -this functionality is not used at all. - -reduce dependency (gtk is no longer needed) -GNUCOPY is not supported by 1.0 series - ---- moz/extractfiles.mk.org Sat Oct 30 22:01:49 2004 -+++ moz/extractfiles.mk Sat Oct 30 22:00:21 2004 -@@ -269,8 +269,8 @@ - +$(COPY) /QSZ $(INCLUDE_PATH)* $(INCLUDE_DIR) - +$(COPY) /QSZ $(PUBLIC_PATH)* $(INCLUDE_DIR) - .ELSE -- +$(GNUCOPY) -pr $(INCLUDE_PATH)* $(INCLUDE_DIR) -- +$(GNUCOPY) -pr $(PUBLIC_PATH)* $(INCLUDE_DIR) -+ +cp -pr $(INCLUDE_PATH)* $(INCLUDE_DIR) -+ +cp -pr $(PUBLIC_PATH)* $(INCLUDE_DIR) - .ENDIF - - .IF "$(GUI)"=="UNX" - ---- moz/mozilla-source-1.0.patch.org Tue Feb 10 19:44:34 2004 -+++ moz/mozilla-source-1.0.patch Sat Mar 19 12:51:35 2005 -@@ -4471,14 +4471,17 @@ - return NS_OK; - } - ----- miss/build/mozilla/.mozconfig Tue Jul 22 21:52:27 2003 -+--- misc/build/mozilla/.mozconfig Tue Jul 22 21:52:27 2003 - +++ misc/build/mozilla/.mozconfig Mon Jul 28 15:07:20 2003 --@@ -0,0 +1,8 @@ -+@@ -0,0 +1,11 @@ - +ac_add_options --disable-tests - +ac_add_options --disable-xprint - +ac_add_options --without-system-zlib - +ac_add_options --enable-ldap - +ac_add_options --disable-debug -++ac_add_options --disable-freetype2 -++ac_add_options --enable-default-toolkit=xlib -++ac_add_options --disable-pedantic - +ac_add_options --enable-optimize - +ac_add_options --enable-crypto - +ac_add_options --enable-strip -@@ -4497,3 +4500,19 @@ - endif - - # Windows equivalents -+ -+--- misc/build/mozilla/xpcom/typelib/xpidl/xpidl.h Wed Apr 10 12:38:31 2002 -++++ misc/build/mozilla/xpcom/typelib/xpidl/xpidl.h Sat Oct 29 12:34:19 2005 -+@@ -71,10 +71,10 @@ -+ * parens, e.g. XPIDL_WARNING((foo, bar, "sil")) -+ * -+ * Probably best removed when we leave 6.5. */ -+-#define XPIDL_WARNING(x) IDL_tree_warning##x -++#define XPIDL_WARNING(x) IDL_tree_warning x -+ #else -+ extern void xpidl_tree_warning(IDL_tree p, int level, const char *fmt, ...); -+-#define XPIDL_WARNING(x) xpidl_tree_warning##x -++#define XPIDL_WARNING(x) xpidl_tree_warning x -+ #endif -+ -+ /* - ---- moz/mozilla-source-1.0.patch.orig 2007-11-17 16:45:06.000000000 +0900 -+++ moz/mozilla-source-1.0.patch 2007-11-17 17:00:23.000000000 +0900 -@@ -4516,3 +4516,217 @@ - #endif - - /* -+*** misc/mozilla/configure Tue May 28 04:29:00 2002 -+--- misc/build/mozilla/configure Sun Sep 10 11:56:33 2006 -+*************** -+*** 4565,4571 **** -+ ;; -+ -+ *-freebsd*) -+! if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` != "elf"; then -+ DLL_SUFFIX=".so.1.0" -+ DSO_LDOPTS="-shared" -+ fi -+--- 4565,4571 ---- -+ ;; -+ -+ *-freebsd*) -+! if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` != "elf"; then -+ DLL_SUFFIX=".so.1.0" -+ DSO_LDOPTS="-shared" -+ fi -+*************** -+*** 6589,6594 **** -+--- 6589,6596 ---- -+ case $target in -+ *-hpux11.*) -+ ;; -++ *-freebsd*) -++ ;; -+ *) -+ echo $ac_n "checking for gethostbyname_r in -lc_r""... $ac_c" 1>&6 -+ echo "configure:6595: checking for gethostbyname_r in -lc_r" >&5 -+*** misc/mozilla/configure.in Tue May 28 04:29:12 2002 -+--- misc/build/mozilla/configure.in Sun Sep 10 11:56:18 2006 -+*************** -+*** 787,793 **** -+ ;; -+ -+ *-freebsd*) -+! if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` != "elf"; then -+ DLL_SUFFIX=".so.1.0" -+ DSO_LDOPTS="-shared" -+ fi -+--- 787,793 ---- -+ ;; -+ -+ *-freebsd*) -+! if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` != "elf"; then -+ DLL_SUFFIX=".so.1.0" -+ DSO_LDOPTS="-shared" -+ fi -+*************** -+*** 1606,1611 **** -+--- 1606,1613 ---- -+ case $target in -+ *-hpux11.*) -+ ;; -++ *-freebsd*) -++ ;; -+ *) -+ AC_CHECK_LIB(c_r, gethostbyname_r) -+ ;; -+*** misc/mozilla/directory/c-sdk/config/FreeBSD.mk Wed Apr 10 11:31:55 2002 -+--- misc/build/mozilla/directory/c-sdk/config/FreeBSD.mk Thu May 3 07:55:57 2007 -+*************** -+*** 66,72 **** -+ -+ ARCH = freebsd -+ -+! MOZ_OBJFORMAT := $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo aout) -+ -+ ifeq ($(MOZ_OBJFORMAT),elf) -+ DLL_SUFFIX = so -+--- 66,72 ---- -+ -+ ARCH = freebsd -+ -+! MOZ_OBJFORMAT := $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo elf) -+ -+ ifeq ($(MOZ_OBJFORMAT),elf) -+ DLL_SUFFIX = so -+*** misc/mozilla/directory/c-sdk/configure Wed Apr 10 11:31:53 2002 -+--- misc/build/mozilla/directory/c-sdk/configure Thu May 3 07:58:33 2007 -+*************** -+*** 3410,3416 **** -+ EOF -+ -+ CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall" -+! MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ if test "$MOZ_OBJFORMAT" = "elf"; then -+ DLL_SUFFIX=so -+ else -+--- 3410,3416 ---- -+ EOF -+ -+ CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall" -+! MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ if test "$MOZ_OBJFORMAT" = "elf"; then -+ DLL_SUFFIX=so -+ else -+*** misc/mozilla/directory/c-sdk/configure.in Wed Apr 10 11:31:54 2002 -+--- misc/build/mozilla/directory/c-sdk/configure.in Thu May 3 07:58:48 2007 -+*************** -+*** 900,906 **** -+ AC_DEFINE(FREEBSD) -+ AC_DEFINE(HAVE_BSD_FLOCK) -+ CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall" -+! MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ if test "$MOZ_OBJFORMAT" = "elf"; then -+ DLL_SUFFIX=so -+ else -+--- 900,906 ---- -+ AC_DEFINE(FREEBSD) -+ AC_DEFINE(HAVE_BSD_FLOCK) -+ CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall" -+! MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ if test "$MOZ_OBJFORMAT" = "elf"; then -+ DLL_SUFFIX=so -+ else -+*** misc/mozilla/nsprpub/configure Tue Sep 14 17:14:38 2004 -+--- misc/build/mozilla/nsprpub/configure Wed Apr 4 20:56:33 2007 -+*************** -+*** 3407,3413 **** -+ EOF -+ -+ CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall" -+! MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ if test "$MOZ_OBJFORMAT" = "elf"; then -+ DLL_SUFFIX=so -+ else -+--- 3407,3413 ---- -+ EOF -+ -+ CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall" -+! MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ if test "$MOZ_OBJFORMAT" = "elf"; then -+ DLL_SUFFIX=so -+ else -+*** misc/mozilla/nsprpub/configure.in Tue Sep 14 17:14:38 2004 -+--- misc/build/mozilla/nsprpub/configure.in Wed Apr 4 20:56:40 2007 -+*************** -+*** 922,928 **** -+ AC_DEFINE(HAVE_BSD_FLOCK) -+ AC_DEFINE(HAVE_SOCKLEN_T) -+ CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall" -+! MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ if test "$MOZ_OBJFORMAT" = "elf"; then -+ DLL_SUFFIX=so -+ else -+--- 922,928 ---- -+ AC_DEFINE(HAVE_BSD_FLOCK) -+ AC_DEFINE(HAVE_SOCKLEN_T) -+ CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall" -+! MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ if test "$MOZ_OBJFORMAT" = "elf"; then -+ DLL_SUFFIX=so -+ else -+ -+*** misc/mozilla/security/coreconf/FreeBSD.mk Wed Mar 26 20:17:25 2003 -+--- misc/build/mozilla/security/coreconf/FreeBSD.mk Wed Apr 4 20:56:48 2007 -+*************** -+*** 63,69 **** -+ -+ ARCH = freebsd -+ -+! MOZ_OBJFORMAT := $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo aout) -+ -+ ifeq ($(MOZ_OBJFORMAT),elf) -+ DLL_SUFFIX = so -+--- 63,69 ---- -+ -+ ARCH = freebsd -+ -+! MOZ_OBJFORMAT := $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo elf) -+ -+ ifeq ($(MOZ_OBJFORMAT),elf) -+ DLL_SUFFIX = so -+*** misc/mozilla/nsprpub/config/FreeBSD.mk Wed Apr 10 12:16:03 2002 -+--- misc/build/mozilla/nsprpub/config/FreeBSD.mk Thu May 3 08:07:27 2007 -+*************** -+*** 66,72 **** -+ -+ ARCH = freebsd -+ -+! MOZ_OBJFORMAT := $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo aout) -+ -+ ifeq ($(MOZ_OBJFORMAT),elf) -+ DLL_SUFFIX = so -+--- 66,72 ---- -+ -+ ARCH = freebsd -+ -+! MOZ_OBJFORMAT := $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo elf) -+ -+ ifeq ($(MOZ_OBJFORMAT),elf) -+ DLL_SUFFIX = so -+*** misc/mozilla/nsprpub/pr/src/misc/prnetdb.c Wed Apr 10 12:17:35 2002 -+--- misc/build/mozilla/nsprpub/pr/src/misc/prnetdb.c Sun Sep 10 11:55:27 2006 -+*************** -+*** 105,111 **** -+ #define _PR_HAVE_GETPROTO_R_INT -+ #endif -+ -+! #if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) -+ #define _PR_HAVE_GETPROTO_R -+ #define _PR_HAVE_5_ARG_GETPROTO_R -+ #endif -+--- 105,112 ---- -+ #define _PR_HAVE_GETPROTO_R_INT -+ #endif -+ -+! #if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) || \ -+! (defined(__FreeBSD__) && __FreeBSD_version > 601103) -+ #define _PR_HAVE_GETPROTO_R -+ #define _PR_HAVE_5_ARG_GETPROTO_R -+ #endif diff --git a/editors/openoffice.org-1.0/files/openoffice.org-wrapper b/editors/openoffice.org-1.0/files/openoffice.org-wrapper deleted file mode 100644 index 7983bbc65e62..000000000000 --- a/editors/openoffice.org-1.0/files/openoffice.org-wrapper +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -# -# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-1.0/files/Attic/openoffice.org-wrapper,v 1.1 2005-07-29 02:16:38 maho Exp $ - -oopath=%%PREFIX%%/OpenOffice.org1.0.3/program/ -program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%-||'` - -case $program in -$0) - exec $oopath/soffice "$@" - ;; - *) - exec $oopath/$program "$@" - ;; -esac diff --git a/editors/openoffice.org-1.0/files/optpatch-freetype b/editors/openoffice.org-1.0/files/optpatch-freetype deleted file mode 100644 index 287676e14dc0..000000000000 --- a/editors/openoffice.org-1.0/files/optpatch-freetype +++ /dev/null @@ -1,211 +0,0 @@ ---- freetype/freetype-2.0.5.patch Fri Apr 5 21:07:34 2002 -+++ freetype/freetype-2.0.5.patch Sat Mar 9 18:04:17 2002 -@@ -1,118 +1,79 @@ --*** misc/freetype-2.0.5/builds/compiler/visualc.mk Thu Dec 14 00:44:33 2000 ----- misc/build/freetype-2.0.5/builds/compiler/visualc.mk Wed Nov 7 16:11:47 2001 --*************** --*** 63,69 **** -- # ANSI compliance. -- # -- ifndef CFLAGS --! CFLAGS := /nologo /c /Ox /G5 /W3 /WX -- endif -- -- # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant. ----- 63,69 ---- -- # ANSI compliance. -- # -- ifndef CFLAGS --! CFLAGS := /nologo /c /Ox /G5 /W3 /WX /MT /Gd -D_CTYPE_DISABLE_MACROS -- endif -- -- # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant. --*** misc/freetype-2.0.5/builds/unix/ltmain.sh Thu Jun 7 19:36:17 2001 ----- misc/build/freetype-2.0.5/builds/unix/ltmain.sh Wed Nov 7 16:11:47 2001 --*************** --*** 631,637 **** -- if test "$build_old_libs" = yes; then -- if test "$pic_mode" != yes; then -- # Don't build PIC code --! command="$base_compile $srcfile" -- else -- # All platforms use -DPIC, to notify preprocessed assembler code. -- command="$base_compile $srcfile $pic_flag -DPIC" ----- 631,637 ---- -- if test "$build_old_libs" = yes; then -- if test "$pic_mode" != yes; then -- # Don't build PIC code --! command="$base_compile $srcfile -DPIC $pic_flag" -- else -- # All platforms use -DPIC, to notify preprocessed assembler code. -- command="$base_compile $srcfile $pic_flag -DPIC" --*** misc/freetype-2.0.5/include/freetype/config/ftmodule.h Mon Jan 1 18:25:21 2001 ----- misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h Wed Nov 7 16:11:47 2001 --*************** --*** 1,7 **** ----- 1,9 ---- -- FT_USE_MODULE(autohint_module_class) -- FT_USE_MODULE(cff_driver_class) -- FT_USE_MODULE(t1cid_driver_class) --+ /* -- FT_USE_MODULE(pcf_driver_class) --+ */ -- FT_USE_MODULE(psaux_module_class) -- FT_USE_MODULE(psnames_module_class) -- FT_USE_MODULE(ft_raster1_renderer_class) --*************** --*** 9,12 **** ----- 11,16 ---- -- FT_USE_MODULE(ft_smooth_renderer_class) -- FT_USE_MODULE(tt_driver_class) -- FT_USE_MODULE(t1_driver_class) --+ /* -- FT_USE_MODULE(winfnt_driver_class) --+ */ --*** misc/freetype-2.0.5/include/freetype/config/ftoption.h Tue Aug 21 10:50:45 2001 ----- misc/build/freetype-2.0.5/include/freetype/config/ftoption.h Wed Nov 7 16:11:47 2001 --*************** --*** 70,76 **** ----- 70,79 ---- -- /* All convenience functions are declared as such in their */ -- /* documentation. */ -- /* */ --+ /* -- #undef FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS --+ */ --+ #define FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS -- -- -- /*************************************************************************/ --*************** --*** 108,116 **** -- /* use a vector `plotter' format that isn't supported when this */ -- /* macro is undefined. */ -- /* */ -- #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS -- --- -- /*************************************************************************/ -- /* */ -- /* Glyph Postscript Names handling */ ----- 111,121 ---- -- /* use a vector `plotter' format that isn't supported when this */ -- /* macro is undefined. */ -- /* */ --+ /* -- #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS --+ */ --+ #undef FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS -- -- /*************************************************************************/ -- /* */ -- /* Glyph Postscript Names handling */ --*** misc/build/freetype-2.0.5/builds/unix/ltmain.sh.orig Mon Jan 7 14:21:35 2002 ----- misc/build/freetype-2.0.5/builds/unix/ltmain.sh Mon Jan 7 14:21:40 2002 --*************** --*** 2251,2257 **** -- ;; -- -- irix) --! major=`expr $current - $age + 1` -- verstring="sgi$major.$revision" -- -- # Add in all the interfaces that we are compatible with. ----- 2251,2257 ---- -- ;; -- -- irix) --! major=`expr $current - $age` -- verstring="sgi$major.$revision" -- -- # Add in all the interfaces that we are compatible with. -+diff -ur misc/freetype-2.0.5/builds/compiler/visualc.mk misc/build/freetype-2.0.5/builds/compiler/visualc.mk -+--- misc/freetype-2.0.5/builds/compiler/visualc.mk Thu Dec 27 14:47:57 2001 -++++ misc/build/freetype-2.0.5/builds/compiler/visualc.mk Thu Dec 27 14:49:17 2001 -+@@ -63,7 +63,7 @@ -+ # ANSI compliance. -+ # -+ ifndef CFLAGS -+- CFLAGS := /nologo /c /Ox /G5 /W3 /WX -++ CFLAGS := /nologo /c /Ox /G5 /W3 /WX /MT /Gd -D_CTYPE_DISABLE_MACROS -+ endif -+ -+ # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant. -+diff -ur misc/freetype-2.0.5/builds/unix/ltmain.sh misc/build/freetype-2.0.5/builds/unix/ltmain.sh -+--- misc/freetype-2.0.5/builds/unix/ltmain.sh Thu Dec 27 14:47:56 2001 -++++ misc/build/freetype-2.0.5/builds/unix/ltmain.sh Thu Dec 27 14:49:17 2001 -+@@ -631,7 +631,7 @@ -+ if test "$build_old_libs" = yes; then -+ if test "$pic_mode" != yes; then -+ # Don't build PIC code -+- command="$base_compile $srcfile" -++ command="$base_compile $srcfile -DPIC $pic_flag" -+ else -+ # All platforms use -DPIC, to notify preprocessed assembler code. -+ command="$base_compile $srcfile $pic_flag -DPIC" -+diff -ur misc/freetype-2.0.5/include/freetype/config/ftmodule.h misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h -+--- misc/freetype-2.0.5/include/freetype/config/ftmodule.h Thu Dec 27 14:47:57 2001 -++++ misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h Thu Dec 27 14:49:17 2001 -+@@ -1,7 +1,9 @@ -+ FT_USE_MODULE(autohint_module_class) -+ FT_USE_MODULE(cff_driver_class) -+ FT_USE_MODULE(t1cid_driver_class) -++/* -+ FT_USE_MODULE(pcf_driver_class) -++*/ -+ FT_USE_MODULE(psaux_module_class) -+ FT_USE_MODULE(psnames_module_class) -+ FT_USE_MODULE(ft_raster1_renderer_class) -+@@ -9,4 +11,6 @@ -+ FT_USE_MODULE(ft_smooth_renderer_class) -+ FT_USE_MODULE(tt_driver_class) -+ FT_USE_MODULE(t1_driver_class) -++/* -+ FT_USE_MODULE(winfnt_driver_class) -++*/ -+diff -ur misc/freetype-2.0.5/include/freetype/config/ftoption.h misc/build/freetype-2.0.5/include/freetype/config/ftoption.h -+--- misc/freetype-2.0.5/include/freetype/config/ftoption.h Thu Dec 27 14:47:57 2001 -++++ misc/build/freetype-2.0.5/include/freetype/config/ftoption.h Thu Dec 27 14:51:15 2001 -+@@ -70,7 +70,10 @@ -+ /* All convenience functions are declared as such in their */ -+ /* documentation. */ -+ /* */ -++/* -+ #undef FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS -++*/ -++#define FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS -+ -+ -+ /*************************************************************************/ -+@@ -108,8 +111,10 @@ -+ /* use a vector `plotter' format that isn't supported when this */ -+ /* macro is undefined. */ -+ /* */ -++/* -+ #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS -+- -++*/ -++#undef FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS -+ -+ /*************************************************************************/ -+ /* */ -+@@ -338,7 +343,7 @@ -+ /* By undefining this, you will only compile the code necessary to load */ -+ /* TrueType glyphs without hinting. */ -+ /* */ -+-#undef TT_CONFIG_OPTION_BYTECODE_INTERPRETER -++#define TT_CONFIG_OPTION_BYTECODE_INTERPRETER -+ -+ -+ /*************************************************************************/ ---- vcl/util/makefile.pmk.orig Mon Apr 28 10:25:02 2003 -+++ vcl/util/makefile.pmk Mon Apr 28 10:25:17 2003 -@@ -67,7 +67,7 @@ - .IF "$(remote)" != "" - USE_BUILTIN_RASTERIZER=true - .ENDIF --.IF "$(GUI)" == "UNX" -+.IF "$(GUI)" == "UNX" && "$(OS)" != "FREEBSD" - USE_BUILTIN_RASTERIZER=true - .ENDIF - diff --git a/editors/openoffice.org-1.0/files/patch-berkeleydb+db-3.2.9.patch b/editors/openoffice.org-1.0/files/patch-berkeleydb+db-3.2.9.patch deleted file mode 100644 index ba42c524d6a5..000000000000 --- a/editors/openoffice.org-1.0/files/patch-berkeleydb+db-3.2.9.patch +++ /dev/null @@ -1,115 +0,0 @@ ---- berkeleydb/db-3.2.9.patch.orig Sun Jan 19 14:58:19 2003 -+++ berkeleydb/db-3.2.9.patch Sun Jan 19 15:00:02 2003 -@@ -62,54 +62,66 @@ - solaris*) JINCSUBDIRS="solaris";; - linux*) JINCSUBDIRS="linux genunix";; - + irix*) JINCSUBDIRS="irix";; --+ netbsd*) JINCSUBDIRS="netbsd linux solaris genunix";; -++ freebsd*) JINCSUBDIRS="freebsd linux solaris genunix";; - *) JINCSUBDIRS="genunix";; - esac - - *** misc/db-3.2.9/dist/ltconfig Fri Oct 13 16:23:00 2000 - --- misc/build/db-3.2.9/dist/ltconfig Tue Jan 7 11:37:05 2003 --*************** --*** 1194,1204 **** -- -- netbsd*) -- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then --- archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' --- archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' --- else -- archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib' -- # can we support soname and/or expsyms with a.out? -oliva -- fi -- ;; -- ----- 1194,1205 ---- -- -- netbsd*) -- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -- archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib' -- # can we support soname and/or expsyms with a.out? -oliva --+ else --+ archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' --+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' --+ need_version=no -- fi -- ;; -- --*** misc/db-3.2.9/dist/ltconfig Fri Oct 13 16:23:00 2000 ----- misc/build/db-3.2.9/dist/ltconfig Tue Jan 7 11:37:05 2003 --*************** --*** 1955,1961 **** -- version_type=irix -- need_lib_prefix=no -- need_version=no --! soname_spec='${libname}${release}.so.$major' -- library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major ${libname}${release}.so $libname.so' -- case "$host_os" in -- irix5*) ----- 1955,1961 ---- -- version_type=irix -- need_lib_prefix=no -- need_version=no --! soname_spec='${libname}${release}.so' -- library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major ${libname}${release}.so $libname.so' -- case "$host_os" in -- irix5*) -+@@ -1202,6 +1202,17 @@ -+ fi -+ ;; -+ -++ freebsd*) -++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -++ archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib' -++ # can we support soname and/or expsyms with a.out? -oliva -++ else -++ archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' -++ archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -++ need_version=no -++ fi -++ ;; -++ -+ solaris* | sysv5*) -+ if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then -+ ld_shlibs=no -+@@ -1891,7 +1902,7 @@ -+ ;; -+ -+ freebsd*) -+- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -++ objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ version_type=freebsd-$objformat -+ case "$version_type" in -+ freebsd-elf*) -+@@ -1955,7 +1966,7 @@ -+ version_type=irix -+ need_lib_prefix=no -+ need_version=no -+- soname_spec='${libname}${release}.so.$major' -++ soname_spec='${libname}${release}.so' -+ library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major ${libname}${release}.so $libname.so' -+ case "$host_os" in -+ irix5*) -+@@ -2023,6 +2034,20 @@ -+ shlibpath_var=LD_LIBRARY_PATH -+ ;; -+ -++freebsd*) -++ version_type=sunos -++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -++ library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' -++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -++ dynamic_linker='FreeBSD (a.out) ld.so' -++ else -++ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so' -++ soname_spec='${libname}${release}.so$major' -++ dynamic_linker='FreeBSD ld.elf_so' -++ fi -++ shlibpath_var=LD_LIBRARY_PATH -++ ;; -++ -+ openbsd*) -+ version_type=sunos -+ if test "$with_gnu_ld" = yes; then diff --git a/editors/openoffice.org-1.0/files/patch-berkeleydb+makefile.mk b/editors/openoffice.org-1.0/files/patch-berkeleydb+makefile.mk deleted file mode 100644 index 43fee3b58750..000000000000 --- a/editors/openoffice.org-1.0/files/patch-berkeleydb+makefile.mk +++ /dev/null @@ -1,12 +0,0 @@ ---- berkeleydb/makefile.mk.orig Sat Apr 12 14:45:40 2003 -+++ berkeleydb/makefile.mk Sat Apr 12 14:46:29 2003 -@@ -84,7 +84,9 @@ - - BUILD_DIR=$(CONFIGURE_DIR) - BUILD_ACTION=make -+.IF "$(OS)"!="FREEBSD" - BUILD_FLAGS=-j$(MAXPROCESS) -+.ENDIF - - OUT2LIB=$(BUILD_DIR)$/.libs$/libdb*.so - diff --git a/editors/openoffice.org-1.0/files/patch-bridges+prj+build.lst b/editors/openoffice.org-1.0/files/patch-bridges+prj+build.lst deleted file mode 100644 index bcf3a8aa850f..000000000000 --- a/editors/openoffice.org-1.0/files/patch-bridges+prj+build.lst +++ /dev/null @@ -1,11 +0,0 @@ ---- bridges/prj/build.lst.orig Tue Mar 19 22:06:50 2002 -+++ bridges/prj/build.lst Tue Jun 4 12:24:46 2002 -@@ -9,6 +9,8 @@ - br bridges\source\cpp_uno\gcc2_linux_intel nmake - u br_gccli br_unotypes NULL - br bridges\source\cpp_uno\gcc3_linux_intel nmake - u br_gcc3li br_unotypes NULL - br bridges\source\cpp_uno\gcc2_freebsd_intel nmake - u br_gccfi br_unotypes NULL -+br bridges\source\cpp_uno\gcc2_freebsd_intel-sjlj nmake - u br_gccfi br_unotypes NULL -+br bridges\source\cpp_uno\gcc3_freebsd_intel nmake - u br_gcc3fi br_unotypes NULL - br bridges\source\cpp_uno\gcc2_linux_powerpc nmake - u br_gcclp br_unotypes NULL - br bridges\source\cpp_uno\gcc2_macosx_powerpc nmake - u br_gccmacoxp br_unotypes NULL - br bridges\source\cpp_uno\cc50_solaris_sparc nmake - u br_cc50sols br_unotypes NULL diff --git a/editors/openoffice.org-1.0/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel+makefile.mk b/editors/openoffice.org-1.0/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel+makefile.mk deleted file mode 100644 index 011bc09d09a7..000000000000 --- a/editors/openoffice.org-1.0/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel+makefile.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- bridges/source/cpp_uno/gcc2_freebsd_intel/makefile.mk.orig Fri May 31 10:22:18 2002 -+++ bridges/source/cpp_uno/gcc2_freebsd_intel/makefile.mk Fri May 31 10:22:46 2002 -@@ -76,7 +76,7 @@ - - # --- Files -------------------------------------------------------- - --.IF "$(COM)$(OS)$(CPU)" == "GCCFREEBSDI" -+.IF "$(COM)$(OS)$(CPU)$(COMNAME)-$(EXCEPTIONS)" == "GCCFREEBSDIgcc2-dwarf2" - - CFLAGSNOOPT=-O0 - NOOPTFILES=$(SLO)$/uno2cpp.obj diff --git a/editors/openoffice.org-1.0/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel-sjlj b/editors/openoffice.org-1.0/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel-sjlj deleted file mode 100644 index d4eeabf5c05a..000000000000 --- a/editors/openoffice.org-1.0/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel-sjlj +++ /dev/null @@ -1,1734 +0,0 @@ ---- /dev/null Thu Jan 1 01:00:00 1970 -+++ bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/cpp2uno.cxx Tue Jun 4 10:49:43 2002 -@@ -0,0 +1,615 @@ -+/************************************************************************* -+ * -+ * $RCSfile: cpp2uno.cxx,v $ -+ * -+ * $Revision: 1.1 $ -+ * -+ * last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $ -+ * -+ * The Contents of this file are made available subject to the terms of -+ * either of the following licenses -+ * -+ * - GNU Lesser General Public License Version 2.1 -+ * - Sun Industry Standards Source License Version 1.1 -+ * -+ * Sun Microsystems Inc., October, 2000 -+ * -+ * GNU Lesser General Public License Version 2.1 -+ * ============================================= -+ * Copyright 2000 by Sun Microsystems, Inc. -+ * 901 San Antonio Road, Palo Alto, CA 94303, USA -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License version 2.1, as published by the Free Software Foundation. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+ * MA 02111-1307 USA -+ * -+ * -+ * Sun Industry Standards Source License Version 1.1 -+ * ================================================= -+ * The contents of this file are subject to the Sun Industry Standards -+ * Source License Version 1.1 (the "License"); You may not use this file -+ * except in compliance with the License. You may obtain a copy of the -+ * License at http://www.openoffice.org/license.html. -+ * -+ * Software provided under this License is provided on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, -+ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, -+ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. -+ * See the License for the specific provisions governing your rights and -+ * obligations concerning the Software. -+ * -+ * The Initial Developer of the Original Code is: Sun Microsystems, Inc. -+ * -+ * Copyright: 2000 by Sun Microsystems, Inc. -+ * -+ * All Rights Reserved. -+ * -+ * Contributor(s): _______________________________________ -+ * -+ * -+ ************************************************************************/ -+ -+#define LEAK_STATIC_DATA -+// #define TRACE(x) OSL_TRACE(x) -+#define TRACE(x) -+ -+#include <stdlib.h> -+#if STLPORT_VERSION<321 -+#include <list.h> -+#include <map.h> -+#else -+#include <list> -+#include <map> -+#endif -+#include <typeinfo> -+#ifndef _RTL_ALLOC_H_ -+#include <rtl/alloc.h> -+#endif -+#ifndef _OSL_MUTEX_HXX_ -+#include <osl/mutex.hxx> -+#endif -+ -+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_ -+#include <typelib/typedescription.hxx> -+#endif -+#ifndef _UNO_DATA_H_ -+#include <uno/data.h> -+#endif -+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_ -+#include <bridges/cpp_uno/bridge.hxx> -+#endif -+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_ -+#include <bridges/cpp_uno/type_misc.hxx> -+#endif -+ -+#include "gcc2_freebsd_intel.hxx" -+ -+using namespace com::sun::star::uno; -+using namespace std; -+using namespace osl; -+using namespace rtl; -+ -+namespace CPPU_CURRENT_NAMESPACE -+{ -+ -+//================================================================================================== -+rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT; -+ -+//================================================================================================== -+static typelib_TypeClass cpp2uno_call( -+ cppu_cppInterfaceProxy * pThis, -+ const typelib_TypeDescription * pMemberTypeDescr, -+ typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return -+ sal_Int32 nParams, typelib_MethodParameter * pParams, -+ void ** pCallStack, -+ sal_Int64 * pRegisterReturn /* space for register return */ ) -+{ -+ // pCallStack: ret, [return ptr], this, params -+ char * pCppStack = (char *)(pCallStack +1); -+ -+ // return -+ typelib_TypeDescription * pReturnTypeDescr = 0; -+ if (pReturnTypeRef) -+ TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef ); -+ -+ void * pUnoReturn = 0; -+ void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need -+ -+ if (pReturnTypeDescr) -+ { -+ if (cppu_isSimpleType( pReturnTypeDescr )) -+ { -+ pUnoReturn = pRegisterReturn; // direct way for simple types -+ } -+ else // complex return via ptr (pCppReturn) -+ { -+ pCppReturn = *(void **)pCppStack; -+ pCppStack += sizeof(void *); -+ -+ pUnoReturn = (cppu_relatesToInterface( pReturnTypeDescr ) -+ ? alloca( pReturnTypeDescr->nSize ) -+ : pCppReturn); // direct way -+ } -+ } -+ // pop this -+ pCppStack += sizeof( void* ); -+ -+ // stack space -+ OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" ); -+ // parameters -+ void ** pUnoArgs = (void **)alloca( 4 * sizeof(void *) * nParams ); -+ void ** pCppArgs = pUnoArgs + nParams; -+ // indizes of values this have to be converted (interface conversion cpp<=>uno) -+ sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams)); -+ // type descriptions for reconversions -+ typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams)); -+ -+ sal_Int32 nTempIndizes = 0; -+ -+ for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos ) -+ { -+ const typelib_MethodParameter & rParam = pParams[nPos]; -+ typelib_TypeDescription * pParamTypeDescr = 0; -+ TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef ); -+ -+ if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr )) // value -+ { -+ pCppArgs[nPos] = pCppStack; -+ pUnoArgs[nPos] = pCppStack; -+ switch (pParamTypeDescr->eTypeClass) -+ { -+ case typelib_TypeClass_HYPER: -+ case typelib_TypeClass_UNSIGNED_HYPER: -+ case typelib_TypeClass_DOUBLE: -+ pCppStack += sizeof(sal_Int32); // extra long -+ } -+ // no longer needed -+ TYPELIB_DANGER_RELEASE( pParamTypeDescr ); -+ } -+ else // ptr to complex value | ref -+ { -+ pCppArgs[nPos] = *(void **)pCppStack; -+ -+ if (! rParam.bIn) // is pure out -+ { -+ // uno out is unconstructed mem! -+ pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ); -+ pTempIndizes[nTempIndizes] = nPos; -+ // will be released at reconversion -+ ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr; -+ } -+ // is in/inout -+ else if (cppu_relatesToInterface( pParamTypeDescr )) -+ { -+ uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ), -+ *(void **)pCppStack, pParamTypeDescr, -+ &pThis->pBridge->aCpp2Uno ); -+ pTempIndizes[nTempIndizes] = nPos; // has to be reconverted -+ // will be released at reconversion -+ ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr; -+ } -+ else // direct way -+ { -+ pUnoArgs[nPos] = *(void **)pCppStack; -+ // no longer needed -+ TYPELIB_DANGER_RELEASE( pParamTypeDescr ); -+ } -+ } -+ pCppStack += sizeof(sal_Int32); // standard parameter length -+ } -+ -+ // ExceptionHolder -+ uno_Any aUnoExc; // Any will be constructed by callee -+ uno_Any * pUnoExc = &aUnoExc; -+ -+ // invoke uno dispatch call -+ (*pThis->pUnoI->pDispatcher)( pThis->pUnoI, pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc ); -+ -+ // in case an exception occured... -+ if (pUnoExc) -+ { -+ // destruct temporary in/inout params -+ for ( ; nTempIndizes--; ) -+ { -+ sal_Int32 nIndex = pTempIndizes[nTempIndizes]; -+ -+ if (pParams[nIndex].bIn) // is in/inout => was constructed -+ uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 ); -+ TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] ); -+ } -+ if (pReturnTypeDescr) -+ TYPELIB_DANGER_RELEASE( pReturnTypeDescr ); -+ -+ gcc291_freebsd_intel_raiseException( &aUnoExc, &pThis->pBridge->aUno2Cpp ); // has to destruct the any -+ // is here for dummy -+ return typelib_TypeClass_VOID; -+ } -+ else // else no exception occured... -+ { -+ // temporary params -+ for ( ; nTempIndizes--; ) -+ { -+ sal_Int32 nIndex = pTempIndizes[nTempIndizes]; -+ typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes]; -+ -+ if (pParams[nIndex].bOut) // inout/out -+ { -+ // convert and assign -+ uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release ); -+ uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr, -+ &pThis->pBridge->aUno2Cpp ); -+ } -+ // destroy temp uno param -+ uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); -+ -+ TYPELIB_DANGER_RELEASE( pParamTypeDescr ); -+ } -+ // return -+ if (pCppReturn) // has complex return -+ { -+ if (pUnoReturn != pCppReturn) // needs reconversion -+ { -+ uno_copyAndConvertData( pCppReturn, pUnoReturn, pReturnTypeDescr, -+ &pThis->pBridge->aUno2Cpp ); -+ // destroy temp uno return -+ uno_destructData( pUnoReturn, pReturnTypeDescr, 0 ); -+ } -+ // complex return ptr is set to eax -+ *(void **)pRegisterReturn = pCppReturn; -+ } -+ if (pReturnTypeDescr) -+ { -+ typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass; -+ TYPELIB_DANGER_RELEASE( pReturnTypeDescr ); -+ return eRet; -+ } -+ else -+ return typelib_TypeClass_VOID; -+ } -+} -+ -+ -+//================================================================================================== -+static typelib_TypeClass cpp_mediate( -+ sal_Int32 nVtableCall, -+ void ** pCallStack, -+ sal_Int64 * pRegisterReturn /* space for register return */ ) -+{ -+ OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" ); -+ -+ // pCallStack: ret adr, [ret *], this, params -+ // _this_ ptr is patched cppu_XInterfaceProxy object -+ cppu_cppInterfaceProxy * pCppI = NULL; -+ if( nVtableCall & 0x80000000 ) -+ { -+ nVtableCall &= 0x7fffffff; -+ pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +2); -+ } -+ else -+ pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +1); -+ -+ typelib_InterfaceTypeDescription * pTypeDescr = pCppI->pTypeDescr; -+ -+ OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, -+ "### illegal vtable index!" ); -+ if (nVtableCall >= pTypeDescr->nMapFunctionIndexToMemberIndex) -+ { -+ throw RuntimeException( OUString::createFromAscii("illegal vtable index!"), (XInterface *)pCppI ); -+ } -+ -+ // determine called method -+ OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" ); -+ sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nVtableCall]; -+ OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" ); -+ -+ TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] ); -+ -+ typelib_TypeClass eRet; -+ switch (aMemberDescr.get()->eTypeClass) -+ { -+ case typelib_TypeClass_INTERFACE_ATTRIBUTE: -+ { -+ if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nVtableCall) -+ { -+ // is GET method -+ eRet = cpp2uno_call( -+ pCppI, aMemberDescr.get(), -+ ((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef, -+ 0, 0, // no params -+ pCallStack, pRegisterReturn ); -+ } -+ else -+ { -+ // is SET method -+ typelib_MethodParameter aParam; -+ aParam.pTypeRef = -+ ((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef; -+ aParam.bIn = sal_True; -+ aParam.bOut = sal_False; -+ -+ eRet = cpp2uno_call( -+ pCppI, aMemberDescr.get(), -+ 0, // indicates void return -+ 1, &aParam, -+ pCallStack, pRegisterReturn ); -+ } -+ break; -+ } -+ case typelib_TypeClass_INTERFACE_METHOD: -+ { -+ // is METHOD -+ switch (nVtableCall) -+ { -+ case 1: // acquire() -+ pCppI->acquireProxy(); // non virtual call! -+ eRet = typelib_TypeClass_VOID; -+ break; -+ case 2: // release() -+ pCppI->releaseProxy(); // non virtual call! -+ eRet = typelib_TypeClass_VOID; -+ break; -+ case 0: // queryInterface() opt -+ { -+ typelib_TypeDescription * pTD = 0; -+ TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pCallStack[3] )->getTypeLibType() ); -+ if (pTD) -+ { -+ XInterface * pInterface = 0; -+ (*pCppI->pBridge->pCppEnv->getRegisteredInterface)( -+ pCppI->pBridge->pCppEnv, -+ (void **)&pInterface, pCppI->oid.pData, (typelib_InterfaceTypeDescription *)pTD ); -+ -+ if (pInterface) -+ { -+ ::uno_any_construct( -+ reinterpret_cast< uno_Any * >( pCallStack[1] ), -+ &pInterface, pTD, cpp_acquire ); -+ pInterface->release(); -+ TYPELIB_DANGER_RELEASE( pTD ); -+ *(void **)pRegisterReturn = pCallStack[1]; -+ eRet = typelib_TypeClass_ANY; -+ break; -+ } -+ TYPELIB_DANGER_RELEASE( pTD ); -+ } -+ } // else perform queryInterface() -+ default: -+ eRet = cpp2uno_call( -+ pCppI, aMemberDescr.get(), -+ ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef, -+ ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams, -+ ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams, -+ pCallStack, pRegisterReturn ); -+ } -+ break; -+ } -+ default: -+ { -+ throw RuntimeException( OUString::createFromAscii("no member description found!"), (XInterface *)pCppI ); -+ // is here for dummy -+ eRet = typelib_TypeClass_VOID; -+ } -+ } -+ -+ return eRet; -+} -+ -+//================================================================================================== -+class MediateClassData -+{ -+public: -+ struct ClassDataBuffer -+ { -+ void* m_pVTable; -+ -+ ~ClassDataBuffer(); -+ }; -+private: -+ -+ map< OUString, ClassDataBuffer* > m_aClassData; -+ Mutex m_aMutex; -+ -+ void createVTable( ClassDataBuffer*, typelib_InterfaceTypeDescription* ); -+public: -+ const ClassDataBuffer* getClassData( typelib_InterfaceTypeDescription* ); -+ -+ MediateClassData() {} -+ ~MediateClassData(); -+}; -+//__________________________________________________________________________________________________ -+MediateClassData::ClassDataBuffer::~ClassDataBuffer() -+{ -+ delete m_pVTable; -+} -+ -+//__________________________________________________________________________________________________ -+MediateClassData::~MediateClassData() -+{ -+ TRACE( "> calling ~MediateClassData(): freeing mediate vtables... <\n" ); -+ -+ // this MUST be the absolute last one which is called! -+ for ( map< OUString, ClassDataBuffer* >::iterator iPos( m_aClassData.begin() ); iPos != m_aClassData.end(); ++iPos ) -+ { -+ // todo -+// delete (*iPos).second; -+ } -+} -+ -+//__________________________________________________________________________________________________ -+ -+const MediateClassData::ClassDataBuffer* MediateClassData::getClassData( typelib_InterfaceTypeDescription* pType ) -+{ -+ MutexGuard aGuard( m_aMutex ); -+ -+ map< OUString, ClassDataBuffer* >::iterator element = m_aClassData.find( pType->aBase.pTypeName ); -+ if( element != m_aClassData.end() ) -+ return (*element).second; -+ -+ ClassDataBuffer* pBuffer = new ClassDataBuffer(); -+ createVTable( pBuffer, pType ); -+ m_aClassData[ pType->aBase.pTypeName ] = pBuffer; -+ return pBuffer; -+} -+ -+ -+//================================================================================================== -+/** -+ * is called on incoming vtable calls -+ * (called by asm snippets) -+ */ -+static void cpp_vtable_call( int nTableEntry, void** pCallStack ) __attribute__((regparm(2))); -+ -+void cpp_vtable_call( int nTableEntry, void** pCallStack ) -+{ -+ volatile long nRegReturn[2]; -+ -+ typelib_TypeClass aType = -+ cpp_mediate( nTableEntry, pCallStack, (sal_Int64*)nRegReturn ); -+ -+ switch( aType ) -+ { -+ case typelib_TypeClass_HYPER: -+ case typelib_TypeClass_UNSIGNED_HYPER: -+ __asm__( "movl %1, %%edx\n\t" -+ "movl %0, %%eax\n" -+ : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) ); -+ break; -+ case typelib_TypeClass_FLOAT: -+ __asm__( "flds %0\n\t" -+ "fstp %%st(0)\n\t" -+ "flds %0\n" -+ : : "m"(*(float *)nRegReturn) ); -+ break; -+ case typelib_TypeClass_DOUBLE: -+ __asm__( "fldl %0\n\t" -+ "fstp %%st(0)\n\t" -+ "fldl %0\n" -+ : : "m"(*(double *)nRegReturn) ); -+ break; -+// case typelib_TypeClass_UNSIGNED_SHORT: -+// case typelib_TypeClass_SHORT: -+// __asm__( "movswl %0, %%eax\n" -+// : : "m"(nRegReturn) ); -+// break; -+ default: -+ __asm__( "movl %0, %%eax\n" -+ : : "m"(nRegReturn[0]) ); -+ break; -+ } -+} -+//__________________________________________________________________________________________________ -+ -+void MediateClassData::createVTable( ClassDataBuffer* pBuffer, typelib_InterfaceTypeDescription* pType ) -+{ -+ // get all member functions -+ list< sal_Bool > aComplexReturn; -+ -+ for( int n = 0; n < pType->nAllMembers; n++ ) -+ { -+ typelib_TypeDescription* pMember = NULL; -+ TYPELIB_DANGER_GET( &pMember, pType->ppAllMembers[n] ); -+ if( pMember->eTypeClass == typelib_TypeClass_INTERFACE_ATTRIBUTE ) -+ { -+ typelib_TypeDescription * pRetTD = 0; -+ TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceAttributeTypeDescription *)pMember)->pAttributeTypeRef ); -+ // get method -+ aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) ); -+ // set method -+ if( ! ((typelib_InterfaceAttributeTypeDescription*)pMember)->bReadOnly ) -+ aComplexReturn.push_back( sal_False ); -+ TYPELIB_DANGER_RELEASE( pRetTD ); -+ } -+ else -+ { -+ typelib_TypeDescription * pRetTD = 0; -+ TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceMethodTypeDescription *)pMember)->pReturnTypeRef ); -+ aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) ); -+ TYPELIB_DANGER_RELEASE( pRetTD ); -+ } -+ TYPELIB_DANGER_RELEASE( pMember ); -+ } -+ -+ int nSize = aComplexReturn.size(); -+ char * pSpace = (char *)rtl_allocateMemory( (2*(nSize+1)*sizeof(void *)) + (nSize*20) ); -+ pBuffer->m_pVTable = (void*)pSpace; -+ -+ char * pCode = pSpace + (2*(nSize+1)*sizeof(void *)); -+ void ** pvft = (void **)pSpace; -+ pvft[0] = NULL; -+ pvft[1] = NULL; -+ -+ // setup vft and code -+ for ( sal_Int32 nPos = 0; nPos < nSize; ++nPos ) -+ { -+ unsigned char * codeSnip = (unsigned char *)pCode + (nPos*20); -+ pvft[(nPos << 1) + 2 ] = NULL; -+ pvft[(nPos << 1) + 3 ] = codeSnip; -+ -+ // mov $nPos, %eax -+ *codeSnip++ = 0xb8; -+ *(sal_Int32 *)codeSnip = nPos | ( aComplexReturn.front() ? 0x80000000 : 0 ); -+ codeSnip += sizeof(sal_Int32); -+ aComplexReturn.pop_front(); -+ // mov %esp, %edx -+ *codeSnip++ = 0x89; -+ *codeSnip++ = 0xe2; -+ // jmp cpp_vtable_call -+ *codeSnip++ = 0xe9; -+ *(sal_Int32 *)codeSnip = ((unsigned char *)cpp_vtable_call) - codeSnip - sizeof(sal_Int32); -+ codeSnip += sizeof(sal_Int32); -+ } -+} -+ -+//================================================================================================== -+void SAL_CALL cppu_cppInterfaceProxy_patchVtable( -+ XInterface * pCppI, typelib_InterfaceTypeDescription * pTypeDescr ) throw () -+{ -+ static MediateClassData * s_pMediateClassData = 0; -+ if (! s_pMediateClassData) -+ { -+ MutexGuard aGuard( Mutex::getGlobalMutex() ); -+ if (! s_pMediateClassData) -+ { -+#ifdef LEAK_STATIC_DATA -+ s_pMediateClassData = new MediateClassData(); -+#else -+ static MediateClassData s_aMediateClassData; -+ s_pMediateClassData = &s_aMediateClassData; -+#endif -+ } -+ } -+ *(const void **)pCppI = s_pMediateClassData->getClassData( pTypeDescr )->m_pVTable; -+} -+ -+} -+ -+//################################################################################################## -+extern "C" SAL_DLLEXPORT sal_Bool SAL_CALL component_canUnload( TimeValue * pTime ) -+ SAL_THROW_EXTERN_C() -+{ -+ return CPPU_CURRENT_NAMESPACE::g_moduleCount.canUnload( &CPPU_CURRENT_NAMESPACE::g_moduleCount, pTime ); -+} -+//################################################################################################## -+extern "C" SAL_DLLEXPORT void SAL_CALL uno_initEnvironment( uno_Environment * pCppEnv ) -+ SAL_THROW_EXTERN_C() -+{ -+ CPPU_CURRENT_NAMESPACE::cppu_cppenv_initEnvironment( pCppEnv ); -+} -+//################################################################################################## -+extern "C" SAL_DLLEXPORT void SAL_CALL uno_ext_getMapping( -+ uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo ) -+ SAL_THROW_EXTERN_C() -+{ -+ CPPU_CURRENT_NAMESPACE::cppu_ext_getMapping( ppMapping, pFrom, pTo ); -+} -+ - ---- /dev/null Thu Jan 1 01:00:00 1970 -+++ bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/except.cxx Tue Jun 4 10:49:44 2002 -@@ -0,0 +1,365 @@ -+/************************************************************************* -+ * -+ * $RCSfile: except.cxx,v $ -+ * -+ * $Revision: 1.1 $ -+ * -+ * last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $ -+ * -+ * The Contents of this file are made available subject to the terms of -+ * either of the following licenses -+ * -+ * - GNU Lesser General Public License Version 2.1 -+ * - Sun Industry Standards Source License Version 1.1 -+ * -+ * Sun Microsystems Inc., October, 2000 -+ * -+ * GNU Lesser General Public License Version 2.1 -+ * ============================================= -+ * Copyright 2000 by Sun Microsystems, Inc. -+ * 901 San Antonio Road, Palo Alto, CA 94303, USA -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License version 2.1, as published by the Free Software Foundation. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+ * MA 02111-1307 USA -+ * -+ * -+ * Sun Industry Standards Source License Version 1.1 -+ * ================================================= -+ * The contents of this file are subject to the Sun Industry Standards -+ * Source License Version 1.1 (the "License"); You may not use this file -+ * except in compliance with the License. You may obtain a copy of the -+ * License at http://www.openoffice.org/license.html. -+ * -+ * Software provided under this License is provided on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, -+ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, -+ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. -+ * See the License for the specific provisions governing your rights and -+ * obligations concerning the Software. -+ * -+ * The Initial Developer of the Original Code is: Sun Microsystems, Inc. -+ * -+ * Copyright: 2000 by Sun Microsystems, Inc. -+ * -+ * All Rights Reserved. -+ * -+ * Contributor(s): _______________________________________ -+ * -+ * -+ ************************************************************************/ -+#include <dlfcn.h> -+#include <new.h> -+#include <typeinfo> -+#if STLPORT_VERSION<321 -+#include <map.h> -+#else -+#include <map> -+#endif -+#ifndef _RTL_ALLOC_H_ -+#include <rtl/alloc.h> -+#endif -+#ifndef _OSL_DIAGNOSE_H_ -+#include <osl/diagnose.h> -+#endif -+ -+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_ -+#include <bridges/cpp_uno/bridge.hxx> -+#endif -+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_ -+#include <typelib/typedescription.hxx> -+#endif -+#ifndef _COM_SUN_STAR_UNO_ANY_HXX_ -+#include <com/sun/star/uno/Any.hxx> -+#endif -+ -+#include <rtl/strbuf.hxx> -+ -+#include "gcc2_freebsd_intel.hxx" -+ -+#ifdef DEBUG -+#include <stdio.h> -+#endif -+ -+using namespace std; -+using namespace osl; -+using namespace rtl; -+using namespace com::sun::star::uno; -+ -+namespace CPPU_CURRENT_NAMESPACE -+{ -+ -+//================================================================================================== -+static OString toUNOname( const OString & rRTTIname ) -+{ -+ OString aRet; -+ -+ sal_Char* pStr = rRTTIname.getStr(); -+ sal_Char* pOrg = pStr; -+ -+ // check for namespace -+ if( *pStr == '_' ) -+ pStr++; -+ if( *pStr == 'Q' ) -+ { -+ pStr++; -+ if( *pStr++ == '_' ) -+ { -+ while( *pStr++ != '_' ) -+ ; -+ } -+ } -+ -+ while( *pStr ) -+ { -+ int nCharsToCopy = 0; -+ while( *pStr >= '0' && *pStr <= '9' ) -+ nCharsToCopy = 10*nCharsToCopy + (int)(*pStr++ - '0'); -+ if( aRet.getLength() ) -+ aRet += "."; -+ aRet += rRTTIname.copy( pStr - pOrg, nCharsToCopy ); -+ pStr += nCharsToCopy; -+ } -+ -+ return aRet; -+} -+//================================================================================================== -+static OString toRTTIname( const OString & rUNOname ) -+{ -+ if( ! rUNOname.getLength() ) -+ return OString(); -+ -+ OStringBuffer aRet( 64 ); -+ -+ sal_Int32 nIndex = 0; -+ sal_Int32 nToken = 0; -+ do -+ { -+ OString aToken( rUNOname.getToken( 0, '.', nIndex ) ); -+ aRet.append( OString::valueOf( (sal_Int32)aToken.getLength() ) ); -+ aRet.append( aToken ); -+ ++nToken; -+ } -+ while (nIndex >= 0); -+ -+ OString ret( aRet.makeStringAndClear() ); -+ -+ if( nToken >= 2 ) -+ { -+ OStringBuffer buf( 64 ); -+ buf.append( 'Q' ); -+ if( nToken > 9 ) -+ aRet.append( '_' ); -+ buf.append( OString::valueOf( (sal_Int32)nToken ) ); -+ if( nToken > 9 ) -+ aRet.append( '_' ); -+ buf.append( ret ); -+ ret = buf.makeStringAndClear(); -+ } -+ -+ return ret; -+} -+ -+ -+//################################################################################################## -+//#### RTTI simulation ############################################################################# -+//################################################################################################## -+ -+class RTTIHolder -+{ -+ static std::map< OString, void* > aAllRTTI; -+public: -+ static void* getRTTI( const OString& rTypename ); -+ static void* getRTTI_UnoName( const OString& rUnoTypename ) -+ { return getRTTI( toRTTIname( rUnoTypename ) ); } -+ -+ static void* insertRTTI( const OString& rTypename ); -+ static void* insertRTTI_UnoName( const OString& rTypename ) -+ { return insertRTTI( toRTTIname( rTypename ) ); } -+ -+ // rSuperTypename MUST exist !!! -+ static void* insertRTTI( const OString& rTypename, const OString& rSuperTypename ); -+ static void* insertRTTI_UnoNames( const OString& rTypename, const OString& rSuperTypename ) -+ { return insertRTTI( toRTTIname( rTypename ), toRTTIname( rSuperTypename ) ); } -+ -+ // for complex RTTI -+ static void* insertRTTI( const OString& rTypename, void* pRTTI ); -+ static void* insertRTTI_UnoName( const OString&rTypename, void* pRTTI ) -+ { return insertRTTI( toRTTIname( rTypename ), pRTTI ); } -+}; -+ -+std::map< OString, void* > RTTIHolder::aAllRTTI; -+ -+void* RTTIHolder::getRTTI( const OString& rTypename ) -+{ -+ std::map< OString, void* >::iterator element; -+ -+ element = aAllRTTI.find( rTypename ); -+ return element != aAllRTTI.end() ? (*element).second : NULL; -+} -+ -+void* RTTIHolder::insertRTTI( const OString& rTypename ) -+{ -+#ifdef DEBUG -+ fprintf( stderr, "generating base RTTI: %s\n", rTypename.getStr() ); -+#endif -+ void* pRTTI = new __user_type_info( strdup( rTypename.getStr() ) ); -+ aAllRTTI[ rTypename ] = pRTTI; -+ return pRTTI; -+} -+ -+void* RTTIHolder::insertRTTI( const OString& rTypename, const OString& rSuperTypename ) -+{ -+#ifdef DEBUG -+ fprintf( stderr, "generating subclass RTTI: %s %s\n", rTypename.getStr(), rSuperTypename.getStr() ); -+#endif -+ OSL_ENSURE( ! getRTTI( rTypename ), "insert RTTI called on already existing type" ); -+ void* pRTTI = new __si_type_info( strdup( rTypename.getStr() ), *(__user_type_info*)getRTTI( rSuperTypename ) ); -+ aAllRTTI[ rTypename ] = pRTTI; -+ return pRTTI; -+} -+ -+void* RTTIHolder::insertRTTI( const OString& rTypename, void* pRTTI ) -+{ -+ aAllRTTI[ rTypename ] = pRTTI; -+ return pRTTI; -+} -+ -+//-------------------------------------------------------------------------------------------------- -+ -+static void* generateRTTI( typelib_CompoundTypeDescription * pCompTypeDescr ) -+{ -+ OString aCompTypeName( OUStringToOString( pCompTypeDescr->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US ) ); -+ void* pRTTI = RTTIHolder::getRTTI_UnoName( aCompTypeName ); -+ if( pRTTI ) -+ return pRTTI; -+ -+ if( ! pCompTypeDescr->pBaseTypeDescription ) -+ // this is a base type -+ return RTTIHolder::insertRTTI_UnoName( aCompTypeName ); -+ if( ! pCompTypeDescr->pBaseTypeDescription->pBaseTypeDescription ) -+ { -+ OString aBasename( -+ OUStringToOString( pCompTypeDescr->pBaseTypeDescription->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US ) -+ ); -+ if( ! RTTIHolder::getRTTI_UnoName( aBasename ) ) -+ RTTIHolder::insertRTTI_UnoName( aBasename ); -+ -+ // this type has only one supertype -+ return RTTIHolder::insertRTTI_UnoNames( aCompTypeName, aBasename ); -+ } -+ -+ // create __si_type_info -+ void* pSuperRTTI = generateRTTI( pCompTypeDescr->pBaseTypeDescription ); -+ OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) ); -+#ifdef DEBUG -+ fprintf( stderr, "generating RTTI: %s\n", aCompTypeRTTIname.getStr() ); -+#endif -+ pRTTI = new __si_type_info( strdup( aCompTypeRTTIname.getStr() ), -+ *(__user_type_info*)pSuperRTTI ); -+#if 0 -+ __class_type_info::base_info* pBaseInfo = new __class_type_info::base_info; -+ pBaseInfo->base = (__user_type_info*)pSuperRTTI; -+ pBaseInfo->offset = 0; -+ pBaseInfo->is_virtual = 0; -+ pBaseInfo->access1 = __class_type_info::PUBLIC; -+ -+ OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) ); -+ pRTTI = new __class_type_info( -+ strdup( aCompTypeRTTIname.getStr() ), -+ pBaseInfo, -+ 1 -+ ); -+#endif -+ return RTTIHolder::insertRTTI_UnoName( aCompTypeName, pRTTI ); -+} -+ -+//-------------------------------------------------------------------------------------------------- -+ -+static Mutex s_aMutex; -+static std::map< void*, typelib_TypeDescription* > aExceptionMap; -+ -+static void deleteException( void* pExc, int nDummy ) -+{ -+ MutexGuard aGuard( s_aMutex ); -+ std::map< void*, typelib_TypeDescription* >::iterator element = -+ aExceptionMap.find( pExc ); -+ OSL_ASSERT( element != aExceptionMap.end() ); -+ if( element != aExceptionMap.end() ) -+ { -+ typelib_TypeDescription* pType = (*element).second; -+ aExceptionMap.erase( pExc ); -+ uno_destructData( pExc, pType, cpp_release ); -+ typelib_typedescription_release( pType ); -+ } -+} -+ -+//__________________________________________________________________________________________________ -+ -+//################################################################################################## -+//#### exported #################################################################################### -+//################################################################################################## -+ -+ -+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) -+{ -+ // construct cpp exception object -+ typelib_TypeDescription * pTypeDescr = 0; -+ typelib_typedescriptionreference_getDescription( &pTypeDescr, pUnoExc->pType ); -+ -+ void * pCppExc = __eh_alloc( pTypeDescr->nSize ); // will be released in generated dtor -+ uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp ); -+ -+ // destruct uno exception -+ uno_any_destruct( pUnoExc, 0 ); -+ -+ // a must be -+ OSL_ENSURE( sizeof(sal_Int32) == sizeof(void *), "### pointer size differs from sal_Int32!" ); -+ -+ typelib_CompoundTypeDescription * pCompTypeDescr = (typelib_CompoundTypeDescription *)pTypeDescr; -+ void* pRTTI = generateRTTI( pCompTypeDescr ); -+ -+ { -+ MutexGuard aGuard( s_aMutex ); -+ aExceptionMap[ pCppExc ] = pTypeDescr; -+ } -+ -+ __cp_push_exception( pCppExc, pRTTI, deleteException ); -+ __sjthrow(); -+} -+ -+void gcc291_freebsd_intel_fillUnoException( cp_eh_info* pInfo, uno_Any* pExc, uno_Mapping * pCpp2Uno ) -+{ -+ OUString aName( OStringToOUString( -+ toUNOname( ((__user_type_info*)(pInfo->type))->name() ), RTL_TEXTENCODING_ASCII_US ) ); -+ -+ typelib_TypeDescription * pExcTypeDescr = 0; -+ typelib_typedescription_getByName( -+ &pExcTypeDescr, -+ aName.pData ); -+ OSL_ENSURE( pExcTypeDescr, "could not get type description for exception" ); -+ if (pExcTypeDescr) -+ { -+ // construct cpp exception any -+ Any aAny( pInfo->value, pExcTypeDescr ); // const_cast -+ typelib_typedescription_release( pExcTypeDescr ); -+ // construct uno exception any -+ typelib_TypeDescription* pAnyDescr = 0; -+ getCppuType( (const Any *)0 ).getDescription( &pAnyDescr ); -+ uno_copyAndConvertData( pExc, &aAny, pAnyDescr, pCpp2Uno ); -+ typelib_typedescription_release( pAnyDescr ); -+ } -+} -+ -+} -+ - ---- /dev/null Thu Jan 1 01:00:00 1970 -+++ bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/gcc2_freebsd_intel.hxx Tue Jun 4 10:49:36 2002 -@@ -0,0 +1,153 @@ -+/************************************************************************* -+ * -+ * $RCSfile: gcc2_freebsd_intel.hxx,v $ -+ * -+ * $Revision: 1.1 $ -+ * -+ * last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $ -+ * -+ * The Contents of this file are made available subject to the terms of -+ * either of the following licenses -+ * -+ * - GNU Lesser General Public License Version 2.1 -+ * - Sun Industry Standards Source License Version 1.1 -+ * -+ * Sun Microsystems Inc., October, 2000 -+ * -+ * GNU Lesser General Public License Version 2.1 -+ * ============================================= -+ * Copyright 2000 by Sun Microsystems, Inc. -+ * 901 San Antonio Road, Palo Alto, CA 94303, USA -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License version 2.1, as published by the Free Software Foundation. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+ * MA 02111-1307 USA -+ * -+ * -+ * Sun Industry Standards Source License Version 1.1 -+ * ================================================= -+ * The contents of this file are subject to the Sun Industry Standards -+ * Source License Version 1.1 (the "License"); You may not use this file -+ * except in compliance with the License. You may obtain a copy of the -+ * License at http://www.openoffice.org/license.html. -+ * -+ * Software provided under this License is provided on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, -+ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, -+ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. -+ * See the License for the specific provisions governing your rights and -+ * obligations concerning the Software. -+ * -+ * The Initial Developer of the Original Code is: Sun Microsystems, Inc. -+ * -+ * Copyright: 2000 by Sun Microsystems, Inc. -+ * -+ * All Rights Reserved. -+ * -+ * Contributor(s): _______________________________________ -+ * -+ * -+ ************************************************************************/ -+ -+#ifndef _RTL_STRING_HXX_ -+#include <rtl/string.hxx> -+#endif -+#include <typeinfo> -+ -+typedef struct _uno_Any uno_Any; -+typedef struct _uno_Mapping uno_Mapping; -+ -+// private egcs type info structs -+ -+// type_info for a simple class ( no base classes or an enum ) -+struct __user_type_info : public std::type_info { -+ __user_type_info (const char *n) : type_info (n) {} -+ -+ // dynamic cast. built by gcc -+ virtual void* dcast (const type_info &, int, void *, -+ const type_info * = 0, void * = 0) const; -+}; -+// type_info for a class with one public, nonvirtual base class. -+ -+class __si_type_info : public __user_type_info { -+ const __user_type_info &base; -+ -+public: -+ __si_type_info (const char *n, const __user_type_info &b) -+ : __user_type_info (n), base (b) { } -+ -+ // dynamic cast. built by gcc -+ virtual void *dcast (const type_info &, int, void *, -+ const type_info * = 0, void * = 0) const; -+}; -+ -+// type_info for a general class. -+ -+typedef unsigned int USItype __attribute__ ((mode (SI))); -+ -+struct __class_type_info : public __user_type_info { -+ enum access { PUBLIC = 1, PROTECTED = 2, PRIVATE = 3 }; -+ -+ struct base_info { -+ const __user_type_info *base; -+ USItype offset: 29; -+ bool is_virtual: 1; -+ access access1: 2; -+ }; -+ -+ const base_info *base_list; -+ size_t n_bases; -+ -+ __class_type_info (const char *name, const base_info *bl, size_t bn) -+ : __user_type_info (name), base_list (bl), n_bases (bn) {} -+ -+ // dynamic cast. built by gcc -+ virtual void* dcast (const type_info &, int, void *, -+ const type_info * = 0, void * = 0) const; -+}; -+ -+struct cp_eh_info -+{ -+ struct __eh_info -+ { -+ void* match_function; -+ short language; -+ short version; -+ }; -+ __eh_info eh_info; -+ void *value; -+ void *type; -+ void (*cleanup)(void *, int); -+ bool caught; -+ cp_eh_info *next; -+ long handlers; -+ void *original_value; -+}; -+ -+extern "C" { -+ void __cp_push_exception( void*, void*, void(*)(void*, int) ); -+ void __sjthrow(void) __attribute__ ((__noreturn__)); -+} -+ -+//################################################################################################## -+//#### exceptions ################################################################################## -+//################################################################################################## -+ -+namespace CPPU_CURRENT_NAMESPACE -+{ -+ -+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ); -+void gcc291_freebsd_intel_fillUnoException( cp_eh_info*, uno_Any*, uno_Mapping * pCpp2Uno ); -+ -+} -+ -diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/makefile.mk ---- /dev/null Thu Jan 1 01:00:00 1970 -+++ bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/makefile.mk Tue Jun 4 12:20:58 2002 -@@ -0,0 +1,109 @@ -+#************************************************************************* -+# -+# $RCSfile: makefile.mk,v $ -+# -+# $Revision: 1.1 $ -+# -+# last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $ -+# -+# The Contents of this file are made available subject to the terms of -+# either of the following licenses -+# -+# - GNU Lesser General Public License Version 2.1 -+# - Sun Industry Standards Source License Version 1.1 -+# -+# Sun Microsystems Inc., October, 2000 -+# -+# GNU Lesser General Public License Version 2.1 -+# ============================================= -+# Copyright 2000 by Sun Microsystems, Inc. -+# 901 San Antonio Road, Palo Alto, CA 94303, USA -+# -+# This library is free software; you can redistribute it and/or -+# modify it under the terms of the GNU Lesser General Public -+# License version 2.1, as published by the Free Software Foundation. -+# -+# This library is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+# Lesser General Public License for more details. -+# -+# You should have received a copy of the GNU Lesser General Public -+# License along with this library; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+# MA 02111-1307 USA -+# -+# -+# Sun Industry Standards Source License Version 1.1 -+# ================================================= -+# The contents of this file are subject to the Sun Industry Standards -+# Source License Version 1.1 (the "License"); You may not use this file -+# except in compliance with the License. You may obtain a copy of the -+# License at http://www.openoffice.org/license.html. -+# -+# Software provided under this License is provided on an "AS IS" basis, -+# WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, -+# WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, -+# MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. -+# See the License for the specific provisions governing your rights and -+# obligations concerning the Software. -+# -+# The Initial Developer of the Original Code is: Sun Microsystems, Inc. -+# -+# Copyright: 2000 by Sun Microsystems, Inc. -+# -+# All Rights Reserved. -+# -+# Contributor(s): _______________________________________ -+# -+# -+# -+#************************************************************************* -+ -+PRJ=..$/..$/.. -+ -+PRJNAME=bridges -+TARGET=gcc2_uno -+LIBTARGET=no -+ENABLE_EXCEPTIONS=TRUE -+NO_BSYMBOLIC=TRUE -+ -+# --- Settings ----------------------------------------------------- -+ -+.INCLUDE : svpre.mk -+.INCLUDE : settings.mk -+.INCLUDE : sv.mk -+ -+# --- Files -------------------------------------------------------- -+ -+.IF "$(COM)$(OS)$(CPU)$(COMNAME)-$(EXCEPTIONS)" == "GCCFREEBSDIgcc2-sjlj" -+ -+CFLAGSNOOPT=-O0 -+NOOPTFILES=$(SLO)$/uno2cpp.obj -+ -+SLOFILES= \ -+ $(SLO)$/except.obj \ -+ $(SLO)$/cpp2uno.obj \ -+ $(SLO)$/uno2cpp.obj -+ -+SHL1TARGET= $(TARGET) -+ -+SHL1DEF= $(MISC)$/$(SHL1TARGET).def -+SHL1IMPLIB= i$(TARGET) -+SHL1VERSIONMAP=..$/..$/bridge_exports.map -+ -+SHL1OBJS= \ -+ $(SLO)$/except.obj \ -+ $(SLO)$/cpp2uno.obj \ -+ $(SLO)$/uno2cpp.obj -+ -+SHL1STDLIBS= \ -+ $(CPPULIB) \ -+ $(SALLIB) -+ -+.ENDIF -+ -+# --- Targets ------------------------------------------------------ -+ -+.INCLUDE : target.mk -+ -diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/uno2cpp.cxx ---- /dev/null Thu Jan 1 01:00:00 1970 -+++ bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/uno2cpp.cxx Tue Jun 4 10:49:44 2002 -@@ -0,0 +1,473 @@ -+/************************************************************************* -+ * -+ * $RCSfile: uno2cpp.cxx,v $ -+ * -+ * $Revision: 1.1 $ -+ * -+ * last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $ -+ * -+ * The Contents of this file are made available subject to the terms of -+ * either of the following licenses -+ * -+ * - GNU Lesser General Public License Version 2.1 -+ * - Sun Industry Standards Source License Version 1.1 -+ * -+ * Sun Microsystems Inc., October, 2000 -+ * -+ * GNU Lesser General Public License Version 2.1 -+ * ============================================= -+ * Copyright 2000 by Sun Microsystems, Inc. -+ * 901 San Antonio Road, Palo Alto, CA 94303, USA -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License version 2.1, as published by the Free Software Foundation. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+ * MA 02111-1307 USA -+ * -+ * -+ * Sun Industry Standards Source License Version 1.1 -+ * ================================================= -+ * The contents of this file are subject to the Sun Industry Standards -+ * Source License Version 1.1 (the "License"); You may not use this file -+ * except in compliance with the License. You may obtain a copy of the -+ * License at http://www.openoffice.org/license.html. -+ * -+ * Software provided under this License is provided on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, -+ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, -+ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. -+ * See the License for the specific provisions governing your rights and -+ * obligations concerning the Software. -+ * -+ * The Initial Developer of the Original Code is: Sun Microsystems, Inc. -+ * -+ * Copyright: 2000 by Sun Microsystems, Inc. -+ * -+ * All Rights Reserved. -+ * -+ * Contributor(s): _______________________________________ -+ * -+ * -+ ************************************************************************/ -+ -+#include <stdlib.h> -+#ifndef _RTL_ALLOC_H_ -+#include <rtl/alloc.h> -+#endif -+ -+#ifndef _UNO_DATA_H_ -+#include <uno/data.h> -+#endif -+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_ -+#include <bridges/cpp_uno/bridge.hxx> -+#endif -+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_ -+#include <bridges/cpp_uno/type_misc.hxx> -+#endif -+ -+#include "gcc2_freebsd_intel.hxx" -+ -+using namespace rtl; -+using namespace com::sun::star::uno; -+ -+namespace CPPU_CURRENT_NAMESPACE -+{ -+ -+//================================================================================================== -+static void callVirtualMethod( void * pThis, -+ sal_Int32 nVtableIndex, -+ void * pRegisterReturn, -+ typelib_TypeClass eReturnType, -+ sal_Int32 * pStackLongs, -+ sal_Int32 nStackLongs, -+ sal_Int32 nThisOffset ) -+{ -+ // parameter list is mixed list of * and values -+ // reference parameters are pointers -+ -+ OSL_ENSURE( pStackLongs && pThis, "### null ptr!" ); -+ OSL_ENSURE( (sizeof(void *) == 4) && -+ (sizeof(sal_Int32) == 4), "### unexpected size of int!" ); -+ OSL_ENSURE( nStackLongs && pStackLongs, "### no stack in callVirtualMethod !" ); -+ -+ volatile long edx = 0, eax = 0; // for register returns -+ __asm__ ( -+ // copy values -+ "pushl %%edx\n\t" -+ "pushl %%ecx\n\t" -+ "pushl %%eax\n\t" -+ "mov %0, %%eax\n\t" -+ "mov %%eax, %%edx\n\t" -+ "dec %%edx\n\t" -+ "shl $2, %%edx\n\t" -+ "add %1, %%edx\n" -+ "Lcopy:\n\t" -+ "mov 0(%%edx), %%ecx\n\t" -+ "sub $4, %%edx\n\t" -+ "push %%ecx\n\t" -+ "dec %%eax\n\t" -+ "jne Lcopy\n" -+ "Lcall:\n\t" -+ // do the actual call -+ "mov %2, %%edx\n\t" -+ "mov 0(%%edx), %%edx\n\t" -+ "mov %3, %%eax\n\t" -+ "add $1, %%eax\n\t" // first entry is reserved -+ "shl $3, %%eax\n\t" -+ "add %%eax, %%edx\n\t" -+ "mov %4, %%eax\n\t" -+ "movswl (%%edx), %%ecx\n\t" -+ "add %%esp, %%eax\n\t" -+ "add %%ecx, (%%eax)\n\t" -+ "mov 4(%%edx), %%edx\n\t" -+ "call *%%edx\n\t" -+ // save return registers -+ "mov %%eax, %5\n\t" -+ "mov %%edx, %6\n\t" -+ // cleanup stack -+ "mov %0, %%eax\n\t" -+ "shl $2, %%eax\n\t" -+ "add %%eax, %%esp\n\t" -+ "popl %%eax\n\t" -+ "popl %%ecx\n\t" -+ "popl %%edx\n\t" -+ : : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), -+ "m"(nThisOffset), "m"(eax), "m"(edx) ); -+ switch( eReturnType ) -+ { -+ case typelib_TypeClass_HYPER: -+ case typelib_TypeClass_UNSIGNED_HYPER: -+ ((long*)pRegisterReturn)[1] = edx; -+ case typelib_TypeClass_LONG: -+ case typelib_TypeClass_UNSIGNED_LONG: -+ case typelib_TypeClass_CHAR: -+ case typelib_TypeClass_ENUM: -+ ((long*)pRegisterReturn)[0] = eax; -+ break; -+ case typelib_TypeClass_SHORT: -+ case typelib_TypeClass_UNSIGNED_SHORT: -+ *(unsigned short*)pRegisterReturn = eax; -+ break; -+ case typelib_TypeClass_BOOLEAN: -+ case typelib_TypeClass_BYTE: -+ *(unsigned char*)pRegisterReturn = eax; -+ break; -+ case typelib_TypeClass_FLOAT: -+ __asm__ ( -+ "fstps %0\n\t" -+ : : "m"(*(char *)pRegisterReturn) ); -+ break; -+ case typelib_TypeClass_DOUBLE: -+ __asm__ ( -+ "fstpl %0\n\t" -+ : : "m"(*(char *)pRegisterReturn) ); -+ break; -+ } -+} -+ -+//================================================================================================== -+static void cpp_call( -+ cppu_unoInterfaceProxy * pThis, -+ sal_Int32 nVtableCall, -+ typelib_TypeDescriptionReference * pReturnTypeRef, -+ sal_Int32 nParams, typelib_MethodParameter * pParams, -+ void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc ) -+{ -+ // max space for: [complex ret ptr], values|ptr ... -+ char * pCppStack = -+ (char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) ); -+ char * pCppStackStart = pCppStack; -+ -+ // return -+ typelib_TypeDescription * pReturnTypeDescr = 0; -+ TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef ); -+ OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" ); -+ -+ void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion -+ -+ sal_Int32 nThisOffset = 0; -+ -+ if (pReturnTypeDescr) -+ { -+ if (cppu_isSimpleType( pReturnTypeDescr )) -+ { -+ pCppReturn = pUnoReturn; // direct way for simple types -+ } -+ else -+ { -+ // complex return via ptr -+ pCppReturn = *(void **)pCppStack = (cppu_relatesToInterface( pReturnTypeDescr ) -+ ? alloca( pReturnTypeDescr->nSize ) -+ : pUnoReturn); // direct way -+ pCppStack += sizeof(void *); -+ nThisOffset = sizeof(void *); -+ } -+ } -+ // push this -+ *(void**)pCppStack = pThis->pCppI; -+ pCppStack += sizeof( void* ); -+ -+ // stack space -+ OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" ); -+ // args -+ void ** pCppArgs = (void **)alloca( 3 * sizeof(void *) * nParams ); -+ // indizes of values this have to be converted (interface conversion cpp<=>uno) -+ sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams); -+ // type descriptions for reconversions -+ typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams)); -+ -+ sal_Int32 nTempIndizes = 0; -+ -+ for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos ) -+ { -+ const typelib_MethodParameter & rParam = pParams[nPos]; -+ typelib_TypeDescription * pParamTypeDescr = 0; -+ TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef ); -+ -+ if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr )) -+ { -+ uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr, -+ &pThis->pBridge->aUno2Cpp ); -+ -+ switch (pParamTypeDescr->eTypeClass) -+ { -+ case typelib_TypeClass_HYPER: -+ case typelib_TypeClass_UNSIGNED_HYPER: -+ case typelib_TypeClass_DOUBLE: -+ pCppStack += sizeof(sal_Int32); // extra long -+ } -+ // no longer needed -+ TYPELIB_DANGER_RELEASE( pParamTypeDescr ); -+ } -+ else // ptr to complex value | ref -+ { -+ if (! rParam.bIn) // is pure out -+ { -+ // cpp out is constructed mem, uno out is not! -+ uno_constructData( -+ *(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ), -+ pParamTypeDescr ); -+ pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call -+ // will be released at reconversion -+ ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr; -+ } -+ // is in/inout -+ else if (cppu_relatesToInterface( pParamTypeDescr )) -+ { -+ uno_copyAndConvertData( -+ *(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ), -+ pUnoArgs[nPos], pParamTypeDescr, &pThis->pBridge->aUno2Cpp ); -+ -+ pTempIndizes[nTempIndizes] = nPos; // has to be reconverted -+ // will be released at reconversion -+ ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr; -+ } -+ else // direct way -+ { -+ *(void **)pCppStack = pCppArgs[nPos] = pUnoArgs[nPos]; -+ // no longer needed -+ TYPELIB_DANGER_RELEASE( pParamTypeDescr ); -+ } -+ } -+ pCppStack += sizeof(sal_Int32); // standard parameter length -+ } -+ -+ try -+ { -+ OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic" ); -+ callVirtualMethod( -+ pThis->pCppI, nVtableCall, -+ pCppReturn, pReturnTypeDescr->eTypeClass, -+ (sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32), -+ nThisOffset); -+ // NO exception occured... -+ *ppUnoExc = 0; -+ -+ // reconvert temporary params -+ for ( ; nTempIndizes--; ) -+ { -+ sal_Int32 nIndex = pTempIndizes[nTempIndizes]; -+ typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes]; -+ -+ if (pParams[nIndex].bIn) -+ { -+ if (pParams[nIndex].bOut) // inout -+ { -+ uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value -+ uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr, -+ &pThis->pBridge->aCpp2Uno ); -+ } -+ } -+ else // pure out -+ { -+ uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr, -+ &pThis->pBridge->aCpp2Uno ); -+ } -+ // destroy temp cpp param => cpp: every param was constructed -+ uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release ); -+ -+ TYPELIB_DANGER_RELEASE( pParamTypeDescr ); -+ } -+ // return value -+ if (pCppReturn && pUnoReturn != pCppReturn) -+ { -+ uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr, -+ &pThis->pBridge->aCpp2Uno ); -+ uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release ); -+ } -+ } -+ catch( ... ) -+ { -+ // get exception -+ cp_eh_info* pEHInfo = (cp_eh_info*)__cp_eh_info(); -+ gcc291_freebsd_intel_fillUnoException( pEHInfo, *ppUnoExc, &pThis->pBridge->aCpp2Uno ); -+ -+ // temporary params -+ for ( ; nTempIndizes--; ) -+ { -+ sal_Int32 nIndex = pTempIndizes[nTempIndizes]; -+ // destroy temp cpp param => cpp: every param was constructed -+ uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release ); -+ TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] ); -+ } -+ // return type -+ if (pReturnTypeDescr) -+ TYPELIB_DANGER_RELEASE( pReturnTypeDescr ); -+ } -+} -+ -+ -+//================================================================================================== -+void SAL_CALL cppu_unoInterfaceProxy_dispatch( -+ uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr, -+ void * pReturn, void * pArgs[], uno_Any ** ppException ) throw () -+{ -+ // is my surrogate -+ cppu_unoInterfaceProxy * pThis = (cppu_unoInterfaceProxy *)pUnoI; -+ typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr; -+ -+ switch (pMemberDescr->eTypeClass) -+ { -+ case typelib_TypeClass_INTERFACE_ATTRIBUTE: -+ { -+ // determine vtable call index -+ sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition; -+ OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" ); -+ -+ sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos]; -+ OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" ); -+ -+ if (pReturn) -+ { -+ // dependent dispatch -+ cpp_call( -+ pThis, nVtableCall, -+ ((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef, -+ 0, 0, // no params -+ pReturn, pArgs, ppException ); -+ } -+ else -+ { -+ // is SET -+ typelib_MethodParameter aParam; -+ aParam.pTypeRef = -+ ((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef; -+ aParam.bIn = sal_True; -+ aParam.bOut = sal_False; -+ -+ typelib_TypeDescriptionReference * pReturnTypeRef = 0; -+ OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") ); -+ typelib_typedescriptionreference_new( -+ &pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData ); -+ -+ // dependent dispatch -+ cpp_call( -+ pThis, nVtableCall +1, // get, then set method -+ pReturnTypeRef, -+ 1, &aParam, -+ pReturn, pArgs, ppException ); -+ -+ typelib_typedescriptionreference_release( pReturnTypeRef ); -+ } -+ -+ break; -+ } -+ case typelib_TypeClass_INTERFACE_METHOD: -+ { -+ // determine vtable call index -+ sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition; -+ OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" ); -+ -+ sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos]; -+ OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" ); -+ -+ switch (nVtableCall) -+ { -+ // standard calls -+ case 1: // acquire uno interface -+ (*pUnoI->acquire)( pUnoI ); -+ *ppException = 0; -+ break; -+ case 2: // release uno interface -+ (*pUnoI->release)( pUnoI ); -+ *ppException = 0; -+ break; -+ case 0: // queryInterface() opt -+ { -+ typelib_TypeDescription * pTD = 0; -+ TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() ); -+ if (pTD) -+ { -+ uno_Interface * pInterface = 0; -+ (*pThis->pBridge->pUnoEnv->getRegisteredInterface)( -+ pThis->pBridge->pUnoEnv, -+ (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD ); -+ -+ if (pInterface) -+ { -+ ::uno_any_construct( -+ reinterpret_cast< uno_Any * >( pReturn ), -+ &pInterface, pTD, 0 ); -+ (*pInterface->release)( pInterface ); -+ TYPELIB_DANGER_RELEASE( pTD ); -+ *ppException = 0; -+ break; -+ } -+ TYPELIB_DANGER_RELEASE( pTD ); -+ } -+ } // else perform queryInterface() -+ default: -+ // dependent dispatch -+ cpp_call( -+ pThis, nVtableCall, -+ ((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pReturnTypeRef, -+ ((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->nParams, -+ ((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pParams, -+ pReturn, pArgs, ppException ); -+ } -+ break; -+ } -+ default: -+ { -+ ::com::sun::star::uno::RuntimeException aExc( -+ OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ), -+ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() ); -+ -+ Type const & rExcType = ::getCppuType( &aExc ); -+ // binary identical null reference -+ ::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 ); -+ } -+ } -+} -+ -+} -+ diff --git a/editors/openoffice.org-1.0/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel b/editors/openoffice.org-1.0/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel deleted file mode 100644 index bda7f0e32487..000000000000 --- a/editors/openoffice.org-1.0/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel +++ /dev/null @@ -1,1608 +0,0 @@ ---- /dev/null Mon Mar 4 21:33:00 2002 -+++ bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx Mon Mar 4 21:23:27 2002 -@@ -0,0 +1,594 @@ -+/************************************************************************* -+ * -+ * $RCSfile: cpp2uno.cxx,v $ -+ * -+ * $Revision: 1.3 $ -+ * -+ * last change: $Author: dbo $ $Date: 2001/10/26 07:22:57 $ -+ * -+ * The Contents of this file are made available subject to the terms of -+ * either of the following licenses -+ * -+ * - GNU Lesser General Public License Version 2.1 -+ * - Sun Industry Standards Source License Version 1.1 -+ * -+ * Sun Microsystems Inc., October, 2000 -+ * -+ * GNU Lesser General Public License Version 2.1 -+ * ============================================= -+ * Copyright 2000 by Sun Microsystems, Inc. -+ * 901 San Antonio Road, Palo Alto, CA 94303, USA -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License version 2.1, as published by the Free Software Foundation. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+ * MA 02111-1307 USA -+ * -+ * -+ * Sun Industry Standards Source License Version 1.1 -+ * ================================================= -+ * The contents of this file are subject to the Sun Industry Standards -+ * Source License Version 1.1 (the "License"); You may not use this file -+ * except in compliance with the License. You may obtain a copy of the -+ * License at http://www.openoffice.org/license.html. -+ * -+ * Software provided under this License is provided on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, -+ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, -+ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. -+ * See the License for the specific provisions governing your rights and -+ * obligations concerning the Software. -+ * -+ * The Initial Developer of the Original Code is: Sun Microsystems, Inc. -+ * -+ * Copyright: 2000 by Sun Microsystems, Inc. -+ * -+ * All Rights Reserved. -+ * -+ * Contributor(s): _______________________________________ -+ * -+ * -+ ************************************************************************/ -+ -+#include <stdlib.h> -+#include <hash_map> -+ -+#include <rtl/alloc.h> -+#include <osl/mutex.hxx> -+ -+#include <uno/data.h> -+#include <typelib/typedescription.hxx> -+ -+#include <bridges/cpp_uno/bridge.hxx> -+#include <bridges/cpp_uno/type_misc.hxx> -+ -+#include "share.hxx" -+ -+ -+using namespace ::osl; -+using namespace ::rtl; -+using namespace ::com::sun::star::uno; -+ -+namespace CPPU_CURRENT_NAMESPACE -+{ -+ -+//================================================================================================== -+rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT; -+ -+//================================================================================================== -+static typelib_TypeClass cpp2uno_call( -+ cppu_cppInterfaceProxy * pThis, -+ const typelib_TypeDescription * pMemberTypeDescr, -+ typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return -+ sal_Int32 nParams, typelib_MethodParameter * pParams, -+ void ** pCallStack, -+ sal_Int64 * pRegisterReturn /* space for register return */ ) -+{ -+ // pCallStack: ret, [return ptr], this, params -+ char * pCppStack = (char *)(pCallStack +1); -+ -+ // return -+ typelib_TypeDescription * pReturnTypeDescr = 0; -+ if (pReturnTypeRef) -+ TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef ); -+ -+ void * pUnoReturn = 0; -+ void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need -+ -+ if (pReturnTypeDescr) -+ { -+ if (cppu_isSimpleType( pReturnTypeDescr )) -+ { -+ pUnoReturn = pRegisterReturn; // direct way for simple types -+ } -+ else // complex return via ptr (pCppReturn) -+ { -+ pCppReturn = *(void **)pCppStack; -+ pCppStack += sizeof(void *); -+ -+ pUnoReturn = (cppu_relatesToInterface( pReturnTypeDescr ) -+ ? alloca( pReturnTypeDescr->nSize ) -+ : pCppReturn); // direct way -+ } -+ } -+ // pop this -+ pCppStack += sizeof( void* ); -+ -+ // stack space -+ OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" ); -+ // parameters -+ void ** pUnoArgs = (void **)alloca( 4 * sizeof(void *) * nParams ); -+ void ** pCppArgs = pUnoArgs + nParams; -+ // indizes of values this have to be converted (interface conversion cpp<=>uno) -+ sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams)); -+ // type descriptions for reconversions -+ typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams)); -+ -+ sal_Int32 nTempIndizes = 0; -+ -+ for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos ) -+ { -+ const typelib_MethodParameter & rParam = pParams[nPos]; -+ typelib_TypeDescription * pParamTypeDescr = 0; -+ TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef ); -+ -+ if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr )) // value -+ { -+ pCppArgs[nPos] = pCppStack; -+ pUnoArgs[nPos] = pCppStack; -+ switch (pParamTypeDescr->eTypeClass) -+ { -+ case typelib_TypeClass_HYPER: -+ case typelib_TypeClass_UNSIGNED_HYPER: -+ case typelib_TypeClass_DOUBLE: -+ pCppStack += sizeof(sal_Int32); // extra long -+ } -+ // no longer needed -+ TYPELIB_DANGER_RELEASE( pParamTypeDescr ); -+ } -+ else // ptr to complex value | ref -+ { -+ pCppArgs[nPos] = *(void **)pCppStack; -+ -+ if (! rParam.bIn) // is pure out -+ { -+ // uno out is unconstructed mem! -+ pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ); -+ pTempIndizes[nTempIndizes] = nPos; -+ // will be released at reconversion -+ ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr; -+ } -+ // is in/inout -+ else if (cppu_relatesToInterface( pParamTypeDescr )) -+ { -+ uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ), -+ *(void **)pCppStack, pParamTypeDescr, -+ &pThis->pBridge->aCpp2Uno ); -+ pTempIndizes[nTempIndizes] = nPos; // has to be reconverted -+ // will be released at reconversion -+ ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr; -+ } -+ else // direct way -+ { -+ pUnoArgs[nPos] = *(void **)pCppStack; -+ // no longer needed -+ TYPELIB_DANGER_RELEASE( pParamTypeDescr ); -+ } -+ } -+ pCppStack += sizeof(sal_Int32); // standard parameter length -+ } -+ -+ // ExceptionHolder -+ uno_Any aUnoExc; // Any will be constructed by callee -+ uno_Any * pUnoExc = &aUnoExc; -+ -+ // invoke uno dispatch call -+ (*pThis->pUnoI->pDispatcher)( pThis->pUnoI, pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc ); -+ -+ // in case an exception occured... -+ if (pUnoExc) -+ { -+ // destruct temporary in/inout params -+ for ( ; nTempIndizes--; ) -+ { -+ sal_Int32 nIndex = pTempIndizes[nTempIndizes]; -+ -+ if (pParams[nIndex].bIn) // is in/inout => was constructed -+ uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 ); -+ TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] ); -+ } -+ if (pReturnTypeDescr) -+ TYPELIB_DANGER_RELEASE( pReturnTypeDescr ); -+ -+ raiseException( &aUnoExc, &pThis->pBridge->aUno2Cpp ); // has to destruct the any -+ // is here for dummy -+ return typelib_TypeClass_VOID; -+ } -+ else // else no exception occured... -+ { -+ // temporary params -+ for ( ; nTempIndizes--; ) -+ { -+ sal_Int32 nIndex = pTempIndizes[nTempIndizes]; -+ typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes]; -+ -+ if (pParams[nIndex].bOut) // inout/out -+ { -+ // convert and assign -+ uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release ); -+ uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr, -+ &pThis->pBridge->aUno2Cpp ); -+ } -+ // destroy temp uno param -+ uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); -+ -+ TYPELIB_DANGER_RELEASE( pParamTypeDescr ); -+ } -+ // return -+ if (pCppReturn) // has complex return -+ { -+ if (pUnoReturn != pCppReturn) // needs reconversion -+ { -+ uno_copyAndConvertData( pCppReturn, pUnoReturn, pReturnTypeDescr, -+ &pThis->pBridge->aUno2Cpp ); -+ // destroy temp uno return -+ uno_destructData( pUnoReturn, pReturnTypeDescr, 0 ); -+ } -+ // complex return ptr is set to eax -+ *(void **)pRegisterReturn = pCppReturn; -+ } -+ if (pReturnTypeDescr) -+ { -+ typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass; -+ TYPELIB_DANGER_RELEASE( pReturnTypeDescr ); -+ return eRet; -+ } -+ else -+ return typelib_TypeClass_VOID; -+ } -+} -+ -+ -+//================================================================================================== -+static typelib_TypeClass cpp_mediate( -+ sal_Int32 nVtableCall, -+ void ** pCallStack, -+ sal_Int64 * pRegisterReturn /* space for register return */ ) -+{ -+ OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" ); -+ -+ // pCallStack: ret adr, [ret *], this, params -+ // _this_ ptr is patched cppu_XInterfaceProxy object -+ cppu_cppInterfaceProxy * pCppI = NULL; -+ if( nVtableCall & 0x80000000 ) -+ { -+ nVtableCall &= 0x7fffffff; -+ pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +2); -+ } -+ else -+ { -+ pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +1); -+ } -+ -+ typelib_InterfaceTypeDescription * pTypeDescr = pCppI->pTypeDescr; -+ -+ OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" ); -+ if (nVtableCall >= pTypeDescr->nMapFunctionIndexToMemberIndex) -+ { -+ throw RuntimeException( -+ OUString::createFromAscii("illegal vtable index!"), -+ (XInterface *)pCppI ); -+ } -+ -+ // determine called method -+ OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" ); -+ sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nVtableCall]; -+ OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" ); -+ -+ TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] ); -+ -+ typelib_TypeClass eRet; -+ switch (aMemberDescr.get()->eTypeClass) -+ { -+ case typelib_TypeClass_INTERFACE_ATTRIBUTE: -+ { -+ if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nVtableCall) -+ { -+ // is GET method -+ eRet = cpp2uno_call( -+ pCppI, aMemberDescr.get(), -+ ((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef, -+ 0, 0, // no params -+ pCallStack, pRegisterReturn ); -+ } -+ else -+ { -+ // is SET method -+ typelib_MethodParameter aParam; -+ aParam.pTypeRef = -+ ((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef; -+ aParam.bIn = sal_True; -+ aParam.bOut = sal_False; -+ -+ eRet = cpp2uno_call( -+ pCppI, aMemberDescr.get(), -+ 0, // indicates void return -+ 1, &aParam, -+ pCallStack, pRegisterReturn ); -+ } -+ break; -+ } -+ case typelib_TypeClass_INTERFACE_METHOD: -+ { -+ // is METHOD -+ switch (nVtableCall) -+ { -+ case 1: // acquire() -+ pCppI->acquireProxy(); // non virtual call! -+ eRet = typelib_TypeClass_VOID; -+ break; -+ case 2: // release() -+ pCppI->releaseProxy(); // non virtual call! -+ eRet = typelib_TypeClass_VOID; -+ break; -+ case 0: // queryInterface() opt -+ { -+ typelib_TypeDescription * pTD = 0; -+ TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pCallStack[3] )->getTypeLibType() ); -+ if (pTD) -+ { -+ XInterface * pInterface = 0; -+ (*pCppI->pBridge->pCppEnv->getRegisteredInterface)( -+ pCppI->pBridge->pCppEnv, -+ (void **)&pInterface, pCppI->oid.pData, (typelib_InterfaceTypeDescription *)pTD ); -+ -+ if (pInterface) -+ { -+ ::uno_any_construct( -+ reinterpret_cast< uno_Any * >( pCallStack[1] ), -+ &pInterface, pTD, cpp_acquire ); -+ pInterface->release(); -+ TYPELIB_DANGER_RELEASE( pTD ); -+ *(void **)pRegisterReturn = pCallStack[1]; -+ eRet = typelib_TypeClass_ANY; -+ break; -+ } -+ TYPELIB_DANGER_RELEASE( pTD ); -+ } -+ } // else perform queryInterface() -+ default: -+ eRet = cpp2uno_call( -+ pCppI, aMemberDescr.get(), -+ ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef, -+ ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams, -+ ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams, -+ pCallStack, pRegisterReturn ); -+ } -+ break; -+ } -+ default: -+ { -+ throw RuntimeException( -+ OUString::createFromAscii("no member description found!"), -+ (XInterface *)pCppI ); -+ // is here for dummy -+ eRet = typelib_TypeClass_VOID; -+ } -+ } -+ -+ return eRet; -+} -+ -+//================================================================================================== -+/** -+ * is called on incoming vtable calls -+ * (called by asm snippets) -+ */ -+static void cpp_vtable_call( int nTableEntry, void** pCallStack ) __attribute__((regparm(2))); -+ -+void cpp_vtable_call( int nTableEntry, void** pCallStack ) -+{ -+ volatile long nRegReturn[2]; -+ typelib_TypeClass aType = cpp_mediate( nTableEntry, pCallStack, (sal_Int64*)nRegReturn ); -+ -+ switch( aType ) -+ { -+ case typelib_TypeClass_HYPER: -+ case typelib_TypeClass_UNSIGNED_HYPER: -+ __asm__( "movl %1, %%edx\n\t" -+ "movl %0, %%eax\n" -+ : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) ); -+ break; -+ case typelib_TypeClass_FLOAT: -+ __asm__( "flds %0\n\t" -+ "fstp %%st(0)\n\t" -+ "flds %0\n" -+ : : "m"(*(float *)nRegReturn) ); -+ break; -+ case typelib_TypeClass_DOUBLE: -+ __asm__( "fldl %0\n\t" -+ "fstp %%st(0)\n\t" -+ "fldl %0\n" -+ : : "m"(*(double *)nRegReturn) ); -+ break; -+// case typelib_TypeClass_UNSIGNED_SHORT: -+// case typelib_TypeClass_SHORT: -+// __asm__( "movswl %0, %%eax\n" -+// : : "m"(nRegReturn) ); -+// break; -+ default: -+ __asm__( "movl %0, %%eax\n" -+ : : "m"(nRegReturn[0]) ); -+ break; -+ } -+} -+ -+ -+//================================================================================================== -+class MediateClassData -+{ -+ typedef ::std::hash_map< OUString, void *, OUStringHash > t_classdata_map; -+ t_classdata_map m_map; -+ Mutex m_mutex; -+ -+public: -+ void const * get_vtable( typelib_InterfaceTypeDescription * pTD ) SAL_THROW( () ); -+ -+ inline MediateClassData() SAL_THROW( () ) -+ {} -+ ~MediateClassData() SAL_THROW( () ); -+}; -+//__________________________________________________________________________________________________ -+MediateClassData::~MediateClassData() SAL_THROW( () ) -+{ -+ OSL_TRACE( "> calling ~MediateClassData(): freeing mediate vtables." ); -+ -+ for ( t_classdata_map::const_iterator iPos( m_map.begin() ); iPos != m_map.end(); ++iPos ) -+ { -+ ::rtl_freeMemory( iPos->second ); -+ } -+} -+//-------------------------------------------------------------------------------------------------- -+static inline void codeSnippet( char * code, sal_uInt32 vtable_pos, bool simple_ret_type ) SAL_THROW( () ) -+{ -+ if (! simple_ret_type) -+ vtable_pos |= 0x80000000; -+ OSL_ASSERT( sizeof (long) == 4 ); -+ // mov $nPos, %eax -+ *code++ = 0xb8; -+ *(long *)code = vtable_pos; -+ code += sizeof (long); -+ // mov %esp, %edx -+ *code++ = 0x89; -+ *code++ = 0xe2; -+ // jmp cpp_vtable_call -+ *code++ = 0xe9; -+ *(long *)code = ((char *)cpp_vtable_call) - code - sizeof (long); -+} -+//__________________________________________________________________________________________________ -+void const * MediateClassData::get_vtable( typelib_InterfaceTypeDescription * pTD ) SAL_THROW( () ) -+{ -+ void * buffer; -+ -+ // avoiding locked counts -+ OUString const & unoName = *(OUString const *)&((typelib_TypeDescription *)pTD)->pTypeName; -+ { -+ MutexGuard aGuard( m_mutex ); -+ t_classdata_map::const_iterator iFind( m_map.find( unoName ) ); -+ if (iFind == m_map.end()) -+ { -+ // create new vtable -+ sal_Int32 nSlots = pTD->nMapFunctionIndexToMemberIndex; -+ buffer = ::rtl_allocateMemory( ((2+ nSlots) * sizeof (void *)) + (nSlots *20) ); -+ -+ ::std::pair< t_classdata_map::iterator, bool > insertion( -+ m_map.insert( t_classdata_map::value_type( unoName, buffer ) ) ); -+ OSL_ENSURE( insertion.second, "### inserting new vtable buffer failed?!" ); -+ -+ void ** slots = (void **)buffer; -+ *slots++ = 0; -+ *slots++ = 0; // rtti -+ char * code = (char *)(slots + nSlots); -+ -+ sal_uInt32 vtable_pos = 0; -+ sal_Int32 nAllMembers = pTD->nAllMembers; -+ typelib_TypeDescriptionReference ** ppAllMembers = pTD->ppAllMembers; -+ for ( sal_Int32 nPos = 0; nPos < nAllMembers; ++nPos ) -+ { -+ typelib_TypeDescription * pTD = 0; -+ TYPELIB_DANGER_GET( &pTD, ppAllMembers[ nPos ] ); -+ OSL_ASSERT( pTD ); -+ if (typelib_TypeClass_INTERFACE_ATTRIBUTE == pTD->eTypeClass) -+ { -+ bool simple_ret = cppu_isSimpleType( -+ ((typelib_InterfaceAttributeTypeDescription *)pTD)->pAttributeTypeRef->eTypeClass ); -+ // get method -+ *slots++ = code; -+ codeSnippet( code, vtable_pos++, simple_ret ); -+ code += 20; -+ if (! ((typelib_InterfaceAttributeTypeDescription *)pTD)->bReadOnly) -+ { -+ // set method -+ *slots++ = code; -+ codeSnippet( code, vtable_pos++, true ); -+ code += 20; -+ } -+ } -+ else -+ { -+ bool simple_ret = cppu_isSimpleType( -+ ((typelib_InterfaceMethodTypeDescription *)pTD)->pReturnTypeRef->eTypeClass ); -+ *slots++ = code; -+ codeSnippet( code, vtable_pos++, simple_ret ); -+ code += 20; -+ } -+ TYPELIB_DANGER_RELEASE( pTD ); -+ } -+ OSL_ASSERT( vtable_pos == nSlots ); -+ } -+ else -+ { -+ buffer = iFind->second; -+ } -+ } -+ -+ return ((void **)buffer +2); -+} -+ -+//================================================================================================== -+void SAL_CALL cppu_cppInterfaceProxy_patchVtable( -+ XInterface * pCppI, typelib_InterfaceTypeDescription * pTypeDescr ) throw () -+{ -+ static MediateClassData * s_pMediateClassData = 0; -+ if (! s_pMediateClassData) -+ { -+ MutexGuard aGuard( Mutex::getGlobalMutex() ); -+ if (! s_pMediateClassData) -+ { -+#ifdef LEAK_STATIC_DATA -+ s_pMediateClassData = new MediateClassData(); -+#else -+ static MediateClassData s_aMediateClassData; -+ s_pMediateClassData = &s_aMediateClassData; -+#endif -+ } -+ } -+ *(void const **)pCppI = s_pMediateClassData->get_vtable( pTypeDescr ); -+} -+ -+} -+ -+extern "C" -+{ -+//################################################################################################## -+sal_Bool SAL_CALL component_canUnload( TimeValue * pTime ) -+ SAL_THROW_EXTERN_C() -+{ -+ return CPPU_CURRENT_NAMESPACE::g_moduleCount.canUnload( -+ &CPPU_CURRENT_NAMESPACE::g_moduleCount, pTime ); -+} -+//################################################################################################## -+void SAL_CALL uno_initEnvironment( uno_Environment * pCppEnv ) -+ SAL_THROW_EXTERN_C() -+{ -+ CPPU_CURRENT_NAMESPACE::cppu_cppenv_initEnvironment( -+ pCppEnv ); -+} -+//################################################################################################## -+void SAL_CALL uno_ext_getMapping( -+ uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo ) -+ SAL_THROW_EXTERN_C() -+{ -+ CPPU_CURRENT_NAMESPACE::cppu_ext_getMapping( -+ ppMapping, pFrom, pTo ); -+} -+} ---- /dev/null Mon Mar 4 21:33:00 2002 -+++ bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx Mon Mar 4 21:23:27 2002 -@@ -0,0 +1,317 @@ -+/************************************************************************* -+ * -+ * $RCSfile: except.cxx,v $ -+ * -+ * $Revision: 1.6 $ -+ * -+ * last change: $Author: dbo $ $Date: 2001/11/08 12:35:28 $ -+ * -+ * The Contents of this file are made available subject to the terms of -+ * either of the following licenses -+ * -+ * - GNU Lesser General Public License Version 2.1 -+ * - Sun Industry Standards Source License Version 1.1 -+ * -+ * Sun Microsystems Inc., October, 2000 -+ * -+ * GNU Lesser General Public License Version 2.1 -+ * ============================================= -+ * Copyright 2000 by Sun Microsystems, Inc. -+ * 901 San Antonio Road, Palo Alto, CA 94303, USA -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License version 2.1, as published by the Free Software Foundation. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+ * MA 02111-1307 USA -+ * -+ * -+ * Sun Industry Standards Source License Version 1.1 -+ * ================================================= -+ * The contents of this file are subject to the Sun Industry Standards -+ * Source License Version 1.1 (the "License"); You may not use this file -+ * except in compliance with the License. You may obtain a copy of the -+ * License at http://www.openoffice.org/license.html. -+ * -+ * Software provided under this License is provided on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, -+ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, -+ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. -+ * See the License for the specific provisions governing your rights and -+ * obligations concerning the Software. -+ * -+ * The Initial Developer of the Original Code is: Sun Microsystems, Inc. -+ * -+ * Copyright: 2000 by Sun Microsystems, Inc. -+ * -+ * All Rights Reserved. -+ * -+ * Contributor(s): _______________________________________ -+ * -+ * -+ ************************************************************************/ -+ -+#include <stdio.h> -+#include <dlfcn.h> -+#include <cxxabi.h> -+#include <hash_map> -+ -+#include <rtl/strbuf.hxx> -+#include <rtl/ustrbuf.hxx> -+#include <osl/diagnose.h> -+#include <osl/mutex.hxx> -+ -+#include <bridges/cpp_uno/bridge.hxx> -+#include <typelib/typedescription.hxx> -+#include <uno/any2.h> -+ -+#include "share.hxx" -+ -+ -+using namespace ::std; -+using namespace ::osl; -+using namespace ::rtl; -+using namespace ::com::sun::star::uno; -+using namespace ::__cxxabiv1; -+ -+ -+namespace CPPU_CURRENT_NAMESPACE -+{ -+ -+void dummy_can_throw_anything( char const * ) -+{ -+} -+ -+//================================================================================================== -+static OUString toUNOname( char const * p ) SAL_THROW( () ) -+{ -+#ifdef DEBUG -+ char const * start = p; -+#endif -+ -+ // example: N3com3sun4star4lang24IllegalArgumentExceptionE -+ -+ OUStringBuffer buf( 64 ); -+ OSL_ASSERT( 'N' == *p ); -+ ++p; // skip N -+ -+ while ('E' != *p) -+ { -+ // read chars count -+ long n = (*p++ - '0'); -+ while ('0' <= *p && '9' >= *p) -+ { -+ n *= 10; -+ n += (*p++ - '0'); -+ } -+ buf.appendAscii( p, n ); -+ p += n; -+ if ('E' != *p) -+ buf.append( (sal_Unicode)'.' ); -+ } -+ -+#ifdef DEBUG -+ OUString ret( buf.makeStringAndClear() ); -+ OString c_ret( OUStringToOString( ret, RTL_TEXTENCODING_ASCII_US ) ); -+ fprintf( stderr, "> toUNOname(): %s => %s\n", start, c_ret.getStr() ); -+ return ret; -+#else -+ return buf.makeStringAndClear(); -+#endif -+} -+ -+//================================================================================================== -+class RTTI -+{ -+ typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map; -+ -+ Mutex m_mutex; -+ t_rtti_map m_rttis; -+ t_rtti_map m_generatedRttis; -+ -+ void * m_hApp; -+ -+public: -+ RTTI() SAL_THROW( () ); -+ ~RTTI() SAL_THROW( () ); -+ -+ type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW( () ); -+}; -+//__________________________________________________________________________________________________ -+RTTI::RTTI() SAL_THROW( () ) -+ : m_hApp( dlopen( 0, RTLD_LAZY ) ) -+{ -+} -+//__________________________________________________________________________________________________ -+RTTI::~RTTI() SAL_THROW( () ) -+{ -+ dlclose( m_hApp ); -+} -+ -+//__________________________________________________________________________________________________ -+type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW( () ) -+{ -+ type_info * rtti; -+ -+ OUString const & unoName = *(OUString const *)&pTypeDescr->aBase.pTypeName; -+ -+ MutexGuard guard( m_mutex ); -+ t_rtti_map::const_iterator iFind( m_rttis.find( unoName ) ); -+ if (iFind == m_rttis.end()) -+ { -+ // RTTI symbol -+ OStringBuffer buf( 64 ); -+ buf.append( RTL_CONSTASCII_STRINGPARAM("_ZTIN") ); -+ sal_Int32 index = 0; -+ do -+ { -+ OUString token( unoName.getToken( 0, '.', index ) ); -+ buf.append( token.getLength() ); -+ OString c_token( OUStringToOString( token, RTL_TEXTENCODING_ASCII_US ) ); -+ buf.append( c_token ); -+ } -+ while (index >= 0); -+ buf.append( 'E' ); -+ -+ OString symName( buf.makeStringAndClear() ); -+ rtti = (type_info *)dlsym( m_hApp, symName.getStr() ); -+ -+ if (rtti) -+ { -+ pair< t_rtti_map::iterator, bool > insertion( -+ m_rttis.insert( t_rtti_map::value_type( unoName, rtti ) ) ); -+ OSL_ENSURE( insertion.second, "### inserting new rtti failed?!" ); -+ } -+ else -+ { -+ // try to lookup the symbol in the generated rtti map -+ t_rtti_map::const_iterator iFind( m_generatedRttis.find( unoName ) ); -+ if (iFind == m_generatedRttis.end()) -+ { -+ // we must generate it ! -+ // symbol and rtti-name is nearly identical, -+ // the symbol is prefixed with _ZTI -+ char const * rttiName = symName.getStr() +4; -+#ifdef DEBUG -+ fprintf( stderr,"generated rtti for %s\n", rttiName ); -+#endif -+ if (pTypeDescr->pBaseTypeDescription) -+ { -+ // ensure availability of base -+ type_info * base_rtti = getRTTI( -+ (typelib_CompoundTypeDescription *)pTypeDescr->pBaseTypeDescription ); -+ rtti = new __si_class_type_info( -+ strdup( rttiName ), (__class_type_info *)base_rtti ); -+ } -+ else -+ { -+ // this class has no base class -+ rtti = new __class_type_info( strdup( rttiName ) ); -+ } -+ -+ pair< t_rtti_map::iterator, bool > insertion( -+ m_generatedRttis.insert( t_rtti_map::value_type( unoName, rtti ) ) ); -+ OSL_ENSURE( insertion.second, "### inserting new generated rtti failed?!" ); -+ } -+ else // taking already generated rtti -+ { -+ rtti = iFind->second; -+ } -+ } -+ } -+ else -+ { -+ rtti = iFind->second; -+ } -+ -+ return rtti; -+} -+ -+//-------------------------------------------------------------------------------------------------- -+static void deleteException( void * pExc ) -+{ -+ __cxa_exception const * header = ((__cxa_exception const *)pExc - 1); -+ typelib_TypeDescription * pTD = 0; -+ OUString unoName( toUNOname( header->exceptionType->name() ) ); -+ ::typelib_typedescription_getByName( &pTD, unoName.pData ); -+ OSL_ENSURE( pTD, "### unknown exception type! leaving out destruction => leaking!!!" ); -+ if (pTD) -+ { -+ ::uno_destructData( pExc, pTD, cpp_release ); -+ ::typelib_typedescription_release( pTD ); -+ } -+} -+ -+//================================================================================================== -+void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) -+{ -+ void * pCppExc; -+ type_info * rtti; -+ -+ { -+ // construct cpp exception object -+ typelib_TypeDescription * pTypeDescr = 0; -+ TYPELIB_DANGER_GET( &pTypeDescr, pUnoExc->pType ); -+ OSL_ASSERT( pTypeDescr ); -+ if (! pTypeDescr) -+ terminate(); -+ -+ pCppExc = __cxa_allocate_exception( pTypeDescr->nSize ); -+ ::uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp ); -+ -+ // destruct uno exception -+ ::uno_any_destruct( pUnoExc, 0 ); -+ // avoiding locked counts -+ static RTTI * s_rtti = 0; -+ if (! s_rtti) -+ { -+ MutexGuard guard( Mutex::getGlobalMutex() ); -+ if (! s_rtti) -+ { -+#ifdef LEAK_STATIC_DATA -+ s_rtti = new RTTI(); -+#else -+ static RTTI rtti_data; -+ s_rtti = &rtti_data; -+#endif -+ } -+ } -+ rtti = (type_info *)s_rtti->getRTTI( (typelib_CompoundTypeDescription *) pTypeDescr ); -+ TYPELIB_DANGER_RELEASE( pTypeDescr ); -+ OSL_ENSURE( rtti, "### no rtti for throwing exception!" ); -+ if (! rtti) -+ terminate(); -+ } -+ -+ __cxa_throw( pCppExc, rtti, deleteException ); -+} -+ -+//================================================================================================== -+void fillUnoException( __cxa_exception * header, uno_Any * pExc, uno_Mapping * pCpp2Uno ) -+{ -+ OSL_ENSURE( header, "### no exception header!!!" ); -+ if (! header) -+ terminate(); -+ -+ typelib_TypeDescription * pExcTypeDescr = 0; -+ OUString unoName( toUNOname( header->exceptionType->name() ) ); -+ ::typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData ); -+ OSL_ENSURE( pExcTypeDescr, "### can not get type description for exception!!!" ); -+ if (! pExcTypeDescr) -+ terminate(); -+ -+ // construct uno exception any -+ ::uno_any_constructAndConvert( pExc, header->adjustedPtr, pExcTypeDescr, pCpp2Uno ); -+ ::typelib_typedescription_release( pExcTypeDescr ); -+} -+ -+} -+ ---- /dev/null Mon Mar 4 21:33:00 2002 -+++ bridges/source/cpp_uno/gcc3_freebsd_intel/makefile.mk Mon Mar 4 21:24:53 2002 -@@ -0,0 +1,112 @@ -+#************************************************************************* -+# -+# $RCSfile: makefile.mk,v $ -+# -+# $Revision: 1.2 $ -+# -+# last change: $Author: dbo $ $Date: 2001/10/26 14:23:30 $ -+# -+# The Contents of this file are made available subject to the terms of -+# either of the following licenses -+# -+# - GNU Lesser General Public License Version 2.1 -+# - Sun Industry Standards Source License Version 1.1 -+# -+# Sun Microsystems Inc., October, 2000 -+# -+# GNU Lesser General Public License Version 2.1 -+# ============================================= -+# Copyright 2000 by Sun Microsystems, Inc. -+# 901 San Antonio Road, Palo Alto, CA 94303, USA -+# -+# This library is free software; you can redistribute it and/or -+# modify it under the terms of the GNU Lesser General Public -+# License version 2.1, as published by the Free Software Foundation. -+# -+# This library is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+# Lesser General Public License for more details. -+# -+# You should have received a copy of the GNU Lesser General Public -+# License along with this library; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+# MA 02111-1307 USA -+# -+# -+# Sun Industry Standards Source License Version 1.1 -+# ================================================= -+# The contents of this file are subject to the Sun Industry Standards -+# Source License Version 1.1 (the "License"); You may not use this file -+# except in compliance with the License. You may obtain a copy of the -+# License at http://www.openoffice.org/license.html. -+# -+# Software provided under this License is provided on an "AS IS" basis, -+# WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, -+# WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, -+# MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. -+# See the License for the specific provisions governing your rights and -+# obligations concerning the Software. -+# -+# The Initial Developer of the Original Code is: Sun Microsystems, Inc. -+# -+# Copyright: 2000 by Sun Microsystems, Inc. -+# -+# All Rights Reserved. -+# -+# Contributor(s): _______________________________________ -+# -+# -+# -+#************************************************************************* -+ -+PRJ=..$/..$/.. -+ -+PRJNAME=bridges -+TARGET=gcc3_uno -+LIBTARGET=no -+ENABLE_EXCEPTIONS=TRUE -+NO_BSYMBOLIC=TRUE -+ -+# --- Settings ----------------------------------------------------- -+ -+.INCLUDE : svpre.mk -+.INCLUDE : settings.mk -+.INCLUDE : sv.mk -+ -+# --- Files -------------------------------------------------------- -+ -+.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCFREEBSDIgcc3" -+ -+.IF "$(cppu_no_leak)" == "" -+CFLAGS += -DLEAK_STATIC_DATA -+.ENDIF -+ -+CFLAGSNOOPT=-O0 -+ -+SLOFILES= \ -+ $(SLO)$/except.obj \ -+ $(SLO)$/cpp2uno.obj \ -+ $(SLO)$/uno2cpp.obj -+ -+SHL1TARGET= $(TARGET) -+ -+SHL1DEF=$(MISC)$/$(SHL1TARGET).def -+SHL1IMPLIB=i$(TARGET) -+SHL1VERSIONMAP=..$/..$/bridge_exports.map -+ -+SHL1OBJS= \ -+ $(SLO)$/except.obj \ -+ $(SLO)$/cpp2uno.obj \ -+ $(SLO)$/uno2cpp.obj -+ -+SHL1STDLIBS= \ -+ $(CPPULIB) \ -+ $(SALLIB) -+ -+.ENDIF -+ -+# --- Targets ------------------------------------------------------ -+ -+.INCLUDE : target.mk -+ ---- /dev/null Mon Mar 4 21:33:00 2002 -+++ bridges/source/cpp_uno/gcc3_freebsd_intel/share.hxx Mon Mar 4 21:23:27 2002 -@@ -0,0 +1,120 @@ -+/************************************************************************* -+ * -+ * $RCSfile: share.hxx,v $ -+ * -+ * $Revision: 1.1 $ -+ * -+ * last change: $Author: dbo $ $Date: 2001/10/19 13:32:39 $ -+ * -+ * The Contents of this file are made available subject to the terms of -+ * either of the following licenses -+ * -+ * - GNU Lesser General Public License Version 2.1 -+ * - Sun Industry Standards Source License Version 1.1 -+ * -+ * Sun Microsystems Inc., October, 2000 -+ * -+ * GNU Lesser General Public License Version 2.1 -+ * ============================================= -+ * Copyright 2000 by Sun Microsystems, Inc. -+ * 901 San Antonio Road, Palo Alto, CA 94303, USA -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License version 2.1, as published by the Free Software Foundation. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+ * MA 02111-1307 USA -+ * -+ * -+ * Sun Industry Standards Source License Version 1.1 -+ * ================================================= -+ * The contents of this file are subject to the Sun Industry Standards -+ * Source License Version 1.1 (the "License"); You may not use this file -+ * except in compliance with the License. You may obtain a copy of the -+ * License at http://www.openoffice.org/license.html. -+ * -+ * Software provided under this License is provided on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, -+ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, -+ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. -+ * See the License for the specific provisions governing your rights and -+ * obligations concerning the Software. -+ * -+ * The Initial Developer of the Original Code is: Sun Microsystems, Inc. -+ * -+ * Copyright: 2000 by Sun Microsystems, Inc. -+ * -+ * All Rights Reserved. -+ * -+ * Contributor(s): _______________________________________ -+ * -+ * -+ ************************************************************************/ -+ -+#include <typeinfo> -+#include <exception> -+#include <cstddef> -+ -+namespace CPPU_CURRENT_NAMESPACE -+{ -+ -+// ----- following decl from libstdc++-v3/libsupc++/unwind-cxx.h and unwind.h -+ -+struct _Unwind_Exception -+{ -+ unsigned exception_class __attribute__((__mode__(__DI__))); -+ void * exception_cleanup; -+ unsigned private_1 __attribute__((__mode__(__word__))); -+ unsigned private_2 __attribute__((__mode__(__word__))); -+} __attribute__((__aligned__)); -+ -+struct __cxa_exception -+{ -+ ::std::type_info *exceptionType; -+ void (*exceptionDestructor)(void *); -+ -+ ::std::unexpected_handler unexpectedHandler; -+ ::std::terminate_handler terminateHandler; -+ -+ __cxa_exception *nextException; -+ -+ int handlerCount; -+ -+ int handlerSwitchValue; -+ const unsigned char *actionRecord; -+ const unsigned char *languageSpecificData; -+ void *catchTemp; -+ void *adjustedPtr; -+ -+ _Unwind_Exception unwindHeader; -+}; -+ -+extern "C" void *__cxa_allocate_exception( -+ std::size_t thrown_size ) throw(); -+extern "C" void __cxa_throw ( -+ void *thrown_exception, std::type_info *tinfo, void (*dest) (void *) ) __attribute__((noreturn)); -+ -+struct __cxa_eh_globals -+{ -+ __cxa_exception *caughtExceptions; -+ unsigned int uncaughtExceptions; -+}; -+extern "C" __cxa_eh_globals *__cxa_get_globals () throw(); -+ -+// ----- -+ -+//================================================================================================== -+void raiseException( -+ uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ); -+//================================================================================================== -+void fillUnoException( -+ __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno ); -+} ---- /dev/null Mon Mar 4 21:33:00 2002 -+++ bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx Mon Mar 4 21:23:27 2002 -@@ -0,0 +1,450 @@ -+/************************************************************************* -+ * -+ * $RCSfile: uno2cpp.cxx,v $ -+ * -+ * $Revision: 1.3 $ -+ * -+ * last change: $Author: hr $ $Date: 2001/10/31 14:46:47 $ -+ * -+ * The Contents of this file are made available subject to the terms of -+ * either of the following licenses -+ * -+ * - GNU Lesser General Public License Version 2.1 -+ * - Sun Industry Standards Source License Version 1.1 -+ * -+ * Sun Microsystems Inc., October, 2000 -+ * -+ * GNU Lesser General Public License Version 2.1 -+ * ============================================= -+ * Copyright 2000 by Sun Microsystems, Inc. -+ * 901 San Antonio Road, Palo Alto, CA 94303, USA -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License version 2.1, as published by the Free Software Foundation. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+ * MA 02111-1307 USA -+ * -+ * -+ * Sun Industry Standards Source License Version 1.1 -+ * ================================================= -+ * The contents of this file are subject to the Sun Industry Standards -+ * Source License Version 1.1 (the "License"); You may not use this file -+ * except in compliance with the License. You may obtain a copy of the -+ * License at http://www.openoffice.org/license.html. -+ * -+ * Software provided under this License is provided on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, -+ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, -+ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. -+ * See the License for the specific provisions governing your rights and -+ * obligations concerning the Software. -+ * -+ * The Initial Developer of the Original Code is: Sun Microsystems, Inc. -+ * -+ * Copyright: 2000 by Sun Microsystems, Inc. -+ * -+ * All Rights Reserved. -+ * -+ * Contributor(s): _______________________________________ -+ * -+ * -+ ************************************************************************/ -+ -+#include <stdlib.h> -+#include <rtl/alloc.h> -+ -+#include <uno/data.h> -+#include <bridges/cpp_uno/bridge.hxx> -+#include <bridges/cpp_uno/type_misc.hxx> -+ -+#include "share.hxx" -+ -+ -+using namespace ::rtl; -+using namespace ::com::sun::star::uno; -+ -+namespace CPPU_CURRENT_NAMESPACE -+{ -+ -+void dummy_can_throw_anything( char const * ); -+ -+//================================================================================================== -+static void callVirtualMethod( -+ void * pThis, -+ sal_Int32 nVtableIndex, -+ void * pRegisterReturn, -+ typelib_TypeClass eReturnType, -+ sal_Int32 * pStackLongs, -+ sal_Int32 nStackLongs ) -+{ -+ // parameter list is mixed list of * and values -+ // reference parameters are pointers -+ -+ OSL_ENSURE( pStackLongs && pThis, "### null ptr!" ); -+ OSL_ENSURE( (sizeof(void *) == 4) && (sizeof(sal_Int32) == 4), "### unexpected size of int!" ); -+ OSL_ENSURE( nStackLongs && pStackLongs, "### no stack in callVirtualMethod !" ); -+ -+ // never called -+ if (! pThis) dummy_can_throw_anything("xxx"); // address something -+ -+ volatile long edx = 0, eax = 0; // for register returns -+ asm volatile ( -+ // copy values -+ "mov %0, %%eax\n\t" -+ "mov %%eax, %%edx\n\t" -+ "dec %%edx\n\t" -+ "shl $2, %%edx\n\t" -+ "add %1, %%edx\n" -+ "Lcopy:\n\t" -+ "pushl 0(%%edx)\n\t" -+ "sub $4, %%edx\n\t" -+ "dec %%eax\n\t" -+ "jne Lcopy\n\t" -+ // do the actual call -+ "mov %2, %%edx\n\t" -+ "mov 0(%%edx), %%edx\n\t" -+ "mov %3, %%eax\n\t" -+ "shl $2, %%eax\n\t" -+ "add %%eax, %%edx\n\t" -+ "mov 0(%%edx), %%edx\n\t" -+ "call *%%edx\n\t" -+ // save return registers -+ "mov %%eax, %4\n\t" -+ "mov %%edx, %5\n\t" -+ // cleanup stack -+ "mov %0, %%eax\n\t" -+ "shl $2, %%eax\n\t" -+ "add %%eax, %%esp\n\t" -+ : -+ : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx) -+ : "eax", "edx" ); -+ -+ switch( eReturnType ) -+ { -+ case typelib_TypeClass_HYPER: -+ case typelib_TypeClass_UNSIGNED_HYPER: -+ ((long*)pRegisterReturn)[1] = edx; -+ case typelib_TypeClass_LONG: -+ case typelib_TypeClass_UNSIGNED_LONG: -+ case typelib_TypeClass_CHAR: -+ case typelib_TypeClass_ENUM: -+ ((long*)pRegisterReturn)[0] = eax; -+ break; -+ case typelib_TypeClass_SHORT: -+ case typelib_TypeClass_UNSIGNED_SHORT: -+ *(unsigned short*)pRegisterReturn = eax; -+ break; -+ case typelib_TypeClass_BOOLEAN: -+ case typelib_TypeClass_BYTE: -+ *(unsigned char*)pRegisterReturn = eax; -+ break; -+ case typelib_TypeClass_FLOAT: -+ asm ( "fstps %0" : : "m"(*(char *)pRegisterReturn) ); -+ break; -+ case typelib_TypeClass_DOUBLE: -+ asm ( "fstpl %0\n\t" : : "m"(*(char *)pRegisterReturn) ); -+ break; -+ } -+} -+ -+//================================================================================================== -+static void cpp_call( -+ cppu_unoInterfaceProxy * pThis, -+ sal_Int32 nVtableCall, -+ typelib_TypeDescriptionReference * pReturnTypeRef, -+ sal_Int32 nParams, typelib_MethodParameter * pParams, -+ void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc ) -+{ -+ // max space for: [complex ret ptr], values|ptr ... -+ char * pCppStack = -+ (char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) ); -+ char * pCppStackStart = pCppStack; -+ -+ // return -+ typelib_TypeDescription * pReturnTypeDescr = 0; -+ TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef ); -+ OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" ); -+ -+ void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion -+ -+ if (pReturnTypeDescr) -+ { -+ if (cppu_isSimpleType( pReturnTypeDescr )) -+ { -+ pCppReturn = pUnoReturn; // direct way for simple types -+ } -+ else -+ { -+ // complex return via ptr -+ pCppReturn = *(void **)pCppStack = (cppu_relatesToInterface( pReturnTypeDescr ) -+ ? alloca( pReturnTypeDescr->nSize ) -+ : pUnoReturn); // direct way -+ pCppStack += sizeof(void *); -+ } -+ } -+ // push this -+ *(void**)pCppStack = pThis->pCppI; -+ pCppStack += sizeof( void* ); -+ -+ // stack space -+ OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" ); -+ // args -+ void ** pCppArgs = (void **)alloca( 3 * sizeof(void *) * nParams ); -+ // indizes of values this have to be converted (interface conversion cpp<=>uno) -+ sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams); -+ // type descriptions for reconversions -+ typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams)); -+ -+ sal_Int32 nTempIndizes = 0; -+ -+ for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos ) -+ { -+ const typelib_MethodParameter & rParam = pParams[nPos]; -+ typelib_TypeDescription * pParamTypeDescr = 0; -+ TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef ); -+ -+ if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr )) -+ { -+ uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr, -+ &pThis->pBridge->aUno2Cpp ); -+ -+ switch (pParamTypeDescr->eTypeClass) -+ { -+ case typelib_TypeClass_HYPER: -+ case typelib_TypeClass_UNSIGNED_HYPER: -+ case typelib_TypeClass_DOUBLE: -+ pCppStack += sizeof(sal_Int32); // extra long -+ } -+ // no longer needed -+ TYPELIB_DANGER_RELEASE( pParamTypeDescr ); -+ } -+ else // ptr to complex value | ref -+ { -+ if (! rParam.bIn) // is pure out -+ { -+ // cpp out is constructed mem, uno out is not! -+ uno_constructData( -+ *(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ), -+ pParamTypeDescr ); -+ pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call -+ // will be released at reconversion -+ ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr; -+ } -+ // is in/inout -+ else if (cppu_relatesToInterface( pParamTypeDescr )) -+ { -+ uno_copyAndConvertData( -+ *(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ), -+ pUnoArgs[nPos], pParamTypeDescr, &pThis->pBridge->aUno2Cpp ); -+ -+ pTempIndizes[nTempIndizes] = nPos; // has to be reconverted -+ // will be released at reconversion -+ ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr; -+ } -+ else // direct way -+ { -+ *(void **)pCppStack = pCppArgs[nPos] = pUnoArgs[nPos]; -+ // no longer needed -+ TYPELIB_DANGER_RELEASE( pParamTypeDescr ); -+ } -+ } -+ pCppStack += sizeof(sal_Int32); // standard parameter length -+ } -+ -+ try -+ { -+ OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic)" ); -+ callVirtualMethod( -+ pThis->pCppI, nVtableCall, -+ pCppReturn, pReturnTypeDescr->eTypeClass, -+ (sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) ); -+ // NO exception occured... -+ *ppUnoExc = 0; -+ -+ // reconvert temporary params -+ for ( ; nTempIndizes--; ) -+ { -+ sal_Int32 nIndex = pTempIndizes[nTempIndizes]; -+ typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes]; -+ -+ if (pParams[nIndex].bIn) -+ { -+ if (pParams[nIndex].bOut) // inout -+ { -+ uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value -+ uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr, -+ &pThis->pBridge->aCpp2Uno ); -+ } -+ } -+ else // pure out -+ { -+ uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr, -+ &pThis->pBridge->aCpp2Uno ); -+ } -+ // destroy temp cpp param => cpp: every param was constructed -+ uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release ); -+ -+ TYPELIB_DANGER_RELEASE( pParamTypeDescr ); -+ } -+ // return value -+ if (pCppReturn && pUnoReturn != pCppReturn) -+ { -+ uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr, -+ &pThis->pBridge->aCpp2Uno ); -+ uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release ); -+ } -+ } -+ catch (...) -+ { -+ // fill uno exception -+ fillUnoException( __cxa_get_globals()->caughtExceptions, *ppUnoExc, &pThis->pBridge->aCpp2Uno ); -+ -+ // temporary params -+ for ( ; nTempIndizes--; ) -+ { -+ sal_Int32 nIndex = pTempIndizes[nTempIndizes]; -+ // destroy temp cpp param => cpp: every param was constructed -+ uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release ); -+ TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] ); -+ } -+ // return type -+ if (pReturnTypeDescr) -+ TYPELIB_DANGER_RELEASE( pReturnTypeDescr ); -+ } -+} -+ -+ -+//================================================================================================== -+void SAL_CALL cppu_unoInterfaceProxy_dispatch( -+ uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr, -+ void * pReturn, void * pArgs[], uno_Any ** ppException ) throw () -+{ -+ // is my surrogate -+ cppu_unoInterfaceProxy * pThis = (cppu_unoInterfaceProxy *)pUnoI; -+ typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr; -+ -+ switch (pMemberDescr->eTypeClass) -+ { -+ case typelib_TypeClass_INTERFACE_ATTRIBUTE: -+ { -+ // determine vtable call index -+ sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition; -+ OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" ); -+ -+ sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos]; -+ OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" ); -+ -+ if (pReturn) -+ { -+ // dependent dispatch -+ cpp_call( -+ pThis, nVtableCall, -+ ((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef, -+ 0, 0, // no params -+ pReturn, pArgs, ppException ); -+ } -+ else -+ { -+ // is SET -+ typelib_MethodParameter aParam; -+ aParam.pTypeRef = -+ ((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef; -+ aParam.bIn = sal_True; -+ aParam.bOut = sal_False; -+ -+ typelib_TypeDescriptionReference * pReturnTypeRef = 0; -+ OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") ); -+ typelib_typedescriptionreference_new( -+ &pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData ); -+ -+ // dependent dispatch -+ cpp_call( -+ pThis, nVtableCall +1, // get, then set method -+ pReturnTypeRef, -+ 1, &aParam, -+ pReturn, pArgs, ppException ); -+ -+ typelib_typedescriptionreference_release( pReturnTypeRef ); -+ } -+ -+ break; -+ } -+ case typelib_TypeClass_INTERFACE_METHOD: -+ { -+ // determine vtable call index -+ sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition; -+ OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" ); -+ -+ sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos]; -+ OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" ); -+ -+ switch (nVtableCall) -+ { -+ // standard calls -+ case 1: // acquire uno interface -+ (*pUnoI->acquire)( pUnoI ); -+ *ppException = 0; -+ break; -+ case 2: // release uno interface -+ (*pUnoI->release)( pUnoI ); -+ *ppException = 0; -+ break; -+ case 0: // queryInterface() opt -+ { -+ typelib_TypeDescription * pTD = 0; -+ TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() ); -+ if (pTD) -+ { -+ uno_Interface * pInterface = 0; -+ (*pThis->pBridge->pUnoEnv->getRegisteredInterface)( -+ pThis->pBridge->pUnoEnv, -+ (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD ); -+ -+ if (pInterface) -+ { -+ ::uno_any_construct( -+ reinterpret_cast< uno_Any * >( pReturn ), -+ &pInterface, pTD, 0 ); -+ (*pInterface->release)( pInterface ); -+ TYPELIB_DANGER_RELEASE( pTD ); -+ *ppException = 0; -+ break; -+ } -+ TYPELIB_DANGER_RELEASE( pTD ); -+ } -+ } // else perform queryInterface() -+ default: -+ // dependent dispatch -+ cpp_call( -+ pThis, nVtableCall, -+ ((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pReturnTypeRef, -+ ((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->nParams, -+ ((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pParams, -+ pReturn, pArgs, ppException ); -+ } -+ break; -+ } -+ default: -+ { -+ ::com::sun::star::uno::RuntimeException aExc( -+ OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ), -+ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() ); -+ -+ Type const & rExcType = ::getCppuType( &aExc ); -+ // binary identical null reference -+ ::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 ); -+ } -+ } -+} -+ -+} -+ diff --git a/editors/openoffice.org-1.0/files/patch-bridges+source+remote+iiop+dispatch.cxx b/editors/openoffice.org-1.0/files/patch-bridges+source+remote+iiop+dispatch.cxx deleted file mode 100644 index 5735846cf20b..000000000000 --- a/editors/openoffice.org-1.0/files/patch-bridges+source+remote+iiop+dispatch.cxx +++ /dev/null @@ -1,23 +0,0 @@ -Index: bridges/source/remote/iiop/dispatch.cxx -=================================================================== -RCS file: /cvs/udk/bridges/source/remote/iiop/dispatch.cxx,v -retrieving revision 1.5.14.1 -diff -u -r1.5.14.1 dispatch.cxx ---- bridges/source/remote/iiop/dispatch.cxx 8 Aug 2002 02:49:44 -0000 1.5.14.1 -+++ bridges/source/remote/iiop/dispatch.cxx 28 Jul 2005 12:17:15 -0000 -@@ -58,14 +58,7 @@ - * - * - ************************************************************************/ --#if defined(SOLARIS) || defined(IRIX) --#include <alloca.h> --#elif defined MACOSX --#include <sys/types.h> --#include <sys/malloc.h> --#else --#include <malloc.h> --#endif -+#include <stdlib.h> - - #include <osl/diagnose.h> - diff --git a/editors/openoffice.org-1.0/files/patch-bridges+source+remote+iiop+unmarshal.cxx b/editors/openoffice.org-1.0/files/patch-bridges+source+remote+iiop+unmarshal.cxx deleted file mode 100644 index 7a37360e6fe1..000000000000 --- a/editors/openoffice.org-1.0/files/patch-bridges+source+remote+iiop+unmarshal.cxx +++ /dev/null @@ -1,23 +0,0 @@ -Index: bridges/source/remote/iiop/unmarshal.cxx -=================================================================== -RCS file: /cvs/udk/bridges/source/remote/iiop/unmarshal.cxx,v -retrieving revision 1.4.10.1 -diff -u -r1.4.10.1 unmarshal.cxx ---- bridges/source/remote/iiop/unmarshal.cxx 8 Aug 2002 02:49:44 -0000 1.4.10.1 -+++ bridges/source/remote/iiop/unmarshal.cxx 28 Jul 2005 12:18:13 -0000 -@@ -58,14 +58,7 @@ - * - * - ************************************************************************/ --#if defined(SOLARIS) || defined(IRIX) --#include <alloca.h> --#elif defined MACOSX --#include <sys/types.h> --#include <sys/malloc.h> --#else --#include <malloc.h> --#endif -+#include <stdlib.h> - - #include <osl/diagnose.h> - diff --git a/editors/openoffice.org-1.0/files/patch-bridges+source+remote+static+proxy.cxx b/editors/openoffice.org-1.0/files/patch-bridges+source+remote+static+proxy.cxx deleted file mode 100644 index cbf4f9552c70..000000000000 --- a/editors/openoffice.org-1.0/files/patch-bridges+source+remote+static+proxy.cxx +++ /dev/null @@ -1,23 +0,0 @@ -Index: bridges/source/remote/static/proxy.cxx -=================================================================== -RCS file: /cvs/udk/bridges/source/remote/static/proxy.cxx,v -retrieving revision 1.3.6.1 -diff -u -r1.3.6.1 proxy.cxx ---- bridges/source/remote/static/proxy.cxx 8 Aug 2002 02:49:46 -0000 1.3.6.1 -+++ bridges/source/remote/static/proxy.cxx 28 Jul 2005 12:08:44 -0000 -@@ -59,14 +59,7 @@ - * - ************************************************************************/ - #include <assert.h> --#if defined(SOLARIS) || defined(IRIX) --#include <alloca.h> --#elif defined MACOSX --#include <sys/types.h> --#include <sys/malloc.h> --#else --#include <malloc.h> --#endif -+#include <stdlib.h> - - #include <bridges/remote/proxy.hxx> - #include <bridges/remote/context.h> diff --git a/editors/openoffice.org-1.0/files/patch-bridges+source+remote+static+stub.cxx b/editors/openoffice.org-1.0/files/patch-bridges+source+remote+static+stub.cxx deleted file mode 100644 index dde90d83c4c2..000000000000 --- a/editors/openoffice.org-1.0/files/patch-bridges+source+remote+static+stub.cxx +++ /dev/null @@ -1,23 +0,0 @@ -Index: bridges/source/remote/static/stub.cxx -=================================================================== -RCS file: /cvs/udk/bridges/source/remote/static/stub.cxx,v -retrieving revision 1.2.26.1 -diff -u -r1.2.26.1 stub.cxx ---- bridges/source/remote/static/stub.cxx 8 Aug 2002 02:49:47 -0000 1.2.26.1 -+++ bridges/source/remote/static/stub.cxx 28 Jul 2005 12:13:32 -0000 -@@ -58,14 +58,7 @@ - * - * - ************************************************************************/ --#if defined(SOLARIS) || defined(IRIX) --#include <alloca.h> --#elif defined MACOSX --#include <sys/types.h> --#include <sys/malloc.h> --#else --#include <malloc.h> --#endif -+#include <stdlib.h> - - #include <osl/diagnose.h> - diff --git a/editors/openoffice.org-1.0/files/patch-bridges+source+remote+urp+urp_dispatch.cxx b/editors/openoffice.org-1.0/files/patch-bridges+source+remote+urp+urp_dispatch.cxx deleted file mode 100644 index eabe859aee7e..000000000000 --- a/editors/openoffice.org-1.0/files/patch-bridges+source+remote+urp+urp_dispatch.cxx +++ /dev/null @@ -1,23 +0,0 @@ -Index: bridges/source/remote/urp/urp_dispatch.cxx -=================================================================== -RCS file: /cvs/udk/bridges/source/remote/urp/urp_dispatch.cxx,v -retrieving revision 1.8.2.1 -diff -u -r1.8.2.1 urp_dispatch.cxx ---- bridges/source/remote/urp/urp_dispatch.cxx 8 Aug 2002 02:49:48 -0000 1.8.2.1 -+++ bridges/source/remote/urp/urp_dispatch.cxx 28 Jul 2005 12:15:51 -0000 -@@ -58,14 +58,7 @@ - * - * - ************************************************************************/ --#if defined(SOLARIS) || defined(IRIX) --#include <alloca.h> --#elif MACOSX --#include <sys/types.h> --#include <sys/malloc.h> --#else --#include <malloc.h> --#endif -+#include <stdlib.h> - - #include <osl/mutex.hxx> - #include <osl/diagnose.h> diff --git a/editors/openoffice.org-1.0/files/patch-chaos+util+makefile.mk b/editors/openoffice.org-1.0/files/patch-chaos+util+makefile.mk deleted file mode 100644 index 7bd2a784d49d..000000000000 --- a/editors/openoffice.org-1.0/files/patch-chaos+util+makefile.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- chaos/util/makefile.mk.orig Wed Jun 12 01:16:35 2002 -+++ chaos/util/makefile.mk Wed Jun 12 01:16:47 2002 -@@ -100,7 +100,7 @@ - - SHL1TARGET= cnt$(UPD)$(DLLPOSTFIX) - SHL1IMPLIB= i$(TARGET) --.IF "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD" -+.IF "$(OS)"=="MACOSX" - #SHL1VERSIONMAP= exports.$(DLLPOSTFIX).map - .ELSE - SHL1VERSIONMAP= exports.map diff --git a/editors/openoffice.org-1.0/files/patch-codemaker+source+codemaker+global.cxx b/editors/openoffice.org-1.0/files/patch-codemaker+source+codemaker+global.cxx deleted file mode 100644 index 6f2ed220356a..000000000000 --- a/editors/openoffice.org-1.0/files/patch-codemaker+source+codemaker+global.cxx +++ /dev/null @@ -1,14 +0,0 @@ ---- codemaker/source/codemaker/global.cxx.orig Fri Apr 4 00:14:50 2003 -+++ codemaker/source/codemaker/global.cxx Fri Apr 4 00:14:53 2003 -@@ -149,11 +149,7 @@ - strcat(tmpPattern, "\\"); - strcat(tmpPattern, pPrefix); - strcat(tmpPattern, "XXXXXX"); --#if defined(FREEBSD) || defined(MACOSX) -- pTmpName = mkstemp(tmpPattern); --#else - pTmpName = mktemp(tmpPattern); --#endif - #endif - - return OString(pTmpName); diff --git a/editors/openoffice.org-1.0/files/patch-codemaker+source+cppumaker+makefile.mk b/editors/openoffice.org-1.0/files/patch-codemaker+source+cppumaker+makefile.mk deleted file mode 100644 index b83a620116f9..000000000000 --- a/editors/openoffice.org-1.0/files/patch-codemaker+source+cppumaker+makefile.mk +++ /dev/null @@ -1,15 +0,0 @@ -Index: codemaker/source/cppumaker/makefile.mk -=================================================================== -RCS file: /cvs/udk/codemaker/source/cppumaker/makefile.mk,v -retrieving revision 1.5 -diff -u -r1.5 makefile.mk ---- codemaker/source/cppumaker/makefile.mk 17 Aug 2001 13:15:48 -0000 1.5 -+++ codemaker/source/cppumaker/makefile.mk 10 Jul 2005 07:39:54 -0000 -@@ -92,6 +92,7 @@ - APP1STDLIBS= \ - $(SALLIB) \ - $(SALHELPERLIB) \ -+ $(STORELIB) \ - $(REGLIB) - - APP1LIBS= \ diff --git a/editors/openoffice.org-1.0/files/patch-codemaker+source+source+javamaker+makefile.mk b/editors/openoffice.org-1.0/files/patch-codemaker+source+source+javamaker+makefile.mk deleted file mode 100644 index 56906191f2f0..000000000000 --- a/editors/openoffice.org-1.0/files/patch-codemaker+source+source+javamaker+makefile.mk +++ /dev/null @@ -1,15 +0,0 @@ -Index: codemaker/source/javamaker/makefile.mk -=================================================================== -RCS file: /cvs/udk/codemaker/source/javamaker/makefile.mk,v -retrieving revision 1.7 -diff -u -r1.7 makefile.mk ---- codemaker/source/javamaker/makefile.mk 17 Aug 2001 13:15:48 -0000 1.7 -+++ codemaker/source/javamaker/makefile.mk 10 Jul 2005 08:39:43 -0000 -@@ -96,6 +96,7 @@ - APP1STDLIBS= \ - $(SALLIB) \ - $(SALHELPERLIB) \ -+ $(STORELIB) \ - $(REGLIB) - - APP1LIBS= \ diff --git a/editors/openoffice.org-1.0/files/patch-config_office+configure.in b/editors/openoffice.org-1.0/files/patch-config_office+configure.in deleted file mode 100644 index 4b6e10a17e04..000000000000 --- a/editors/openoffice.org-1.0/files/patch-config_office+configure.in +++ /dev/null @@ -1,32 +0,0 @@ -Index: config_office/configure.in -=================================================================== -RCS file: /cvs/tools/config_office/configure.in,v -retrieving revision 1.41.2.18 -diff -u -r1.41.2.18 configure.in ---- config_office/configure.in 12 Mar 2003 11:38:41 -0000 1.41.2.18 -+++ config_office/configure.in 23 Nov 2007 06:17:03 -0000 -@@ -383,9 +383,6 @@ - if test "$COMPATH" != "NO_GCC"; then - AC_MSG_RESULT([checked (gcc $_gcc_version)]) - fi -- --dnl Set the include paths -- _gcc_include_path=`$CC -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include - fi - - dnl =================================================================== -@@ -545,10 +542,12 @@ - fi - - dnl =================================================================== --dnl Set the gxx include directories -+dnl Set the gcc/gxx include directories - dnl =================================================================== - if test "$GXX" = "yes"; then -- _gxx_include_path=`echo "#include <cstring>" | $CXX -E -xc++ - | $SED -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -1` -+ _gcc_include_path=`$CC -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include -+ _gxx_include_path=`echo "#include <cstring>" | $CXX -E -xc++ - \ -+ | $SED -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -1` - dnl This is the original code... - dnl _gxx_include_path=`$CXX -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include - fi diff --git a/editors/openoffice.org-1.0/files/patch-config_office+setsoenv.in b/editors/openoffice.org-1.0/files/patch-config_office+setsoenv.in deleted file mode 100644 index 5c894af6e1e2..000000000000 --- a/editors/openoffice.org-1.0/files/patch-config_office+setsoenv.in +++ /dev/null @@ -1,102 +0,0 @@ -Index: config_office/set_soenv.in -=================================================================== -RCS file: /cvs/tools/config_office/set_soenv.in,v -retrieving revision 1.3.2.2.2.8.2.2.2.3 -diff -u -r1.3.2.2.2.8.2.2.2.3 set_soenv.in ---- config_office/set_soenv.in 3 Apr 2003 04:52:43 -0000 1.3.2.2.2.8.2.2.2.3 -+++ config_office/set_soenv.in 3 Aug 2005 22:14:14 -0000 -@@ -52,8 +52,8 @@ - #------------------------------------------------- - # - # Platform independent constant values. --my @LANGUAGES = ("ARAB", "CHINSIM", "CHINTRAD", "DAN", "DTCH", "ENUS", "FREN", "GREEK", "ITAL", --"JAPN", "KOREAN", "POL", "PORT", "RUSS", "SPAN", "SWED", "TURK" ); -+my @LANGUAGES = ("ARAB", "CHINSIM", "CHINTRAD", "DAN", "DTCH", "ENUS", "FREN", "GREEK", "GER", -+"ITAL", "JAPN", "KOREAN", "POL", "PORT", "RUSS", "SPAN", "SWED", "TURK" ); - my ( $CALL_CDECL, $COMMON_OUTDIR, $NO_SRS_PATCH, $PRODUCT, $PROFULLSWITCH, $BIG_GOODIES, $BMP_WRITES_FLAG, - $common_build, $MK_UNROLL, $NO_REC_RES, $PROEXT, $SO3, $SOLAR_JAVA, - $SOLAR_PLUGIN, $TF_PACKAGES, $TF_SDBAPI, $TF_FILEURL, $UPDATER, $BUILD_DELIVER, $USE_NEWCHARSET, $USE_NEW_RSC, $VCL, -@@ -65,7 +65,7 @@ - my ( $BIG_SVX, $COM, $CPU, $CPUNAME, $CVER, $DLLSUFFIX, $GLIBC, $GUI, $GUIBASE, $GUIENV, - $GVER, $GVERDIR, $OS, $OSVERSION, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH, - $DEMO_ENV, $DYNAMIC_CRT, $SET_EXCEPTIONS, $emergency, $use_shl_versions, $CDPATHx, $JRELIBDIR, -- $JRETOOLKITDIR, $JRETHREADDIR, $PTHREAD_CFLAGS, $PTHREAD_LIBS, $EXCEPTIONS, $WRAPCMD ); -+ $JRETOOLKITDIR, $JRETHREADDIR, $JRETHREADDIR2, $PTHREAD_CFLAGS, $PTHREAD_LIBS, $EXCEPTIONS, $WRAPCMD ); - # - #------------------------------------------- - # IIc. Declaring the environment variables. -@@ -335,6 +335,7 @@ - $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386"; - $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client"; - $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."green_threads"; -+ $JRETHREADDIR2 = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."classic"; - } - elsif ( $platform eq "$Linux" ) - { -@@ -875,24 +876,18 @@ - $ps.$JRETHREADDIR. - $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB; - } --elsif (($platform eq "$Linux") || ($platform eq "$NetBSD") || ($platform eq "$Tru64")) -+elsif (($platform eq "$Linux") || ($platform eq "$NetBSD") || ($platform eq "$FreeBSD") || ($platform eq "$Tru64")) - { $LD_LIBRARY_PATH = $cur_dir. - $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB. - $ps.$JRELIBDIR. - $ps.$JRETOOLKITDIR. - $ps.$JRETHREADDIR. -+ $ps.$JRETHREADDIR2. - $ps.$par_dir.$LIB. - $ps_STLPORT_LIB. - $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB. - $ps.$ENV{'LD_LIBRARY_PATH'}; - } --elsif ($platform eq "$FreeBSD") --{ $LD_LIBRARY_PATH = $cur_dir. -- $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB. -- $ps.$par_dir.$LIB. -- $ps_STLPORT_LIB. -- $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB; --} - elsif ($platform eq "$Irix" || $platform eq "$Irix64") - { $LD_LIBRARY_PATH = $cur_dir. - $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB. -@@ -1165,7 +1160,7 @@ - $L_STLPORT_LIB. - $L.$XLIB; - } --elsif (($platform eq "$Linux") || ($platform eq "$NetBSD") || ($platform eq "$Tru64") || ($platform eq "$Irix") || ($platform eq "$Irix64")) -+elsif (($platform eq "$Linux") || ($platform eq "$NetBSD") || ($platform eq "$Tru64") || ($platform eq "$Irix") || ($platform eq "$Irix64") || ($platform eq "$FreeBSD")) - { $SOLARLIB = $L.$par_dir.$LIB. - $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB. - $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB. -@@ -1174,18 +1169,10 @@ - $L.$JRELIBDIR. - $L.$JRETOOLKITDIR. - $L.$JRETHREADDIR. -+ $L.$JRETHREADDIR2. - $L_STLPORT_LIB. - $L.$XLIB; - } --elsif ($platform eq "$FreeBSD") --{ $SOLARLIB = $L.$par_dir.$LIB. -- $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB. -- $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB. -- $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB. -- $L.'$JAVA_HOME'.$LIB. -- $L_STLPORT_LIB. -- $L.$XLIB; --} - elsif ($platform eq "$Winnt") - { $SOLARLIB = $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB. - $L.$par_dir.$LIB. -@@ -1251,7 +1238,9 @@ - { $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux"; - } - elsif ($platform eq "$FreeBSD") --{ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd"; -+{ -+ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd". -+ $I.'$JAVA_HOME'.$INCLUDE.$ds."linux"; - } - elsif ($platform eq "$NetBSD") - { $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."netbsd"; diff --git a/editors/openoffice.org-1.0/files/patch-connectivity+source+drivers+adabas+makefile.mk b/editors/openoffice.org-1.0/files/patch-connectivity+source+drivers+adabas+makefile.mk deleted file mode 100644 index 985c87525e68..000000000000 --- a/editors/openoffice.org-1.0/files/patch-connectivity+source+drivers+adabas+makefile.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- connectivity/source/drivers/adabas/makefile.mk.orig Wed Jun 12 01:06:20 2002 -+++ connectivity/source/drivers/adabas/makefile.mk Wed Jun 12 01:06:34 2002 -@@ -104,7 +104,7 @@ - $(SLO)$/BResultSetMetaData.obj \ - $(SLO)$/BResultSet.obj - --.IF "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD" -+.IF "$(OS)"=="MACOSX" - #SHL1VERSIONMAP=$(ADABAS_TARGET).$(DLLPOSTFIX).map - .ELSE - SHL1VERSIONMAP=$(ADABAS_TARGET).map diff --git a/editors/openoffice.org-1.0/files/patch-connectivity+source+drivers+calc+makefile.mk b/editors/openoffice.org-1.0/files/patch-connectivity+source+drivers+calc+makefile.mk deleted file mode 100644 index 845cdffa9915..000000000000 --- a/editors/openoffice.org-1.0/files/patch-connectivity+source+drivers+calc+makefile.mk +++ /dev/null @@ -1,12 +0,0 @@ ---- connectivity/source/drivers/calc/makefile.mk.orig Wed Jun 12 01:36:16 2002 -+++ connectivity/source/drivers/calc/makefile.mk Wed Jun 12 01:36:22 2002 -@@ -92,9 +92,7 @@ - $(SLO)$/CDriver.obj - - .IF "$(OS)"!="MACOSX" --.IF "$(OS)"!="FREEBSD" - SHL1VERSIONMAP= $(TARGET).map --.ENDIF - .ENDIF - # --- Library ----------------------------------- - diff --git a/editors/openoffice.org-1.0/files/patch-connectivity+source+drivers+dbase+makefile.mk b/editors/openoffice.org-1.0/files/patch-connectivity+source+drivers+dbase+makefile.mk deleted file mode 100644 index 50a7123bb829..000000000000 --- a/editors/openoffice.org-1.0/files/patch-connectivity+source+drivers+dbase+makefile.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- connectivity/source/drivers/dbase/makefile.mk.orig Wed Jun 12 01:26:39 2002 -+++ connectivity/source/drivers/dbase/makefile.mk Wed Jun 12 01:26:48 2002 -@@ -116,7 +116,7 @@ - $(SLO)$/DDriver.obj - - --.IF "$(OS)"=="MACOSX"||"$(OS)"=="FREEBSD" -+.IF "$(OS)"=="MACOSX" - #SHL1VERSIONMAP=$(TARGET).$(DLLPOSTFIX).map - .ELSE - SHL1VERSIONMAP=$(TARGET).map diff --git a/editors/openoffice.org-1.0/files/patch-connectivity+source+drivers+file+makefile.mk b/editors/openoffice.org-1.0/files/patch-connectivity+source+drivers+file+makefile.mk deleted file mode 100644 index a94e5e388d10..000000000000 --- a/editors/openoffice.org-1.0/files/patch-connectivity+source+drivers+file+makefile.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- connectivity/source/drivers/file/makefile.mk.orig Wed Jun 12 01:12:42 2002 -+++ connectivity/source/drivers/file/makefile.mk Wed Jun 12 01:12:44 2002 -@@ -112,7 +112,7 @@ - $(SLO)$/fanalyzer.obj \ - $(SLO)$/fcomp.obj - --.IF "$(OS)"=="MACOSX"||"$(OS)"=="FREEBSD" -+.IF "$(OS)"=="MACOSX" - #SHL1VERSIONMAP=$(TARGET).$(DLLPOSTFIX).map - .ELSE - #SHL1VERSIONMAP=$(TARGET).map diff --git a/editors/openoffice.org-1.0/files/patch-connectivity+source+drivers+flat+makefile.mk b/editors/openoffice.org-1.0/files/patch-connectivity+source+drivers+flat+makefile.mk deleted file mode 100644 index 0e863e93ad65..000000000000 --- a/editors/openoffice.org-1.0/files/patch-connectivity+source+drivers+flat+makefile.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- connectivity/source/drivers/flat/makefile.mk.orig Wed Jun 12 01:14:43 2002 -+++ connectivity/source/drivers/flat/makefile.mk Wed Jun 12 01:15:03 2002 -@@ -104,7 +104,7 @@ - $(SLO)$/EDriver.obj - - --.IF "$(OS)"=="MACOSX"||"$(OS)"=="FREEBSD" -+.IF "$(OS)"=="MACOSX" - #SHL1VERSIONMAP=$(TARGET).$(DLLPOSTFIX).map - .ELSE - SHL1VERSIONMAP=$(TARGET).map diff --git a/editors/openoffice.org-1.0/files/patch-connectivity+source+drivers+jdbc+makefile.mk b/editors/openoffice.org-1.0/files/patch-connectivity+source+drivers+jdbc+makefile.mk deleted file mode 100644 index 8c35f8387963..000000000000 --- a/editors/openoffice.org-1.0/files/patch-connectivity+source+drivers+jdbc+makefile.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- connectivity/source/drivers/jdbc/makefile.mk.orig Wed Jun 12 00:57:12 2002 -+++ connectivity/source/drivers/jdbc/makefile.mk Wed Jun 12 00:57:21 2002 -@@ -111,7 +111,7 @@ - $(SLO)$/tools.obj - - --.IF "$(OS)"=="MACOSX"||"$(OS)"=="FREEBSD" -+.IF "$(OS)"=="MACOSX" - #SHL1VERSIONMAP=$(JDBC_TARGET).$(DLLPOSTFIX).map - .ELSE - SHL1VERSIONMAP=$(JDBC_TARGET).map diff --git a/editors/openoffice.org-1.0/files/patch-connectivity+source+drivers+mozab+makefile.mk b/editors/openoffice.org-1.0/files/patch-connectivity+source+drivers+mozab+makefile.mk deleted file mode 100644 index a72837ceded0..000000000000 --- a/editors/openoffice.org-1.0/files/patch-connectivity+source+drivers+mozab+makefile.mk +++ /dev/null @@ -1,12 +0,0 @@ ---- connectivity/source/drivers/mozab/makefile.mk.orig Wed Jun 12 01:37:30 2002 -+++ connectivity/source/drivers/mozab/makefile.mk Wed Jun 12 01:37:47 2002 -@@ -107,9 +107,7 @@ - # --- MOZAB BASE Library ----------------------------------- - - SHL1VERSIONMAP= $(TARGET).map --.IF "$(OS)"!="FREEBSD" - SHL1TARGET= $(TARGET)$(MOZAB_MAJOR) --.ENDIF - SHL1OBJS=$(SLOFILES) - SHL1STDLIBS=\ - $(CPPULIB) \ diff --git a/editors/openoffice.org-1.0/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk b/editors/openoffice.org-1.0/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk deleted file mode 100644 index eea25f2b889c..000000000000 --- a/editors/openoffice.org-1.0/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk +++ /dev/null @@ -1,54 +0,0 @@ ---- connectivity/source/drivers/mozab/mozillasrc/makefile.mk.orig Tue Mar 19 12:56:24 2002 -+++ connectivity/source/drivers/mozab/mozillasrc/makefile.mk Sat May 18 15:51:13 2002 -@@ -64,8 +64,8 @@ - #mozilla specific stuff. - MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT) - MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla --#MOZ_LIB=$(PRJ)$/$(INPATH)$/lib --#MOZ_INC=$(PRJ)$/$(INPATH)$/inc$/mozilla -+#MOZ_LIB=$(PRJ)$/..$/moz$/$(INPATH)$/lib -+#MOZ_INC=$(PRJ)$/..$/moz$/$(INPATH)$/inc$/mozilla - #End of mozilla specific stuff. - - PRJ=..$/..$/..$/.. -@@ -107,7 +107,7 @@ - -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \ - -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \ - -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \ -- -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -+ -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr - CDEFS += -DWINVER=0x400 -DMOZILLA_CLIENT \ - -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \ - -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \ -@@ -123,7 +123,7 @@ - -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \ - -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \ - -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \ -- -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -+ -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr - CDEFS += -DDEBUG -DWINVER=0x400 -DMOZILLA_CLIENT \ - -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \ - -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \ -@@ -141,7 +141,7 @@ - -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \ - -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \ - -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \ -- -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -+ -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr - CDEFS+= -DMOZILLA_CLIENT \ - -DOSTYPE=\"Linux2.2.14-5\" -DOJI - .IF "$(OS)" == "LINUX" -@@ -157,6 +157,13 @@ - -fno-rtti -Wall -Wconversion -Wpointer-arith \ - -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \ - -Wno-long-long -+CDEFS += -DTRACING -+.ELIF "$(OS)" == "FREEBSD" -+CFLAGS += -fPIC -+CFLAGSCXX += \ -+ -fno-rtti -Wall -Wconversion -Wpointer-arith \ -+ -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \ -+ -Wno-long-long -pthread - CDEFS += -DTRACING - .ENDIF - .ENDIF diff --git a/editors/openoffice.org-1.0/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk b/editors/openoffice.org-1.0/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk deleted file mode 100644 index d9655c5e9855..000000000000 --- a/editors/openoffice.org-1.0/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk +++ /dev/null @@ -1,12 +0,0 @@ ---- connectivity/source/drivers/mozaddressbook/makefile.mk.orig Wed Jun 12 01:40:36 2002 -+++ connectivity/source/drivers/mozaddressbook/makefile.mk Wed Jun 12 01:40:37 2002 -@@ -134,9 +134,7 @@ - SLOFILES+=$(SLO)$/staticmbmozab.obj - .ENDIF - --.IF "$(OS)"!="FREEBSD" - SHL1VERSIONMAP= $(TARGET).map --.ENDIF - # --- Library ----------------------------------- - - SHL1TARGET=$(TARGET)$(UPD)$(DLLPOSTFIX) diff --git a/editors/openoffice.org-1.0/files/patch-cppu+inc+cppu+macros.hxx b/editors/openoffice.org-1.0/files/patch-cppu+inc+cppu+macros.hxx deleted file mode 100644 index 3e6e3f558c4f..000000000000 --- a/editors/openoffice.org-1.0/files/patch-cppu+inc+cppu+macros.hxx +++ /dev/null @@ -1,11 +0,0 @@ ---- cppu/inc/cppu/macros.hxx.kan Wed Jul 24 23:28:55 2002 -+++ cppu/inc/cppu/macros.hxx Wed Jul 24 23:29:45 2002 -@@ -76,7 +76,7 @@ - the struct inherits from a base struct the first member is no double or [unsigned] long long. - @internal - */ --#if defined(__GNUC__) && defined(LINUX) && (defined(INTEL) || defined(POWERPC)) && (__GNUC__ == 3) -+#if defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD)) && (defined(INTEL) || defined(POWERPC)) && (__GNUC__ == 3) - #define CPPU_GCC3_ALIGN( base_struct ) __attribute__ ((aligned (__alignof__ (base_struct)))) - #else - #define CPPU_GCC3_ALIGN( base_struct ) diff --git a/editors/openoffice.org-1.0/files/patch-cppu+inc+uno+lbnames.h b/editors/openoffice.org-1.0/files/patch-cppu+inc+uno+lbnames.h deleted file mode 100644 index ec9dbb3a299c..000000000000 --- a/editors/openoffice.org-1.0/files/patch-cppu+inc+uno+lbnames.h +++ /dev/null @@ -1,11 +0,0 @@ ---- cppu/inc/uno/lbnames.h.orig Fri May 31 00:06:58 2002 -+++ cppu/inc/uno/lbnames.h Fri May 31 00:07:22 2002 -@@ -94,7 +94,7 @@ - #define __CPPU_ENV gcc2 - #elif (__GNUC__ == 2) - #error "Tested gcc 2 versions are 2.91 and 2.95. Patch uno/lbnames.h to try your gcc 2 version." --#elif (__GNUC__ == 3 && __GNUC_MINOR__ == 0) -+#elif (__GNUC__ == 3 && (__GNUC_MINOR__ == 0 || __GNUC_MINOR__ == 1 || __GNUC_MINOR__ == 2)) - #define __CPPU_ENV gcc3 - #elif (__GNUC__ == 3) - #error "Tested gcc 3 version is 3.0. Patch uno/lbnames.h to try your gcc 3 version." diff --git a/editors/openoffice.org-1.0/files/patch-cppu+prj+build.lst b/editors/openoffice.org-1.0/files/patch-cppu+prj+build.lst deleted file mode 100644 index c4e803c46e69..000000000000 --- a/editors/openoffice.org-1.0/files/patch-cppu+prj+build.lst +++ /dev/null @@ -1,8 +0,0 @@ ---- cppu/prj/build.lst.orig Mon Mar 11 14:13:47 2002 -+++ cppu/prj/build.lst Mon Mar 11 14:14:30 2002 -@@ -1,4 +1,4 @@ --cu cppu : codemaker udkapi NULL -+cu cppu : codemaker udkapi offuh NULL - cu cppu usr1 - all cu_mkout NULL - cu cppu\source nmake - all cu_source NULL - cu cppu\source\uno nmake - all cu_uno cu_source NULL diff --git a/editors/openoffice.org-1.0/files/patch-cppu+source+typelib+typelib.cxx b/editors/openoffice.org-1.0/files/patch-cppu+source+typelib+typelib.cxx deleted file mode 100644 index 226c6033836e..000000000000 --- a/editors/openoffice.org-1.0/files/patch-cppu+source+typelib+typelib.cxx +++ /dev/null @@ -1,20 +0,0 @@ -Index: cppu/source/typelib/typelib.cxx -=================================================================== -RCS file: /cvs/udk/cppu/source/typelib/typelib.cxx,v -retrieving revision 1.14.10.1 -diff -u -r1.14.10.1 typelib.cxx ---- cppu/source/typelib/typelib.cxx 9 Aug 2002 02:30:50 -0000 1.14.10.1 -+++ cppu/source/typelib/typelib.cxx 10 Jul 2005 09:13:22 -0000 -@@ -71,12 +71,6 @@ - #include <stdarg.h> - #include <stdlib.h> - #include <string.h> --#ifdef MACOSX --#include <sys/types.h> --#include <sys/malloc.h> --#else --#include <malloc.h> --#endif - #if defined(SOLARIS) || defined(IRIX) - #include <alloca.h> - #endif diff --git a/editors/openoffice.org-1.0/files/patch-cppu+source+uno+data.cxx b/editors/openoffice.org-1.0/files/patch-cppu+source+uno+data.cxx deleted file mode 100644 index 3a610504c83b..000000000000 --- a/editors/openoffice.org-1.0/files/patch-cppu+source+uno+data.cxx +++ /dev/null @@ -1,20 +0,0 @@ ---- cppu/source/uno/data.cxx.kan Wed Jul 24 23:39:23 2002 -+++ cppu/source/uno/data.cxx Wed Jul 24 23:38:49 2002 -@@ -295,7 +295,7 @@ - # pragma pack(8) - #endif - --#if defined(__GNUC__) && defined(LINUX) && defined(INTEL) -+#if defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD)) && defined(INTEL) - #define MAX_ALIGNMENT_4 - #endif - -@@ -307,7 +307,7 @@ - if (OFFSET_OF(s, m) != n) { fprintf( stderr, "### OFFSET_OF(" #s ", " #m ") = %d instead of expected %d!!!\n", OFFSET_OF(s, m), n ); abort(); } - - #ifdef DEBUG --#if defined(__GNUC__) && defined(LINUX) && (defined(INTEL) || defined(POWERPC)) -+#if defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD)) && (defined(INTEL) || defined(POWERPC)) - #define BINTEST_VERIFYSIZE( s, n ) \ - fprintf( stderr, "> sizeof(" #s ") = %d; __alignof__ (" #s ") = %d\n", sizeof(s), __alignof__ (s) ); \ - if (sizeof(s) != n) { fprintf( stderr, "### sizeof(" #s ") = %d instead of expected %d!!!\n", sizeof(s), n ); abort(); } diff --git a/editors/openoffice.org-1.0/files/patch-cppu+source+uno+lbenv.cxx b/editors/openoffice.org-1.0/files/patch-cppu+source+uno+lbenv.cxx deleted file mode 100644 index 45a097727c30..000000000000 --- a/editors/openoffice.org-1.0/files/patch-cppu+source+uno+lbenv.cxx +++ /dev/null @@ -1,18 +0,0 @@ -Index: cppu/source/uno/lbenv.cxx -=================================================================== -RCS file: /cvs/udk/cppu/source/uno/lbenv.cxx,v -retrieving revision 1.23 -diff -u -r1.23 lbenv.cxx ---- cppu/source/uno/lbenv.cxx 13 Aug 2002 15:07:09 -0000 1.23 -+++ cppu/source/uno/lbenv.cxx 10 Jul 2005 09:32:20 -0000 -@@ -93,10 +93,6 @@ - #include <stdio.h> - #ifdef SOLARIS - #include <alloca.h> --#elif defined MACOSX --#include <sys/malloc.h> --#else --#include <malloc.h> - #endif - #include <hash_map> - #include <vector> diff --git a/editors/openoffice.org-1.0/files/patch-cppu+test+alignment+diagnose.h b/editors/openoffice.org-1.0/files/patch-cppu+test+alignment+diagnose.h deleted file mode 100644 index c8eb02d754c5..000000000000 --- a/editors/openoffice.org-1.0/files/patch-cppu+test+alignment+diagnose.h +++ /dev/null @@ -1,11 +0,0 @@ ---- cppu/test/alignment/diagnose.h.orig Sat Jul 20 23:54:59 2002 -+++ cppu/test/alignment/diagnose.h Sat Jul 20 23:55:06 2002 -@@ -64,7 +64,7 @@ - #include <sal/types.h> - #include <stdio.h> - --#if defined(__GNUC__) && defined(LINUX) && defined(INTEL) -+#if defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD)) && defined(INTEL) - #define __ALIGNMENT__(s, n) __alignof__ (s) - #else - #define __ALIGNMENT__(s, n) n diff --git a/editors/openoffice.org-1.0/files/patch-cppu+util+makefile.mk b/editors/openoffice.org-1.0/files/patch-cppu+util+makefile.mk deleted file mode 100644 index db6dafce246f..000000000000 --- a/editors/openoffice.org-1.0/files/patch-cppu+util+makefile.mk +++ /dev/null @@ -1,12 +0,0 @@ ---- cppu/util/makefile.mk.orig Wed Jun 12 01:39:28 2002 -+++ cppu/util/makefile.mk Wed Jun 12 01:39:32 2002 -@@ -87,9 +87,7 @@ - - SHL1DEPN= - SHL1IMPLIB=i$(TARGET) --.IF "$(OS)"!="FREEBSD" - SHL1DEF=$(MISC)$/$(SHL1TARGET).def --.ENDIF - - SHL1VERSIONMAP=$(TARGET).map - diff --git a/editors/openoffice.org-1.0/files/patch-cppuhelper+source+implbase_ex.cxx b/editors/openoffice.org-1.0/files/patch-cppuhelper+source+implbase_ex.cxx deleted file mode 100644 index 1ff1d3920840..000000000000 --- a/editors/openoffice.org-1.0/files/patch-cppuhelper+source+implbase_ex.cxx +++ /dev/null @@ -1,20 +0,0 @@ -Index: cppuhelper/source/implbase_ex.cxx -=================================================================== -RCS file: /cvs/udk/cppuhelper/source/implbase_ex.cxx,v -retrieving revision 1.5 -diff -u -r1.5 implbase_ex.cxx ---- cppuhelper/source/implbase_ex.cxx 15 Aug 2002 12:36:30 -0000 1.5 -+++ cppuhelper/source/implbase_ex.cxx 10 Jul 2005 09:41:00 -0000 -@@ -61,11 +61,8 @@ - - #ifdef SOLARIS - #include <alloca.h> --#elif defined MACOSX --#include <sys/types.h> --#include <sys/malloc.h> - #else --#include <malloc.h> -+#include <stdlib.h> - #endif - #include <string.h> - diff --git a/editors/openoffice.org-1.0/files/patch-cppuhelper+source+makefile.mk b/editors/openoffice.org-1.0/files/patch-cppuhelper+source+makefile.mk deleted file mode 100644 index 3e74fb33e425..000000000000 --- a/editors/openoffice.org-1.0/files/patch-cppuhelper+source+makefile.mk +++ /dev/null @@ -1,13 +0,0 @@ ---- cppuhelper/source/makefile.mk.orig Mon Mar 11 22:17:52 2002 -+++ cppuhelper/source/makefile.mk Wed Apr 3 00:31:19 2002 -@@ -175,6 +175,10 @@ - #SHL1VERSIONMAP=gcc2_freebsd_intel.map - .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3" - SHL1VERSIONMAP=gcc3_linux_intel.map -+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc2" -+#SHL1VERSIONMAP=gcc2_freebsd_intel.map -+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3" -+#SHL1VERSIONMAP=gcc3_freebsd_intel.map - .ENDIF - - # --- Targets ------------------------------------------------------ diff --git a/editors/openoffice.org-1.0/files/patch-cppuhelper+source+tdmgr.cxx b/editors/openoffice.org-1.0/files/patch-cppuhelper+source+tdmgr.cxx deleted file mode 100644 index a3f59112ea22..000000000000 --- a/editors/openoffice.org-1.0/files/patch-cppuhelper+source+tdmgr.cxx +++ /dev/null @@ -1,16 +0,0 @@ -Index: cppuhelper/source/tdmgr.cxx -=================================================================== -RCS file: /cvs/udk/cppuhelper/source/tdmgr.cxx,v -retrieving revision 1.4 -diff -u -r1.4 tdmgr.cxx ---- cppuhelper/source/tdmgr.cxx 15 Oct 2001 16:07:59 -0000 1.4 -+++ cppuhelper/source/tdmgr.cxx 10 Jul 2005 09:41:51 -0000 -@@ -60,7 +60,7 @@ - ************************************************************************/ - - #ifndef MACOSX --#include <malloc.h> -+#include <stdlib.h> - #endif - #ifdef SOLARIS - #include <alloca.h> diff --git a/editors/openoffice.org-1.0/files/patch-desktop+source+pkgchk_packages.cxx b/editors/openoffice.org-1.0/files/patch-desktop+source+pkgchk_packages.cxx deleted file mode 100644 index b60b684b25ee..000000000000 --- a/editors/openoffice.org-1.0/files/patch-desktop+source+pkgchk_packages.cxx +++ /dev/null @@ -1,13 +0,0 @@ ---- desktop/source/pkgchk/pkgchk_packages.cxx.orig Sun Jan 19 20:00:08 2003 -+++ desktop/source/pkgchk/pkgchk_packages.cxx Sun Jan 19 20:01:51 2003 -@@ -124,6 +124,10 @@ - static char const s_platform_path [] = "/macosx_powerpc.plt"; - #elif defined (NETBSD) && defined (SPARC) - static char const s_platform_path [] = "/netbsd_sparc.plt"; -+#elif defined (FREEBSD) && defined (INTEL) -+static char const s_platform_path [] = "/freebsd_x86.plt"; -+#elif defined (FREEBSD) && defined (SPARC) -+static char const s_platform_path [] = "/freebsd_sparc.plt"; - #else - #error "unkonwn platform" - insert your platform identifier above; inserted for the case the preprocessor ignores error diff --git a/editors/openoffice.org-1.0/files/patch-desktop+util+makefile.mk b/editors/openoffice.org-1.0/files/patch-desktop+util+makefile.mk deleted file mode 100644 index bb622aa62e25..000000000000 --- a/editors/openoffice.org-1.0/files/patch-desktop+util+makefile.mk +++ /dev/null @@ -1,20 +0,0 @@ ---- desktop/util/makefile.mk.orig Sun Jul 21 00:04:35 2002 -+++ desktop/util/makefile.mk Sun Jul 21 00:04:38 2002 -@@ -81,7 +81,7 @@ - - # --- Linken der Applikation --------------------------------------- - --.IF "$(OS)" == "LINUX" -+.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD" - # #74158# linux needs sal/vos/tools at end of link list, solaris needs it first, - # winXX is handled like solaris for now - APP1_STDPRE= -@@ -111,7 +111,7 @@ - $(SALHELPERLIB) - - .IF "$(GUI)" == "UNX" --.IF "$(OS)" == "LINUX" -+.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD" - - APP1STDLIBS+= -lXext -lSM -lICE - diff --git a/editors/openoffice.org-1.0/files/patch-dmake+unix+linux+gnu+make.sh b/editors/openoffice.org-1.0/files/patch-dmake+unix+linux+gnu+make.sh deleted file mode 100644 index 0956ef9c130a..000000000000 --- a/editors/openoffice.org-1.0/files/patch-dmake+unix+linux+gnu+make.sh +++ /dev/null @@ -1,244 +0,0 @@ ---- dmake/unix/linux/gnu/make.sh.orig Wed Mar 13 20:32:53 2002 -+++ dmake/unix/linux/gnu/make.sh Wed Mar 13 20:33:00 2002 -@@ -3,188 +3,188 @@ - mkdir objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O infer.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O infer.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O infer.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O infer.c - fi - mv infer.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O make.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O make.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O make.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O make.c - fi - mv make.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O stat.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O stat.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O stat.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O stat.c - fi - mv stat.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O expand.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O expand.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O expand.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O expand.c - fi - mv expand.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmstring.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmstring.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmstring.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmstring.c - fi - mv dmstring.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O hash.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O hash.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O hash.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O hash.c - fi - mv hash.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dag.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dag.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dag.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dag.c - fi - mv dag.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmake.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmake.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmake.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmake.c - fi - mv dmake.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O path.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O path.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O path.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O path.c - fi - mv path.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O imacs.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O imacs.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O imacs.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O imacs.c - fi - mv imacs.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O sysintf.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O sysintf.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O sysintf.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O sysintf.c - fi - mv sysintf.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O parse.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O parse.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O parse.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O parse.c - fi - mv parse.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O getinp.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O getinp.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O getinp.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O getinp.c - fi - mv getinp.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O quit.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O quit.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O quit.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O quit.c - fi - mv quit.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O state.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O state.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O state.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O state.c - fi - mv state.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmdump.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmdump.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmdump.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmdump.c - fi - mv dmdump.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O macparse.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O macparse.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O macparse.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O macparse.c - fi - mv macparse.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O rulparse.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O rulparse.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O rulparse.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O rulparse.c - fi - mv rulparse.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O percent.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O percent.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O percent.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O percent.c - fi - mv percent.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O function.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O function.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O function.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O function.c - fi - mv function.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/arlib.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/arlib.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/arlib.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/arlib.c - fi - mv arlib.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dirbrk.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dirbrk.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dirbrk.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dirbrk.c - fi - mv dirbrk.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/rmprq.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/rmprq.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/rmprq.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/rmprq.c - fi - mv rmprq.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/ruletab.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/ruletab.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/ruletab.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/ruletab.c - fi - mv ruletab.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/runargv.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/runargv.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/runargv.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/runargv.c - fi - mv runargv.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dcache.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dcache.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dcache.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dcache.c - fi - mv dcache.o objects - --gcc -O -o dmake objects/infer.o objects/make.o objects/stat.o objects/expand.o \ -+${CC} ${CFLAGS} -O -o dmake objects/infer.o objects/make.o objects/stat.o objects/expand.o \ - objects/dmstring.o objects/hash.o objects/dag.o objects/dmake.o objects/path.o \ - objects/imacs.o objects/sysintf.o objects/parse.o objects/getinp.o \ - objects/quit.o objects/state.o objects/dmdump.o objects/macparse.o \ diff --git a/editors/openoffice.org-1.0/files/patch-dtrans+source+X11+X11_selection.cxx b/editors/openoffice.org-1.0/files/patch-dtrans+source+X11+X11_selection.cxx deleted file mode 100644 index a1e3006b3022..000000000000 --- a/editors/openoffice.org-1.0/files/patch-dtrans+source+X11+X11_selection.cxx +++ /dev/null @@ -1,19 +0,0 @@ ---- dtrans/source/X11/X11_selection.cxx.orig Sat Jul 20 23:18:03 2002 -+++ dtrans/source/X11/X11_selection.cxx Sat Jul 20 23:18:05 2002 -@@ -65,7 +65,7 @@ - #include <X11/keysym.h> - #include <X11/Xlib.h> - #include <X11/Xutil.h> --#if defined(LINUX) || defined(NETBSD) -+#if defined(LINUX) || defined(NETBSD) || defined (FREEBSD) - #include <sys/poll.h> - #else - #include <poll.h> -@@ -175,6 +175,7 @@ - { 0, "text/plain;charset=ksc5601.1992-0", "KSC5601.1992-0", 8 }, - // eastern european encodings - { 0, "text/plain;charset=koi8-r", "KOI8-R", 8 }, -+ { 0, "text/plain;charset=koi8-u", "KOI8-U", 8 }, - // String (== iso8859-1) - { XA_STRING, "text/plain;charset=string", "STRING", 8 }, - // special for compound text diff --git a/editors/openoffice.org-1.0/files/patch-external+dt+dtpatch.sh b/editors/openoffice.org-1.0/files/patch-external+dt+dtpatch.sh deleted file mode 100644 index 528a1110f48d..000000000000 --- a/editors/openoffice.org-1.0/files/patch-external+dt+dtpatch.sh +++ /dev/null @@ -1,11 +0,0 @@ ---- external/dt/dtpatch.sh.orig Wed Mar 13 17:09:43 2002 -+++ external/dt/dtpatch.sh Wed Mar 13 17:09:47 2002 -@@ -96,7 +96,7 @@ - done - - chmod -R +w rtufiles/*.h -- patch -i pat/editor.h.pat rtufiles/editor.h 2> newpatch -+ patch < pat/editor.h.pat rtufiles/editor.h 2> newpatch - - if test -s "patcherror"; then - echo "Please install the SUNWdtinc Version 1.2 package on your Solaris machine" >> patcherror diff --git a/editors/openoffice.org-1.0/files/patch-external+expat+expatpatch.sh b/editors/openoffice.org-1.0/files/patch-external+expat+expatpatch.sh deleted file mode 100644 index 5140022b3e99..000000000000 --- a/editors/openoffice.org-1.0/files/patch-external+expat+expatpatch.sh +++ /dev/null @@ -1,11 +0,0 @@ ---- external/expat/expatpatch.sh.orig Wed Mar 13 16:59:16 2002 -+++ external/expat/expatpatch.sh Wed Mar 13 17:00:18 2002 -@@ -87,7 +87,7 @@ - - for PNAME in `cat flist.pat` - do -- patch -i pat/$PNAME.pat rtufiles/$PNAME -+ patch < pat/$PNAME.pat rtufiles/$PNAME - done - - for SDNAME in `cat flist.sd` diff --git a/editors/openoffice.org-1.0/files/patch-external+glibc+glibcpatch b/editors/openoffice.org-1.0/files/patch-external+glibc+glibcpatch deleted file mode 100644 index b77c0644b3fd..000000000000 --- a/editors/openoffice.org-1.0/files/patch-external+glibc+glibcpatch +++ /dev/null @@ -1,35 +0,0 @@ ---- /dev/null Sun Jun 2 16:11:00 2002 -+++ external/glibc/flist.pat Sun Jun 2 12:00:09 2002 -@@ -0,0 +1 @@ -+patch-getopt.h ---- /dev/null Sun Jun 2 16:11:00 2002 -+++ external/glibc/patch-getopt.h Sun Jun 2 16:14:52 2002 -@@ -0,0 +1,14 @@ -+--- rtufiles/getopt.h.orig Fri May 31 16:46:21 2002 -++++ rtufiles/getopt.h Fri May 31 17:07:19 2002 -+@@ -133,7 +133,11 @@ -+ errors, only prototype getopt for the GNU C library. */ -+ extern int getopt (int __argc, char *const *__argv, const char *__shortopts); -+ # else /* not __GNU_LIBRARY__ */ -++#if (__GNUC__ == 3 && defined(FREEBSD)) -++/* skip getopt() definition , it conflicts with std.h */ -++#else -+ extern int getopt (); -++# endif /* FREEBSD */ -+ # endif /* __GNU_LIBRARY__ */ -+ -+ # ifndef __need_getopt ---- external/glibc/glibcpatch.sh.orig Sun Jun 2 11:46:42 2002 -+++ external/glibc/glibcpatch.sh Sun Jun 2 16:13:51 2002 -@@ -113,7 +113,10 @@ - # apply the patches - # - --# there is no need to apply patch here -+for PNAME in `cat flist.pat` -+ do -+ patch < $PNAME -+ done - - - # diff --git a/editors/openoffice.org-1.0/files/patch-external+jpeg+jpegpatch.sh b/editors/openoffice.org-1.0/files/patch-external+jpeg+jpegpatch.sh deleted file mode 100644 index c742b4f31e5a..000000000000 --- a/editors/openoffice.org-1.0/files/patch-external+jpeg+jpegpatch.sh +++ /dev/null @@ -1,11 +0,0 @@ ---- external/jpeg/jpegpatch.sh.orig Wed Mar 13 17:04:35 2002 -+++ external/jpeg/jpegpatch.sh Wed Mar 13 17:08:02 2002 -@@ -112,7 +112,7 @@ - - for PNAME in `cat flist.pat` - do -- patch -i pat/$PNAME.pat $PNAME -+ patch < pat/$PNAME.pat $PNAME - done - - cp -rf jpeg-6b/* rtufiles/ diff --git a/editors/openoffice.org-1.0/files/patch-external+neon+md5.c.pat b/editors/openoffice.org-1.0/files/patch-external+neon+md5.c.pat deleted file mode 100644 index 6c0b7624be45..000000000000 --- a/editors/openoffice.org-1.0/files/patch-external+neon+md5.c.pat +++ /dev/null @@ -1,112 +0,0 @@ ---- /dev/null Thu Aug 8 22:39:51 2002 -+++ external/neon/md5.c.pat Thu Aug 8 22:35:33 2002 -@@ -0,0 +1,109 @@ -+*** ..\download\neon-0.14.0\src\md5.c Sun Apr 29 13:23:08 2001 -+--- sub\md5.c Tue May 08 12:52:02 2001 -+*************** -+*** 278,290 **** -+ const void *buffer; -+ size_t len; -+ struct md5_ctx *ctx; -+ { -+ md5_uint32 correct_words[16]; -+! const md5_uint32 *words = buffer; -+! size_t nwords = len / sizeof (md5_uint32); -+! const md5_uint32 *endp = words + nwords; -+ md5_uint32 A = ctx->A; -+ md5_uint32 B = ctx->B; -+ md5_uint32 C = ctx->C; -+ md5_uint32 D = ctx->D; -+ -+--- 278,289 ---- -+ const void *buffer; -+ size_t len; -+ struct md5_ctx *ctx; -+ { -+ md5_uint32 correct_words[16]; -+! const unsigned char *words = buffer; -+! const unsigned char *endp = words + len; -+ md5_uint32 A = ctx->A; -+ md5_uint32 B = ctx->B; -+ md5_uint32 C = ctx->C; -+ md5_uint32 D = ctx->D; -+ -+*************** -+*** 313,324 **** -+ we store the swapped words in the array CORRECT_WORDS. */ -+ -+ #define OP(a, b, c, d, s, T) \ -+ do \ -+ { \ -+! a += FF (b, c, d) + (*cwp++ = SWAP (*words)) + T; \ -+! ++words; \ -+ CYCLIC (a, s); \ -+ a += b; \ -+ } \ -+ while (0) -+ -+--- 312,325 ---- -+ we store the swapped words in the array CORRECT_WORDS. */ -+ -+ #define OP(a, b, c, d, s, T) \ -+ do \ -+ { \ -+! md5_uint32 WORD_ = words[0] | (words[1] << 8) \ -+! | (words[2] << 16) | (words[3] << 24); \ -+! a += FF (b, c, d) + (*cwp++ = WORD_) + T; \ -+! words += 4; \ -+ CYCLIC (a, s); \ -+ a += b; \ -+ } \ -+ while (0) -+ -+*************** -+*** 431,441 **** -+ ctx->D = D; -+ } -+ -+ /* Writes the ASCII representation of the MD5 digest into the -+ * given buffer, which must be at least 33 characters long. */ -+! void ne_md5_to_ascii(const unsigned char md5_buf[16], char *buffer) -+ { -+ int count; -+ for (count = 0; count<16; count++) { -+ buffer[count*2] = HEX2ASC(md5_buf[count] >> 4); -+ buffer[count*2+1] = HEX2ASC(md5_buf[count] & 0x0f); -+--- 432,442 ---- -+ ctx->D = D; -+ } -+ -+ /* Writes the ASCII representation of the MD5 digest into the -+ * given buffer, which must be at least 33 characters long. */ -+! void ne_md5_to_ascii(const unsigned char md5_buf[16], char *buffer) -+ { -+ int count; -+ for (count = 0; count<16; count++) { -+ buffer[count*2] = HEX2ASC(md5_buf[count] >> 4); -+ buffer[count*2+1] = HEX2ASC(md5_buf[count] & 0x0f); -+*************** -+*** 443,453 **** -+ buffer[32] = '\0'; -+ } -+ -+ /* Reads the ASCII representation of an MD5 digest. The buffer must -+ * be at least 32 characters long. */ -+! void ne_ascii_to_md5(const char *buffer, unsigned char md5_buf[16]) -+ { -+ int count; -+ for (count = 0; count<16; count++) { -+ md5_buf[count] = ((ASC2HEX(buffer[count*2])) << 4) | -+ ASC2HEX(buffer[count*2+1]); -+--- 444,454 ---- -+ buffer[32] = '\0'; -+ } -+ -+ /* Reads the ASCII representation of an MD5 digest. The buffer must -+ * be at least 32 characters long. */ -+! void ne_ascii_to_md5(const char *buffer, unsigned char md5_buf[16]) -+ { -+ int count; -+ for (count = 0; count<16; count++) { -+ md5_buf[count] = ((ASC2HEX(buffer[count*2])) << 4) | -+ ASC2HEX(buffer[count*2+1]); diff --git a/editors/openoffice.org-1.0/files/patch-external+neon+neonpatch.sh b/editors/openoffice.org-1.0/files/patch-external+neon+neonpatch.sh deleted file mode 100644 index ac228884ad46..000000000000 --- a/editors/openoffice.org-1.0/files/patch-external+neon+neonpatch.sh +++ /dev/null @@ -1,14 +0,0 @@ ---- external/neon/neonpatch.sh.orig Tue May 29 17:40:10 2001 -+++ external/neon/neonpatch.sh Thu Aug 8 22:43:04 2002 -@@ -119,10 +119,7 @@ - # apply the patches - # - -- for PNAME in `cat flist.pat` -- do -- patch -i pat/$PNAME.pat rtufiles/$PNAME -- done -+ patch < md5.c.pat rtufiles/md5.c - - # - # copy the SD files into rtufiles directory diff --git a/editors/openoffice.org-1.0/files/patch-external+npsdk+npsdkpatch.sh b/editors/openoffice.org-1.0/files/patch-external+npsdk+npsdkpatch.sh deleted file mode 100644 index 658223558005..000000000000 --- a/editors/openoffice.org-1.0/files/patch-external+npsdk+npsdkpatch.sh +++ /dev/null @@ -1,11 +0,0 @@ ---- external/npsdk/npsdkpatch.sh.orig Wed Mar 13 16:49:19 2002 -+++ external/npsdk/npsdkpatch.sh Wed Mar 13 16:49:39 2002 -@@ -121,7 +121,7 @@ - - for PNAME in `cat flist.pat` - do -- patch -i pat/$PNAME.pat rtufiles/$PNAME -+ patch < pat/$PNAME.pat rtufiles/$PNAME - done - - # diff --git a/editors/openoffice.org-1.0/files/patch-freetype+makefile.mk b/editors/openoffice.org-1.0/files/patch-freetype+makefile.mk deleted file mode 100644 index 4d29bbb79d9c..000000000000 --- a/editors/openoffice.org-1.0/files/patch-freetype+makefile.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- freetype/makefile.mk.orig Fri Aug 16 17:28:36 2002 -+++ freetype/makefile.mk Sat Jan 18 13:39:03 2003 -@@ -95,6 +99,8 @@ - objs$/.libs$/libfreetype.a - .IF "$(OS)"=="MACOSX" - OUT2LIB+=objs$/.libs$/libfreetype.*.dylib -+.ELIF "$(OS)"=="FREEBSD" -+OUT2LIB+=objs$/.libs$/libfreetype.so.7* - .ELSE - OUT2LIB+=objs$/.libs$/libfreetype.so.6* - .ENDIF # "$(OS)"=="MACOSX" diff --git a/editors/openoffice.org-1.0/files/patch-gethostbyname_r b/editors/openoffice.org-1.0/files/patch-gethostbyname_r deleted file mode 100644 index 1a04cdae0174..000000000000 --- a/editors/openoffice.org-1.0/files/patch-gethostbyname_r +++ /dev/null @@ -1,42 +0,0 @@ -Index: sal/osl/unx/socket.c -=================================================================== -RCS file: /cvs/porting/sal/osl/unx/socket.c,v -retrieving revision 1.22.10.1 -diff -u -r1.22.10.1 socket.c ---- sal/osl/unx/socket.c 18 Aug 2003 15:12:26 -0000 1.22.10.1 -+++ sal/osl/unx/socket.c 10 Sep 2006 03:18:08 -0000 -@@ -836,7 +836,7 @@ - const char *name, struct hostent *result, - char *buffer, int buflen, int *h_errnop) - { --#ifdef LINUX -+#if defined(LINUX) || (defined(FREEBSD) && (__FreeBSD_version >= 601103)) - struct hostent *__result; /* will be the same as result */ - int __error; - __error = gethostbyname_r (name, result, buffer, buflen, -Index: sal/osl/unx/system.c -=================================================================== -RCS file: /cvs/porting/sal/osl/unx/system.c,v -retrieving revision 1.8 -diff -u -r1.8 system.c ---- sal/osl/unx/system.c 16 Jul 2003 17:21:47 -0000 1.8 -+++ sal/osl/unx/system.c 10 Sep 2006 03:18:08 -0000 -@@ -371,6 +371,8 @@ - - extern int h_errno; - -+#if !defined(FREEBSD) || (__FreeBSD_version < 601103) -+ - struct hostent *gethostbyname_r(const char *name, struct hostent *result, - char *buffer, int buflen, int *h_errnop) - { -@@ -459,6 +461,8 @@ - - return res; - } -+#endif /* !defined(FREEBSD) || (__FreeBSD_version < 601103) */ -+ - - #if defined(MACOSX) - /* - diff --git a/editors/openoffice.org-1.0/files/patch-i18n+inc+collator.hxx b/editors/openoffice.org-1.0/files/patch-i18n+inc+collator.hxx deleted file mode 100644 index a484b5db2fc5..000000000000 --- a/editors/openoffice.org-1.0/files/patch-i18n+inc+collator.hxx +++ /dev/null @@ -1,11 +0,0 @@ ---- i18n/inc/collator.hxx.orig Sat Apr 6 12:19:32 2002 -+++ i18n/inc/collator.hxx Wed May 1 22:31:57 2002 -@@ -78,7 +78,7 @@ - #include <com/sun/star/lang/XServiceInfo.hpp> - #endif - --#if !(defined WIN32 || defined MACOSX || defined NETBSD) -+#if !(defined WIN32 || defined MACOSX || defined NETBSD || defined FREEBSD) - #include <alloca.h> - #endif - #include <tools/string.hxx> diff --git a/editors/openoffice.org-1.0/files/patch-i18npool+source+localedata+localedata.cxx b/editors/openoffice.org-1.0/files/patch-i18npool+source+localedata+localedata.cxx deleted file mode 100644 index e6dab620463f..000000000000 --- a/editors/openoffice.org-1.0/files/patch-i18npool+source+localedata+localedata.cxx +++ /dev/null @@ -1,10 +0,0 @@ ---- i18npool/source/localedata/localedata.cxx.orig Mon Feb 24 17:47:22 2003 -+++ i18npool/source/localedata/localedata.cxx Tue Feb 25 16:41:58 2003 -@@ -150,6 +150,7 @@ - { "pt_BR", lcl_ASCII }, - { "pt_PT", lcl_ASCII }, - { "ru_RU", lcl_ASCII }, -+ { "uk_UA", lcl_ASCII }, - { "sv_FI", lcl_ASCII }, - { "tr_TR", lcl_ASCII }, - { "th_TH", lcl_ASCII }, // PlaDao convenience entry diff --git a/editors/openoffice.org-1.0/files/patch-i18npool+source+localedata_ascii+makefile.mk b/editors/openoffice.org-1.0/files/patch-i18npool+source+localedata_ascii+makefile.mk deleted file mode 100644 index 45089ef1ec01..000000000000 --- a/editors/openoffice.org-1.0/files/patch-i18npool+source+localedata_ascii+makefile.mk +++ /dev/null @@ -1,18 +0,0 @@ ---- i18npool/source/localedata_ascii/makefile.mk.orig Sun Nov 17 23:27:32 2002 -+++ i18npool/source/localedata_ascii/makefile.mk Tue Feb 25 16:43:21 2003 -@@ -138,6 +138,7 @@ - $(MISC)$/localedata_pt_BR.cxx \ - $(MISC)$/localedata_pt_PT.cxx \ - $(MISC)$/localedata_ru_RU.cxx \ -+ $(MISC)$/localedata_uk_UA.cxx \ - $(MISC)$/localedata_sv_FI.cxx \ - $(MISC)$/localedata_tr_TR.cxx \ - $(MISC)$/localedata_nb_NO.cxx \ -@@ -208,6 +209,7 @@ - $(SLO)$/localedata_pt_BR.obj \ - $(SLO)$/localedata_pt_PT.obj \ - $(SLO)$/localedata_ru_RU.obj \ -+ $(SLO)$/localedata_uk_UA.obj \ - $(SLO)$/localedata_sv_FI.obj \ - $(SLO)$/localedata_tr_TR.obj \ - $(SLO)$/localedata_nb_NO.obj \ diff --git a/editors/openoffice.org-1.0/files/patch-i18npool+source+localedata_ascii+uk_UA.xml b/editors/openoffice.org-1.0/files/patch-i18npool+source+localedata_ascii+uk_UA.xml deleted file mode 100644 index 03b434315902..000000000000 --- a/editors/openoffice.org-1.0/files/patch-i18npool+source+localedata_ascii+uk_UA.xml +++ /dev/null @@ -1,454 +0,0 @@ ---- i18npool/source/localedata_ascii/uk_UA.xml.orig Thu Jan 1 00:00:00 1970 -+++ i18npool/source/localedata_ascii/uk_UA.xml Fri Feb 28 13:04:01 2003 -@@ -0,0 +1,451 @@ -+<?xml version="1.0" encoding="UTF-8"?> -+<!DOCTYPE Locale SYSTEM 'locale.dtd'> -+<Locale version="1.2"> -+<LC_INFO> -+<Language> -+<LangID>uk</LangID> -+<DefaultName>Ukrainian</DefaultName> -+</Language> -+<Country> -+<CountryID>UA</CountryID> -+<DefaultName>Ukraine</DefaultName> -+</Country> -+<Platform> -+<PlatformID>generic</PlatformID> -+</Platform> -+<Varient></Varient> -+</LC_INFO> -+<LC_CTYPE unoid="generic"> -+<Separators> -+<DateSeparator>.</DateSeparator> -+<ThousandSeparator> </ThousandSeparator> -+<DecimalSeparator>,</DecimalSeparator> -+<TimeSeparator>:</TimeSeparator> -+<Time100SecSeparator>,</Time100SecSeparator> -+<ListSeparator>;</ListSeparator> -+<LongDateDayOfWeekSeparator></LongDateDayOfWeekSeparator> -+<LongDateDaySeparator> </LongDateDaySeparator> -+<LongDateMonthSeparator> </LongDateMonthSeparator> -+<LongDateYearSeparator> Ñ€.</LongDateYearSeparator> -+</Separators> -+<Markers> -+<QuotationStart>‘</QuotationStart> -+<QuotationEnd>’</QuotationEnd> -+<DoubleQuotationStart>“</DoubleQuotationStart> -+<DoubleQuotationEnd>â€</DoubleQuotationEnd> -+</Markers> -+<TimeAM>AM</TimeAM> -+<TimePM>PM</TimePM> -+<MeasurementSystem>Metric</MeasurementSystem> -+</LC_CTYPE> -+<LC_FORMAT> -+<FormatElement msgid="DateFormatskey1" default="true" type="short" usage="DATE" formatindex="18"> -+<FormatCode>M/D/YY</FormatCode> -+<DefaultName></DefaultName> -+</FormatElement> -+<FormatElement msgid="DateFormatskey2" default="false" type="medium" usage="DATE" formatindex="28"> -+<FormatCode>NN DD/MMM YY</FormatCode> -+<DefaultName></DefaultName> -+</FormatElement> -+<FormatElement msgid="DateFormatskey3" default="false" type="medium" usage="DATE" formatindex="34"> -+<FormatCode>MM/YY</FormatCode> -+<DefaultName></DefaultName> -+</FormatElement> -+<FormatElement msgid="DateFormatskey4" default="false" type="medium" usage="DATE" formatindex="35"> -+<FormatCode>MMM DD</FormatCode> -+<DefaultName></DefaultName> -+</FormatElement> -+<FormatElement msgid="DateFormatskey5" default="false" type="medium" usage="DATE" formatindex="36"> -+<FormatCode>MMMM</FormatCode> -+<DefaultName></DefaultName> -+</FormatElement> -+<FormatElement msgid="DateFormatskey6" default="false" type="medium" usage="DATE" formatindex="37"> -+<FormatCode>QQ YY</FormatCode> -+<DefaultName></DefaultName> -+</FormatElement> -+<FormatElement msgid="DateFormatskey7" default="false" type="medium" usage="DATE" formatindex="21"> -+<FormatCode>MM/DD/YYYY</FormatCode> -+<DefaultName></DefaultName> -+</FormatElement> -+<FormatElement msgid="DateFormatskey8" default="true" type="medium" usage="DATE" formatindex="20"> -+<FormatCode>MM/DD/YY</FormatCode> -+<DefaultName></DefaultName> -+</FormatElement> -+<FormatElement msgid="DateFormatskey9" default="true" type="long" usage="DATE" formatindex="19"> -+<FormatCode>NNNNMMMM DD, YYYY</FormatCode> -+<DefaultName></DefaultName> -+</FormatElement> -+<FormatElement msgid="DateFormatskey10" default="false" type="long" usage="DATE" formatindex="22"> -+<FormatCode>MMM D, YY</FormatCode> -+<DefaultName></DefaultName> -+</FormatElement> -+<FormatElement msgid="DateFormatskey11" default="false" type="long" usage="DATE" formatindex="23"> -+<FormatCode>MMM D, YYYY</FormatCode> -+<DefaultName></DefaultName> -+</FormatElement> -+<FormatElement msgid="DateFormatskey12" default="false" type="long" usage="DATE" formatindex="25"> -+<FormatCode>MMMM D, YYYY</FormatCode> -+<DefaultName></DefaultName> -+</FormatElement> -+<FormatElement msgid="DateFormatskey13" default="false" type="long" usage="DATE" formatindex="27"> -+<FormatCode>NN, MMM D, YY</FormatCode> -+<DefaultName></DefaultName> -+</FormatElement> -+<FormatElement msgid="DateFormatskey14" default="false" type="long" usage="DATE" formatindex="29"> -+<FormatCode>NN, MMMM D, YYYY</FormatCode> -+<DefaultName></DefaultName> -+</FormatElement> -+<FormatElement msgid="DateFormatskey15" default="false" type="long" usage="DATE" formatindex="30"> -+<FormatCode>NNNNMMMM D, YYYY</FormatCode> -+<DefaultName>DIN 5008 (EN 28601) </DefaultName> -+</FormatElement> -+<FormatElement msgid="DateFormatskey16" default="false" type="long" usage="DATE" formatindex="24"> -+<FormatCode>D. MMM. YYYY</FormatCode> -+<DefaultName>DIN 5008 (EN 28601) </DefaultName> -+</FormatElement> -+<FormatElement msgid="DateFormatskey17" default="false" type="long" usage="DATE" formatindex="26"> -+<FormatCode>D. MMMM YYYY</FormatCode> -+<DefaultName>DIN 5008 (EN 28601) </DefaultName> -+</FormatElement> -+<FormatElement msgid="DateFormatskey18" default="false" type="short" usage="DATE" formatindex="31"> -+<FormatCode>MM-DD</FormatCode> -+<DefaultName>DIN 5008 (EN 28601) </DefaultName> -+</FormatElement> -+<FormatElement msgid="DateFormatskey19" default="false" type="medium" usage="DATE" formatindex="32"> -+<FormatCode>YY-MM-DD</FormatCode> -+<DefaultName>DIN 5008 (EN 28601) </DefaultName> -+</FormatElement> -+<FormatElement msgid="DateFormatskey20" default="false" type="medium" usage="DATE" formatindex="33"> -+<FormatCode>YYYY-MM-DD</FormatCode> -+<DefaultName></DefaultName> -+</FormatElement> -+<FormatElement msgid="DateFormatskey21" default="false" type="medium" usage="DATE" formatindex="38"> -+<FormatCode>WW</FormatCode> -+<DefaultName></DefaultName> -+</FormatElement> -+<FormatElement msgid="TimeFormatskey1" default="true" type="short" usage="TIME" formatindex="39"> -+<FormatCode>HH:MM</FormatCode> -+<DefaultName></DefaultName> -+</FormatElement> -+<FormatElement msgid="TimeFormatskey2" default="true" type="medium" usage="TIME" formatindex="40"> -+<FormatCode>HH:MM:SS</FormatCode> -+<DefaultName></DefaultName> -+</FormatElement> -+<FormatElement msgid="TimeFormatskey3" default="false" type="short" usage="TIME" formatindex="41"> -+<FormatCode>HH:MM AM/PM</FormatCode> -+<DefaultName></DefaultName> -+</FormatElement> -+<FormatElement msgid="TimeFormatskey4" default="false" type="medium" usage="TIME" formatindex="42"> -+<FormatCode>HH:MM:SS AM/PM</FormatCode> -+<DefaultName></DefaultName> -+</FormatElement> -+<FormatElement msgid="TimeFormatskey5" default="false" type="medium" usage="TIME" formatindex="43"> -+<FormatCode>[HH]:MM:SS</FormatCode> -+<DefaultName></DefaultName> -+</FormatElement> -+<FormatElement msgid="TimeFormatskey6" default="false" type="short" usage="TIME" formatindex="44"> -+<FormatCode>MM:SS,00</FormatCode> -+<DefaultName></DefaultName> -+</FormatElement> -+<FormatElement msgid="TimeFormatskey7" default="false" type="medium" usage="TIME" formatindex="45"> -+<FormatCode>[HH]:MM:SS,00</FormatCode> -+<DefaultName></DefaultName> -+</FormatElement> -+<FormatElement msgid="DateTimeFormatskey1" default="true" type="medium" usage="DATE_TIME" formatindex="46"> -+<FormatCode>MM/DD/YY HH:MM</FormatCode> -+<DefaultName></DefaultName> -+</FormatElement> -+<FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> -+<FormatCode>MM/DD/YYYY HH:MM:SS</FormatCode> -+<DefaultName></DefaultName> -+</FormatElement> -+<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0"> -+<FormatCode>Standard</FormatCode> -+<DefaultName></DefaultName> -+</FormatElement> -+<FormatElement msgid="FixedFormatskey2" default="true" type="short" usage="FIXED_NUMBER" formatindex="1"> -+<FormatCode>0</FormatCode> -+<DefaultName></DefaultName> -+</FormatElement> -+<FormatElement msgid="FixedFormatskey3" default="false" type="medium" usage="FIXED_NUMBER" formatindex="2"> -+<FormatCode>0,00</FormatCode> -+<DefaultName></DefaultName> -+</FormatElement> -+<FormatElement msgid="FixedFormatskey4" default="false" type="short" usage="FIXED_NUMBER" formatindex="3"> -+<FormatCode># ##0</FormatCode> -+<DefaultName></DefaultName> -+</FormatElement> -+<FormatElement msgid="FixedFormatskey5" default="false" type="medium" usage="FIXED_NUMBER" formatindex="4"> -+<FormatCode># ##0,00</FormatCode> -+<DefaultName></DefaultName> -+</FormatElement> -+<FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER" formatindex="5"> -+<FormatCode># ###,00</FormatCode> -+<DefaultName></DefaultName> -+</FormatElement> -+<FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY" formatindex="12"> -+<FormatCode>[$грн.-419]# ##0;-[$грн.-419]# ##0</FormatCode> -+<DefaultName></DefaultName> -+</FormatElement> -+<FormatElement msgid="CurrencyFormatskey2" default="false" type="medium" usage="CURRENCY" formatindex="13"> -+<FormatCode>[$грн.-419]# ##0,00;-[$грн.-419]# ##0,00</FormatCode> -+<DefaultName></DefaultName> -+</FormatElement> -+<FormatElement msgid="CurrencyFormatskey3" default="false" type="medium" usage="CURRENCY" formatindex="14"> -+ <FormatCode>[$грн.-419]# ##0;[RED]-[$грн.-419]# ##0</FormatCode> -+<DefaultName></DefaultName> -+</FormatElement> -+<FormatElement msgid="CurrencyFormatskey4" default="true" type="medium" usage="CURRENCY" formatindex="15"> -+<FormatCode>[$грн.-419]# ##0,00;[RED]-[$грн.-419]# ##0,00</FormatCode> -+<DefaultName></DefaultName> -+</FormatElement> -+<FormatElement msgid="CurrencyFormatskey5" default="false" type="medium" usage="CURRENCY" formatindex="16"> -+<FormatCode># ##0,00 CCC</FormatCode> -+<DefaultName></DefaultName> -+</FormatElement> -+<FormatElement msgid="CurrencyFormatskey6" default="false" type="medium" usage="CURRENCY" formatindex="17"> -+<FormatCode>[$грн.-419]# ##0,--;[RED]-[$грн.-419]# ##0,--</FormatCode> -+<DefaultName></DefaultName> -+</FormatElement> -+<FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="8"> -+<FormatCode>0%</FormatCode> -+<DefaultName></DefaultName> -+</FormatElement> -+<FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="9"> -+<FormatCode>0,00%</FormatCode> -+<DefaultName></DefaultName> -+</FormatElement> -+<FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="6"> -+<FormatCode>0,00E+000</FormatCode> -+<DefaultName></DefaultName> -+</FormatElement> -+<FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="7"> -+<FormatCode>0,00E+00</FormatCode> -+<DefaultName></DefaultName> -+</FormatElement> -+</LC_FORMAT> -+<LC_COLLATION> -+<Collator unoid="uk_UA.alphanumeric" default="true"/> -+<CollationOptions> -+<TransliterationModules>IGNORE_CASE</TransliterationModules> -+</CollationOptions> -+</LC_COLLATION> -+<LC_SEARCH> -+<SearchOptions> -+<TransliterationModules>IGNORE_CASE</TransliterationModules> -+</SearchOptions> -+</LC_SEARCH> -+<LC_CALENDAR> -+<Calendar unoid="gregorian" default="true"> -+<DaysOfWeek> -+<Day> -+<DayID>sun</DayID> -+<DefaultAbbrvName>Ðд</DefaultAbbrvName> -+<DefaultFullName>неділÑ</DefaultFullName> -+</Day> -+<Day> -+<DayID>mon</DayID> -+<DefaultAbbrvName>Пн</DefaultAbbrvName> -+<DefaultFullName>понеділок</DefaultFullName> -+</Day> -+<Day> -+<DayID>tue</DayID> -+<DefaultAbbrvName>Ð’Ñ‚</DefaultAbbrvName> -+<DefaultFullName>вівторок</DefaultFullName> -+</Day> -+<Day> -+<DayID>wed</DayID> -+<DefaultAbbrvName>Ср</DefaultAbbrvName> -+<DefaultFullName>Ñереда</DefaultFullName> -+</Day> -+<Day> -+<DayID>thu</DayID> -+<DefaultAbbrvName>Чт</DefaultAbbrvName> -+<DefaultFullName>четвер</DefaultFullName> -+</Day> -+<Day> -+<DayID>fri</DayID> -+<DefaultAbbrvName>Пт</DefaultAbbrvName> -+<DefaultFullName>п'ÑтницÑ</DefaultFullName> -+</Day> -+<Day> -+<DayID>sat</DayID> -+<DefaultAbbrvName>Сб</DefaultAbbrvName> -+<DefaultFullName>Ñубота</DefaultFullName> -+</Day> -+</DaysOfWeek> -+<MonthsOfYear> -+<Month> -+<MonthID>jan</MonthID> -+<DefaultAbbrvName>Ñіч</DefaultAbbrvName> -+<DefaultFullName>Січень</DefaultFullName> -+</Month> -+<Month> -+<MonthID>feb</MonthID> -+<DefaultAbbrvName>лют</DefaultAbbrvName> -+<DefaultFullName>Лютий</DefaultFullName> -+</Month> -+<Month> -+<MonthID>mar</MonthID> -+<DefaultAbbrvName>бер</DefaultAbbrvName> -+<DefaultFullName>Березень</DefaultFullName> -+</Month> -+<Month> -+<MonthID>apr</MonthID> -+<DefaultAbbrvName>квт</DefaultAbbrvName> -+<DefaultFullName>Квітень</DefaultFullName> -+</Month> -+<Month> -+<MonthID>may</MonthID> -+<DefaultAbbrvName>трв</DefaultAbbrvName> -+<DefaultFullName>Травень</DefaultFullName> -+</Month> -+<Month> -+<MonthID>jun</MonthID> -+<DefaultAbbrvName>чер</DefaultAbbrvName> -+<DefaultFullName>Червень</DefaultFullName> -+</Month> -+<Month> -+<MonthID>jul</MonthID> -+<DefaultAbbrvName>лип</DefaultAbbrvName> -+<DefaultFullName>Липень</DefaultFullName> -+</Month> -+<Month> -+<MonthID>aug</MonthID> -+<DefaultAbbrvName>Ñер</DefaultAbbrvName> -+<DefaultFullName>Серпень</DefaultFullName> -+</Month> -+<Month> -+<MonthID>sep</MonthID> -+<DefaultAbbrvName>вер</DefaultAbbrvName> -+<DefaultFullName>ВереÑень</DefaultFullName> -+</Month> -+<Month> -+<MonthID>oct</MonthID> -+<DefaultAbbrvName>жов</DefaultAbbrvName> -+<DefaultFullName>Жовтень</DefaultFullName> -+</Month> -+<Month> -+<MonthID>nov</MonthID> -+<DefaultAbbrvName>лиÑ</DefaultAbbrvName> -+<DefaultFullName>ЛиÑтопад</DefaultFullName> -+</Month> -+<Month> -+<MonthID>dec</MonthID> -+<DefaultAbbrvName>гру</DefaultAbbrvName> -+<DefaultFullName>Грудень</DefaultFullName> -+</Month> -+</MonthsOfYear> -+<Eras> -+<Era> -+<EraID>bc</EraID> -+<DefaultAbbrvName>до н.е.</DefaultAbbrvName> -+<DefaultFullName>до н.е.</DefaultFullName> -+</Era> -+<Era> -+<EraID>ad</EraID> -+<DefaultAbbrvName>н.е.</DefaultAbbrvName> -+<DefaultFullName>н.е.</DefaultFullName> -+</Era> -+</Eras> -+<StartDayOfWeek> -+<DayID>sun</DayID> -+</StartDayOfWeek> -+<MinimalDaysInFirstWeek>1</MinimalDaysInFirstWeek> -+</Calendar> -+</LC_CALENDAR> -+<LC_CURRENCY> -+<Currency default="true" usedInCompatibleFormatCodes="true"> -+<CurrencyID>грн.</CurrencyID> -+<CurrencySymbol>грн.</CurrencySymbol> -+<BankSymbol>UAH</BankSymbol> -+<CurrencyName>Hrivnya</CurrencyName> -+<DecimalPlaces>2</DecimalPlaces> -+</Currency> -+</LC_CURRENCY> -+<LC_TRANSLITERATION> -+<Transliteration unoid="UPPERCASE_LOWERCASE"/> -+<Transliteration unoid="IGNORE_CASE"/> -+<Transliteration unoid="LOWERCASE_UPPERCASE" /> -+</LC_TRANSLITERATION> -+<LC_MISC> -+<ReservedWords> -+<trueWord>true</trueWord> -+<falseWord>false</falseWord> -+<quarter1Word>1st quarter</quarter1Word> -+<quarter2Word>2nd quarter</quarter2Word> -+<quarter3Word>3rd quarter</quarter3Word> -+<quarter4Word>4th quarter</quarter4Word> -+<aboveWord>above</aboveWord> -+<belowWord>below</belowWord> -+</ReservedWords> -+</LC_MISC> -+<LC_NumberingLevel> -+<NumberingLevel Prefix=" " NumType="4" Suffix=")" /> -+<NumberingLevel Prefix=" " NumType="4" Suffix="." /> -+<NumberingLevel Prefix="(" NumType="4" Suffix="." /> -+<NumberingLevel Prefix=" " NumType="2" Suffix="." /> -+<NumberingLevel Prefix=" " NumType="0" Suffix=")" /> -+<NumberingLevel Prefix=" " NumType="1" Suffix=")" /> -+<NumberingLevel Prefix="(" NumType="1" Suffix=")" /> -+<NumberingLevel Prefix=" " NumType="3" Suffix="." /> -+</LC_NumberingLevel> -+<LC_OutLineNumberingLevel> -+<OutlineStyle> -+<OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0" /> -+<OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="1" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0" /> -+<OutLineNumberingLevel Prefix=" " NumType="1" Suffix=")" BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0" /> -+<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0" /> -+<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0" /> -+</OutlineStyle> -+<OutlineStyle> -+<OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0" /> -+<OutLineNumberingLevel Prefix=" " NumType="1" Suffix=")" BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0" /> -+<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0" /> -+<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0" /> -+<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0" /> -+</OutlineStyle> -+<OutlineStyle> -+<OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0" /> -+<OutLineNumberingLevel Prefix="(" NumType="1" Suffix=")" BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0" /> -+<OutLineNumberingLevel Prefix=" " NumType="3" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0" /> -+<OutLineNumberingLevel Prefix=" " NumType="0" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0" /> -+<OutLineNumberingLevel Prefix=" " NumType="6" Suffix="." BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0" /> -+</OutlineStyle> -+<OutlineStyle> -+<OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0" /> -+<OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0" /> -+<OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0" /> -+<OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0" /> -+<OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0" /> -+</OutlineStyle> -+<OutlineStyle> -+<OutLineNumberingLevel Prefix=" " NumType="2" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0" /> -+<OutLineNumberingLevel Prefix=" " NumType="0" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0" /> -+<OutLineNumberingLevel Prefix=" " NumType="3" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0" /> -+<OutLineNumberingLevel Prefix=" " NumType="1" Suffix=")" BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0" /> -+<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0" /> -+</OutlineStyle> -+<OutlineStyle> -+<OutLineNumberingLevel Prefix=" " NumType="0" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0" /> -+<OutLineNumberingLevel Prefix=" " NumType="2" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0" /> -+<OutLineNumberingLevel Prefix=" " NumType="1" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0" /> -+<OutLineNumberingLevel Prefix=" " NumType="3" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0" /> -+<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0" /> -+</OutlineStyle> -+<OutlineStyle> -+<OutLineNumberingLevel Prefix=" " NumType="4" Suffix=" " BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0" /> -+<OutLineNumberingLevel Prefix=" " NumType="4" Suffix=" " BulletChar="0020" BulletFontName="" ParentNumbering="1" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0" /> -+<OutLineNumberingLevel Prefix=" " NumType="4" Suffix=" " BulletChar="0020" BulletFontName="" ParentNumbering="2" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0" /> -+<OutLineNumberingLevel Prefix=" " NumType="4" Suffix=" " BulletChar="0020" BulletFontName="" ParentNumbering="3" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0" /> -+<OutLineNumberingLevel Prefix=" " NumType="4" Suffix=" " BulletChar="0020" BulletFontName="" ParentNumbering="4" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0" /> -+</OutlineStyle> -+<OutlineStyle> -+<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="27A2" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0" /> -+<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="E006" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0" /> -+<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=")" BulletChar="E004" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0" /> -+<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0" /> -+<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0" /> -+</OutlineStyle> -+</LC_OutLineNumberingLevel> -+</Locale> diff --git a/editors/openoffice.org-1.0/files/patch-idlc+source+parser.yy b/editors/openoffice.org-1.0/files/patch-idlc+source+parser.yy deleted file mode 100644 index 77b46c571f59..000000000000 --- a/editors/openoffice.org-1.0/files/patch-idlc+source+parser.yy +++ /dev/null @@ -1,36 +0,0 @@ ---- idlc/source/parser.yy.orig Wed Jul 10 11:43:18 2002 -+++ idlc/source/parser.yy Thu Oct 31 10:00:47 2002 -@@ -995,7 +995,8 @@ - { - idlc()->setParseState(PS_ConstantDeclSeen); - } -- ';' -+ ';' {}; -+ - - const_dcl : - IDL_CONST -@@ -1316,7 +1317,7 @@ - * Push the scope of the exception on the scopes stack - */ - idlc()->scopes()->push(pExcept); -- delete $1 -+ delete $1; - } - '{' - { -@@ -1705,10 +1706,10 @@ - { - idlc()->setParseState(PS_TypedefSeen); - } -- type_declarator -- | struct_type -- | union_type -- | enum_type -+ type_declarator {} -+ | struct_type {} -+ | union_type {} -+ | enum_type {} - ; - - type_declarator : diff --git a/editors/openoffice.org-1.0/files/patch-nas+nas-1.4.1.patch b/editors/openoffice.org-1.0/files/patch-nas+nas-1.4.1.patch deleted file mode 100644 index 2fb8d0cc15ff..000000000000 --- a/editors/openoffice.org-1.0/files/patch-nas+nas-1.4.1.patch +++ /dev/null @@ -1,246 +0,0 @@ ---- nas/nas-1.4.1.patch.orig Wed Jan 8 02:52:13 2003 -+++ nas/nas-1.4.1.patch Sat Jan 18 17:55:19 2003 -@@ -1,5 +1,5 @@ --*** misc/nas-1.4.1/config/NetAudio.tmpl Sat Mar 4 21:40:50 2000 ----- misc/build/nas-1.4.1/config/NetAudio.tmpl Tue Jan 7 19:30:41 2003 -+*** misc/nas-1.4.1/config/NetAudio.tmpl Sun Mar 5 03:40:50 2000 -+--- misc/build/nas-1.4.1/config/NetAudio.tmpl Thu Nov 1 13:08:21 2001 - *************** - *** 166,171 **** - --- 166,177 ---- -@@ -15,8 +15,8 @@ - INCLUDESRC = $(TOP)/include - INCDIR = $(INCROOT)/audio - WIDGET_DIR = $(TOP)/clients/audio/widgets --*** misc/nas-1.4.1/lib/audio/Alibint.c Sun Oct 24 13:45:21 1999 ----- misc/build/nas-1.4.1/lib/audio/Alibint.c Tue Jan 7 19:30:41 2003 -+*** misc/nas-1.4.1/lib/audio/Alibint.c Sun Oct 24 19:45:21 1999 -+--- misc/build/nas-1.4.1/lib/audio/Alibint.c Thu Nov 1 13:11:51 2001 - *************** - *** 1336,1348 **** - static char *_SysErrorMsg (n) -@@ -40,8 +40,8 @@ - } - - #endif /* USL sharedlibs in don't define for AUD3.2 */ --*** misc/nas-1.4.1/lib/audio/Astreams.c Sat May 8 21:10:05 1999 ----- misc/build/nas-1.4.1/lib/audio/Astreams.c Tue Jan 7 19:30:41 2003 -+*** misc/nas-1.4.1/lib/audio/Astreams.c Sun May 9 03:10:05 1999 -+--- misc/build/nas-1.4.1/lib/audio/Astreams.c Thu Nov 1 13:05:48 2001 - *************** - *** 51,59 **** - #include <errno.h> -@@ -120,59 +120,157 @@ - return(-1); - } - --*** misc/nas-1.4.1/lib/audio/Imakefile Sat Jan 1 04:28:13 2000 ----- misc/build/nas-1.4.1/lib/audio/Imakefile Tue Jan 7 19:30:41 2003 --*************** --*** 25,30 **** ----- 25,32 ---- -- -- #include "../../config/NetAudio.tmpl" -- --+ CCOPTIONS += $(EXTRA_CCOPTIONS) --+ -- #if ProjectX < 5 -- /* Pre-X11R5 compatability */ -- #ifndef NormalLibX --*************** --*** 119,124 **** ----- 121,127 ---- -- -- #endif -- BuildIncludes($(HEADERS),audio,..) --+ BuildIncludes($(HEADERS),audio,$(BUILDINCTOP:../..=.)) -- InstallMultiple($(HEADERS),$(INCDIR)) -- #if ProjectX >= 5 -- InstallNonExecFile(AuErrorDB,$(LIBDIR)) --*** misc/nas-1.4.1/server/dia/gram.y Sat Jan 1 22:35:49 2000 ----- misc/build/nas-1.4.1/server/dia/gram.y Tue Jan 7 19:42:40 2003 --*************** --*** 119,132 **** -- } -- | MAXRATE number -- { ddaSetConfig(MAXRATE, (void *)$2); } --! | MINRATE number --! { ddaSetConfig(MINRATE, (void *)$2); } -- -- string : STRING { ptr = (char *)malloc(strlen($1)+1); -- strcpy(ptr, $1); -- RemoveDQuote(ptr); -- $$ = ptr; --! } -- number : NUMBER { $$ = $1; } -- ; -- ----- 119,132 ---- -- } -- | MAXRATE number -- { ddaSetConfig(MAXRATE, (void *)$2); } --! | MINRATE number --! { ddaSetConfig(MINRATE, (void *)$2); } ; -- -- string : STRING { ptr = (char *)malloc(strlen($1)+1); -- strcpy(ptr, $1); -- RemoveDQuote(ptr); -- $$ = ptr; --! }; -- number : NUMBER { $$ = $1; } -- ; -- -+--- misc/nas-1.4.1/Imakefile.orig Wed Mar 6 02:20:01 2002 -++++ misc/build/nas-1.4.1/Imakefile Wed Mar 6 02:20:07 2002 -+@@ -42,6 +42,8 @@ -+ @echo "" -+ Date -+ @echo "" -++ @find . | egrep "\.(cxx|h|c)$$" | xargs \ -++ ${PERL} -pi -e "s|<malloc.h>|<stdlib.h>|g" -+ $(MAKE) $(MFLAGS) Makefiles -+ $(MAKE) $(MFLAGS) clean -+ $(MAKE) $(MFLAGS) includes -+--- misc/nas-1.4.1/clients/audio/audial/audial.c.orig Wed Nov 5 18:50:21 1997 -++++ misc/build/nas-1.4.1/clients/audio/audial/audial.c Wed Nov 5 18:56:33 1997 -+@@ -133,6 +133,7 @@ -+ signal(SIGALRM, SIG_DFL); -+ } -+ -++#if !defined(__FreeBSD__) || (__FreeBSD__ < 3) -+ static void -+ usleep(usecs) -+ unsigned int usecs; -+@@ -149,7 +150,7 @@ -+ setitimer(ITIMER_REAL, &ntval, &otval); -+ pause(); -+ } -+- -++#endif -+ #endif /* SYSV else not */ -+ #endif /* VMS else not */ -+ #endif /* NEEDUSLEEP */ -+--- misc/nas-1.4.1/server/dda/voxware/auvoxware.c.orig Sun Mar 5 03:40:55 2000 -++++ misc/build/nas-1.4.1/server/dda/voxware/auvoxware.c Sat Dec 16 22:11:35 2000 -+@@ -155,8 +155,10 @@ -+ #include <assert.h> -+ -+ #ifdef __FreeBSD__ -+-# include <machine/soundcard.h> -+-# include <machine/pcaudioio.h> -++# include <sys/soundcard.h> -++# ifdef __i386__ -++# include <machine/pcaudioio.h> -++# endif -+ #else -+ # ifdef __NetBSD__ -+ # include <sys/ioctl.h> -+@@ -610,7 +612,11 @@ -+ -+ if(sndStatOut.fd == -1) -+ { -++#ifdef __FreeBSD__ -++ while ((sndStatOut.fd = open(sndStatOut.device, O_RDWR)) == -1 && wait) -++#else -+ while ((sndStatOut.fd = open(sndStatOut.device, O_RDWR|O_SYNC)) == -1 && wait) -++#endif -+ { -+ osLogMsg("openDevice: waiting on output device\n"); -+ sleep(1); -+@@ -1230,6 +1236,11 @@ -+ /* -+ * Setup soundcard at maximum audio quality. -+ */ -++ -++#ifdef __FreeBSD__ -++#define NO_16_BIT_SAMPLING -++#endif -++ -+ static void setupSoundcard(sndStatPtr) -+ SndStat* sndStatPtr; -+ { -+@@ -1380,7 +1391,11 @@ -+ -+ AL_initialized = AuTrue; -+ -++#ifdef __FreeBSD__ -++ if ((fd = open(sndStatOut.device, O_RDWR, 0)) == -1) { -++#else -+ if ((fd = open(sndStatOut.device, O_RDWR|O_SYNC, 0)) == -1) { -++#endif -+ UNIDENTMSG; -+ return AuFalse; -+ } -+--- misc/nas-1.4.1/clients/audio/auedit/Graph.c.orig Mon Oct 25 02:24:08 1999 -++++ misc/build/nas-1.4.1/clients/audio/auedit/Graph.c Sat Mar 25 14:56:23 2000 -+@@ -28,7 +28,7 @@ -+ */ -+ -+ #ifndef WIN32 -+-# ifdef __NetBSD__ -++# if defined(__NetBSD__) || defined(__FreeBSD__) -+ # include <limits.h> -+ # define MAXSHORT SHRT_MAX -+ # define MINSHORT SHRT_MIN -+--- misc/nas-1.4.1/lib/audio/Imakefile.orig Sun May 19 14:52:20 2002 -++++ misc/build/nas-1.4.1/lib/audio/Imakefile Sun May 19 14:54:25 2002 -+@@ -25,6 +25,8 @@ -+ -+ #include "../../config/NetAudio.tmpl" -+ -++CCOPTIONS += $(EXTRA_CCOPTIONS) -++ -+ #if ProjectX < 5 -+ /* Pre-X11R5 compatability */ -+ #ifndef NormalLibX -+@@ -64,10 +66,14 @@ -+ COMPAT_OBJS = AuGetBest.o -+ #endif /* ProjectX < 5 */ -+ -++#if HasBSD44Sockets -++ SOCK_DEFINES = -DBSD44SOCKETS -++#endif -++ -+ EDB_DEFINES = -DERRORDB=\"$(LIBDIR)/AuErrorDB\" -+ -+ DEFINES = $(MALLOC_DEFINES) $(SYSV_DEFINES) -+- CONN_DEFINES = ConnectionFlags -++ CONN_DEFINES = ConnectionFlags $(SOCK_DEFINES) -+ -+ HEADERS = Alibint.h Alibnet.h Xtutil.h audiolib.h audioutil.h snd.h wave.h \ -+ voc.h aiff.h sound.h soundlib.h fileutil.h 8svx.h Astreams.h \ -+@@ -119,6 +125,7 @@ -+ -+ #endif -+ BuildIncludes($(HEADERS),audio,..) -++BuildIncludes($(HEADERS),audio,$(BUILDINCTOP:../..=.)) -+ InstallMultiple($(HEADERS),$(INCDIR)) -+ #if ProjectX >= 5 -+ InstallNonExecFile(AuErrorDB,$(LIBDIR)) -+--- misc/nas-1.4.1/config/NetAudio.def.orig Sun Feb 13 05:31:14 2000 -++++ misc/build/nas-1.4.1/config/NetAudio.def Fri Mar 24 04:55:49 2000 -+@@ -8,5 +8,5 @@ -+ -+ XCOMM Directory where NAS will look for it's config file(s) -+ #ifndef NasConfigSearchPath -+-#define NasConfigSearchPath /etc/nas/ -++#define NasConfigSearchPath $(PROJECTROOT)/etc/ -+ #endif -+--- misc/nas-1.4.1/server/dia/gram.y.orig Thu Oct 31 10:13:28 2002 -++++ misc/build/nas-1.4.1/server/dia/gram.y Thu Oct 31 10:15:18 2002 -+@@ -120,13 +120,13 @@ -+ | MAXRATE number -+ { ddaSetConfig(MAXRATE, (void *)$2); } -+ | MINRATE number -+- { ddaSetConfig(MINRATE, (void *)$2); } -++ { ddaSetConfig(MINRATE, (void *)$2); }; -+ -+ string : STRING { ptr = (char *)malloc(strlen($1)+1); -+ strcpy(ptr, $1); -+ RemoveDQuote(ptr); -+ $$ = ptr; -+- } -++ }; -+ number : NUMBER { $$ = $1; } -+ ; -+ diff --git a/editors/openoffice.org-1.0/files/patch-odk+pack+copying+makefile.mk b/editors/openoffice.org-1.0/files/patch-odk+pack+copying+makefile.mk deleted file mode 100644 index 13512504fa1c..000000000000 --- a/editors/openoffice.org-1.0/files/patch-odk+pack+copying+makefile.mk +++ /dev/null @@ -1,15 +0,0 @@ -Index: odk/pack/copying/makefile.mk -=================================================================== -RCS file: /cvs/api/odk/pack/copying/makefile.mk,v -retrieving revision 1.46.2.9 -diff -u -r1.46.2.9 makefile.mk ---- odk/pack/copying/makefile.mk 24 Feb 2003 16:48:59 -0000 1.46.2.9 -+++ odk/pack/copying/makefile.mk 4 Aug 2005 03:03:48 -0000 -@@ -16,6 +16,7 @@ - - DIRLIST = \ - $(DESTDIRDOCU) \ -+ $(DESTDIR)$/settings \ - $(DESTDIRDOCUIMAGES) \ - $(DESTDIRDOCU)$/DevStudioWizards \ - $(DESTDIRDOCU)$/DevStudioWizards$/images \ diff --git a/editors/openoffice.org-1.0/files/patch-odk+source+OOSupport+makefile.mk b/editors/openoffice.org-1.0/files/patch-odk+source+OOSupport+makefile.mk deleted file mode 100644 index d29cebfd753d..000000000000 --- a/editors/openoffice.org-1.0/files/patch-odk+source+OOSupport+makefile.mk +++ /dev/null @@ -1,14 +0,0 @@ -Index: odk/source/OOSupport/makefile.mk -=================================================================== -RCS file: /cvs/api/odk/source/OOSupport/makefile.mk,v -retrieving revision 1.1.2.1 -diff -u -r1.1.2.1 makefile.mk ---- odk/source/OOSupport/makefile.mk 13 Jan 2003 10:58:17 -0000 1.1.2.1 -+++ odk/source/OOSupport/makefile.mk 4 Aug 2005 03:44:04 -0000 -@@ -336,5 +336,5 @@ - +cp -R ParserDB $(CLASSDIR)$/netbeans$/system - +cp openoffice-nbm-license.txt $(CLASSDIR) - +-mkdir $(CLASSDIR)$/netbeans$/modules -- +cd $(CLASSDIR) && cp oosupport.jar netbeans$/modules && java MakeModule -+ +cd $(CLASSDIR) && cp oosupport.jar netbeans$/modules && java -classpath $(CLASSDIR) MakeModule - +cd $(CLASSDIR) && jar -uvf $(TARGETNETBEANSMODULEFILE) netbeans diff --git a/editors/openoffice.org-1.0/files/patch-odk+source+bean+native+unix+makefile.mk b/editors/openoffice.org-1.0/files/patch-odk+source+bean+native+unix+makefile.mk deleted file mode 100644 index 459335c2a3b1..000000000000 --- a/editors/openoffice.org-1.0/files/patch-odk+source+bean+native+unix+makefile.mk +++ /dev/null @@ -1,21 +0,0 @@ -Index: odk/source/bean/native/unix/makefile.mk -=================================================================== -RCS file: /cvs/api/odk/source/bean/native/unix/Attic/makefile.mk,v -retrieving revision 1.4 -diff -u -r1.4 makefile.mk ---- odk/source/bean/native/unix/makefile.mk 6 May 2002 18:56:38 -0000 1.4 -+++ odk/source/bean/native/unix/makefile.mk 3 Aug 2005 07:10:36 -0000 -@@ -20,9 +20,12 @@ - SHL1LIBS= $(SLB)$/$(TARGET).lib - SHL1STDLIBS=-ljawt -lsal - --.IF "$(OS)" == "LINUX" -+.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD" - SHL1STDLIBS+=-lstdc++ - .ENDIF -+.IF "$(OS)" == "FREEBSD" -+SHL1STDLIBS+=-ljvm -lhpi -+.ENDIF - - NO_SHL1DESCRIPTION=TRUE - diff --git a/editors/openoffice.org-1.0/files/patch-odk+util+makefile.pmk b/editors/openoffice.org-1.0/files/patch-odk+util+makefile.pmk deleted file mode 100644 index f3056308a682..000000000000 --- a/editors/openoffice.org-1.0/files/patch-odk+util+makefile.pmk +++ /dev/null @@ -1,31 +0,0 @@ -Index: odk/util/makefile.pmk -=================================================================== -RCS file: /cvs/api/odk/util/makefile.pmk,v -retrieving revision 1.26.2.4 -diff -u -r1.26.2.4 makefile.pmk ---- odk/util/makefile.pmk 17 Feb 2003 15:51:33 -0000 1.26.2.4 -+++ odk/util/makefile.pmk 29 Jul 2005 13:57:12 -0000 -@@ -76,7 +76,7 @@ - #-------------------- - MY_DELETE_RECURSIVE=rm -rf - MY_DIRCMP=dircmp --MY_TEXTCOPY= tr -d "\015" -+MY_TEXTCOPY=%%GNUTR%% -d "\015" - #MY_COPY=cat - - MY_DLLPREFIX=lib -@@ -116,6 +116,14 @@ - DESTDIRLIB=$(DESTDIR)$/netbsd$/lib - DESTDIRDLL=$(DESTDIRLIB) - -+.ELIF "$(OS)"=="FREEBSD" -+########### -+# FREEBSD -+########### -+DESTDIRBIN=$(DESTDIR)$/freebsd$/bin -+DESTDIRLIB=$(DESTDIR)$/freebsd$/lib -+DESTDIRDLL=$(DESTDIRLIB) -+ - .ELIF "$(OS)"=="IRIX " - ########### - # IRIX diff --git a/editors/openoffice.org-1.0/files/patch-offapi+com+sun+star+setup+OSType.idl b/editors/openoffice.org-1.0/files/patch-offapi+com+sun+star+setup+OSType.idl deleted file mode 100644 index f6bb7fbd9886..000000000000 --- a/editors/openoffice.org-1.0/files/patch-offapi+com+sun+star+setup+OSType.idl +++ /dev/null @@ -1,12 +0,0 @@ ---- offapi/com/sun/star/setup/OSType.idl.orig Mon Dec 18 16:34:26 2000 -+++ offapi/com/sun/star/setup/OSType.idl Sun Jul 21 01:37:15 2002 -@@ -88,6 +88,9 @@ - UNIX_LINUX, - - // DocMerge: empty anyway -+ UNIX_FREEBSD, -+ -+ // DocMerge: empty anyway - UNIX_HP, - - // DocMerge: empty anyway diff --git a/editors/openoffice.org-1.0/files/patch-offapi+util+makefile.pmk b/editors/openoffice.org-1.0/files/patch-offapi+util+makefile.pmk deleted file mode 100644 index 418bf7386412..000000000000 --- a/editors/openoffice.org-1.0/files/patch-offapi+util+makefile.pmk +++ /dev/null @@ -1,11 +0,0 @@ ---- offapi/util/makefile.pmk.orig Mon Mar 11 01:37:55 2002 -+++ offapi/util/makefile.pmk Mon Mar 11 01:37:57 2002 -@@ -85,7 +85,7 @@ - - URDDOC=TRUE - --.IF "$(OS)"=="SOLARIS" -+.IF "$(OS)"=="SOLARIS" || "$(OS)"=="FREEBSD" - .IF "$(CPU)"=="I" - UNOIDL=unoidl - .ENDIF diff --git a/editors/openoffice.org-1.0/files/patch-package+inc+HashMaps.hxx b/editors/openoffice.org-1.0/files/patch-package+inc+HashMaps.hxx deleted file mode 100644 index 13b28b2a978f..000000000000 --- a/editors/openoffice.org-1.0/files/patch-package+inc+HashMaps.hxx +++ /dev/null @@ -1,20 +0,0 @@ ---- package/inc/HashMaps.hxx.orig Tue Oct 30 14:52:18 2001 -+++ package/inc/HashMaps.hxx Wed Jun 12 23:10:42 2002 -@@ -79,7 +79,7 @@ - }; - - class ZipPackageFolder; --class ContentInfo; -+class ZipContentInfo; - - typedef std::hash_map < rtl::OUString, - ZipPackageFolder *, -@@ -87,7 +87,7 @@ - eqFunc > FolderHash; - - typedef std::hash_map < rtl::OUString, -- vos::ORef < ContentInfo >, -+ vos::ORef < ZipContentInfo >, - ::rtl::OUStringHash, - eqFunc > ContentHash; - diff --git a/editors/openoffice.org-1.0/files/patch-package+inc+ZipPackageFolder.hxx b/editors/openoffice.org-1.0/files/patch-package+inc+ZipPackageFolder.hxx deleted file mode 100644 index a6b291661686..000000000000 --- a/editors/openoffice.org-1.0/files/patch-package+inc+ZipPackageFolder.hxx +++ /dev/null @@ -1,11 +0,0 @@ ---- package/inc/ZipPackageFolder.hxx.orig Thu Nov 15 21:01:49 2001 -+++ package/inc/ZipPackageFolder.hxx Wed Jun 12 23:10:42 2002 -@@ -106,7 +106,7 @@ - - void doInsertByName ( ZipPackageEntry *pEntry, sal_Bool bSetParent ) - throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); -- ContentInfo & doGetByName( const ::rtl::OUString& aName ) -+ ZipContentInfo & doGetByName( const ::rtl::OUString& aName ) - throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - static void copyZipEntry( ZipEntry &rDest, const ZipEntry &rSource); - static ::com::sun::star::uno::Sequence < sal_Int8 > static_getImplementationId() diff --git a/editors/openoffice.org-1.0/files/patch-package+source+zippackage+ContentInfo.hxx b/editors/openoffice.org-1.0/files/patch-package+source+zippackage+ContentInfo.hxx deleted file mode 100644 index adf7578a5b96..000000000000 --- a/editors/openoffice.org-1.0/files/patch-package+source+zippackage+ContentInfo.hxx +++ /dev/null @@ -1,34 +0,0 @@ ---- package/source/zippackage/ContentInfo.hxx.orig Tue Oct 30 14:54:47 2001 -+++ package/source/zippackage/ContentInfo.hxx Wed Jun 12 23:10:42 2002 -@@ -75,7 +75,7 @@ - #endif - #include <hash_map> - --class ContentInfo : public cppu::OWeakObject -+class ZipContentInfo : public cppu::OWeakObject - { - public: - com::sun::star::uno::Reference < com::sun::star::lang::XUnoTunnel > xTunnel; -@@ -85,19 +85,19 @@ - ZipPackageFolder *pFolder; - ZipPackageStream *pStream; - }; -- ContentInfo ( ZipPackageStream * pNewStream ) -+ ZipContentInfo ( ZipPackageStream * pNewStream ) - : bFolder ( false ) - , pStream ( pNewStream ) - , xTunnel ( pNewStream ) - { - } -- ContentInfo ( ZipPackageFolder * pNewFolder ) -+ ZipContentInfo ( ZipPackageFolder * pNewFolder ) - : bFolder ( true ) - , pFolder ( pNewFolder ) - , xTunnel ( pNewFolder ) - { - } -- virtual ~ContentInfo () -+ virtual ~ZipContentInfo () - { - if ( bFolder ) - pFolder->releaseUpwardRef(); diff --git a/editors/openoffice.org-1.0/files/patch-package+source+zippackage+ZipPackageFolder.cxx b/editors/openoffice.org-1.0/files/patch-package+source+zippackage+ZipPackageFolder.cxx deleted file mode 100644 index dc0f493f124d..000000000000 --- a/editors/openoffice.org-1.0/files/patch-package+source+zippackage+ZipPackageFolder.cxx +++ /dev/null @@ -1,41 +0,0 @@ ---- package/source/zippackage/ZipPackageFolder.cxx.orig Wed Jun 12 23:09:16 2002 -+++ package/source/zippackage/ZipPackageFolder.cxx Wed Jun 12 23:10:42 2002 -@@ -212,7 +212,7 @@ - return maContents.size() > 0; - } - // XNameAccess --ContentInfo& ZipPackageFolder::doGetByName( const OUString& aName ) -+ZipContentInfo& ZipPackageFolder::doGetByName( const OUString& aName ) - throw(NoSuchElementException, WrappedTargetException, RuntimeException) - { - ContentHash::iterator aIter = maContents.find ( aName ); -@@ -286,7 +286,7 @@ - aCI++) - { - const OUString &rShortName = (*aCI).first; -- const ContentInfo &rInfo = *(*aCI).second; -+ const ZipContentInfo &rInfo = *(*aCI).second; - - Sequence < PropertyValue > aPropSet (2); - PropertyValue *pValue = aPropSet.getArray(); -@@ -533,7 +533,7 @@ - aCI!=maContents.end(); - aCI++) - { -- ContentInfo &rInfo = * (*aCI).second; -+ ZipContentInfo &rInfo = * (*aCI).second; - if ( rInfo.bFolder )// && ! rInfo.pFolder->HasReleased () ) - rInfo.pFolder->releaseUpwardRef(); - else //if ( !rInfo.bFolder && !rInfo.pStream->HasReleased() ) -@@ -577,9 +577,9 @@ - throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException) - { - if ( pEntry->IsFolder() ) -- maContents[pEntry->aEntry.sName] = new ContentInfo ( static_cast < ZipPackageFolder *> ( pEntry ) ); -+ maContents[pEntry->aEntry.sName] = new ZipContentInfo ( static_cast < ZipPackageFolder *> ( pEntry ) ); - else -- maContents[pEntry->aEntry.sName] = new ContentInfo ( static_cast < ZipPackageStream *> ( pEntry ) ); -+ maContents[pEntry->aEntry.sName] = new ZipContentInfo ( static_cast < ZipPackageStream *> ( pEntry ) ); - - if ( bSetParent ) - pEntry->setParent ( *this ); diff --git a/editors/openoffice.org-1.0/files/patch-product+inc+scp+udk_basefiles.scp b/editors/openoffice.org-1.0/files/patch-product+inc+scp+udk_basefiles.scp deleted file mode 100644 index 1850fe136c9e..000000000000 --- a/editors/openoffice.org-1.0/files/patch-product+inc+scp+udk_basefiles.scp +++ /dev/null @@ -1,18 +0,0 @@ ---- product/inc/scp/udk_basefiles.scp.orig Tue Jan 7 14:52:10 2003 -+++ product/inc/scp/udk_basefiles.scp Sun Jan 19 22:37:05 2003 -@@ -2,6 +2,7 @@ - - // Temporary solution/hack: at the moment libstdc++.so and libgcc_s.so are needed for unxlngi4 environment - // (setup is linked against it). -+#if ( !defined ( FREEBSD )) - #if ( defined( _gcc3 ) && defined( C300 ) ) - - File gid_File_Lib_gcc -@@ -34,6 +35,7 @@ - End - - -+#endif - #endif - - File gid_File_Lib_Sal diff --git a/editors/openoffice.org-1.0/files/patch-product+settings+settings.mk b/editors/openoffice.org-1.0/files/patch-product+settings+settings.mk deleted file mode 100644 index c7824cec2938..000000000000 --- a/editors/openoffice.org-1.0/files/patch-product+settings+settings.mk +++ /dev/null @@ -1,75 +0,0 @@ ---- product/settings/settings.mk.orig Sat Jan 18 18:23:17 2003 -+++ product/settings/settings.mk Sat Jan 18 18:37:12 2003 -@@ -225,3 +226,72 @@ - - endif - -+ifeq "$(PLATFORM)" "FreeBSD" -+# Settings for FreeBSD using gcc compiler -+ -+OS=FREEBSD -+PLATFORM=freebsd -+PS=/ -+LINK=$(CC) -+LIB=$(CC) -+ECHO=@echo -+MKDIR=mkdir -p -+CAT=cat -+OBJ_EXT=o -+SHAREDLIB_EXT=so -+SHAREDLIB_PRE=lib -+SHAREDLIB_OUT=$(OUT_LIB) -+PACKAGE_LIB_DIR=freebsd_x86.plt -+ -+GCC_VERSION=$(shell $(CC) -dumpversion) -+ -+ifeq "$(shell echo $(GCC_VERSION) | cut -c 1)" "3" -+COMID=gcc3 -+CPPU_ENV=gcc3 -+else -+COMID=GCC -+CPPU_ENV=gcc2 -+endif -+ -+OSEP=\< -+CSEP=\> -+ -+DEL=rm -f -+DELRECURSIVE=rm -rf -+COPY=cp -+URLPREFIX=file:// -+ -+# Include UDK version numbers -+include $(PRJ)/include/udkversion.mk -+ -+SALLIB=-lsal -+CPPULIB=-lcppu -+CPPUHELPERLIB=-lcppuhelper$(COMID) -+SALHELPERLIB=-lsalhelper$(COMID) -+STLPORTLIB=-lstlport_gcc -+ -+EMPTYSTRING= -+PATH_SEPARATOR=: -+ -+# -O is necessary for inlining (see gcc documentation) -+ifeq "$(DEBUG)" "yes" -+CC_FLAGS=-c -g -+else -+CC_FLAGS=-c -O -+endif -+SDK_JAVA_INCLUDES = -I$(OO_SDK_JAVA_HOME)/include -I$(OO_SDK_JAVA_HOME)/include/freebsd -I$(OO_SDK_JAVA_HOME)/include/linux -+CC_INCLUDES=-I. -I/usr/include -I$(OUT)/inc/examples -I$(PRJ)/include -+STL_INCLUDES=-I$(OO_STLPORT_HOME)/stlport -+CC_DEFINES=-DUNX -DGCC -DFREEBSD -DCPPU_ENV=$(CPPU_ENV) %%PTHREAD_CFLAGS%% -+ -+# define for used compiler necessary for UNO -+#-DCPPU_ENV=gcc2 -- gcc 2.91/2.95 -+#-DCPPU_ENV=gcc3 -- gcc3 3.0 -+ -+CC_OUTPUT_SWITCH=-o -+ -+LIBRARY_LINK_FLAGS=-shared -+EXE_LINK_FLAGS=-Wl -export-dynamic -+LINK_LIBS=-L$(OUT)/lib -L$(PRJ)/$(PLATFORM)/lib -L$(OFFICE_PROGRAM_PATH) %%PTHREAD_LIBS%% -+ -+endif diff --git a/editors/openoffice.org-1.0/files/patch-product+util+makefile.mk b/editors/openoffice.org-1.0/files/patch-product+util+makefile.mk deleted file mode 100644 index 7b7e6d665ec7..000000000000 --- a/editors/openoffice.org-1.0/files/patch-product+util+makefile.mk +++ /dev/null @@ -1,32 +0,0 @@ ---- product/util/makefile.mk.orig Sat Jan 18 13:31:50 2003 -+++ product/util/makefile.mk Sat Jan 18 13:30:54 2003 -@@ -131,13 +131,6 @@ - DESTDIRDLL=$(DESTDIRLIB) - STLPORTLIBNAME=libstlport_gcc.so - BINDINGDLL=$(COMNAME)_uno --.IF "$(COMID)"=="gcc3" --ADDITIONAL_DLLS= \ -- $(DESTDIRDLL)$/libgcc_s.so.1 \ -- $(DESTDIRDLL)$/libgcc_s.so \ -- $(DESTDIRDLL)$/libstdc++.so.$(SHORTSTDCPP3) \ -- $(DESTDIRDLL)$/libstdc++.so.$(LIBSTDCPP3) --.ENDIF - - .ELIF "$(OS)"=="NETBSD" - ########### -@@ -491,6 +484,7 @@ - # special targets for linux gcc3 - .IF "$(COMID)"=="gcc3" - -+.IF "$(OS)"!="FREEBSD" - $(DLLOUT)$/libstdc++.so.$(LIBSTDCPP3) : - $(GCCINSTLIB) libstdc++.so.$(LIBSTDCPP3) $(DLLOUT) - -@@ -514,6 +508,7 @@ - $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST) - -rm -f $@ - +ln -s libgcc_s.so.1 $@ -+.ENDIF - #------------------------------------------------------------- - - $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST) diff --git a/editors/openoffice.org-1.0/files/patch-psprint+source+printer+printerinfomanager.cxx b/editors/openoffice.org-1.0/files/patch-psprint+source+printer+printerinfomanager.cxx deleted file mode 100644 index fa1e6ccb68b2..000000000000 --- a/editors/openoffice.org-1.0/files/patch-psprint+source+printer+printerinfomanager.cxx +++ /dev/null @@ -1,11 +0,0 @@ ---- psprint/source/printer/printerinfomanager.cxx.orig Sat Apr 6 11:56:35 2002 -+++ psprint/source/printer/printerinfomanager.cxx Wed May 1 22:42:58 2002 -@@ -883,7 +883,7 @@ - - static const struct SystemCommandParameters aParms[] = - { --#if defined(LINUX) || defined(NETBSD) -+#if defined(LINUX) || defined(NETBSD) || defined(FREEBSD) - { "/usr/sbin/lpc status", "lpr -P (PRINTER)", "", ":", 0 }, - { "lpc status", "lpr -P (PRINTER)", "", ":", 0 }, - { "LANG=C;LC_ALL=C;export LANG LC_ALL;lpstat -s", "lp -d (PRINTER)", "system for ", ": ", 1 } diff --git a/editors/openoffice.org-1.0/files/patch-psprint+source+printergfx+psheader.ps b/editors/openoffice.org-1.0/files/patch-psprint+source+printergfx+psheader.ps deleted file mode 100644 index f0b93e643758..000000000000 --- a/editors/openoffice.org-1.0/files/patch-psprint+source+printergfx+psheader.ps +++ /dev/null @@ -1,13 +0,0 @@ ---- psprint/source/printergfx/psheader.ps.orig Tue Jun 4 22:33:58 2002 -+++ psprint/source/printergfx/psheader.ps -@@ -303,8 +303,8 @@ - /h /i /j /k /l /m /n /o - /p /q /r /s /t /u /v /w - /x /y /z /braceleft /bar /braceright /asciitilde /unused -- /euro /unused /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl -- /circumflex /perthousand /Scaron /guilsinglleft /OE /unused /zcaron /unused -+ /Euro /unused /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl -+ /circumflex /perthousand /Scaron /guilsinglleft /OE /unused /Zcaron /unused - /unused /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash - /tilde /trademark /scaron /guilsinglright /oe /unused /zcaron /Ydieresis - /space /exclamdown /cent /sterling /currency /yen /brokenbar /section diff --git a/editors/openoffice.org-1.0/files/patch-registry+source+registry.cxx b/editors/openoffice.org-1.0/files/patch-registry+source+registry.cxx deleted file mode 100644 index afa16cc20a6d..000000000000 --- a/editors/openoffice.org-1.0/files/patch-registry+source+registry.cxx +++ /dev/null @@ -1,14 +0,0 @@ ---- registry/source/registry.cxx.orig Fri Apr 4 00:09:08 2003 -+++ registry/source/registry.cxx Fri Apr 4 00:06:25 2003 -@@ -134,11 +134,7 @@ - - #ifdef UNX - strcat(tmpPattern, "/reg_XXXXXX"); --#if defined(FREEBSD) || defined(MACOSX) -- pTmpName = mkstemp(tmpPattern); --#else - pTmpName = mktemp(tmpPattern); --#endif - #endif - - return OString(pTmpName); diff --git a/editors/openoffice.org-1.0/files/patch-registry+source+regkey.cxx b/editors/openoffice.org-1.0/files/patch-registry+source+regkey.cxx deleted file mode 100644 index a04188601413..000000000000 --- a/editors/openoffice.org-1.0/files/patch-registry+source+regkey.cxx +++ /dev/null @@ -1,12 +0,0 @@ ---- registry/source/regkey.cxx.orig Mon Mar 11 01:27:56 2002 -+++ registry/source/regkey.cxx Mon Mar 11 01:28:51 2002 -@@ -228,6 +228,9 @@ - { - RegError _ret = REG_NO_ERROR; - -+ if (!nSubKeys) -+ return REG_NO_ERROR; -+ - if (phSubKeys) - { - ORegistry* pReg = NULL; diff --git a/editors/openoffice.org-1.0/files/patch-registry+tools+makefile.mk b/editors/openoffice.org-1.0/files/patch-registry+tools+makefile.mk deleted file mode 100644 index 488b4a2eed71..000000000000 --- a/editors/openoffice.org-1.0/files/patch-registry+tools+makefile.mk +++ /dev/null @@ -1,39 +0,0 @@ -Index: registry/tools/makefile.mk -=================================================================== -RCS file: /cvs/udk/registry/tools/makefile.mk,v -retrieving revision 1.4 -diff -u -r1.4 makefile.mk ---- registry/tools/makefile.mk 18 May 2001 15:20:12 -0000 1.4 -+++ registry/tools/makefile.mk 10 Jul 2005 05:16:53 -0000 -@@ -88,6 +88,7 @@ - APP1STDLIBS=\ - $(SALLIB) \ - $(SALHELPERLIB) \ -+ $(STORELIB) \ - $(REGLIB) - - .IF "$(GUI)"=="WNT" -@@ -102,6 +103,7 @@ - APP2STDLIBS=\ - $(SALLIB) \ - $(SALHELPERLIB) \ -+ $(STORELIB) \ - $(REGLIB) - - .IF "$(GUI)"=="WNT" -@@ -115,6 +117,7 @@ - APP3STDLIBS=\ - $(SALLIB) \ - $(SALHELPERLIB) \ -+ $(STORELIB) \ - $(REGLIB) - - .IF "$(GUI)"=="WNT" -@@ -128,6 +131,7 @@ - APP4STDLIBS=\ - $(SALLIB) \ - $(SALHELPERLIB) \ -+ $(STORELIB) \ - $(REGLIB) - - .IF "$(GUI)"=="WNT" diff --git a/editors/openoffice.org-1.0/files/patch-rsc+source+rscpp+cpp.h b/editors/openoffice.org-1.0/files/patch-rsc+source+rscpp+cpp.h deleted file mode 100644 index c49c2533f367..000000000000 --- a/editors/openoffice.org-1.0/files/patch-rsc+source+rscpp+cpp.h +++ /dev/null @@ -1,12 +0,0 @@ ---- rsc/source/rscpp/cpp.h.orig Fri Mar 1 00:14:38 2002 -+++ rsc/source/rscpp/cpp.h Fri Mar 1 00:15:03 2002 -@@ -462,7 +462,9 @@ - extern char *strrchr(); - extern char *strchr(); - #if ! ( defined UNX && defined ALPHA ) -+#if ! ( defined FREEBSD ) - extern long time(); -+#endif - #endif - /* extern char *sprintf(); */ /* Lint needs this */ - diff --git a/editors/openoffice.org-1.0/files/patch-rsc+source+rscpp+cpp3.c b/editors/openoffice.org-1.0/files/patch-rsc+source+rscpp+cpp3.c deleted file mode 100644 index 3a4aa79dee18..000000000000 --- a/editors/openoffice.org-1.0/files/patch-rsc+source+rscpp+cpp3.c +++ /dev/null @@ -1,12 +0,0 @@ ---- rsc/source/rscpp/cpp3.c.orig Thu Jul 25 00:00:25 2002 -+++ rsc/source/rscpp/cpp3.c Thu Jul 25 00:01:50 2002 -@@ -82,7 +82,9 @@ - #ifdef IRIX - extern void abort(void); - #else -+#ifndef FREEBSD - extern int abort(); /* For debugging */ -+#endif - #endif - #endif - diff --git a/editors/openoffice.org-1.0/files/patch-sablot+Sablot-0.52.patch b/editors/openoffice.org-1.0/files/patch-sablot+Sablot-0.52.patch deleted file mode 100644 index 59837cad556c..000000000000 --- a/editors/openoffice.org-1.0/files/patch-sablot+Sablot-0.52.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- sablot/Sablot-0.52.patch.orig Sun Jan 19 15:13:42 2003 -+++ sablot/Sablot-0.52.patch Sun Jan 19 15:15:15 2003 -@@ -3,7 +3,7 @@ - *************** - *** 1 **** - ! dummy ----- 1,159 ---- -+--- 1,161 ---- - ! #************************************************************************* - ! # - ! # $RCSfile: makefile.mk,v $ -@@ -96,6 +96,8 @@ - ! .IF "$(GUI)"=="UNX" - ! .IF "$(OS)"=="NETBSD" - ! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE -+! .ELIF "$(OS)"=="FREEBSD" -+! CFLAGS+= -DHAVE_SYS_TIME_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE - ! .ELSE - ! .IF "$(OS)"=="MACOSX" - ! CFLAGS+= -DHAVE_GETTIMEOFDAY -DHAVE_SYS_TIME_H -DHAVE_ISNAN -DHAVE_FINITE diff --git a/editors/openoffice.org-1.0/files/patch-sal+inc+osl+endian.h b/editors/openoffice.org-1.0/files/patch-sal+inc+osl+endian.h deleted file mode 100644 index 7f709a502e81..000000000000 --- a/editors/openoffice.org-1.0/files/patch-sal+inc+osl+endian.h +++ /dev/null @@ -1,20 +0,0 @@ ---- sal/inc/osl/endian.h.orig Thu May 8 20:19:09 2003 -+++ sal/inc/osl/endian.h Thu May 8 20:29:00 2003 -@@ -107,7 +107,9 @@ - #endif - - #ifdef FREEBSD -+# include <sys/param.h> - # include <machine/endian.h> -+#if __FreeBSD_version < 500000 - # if BYTE_ORDER == LITTLE_ENDIAN - # define _LITTLE_ENDIAN - # elif BYTE_ORDER == BIG_ENDIAN -@@ -115,6 +117,7 @@ - # elif BYTE_ORDER == PDP_ENDIAN - # define _PDP_ENDIAN - # endif -+#endif - #endif - - #ifdef SCO diff --git a/editors/openoffice.org-1.0/files/patch-sal+inc+rtl+textenc.h b/editors/openoffice.org-1.0/files/patch-sal+inc+rtl+textenc.h deleted file mode 100644 index b7869a30acfb..000000000000 --- a/editors/openoffice.org-1.0/files/patch-sal+inc+rtl+textenc.h +++ /dev/null @@ -1,21 +0,0 @@ ---- sal/inc/rtl/textenc.h.orig Mon Feb 24 17:46:26 2003 -+++ sal/inc/rtl/textenc.h Tue Feb 25 16:45:00 2003 -@@ -173,8 +173,9 @@ - #define RTL_TEXTENCODING_MS_1361 (RTL_TEXTENC_CAST( 84 )) - #define RTL_TEXTENCODING_GB_18030 (RTL_TEXTENC_CAST( 85 )) - #define RTL_TEXTENCODING_BIG5_HKSCS (RTL_TEXTENC_CAST( 86 )) -+#define RTL_TEXTENCODING_KOI8_U (RTL_TEXTENC_CAST( 87 )) - --#define RTL_TEXTENCODING_STD_COUNT (RTL_TEXTENC_CAST( 87 )) -+#define RTL_TEXTENCODING_STD_COUNT (RTL_TEXTENC_CAST( 88 )) - - #define RTL_TEXTENCODING_USER_START (RTL_TEXTENC_CAST( 0x8000 )) - #define RTL_TEXTENCODING_USER_END (RTL_TEXTENC_CAST( 0xEFFF )) -@@ -223,6 +224,7 @@ - Cyrillic (DOS/OS2-866/Russian) RTL_TEXTENCODING_IBM_866 - Cyrillic (ISO-8859-5) RTL_TEXTENCODING_ISO_8859_5 - Cyrillic (KOI8-R) RTL_TEXTENCODING_KOI8_R -+Cyrillic (KOI8-U) RTL_TEXTENCODING_KOI8_U - Cyrillic (Windows-1251) RTL_TEXTENCODING_MS_1251 - - Greek (Apple Macintosh) RTL_TEXTENCODING_APPLE_GREEK diff --git a/editors/openoffice.org-1.0/files/patch-sal+osl+unx+interlck.c b/editors/openoffice.org-1.0/files/patch-sal+osl+unx+interlck.c deleted file mode 100644 index d7f43eaa741a..000000000000 --- a/editors/openoffice.org-1.0/files/patch-sal+osl+unx+interlck.c +++ /dev/null @@ -1,30 +0,0 @@ ---- sal/osl/unx/interlck.c.orig Mon Jul 22 17:51:34 2002 -+++ sal/osl/unx/interlck.c Mon Jul 22 18:03:42 2002 -@@ -81,10 +81,10 @@ - __asm__ __volatile__ ( - "movl $1, %0\n\t" - "lock\n\t" -- "xadd %0, %2\n\t" -+ "xadd %0, %1\n\t" - "incl %0" -- : "=a" (nCount), "=m" (*pCount) -- : "m" (*pCount) -+ : "=&a" (nCount), "+m" (*pCount) -+ : - : "memory"); - } - -@@ -95,10 +95,10 @@ - __asm__ __volatile__ ( - "movl $-1, %0\n\t" - "lock\n\t" -- "xadd %0, %2\n\t" -+ "xadd %0, %1\n\t" - "decl %0" -- : "=a" (nCount), "=m" (*pCount) -- : "m" (*pCount) -+ : "=&a" (nCount), "+m" (*pCount) -+ : - : "memory"); - } - diff --git a/editors/openoffice.org-1.0/files/patch-sal+osl+unx+nlsupport.c b/editors/openoffice.org-1.0/files/patch-sal+osl+unx+nlsupport.c deleted file mode 100644 index a21898194f4d..000000000000 --- a/editors/openoffice.org-1.0/files/patch-sal+osl+unx+nlsupport.c +++ /dev/null @@ -1,135 +0,0 @@ ---- sal/osl/unx/nlsupport.c.orig Tue May 21 15:22:11 2002 -+++ sal/osl/unx/nlsupport.c Tue Sep 3 12:58:48 2002 -@@ -63,7 +63,7 @@ - #include <osl/diagnose.h> - #include <osl/process.h> - --#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD) -+#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(FREEBSD) || defined(NETBSD) - #include <pthread.h> - #include <locale.h> - #include <langinfo.h> -@@ -241,12 +240,13 @@ - return NULL; - } - --#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD) -+#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(FREEBSD) || defined(NETBSD) - - /* - * This implementation of osl_getTextEncodingFromLocale maps - * from nl_langinfo(CODESET) to rtl_textencoding defines. -- * nl_langinfo() is supported only on Linux, Solaris and IRIX. -+ * nl_langinfo() is supported only on Linux, Solaris and IRIX, -+ * >= NetBSD 1.6 and >= FreeBSD 4.4 - * - * This routine is SLOW because of the setlocale call, so - * grab the result and cache it. -@@ -260,6 +260,12 @@ - #endif - #endif - -+/* -+ * _nl_language_list[] is an array list of supported encodings. Because -+ * we are using a binary search, the list has to be in ascending order. -+ * We are comparing the encodings case insensitiv, so the list has -+ * to be completly upper- , or lowercase. -+ */ - - #if defined(SOLARIS) - -@@ -497,7 +503,59 @@ - { "WIN-SAMI-2", RTL_TEXTENCODING_DONTKNOW } /* WS2 */ - }; - --#endif /* ifdef LINUX || NETBSD */ -+#elif defined(FREEBSD) -+ -+const _pair _nl_language_list[] = { -+ { "ASCII", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */ -+ { "BIG5", RTL_TEXTENCODING_BIG5 }, /* China - Traditional Chinese */ -+ { "CP1251", RTL_TEXTENCODING_MS_1251 }, /* MS-CYRL */ -+ { "CP866", RTL_TEXTENCODING_IBM_866 }, /* CP866 866 */ -+ { "EUCCN", RTL_TEXTENCODING_EUC_CN }, /* China - Simplified Chinese */ -+ { "EUCJP", RTL_TEXTENCODING_EUC_JP }, /* Japan */ -+ { "EUCKR", RTL_TEXTENCODING_EUC_KR }, /* Korea */ -+ { "ISO8859-1", RTL_TEXTENCODING_ISO_8859_1 }, /* Western */ -+ { "ISO8859-15", RTL_TEXTENCODING_ISO_8859_15 }, /* Western Updated (w/Euro sign) */ -+ { "ISO8859-2", RTL_TEXTENCODING_ISO_8859_2 }, /* Central European */ -+ { "ISO8859-4", RTL_TEXTENCODING_ISO_8859_4 }, /* LATIN4 L4 */ -+ { "ISO8859-5", RTL_TEXTENCODING_ISO_8859_5 }, /* Cyrillic */ -+ { "ISO8859-7", RTL_TEXTENCODING_ISO_8859_7 }, /* Greek */ -+ { "ISO8859-9", RTL_TEXTENCODING_ISO_8859_9 }, /* Turkish */ -+ { "KOI8-R", RTL_TEXTENCODING_KOI8_R }, /* KOI8 */ -+ { "KOI8-U", RTL_TEXTENCODING_KOI8_U }, /* KOI8-U */ -+ { "SJIS", RTL_TEXTENCODING_SHIFT_JIS }, /* Japan */ -+ { "US-ASCII", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */ -+ { "UTF-8", RTL_TEXTENCODING_UTF8 } /* ISO-10646/UTF-8 */ -+}; -+ -+#elif defined(NETBSD) -+ -+const _pair _nl_language_list[] = { -+ { "ASCII", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */ -+ { "BIG5", RTL_TEXTENCODING_BIG5 }, /* China - Traditional Chinese */ -+ { "CP1251", RTL_TEXTENCODING_MS_1251 }, /* MS-CYRL */ -+ { "CP866", RTL_TEXTENCODING_IBM_866 }, /* CP866 866 */ -+ { "CTEXT", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */ -+ { "EUCCN", RTL_TEXTENCODING_EUC_CN }, /* China - Simplified Chinese */ -+ { "EUCJP", RTL_TEXTENCODING_EUC_JP }, /* Japan */ -+ { "EUCKR", RTL_TEXTENCODING_EUC_KR }, /* Korea */ -+ { "EUCTW", RTL_TEXTENCODING_EUC_TW }, /* China - Traditional Chinese */ -+ { "ISO-2022-JP", RTL_TEXTENCODING_DONTKNOW }, /* */ -+ { "ISO-2022-JP-2", RTL_TEXTENCODING_DONTKNOW }, /* */ -+ { "ISO8859-1", RTL_TEXTENCODING_ISO_8859_1 }, /* Western */ -+ { "ISO8859-15", RTL_TEXTENCODING_ISO_8859_15 }, /* Western Updated (w/Euro sign) */ -+ { "ISO8859-2", RTL_TEXTENCODING_ISO_8859_2 }, /* Central European */ -+ { "ISO8859-4", RTL_TEXTENCODING_ISO_8859_4 }, /* LATIN4 L4 */ -+ { "ISO8859-5", RTL_TEXTENCODING_ISO_8859_5 }, /* Cyrillic */ -+ { "ISO8859-7", RTL_TEXTENCODING_ISO_8859_7 }, /* Greek */ -+ { "ISO8859-9", RTL_TEXTENCODING_ISO_8859_9 }, /* Turkish */ -+ { "KOI8-R", RTL_TEXTENCODING_KOI8_R }, /* KOI8 */ -+ { "KOI8-U", RTL_TEXTENCODING_KOI8_U }, /* KOI8-U */ -+ { "SJIS", RTL_TEXTENCODING_SHIFT_JIS }, /* Japan */ -+ { "US-ASCII", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */ -+ { "UTF-8", RTL_TEXTENCODING_UTF8 } /* ISO-10646/UTF-8 */ -+}; -+ -+#endif /* ifdef SOLARIS IRIX LINUX FREEBSD NETBSD */ - - static pthread_mutex_t aLocalMutex = PTHREAD_MUTEX_INITIALIZER; - -@@ -619,7 +677,7 @@ - return ret; - } - --#elif defined(MACOSX) /* ifdef LINUX || SOLARIS || NETBSD */ -+#elif defined(MACOSX) /* ifdef LINUX || SOLARIS || IRIX || FREEBSD || NETBSD */ - - /* - * FIXME: the MacOS X implemetation is missing -@@ -652,7 +710,7 @@ - return 0; - } - --#else /* ifdef LINUX || SOLARIS || MACOSX || NETBSD */ -+#else /* ifdef LINUX || SOLARIS || IRIX || FREEBSD || NETBSD || MACOSX */ - - /* - * This implementation of osl_getTextEncodingFromLocale maps -@@ -685,6 +743,7 @@ - { "iso8859-8", RTL_TEXTENCODING_ISO_8859_8 }, - { "iso8859-9", RTL_TEXTENCODING_ISO_8859_9 }, - { "koi8-r", RTL_TEXTENCODING_KOI8_R }, -+ { "koi8-u", RTL_TEXTENCODING_KOI8_U }, - { "pck", RTL_TEXTENCODING_MS_932 }, - #if (0) - { "sun_eu_greek", RTL_TEXTENCODING_DONTKNOW }, -@@ -888,6 +947,6 @@ - return 0; - } - --#endif /* ifdef LINUX || SOLARIS || MACOSX || NETBSD */ -+#endif /* ifdef LINUX || SOLARIS || FREEBSD || NETBSD || MACOSX */ - - diff --git a/editors/openoffice.org-1.0/files/patch-sal+osl+unx+pipe.c b/editors/openoffice.org-1.0/files/patch-sal+osl+unx+pipe.c deleted file mode 100644 index acf47ad85552..000000000000 --- a/editors/openoffice.org-1.0/files/patch-sal+osl+unx+pipe.c +++ /dev/null @@ -1,14 +0,0 @@ ---- sal/osl/unx/pipe.c.orig Mon Feb 18 13:48:55 2002 -+++ sal/osl/unx/pipe.c Wed Apr 3 00:59:15 2002 -@@ -264,7 +264,11 @@ - - addr.sun_family = AF_UNIX; - strncpy(addr.sun_path, name, sizeof(addr.sun_path)); -+#if defined(FREEBSD) -+ len = SUN_LEN(&addr); -+#else - len = sizeof(addr); -+#endif - - if ( Options & osl_Pipe_CREATE ) - { diff --git a/editors/openoffice.org-1.0/files/patch-sal+osl+unx+process.c b/editors/openoffice.org-1.0/files/patch-sal+osl+unx+process.c deleted file mode 100644 index 9f94bc83493c..000000000000 --- a/editors/openoffice.org-1.0/files/patch-sal+osl+unx+process.c +++ /dev/null @@ -1,20 +0,0 @@ ---- sal/osl/unx/process.c.orig Wed Jun 5 16:24:42 2002 -+++ sal/osl/unx/process.c Wed Jan 15 01:25:17 2003 -@@ -222,7 +222,7 @@ - /* Memory layout of CMD_ARG_PRG: - progname\0arg1\0...argn[\0]\0environ\0env2\0...envn\0[\0] */ - --#if !defined(NETBSD) -+#if !defined(NETBSD) && !defined(FREEBSD) - extern sal_Char* CMD_ARG_PRG; - #endif - extern sal_Char** CMD_ARG_ENV; -@@ -862,7 +862,7 @@ - - if (! INIT_GROUPS(data.m_name, data.m_gid) || (setuid(data.m_uid) != 0)) - OSL_TRACE("Failed to change uid and guid, errno=%d (%s)\n", errno, strerror(errno)); --#ifdef LINUX -+#if defined(LINUX) || defined(FREEBSD) - unsetenv("HOME"); - #else - putenv("HOME="); diff --git a/editors/openoffice.org-1.0/files/patch-sal+osl+unx+socket.c b/editors/openoffice.org-1.0/files/patch-sal+osl+unx+socket.c deleted file mode 100644 index c10adeb079b3..000000000000 --- a/editors/openoffice.org-1.0/files/patch-sal+osl+unx+socket.c +++ /dev/null @@ -1,20 +0,0 @@ ---- sal/osl/unx/socket.c.orig Sun Mar 17 12:46:37 2002 -+++ sal/osl/unx/socket.c Wed Apr 3 01:01:14 2002 -@@ -82,7 +82,7 @@ - #undef HAVE_POLL_H - #endif - --#if defined(LINUX) || defined (IRIX) || defined(NETBSD) -+#if defined(LINUX) || defined (IRIX) || defined(NETBSD) || defined(FREEBSD) - #include <sys/poll.h> - #define HAVE_POLL_H - #endif /* HAVE_POLL_H */ -@@ -1965,7 +1965,7 @@ - /*****************************************************************************/ - oslSocketAddr SAL_CALL osl_getLocalAddrOfSocket(oslSocket pSocket) - { --#ifdef LINUX -+#ifdef LINUX || defined(FREEBSD) - socklen_t AddrLen; - #else - /* mfe: Solaris 'cc +w' means Addrlen should be signed! */ diff --git a/editors/openoffice.org-1.0/files/patch-sal+osl+unx+system.c b/editors/openoffice.org-1.0/files/patch-sal+osl+unx+system.c deleted file mode 100644 index a50abf9acbf9..000000000000 --- a/editors/openoffice.org-1.0/files/patch-sal+osl+unx+system.c +++ /dev/null @@ -1,137 +0,0 @@ ---- sal/osl/unx/system.c.orig Tue Aug 20 08:49:46 2002 -+++ sal/osl/unx/system.c Sat Apr 19 22:15:25 2003 -@@ -74,7 +74,8 @@ - static pthread_mutex_t getrtl_mutex = PTHREAD_MUTEX_INITIALIZER; - - /* struct passwd differs on some platforms */ --#if defined NETBSD || defined MACOSX || defined FREEBSD -+#if defined NETBSD || defined MACOSX || \ -+ (defined FREEBSD && (__FreeBSD_version < 500112)) - #include <pwd.h> - #include <sys/types.h> - -@@ -203,6 +204,73 @@ - } - #endif - -+int getpwuid_r(uid_t uid, struct passwd *pwd, char *buffer, -+ size_t buflen, struct passwd **result) -+{ -+ struct passwd* res; -+ -+ pthread_mutex_lock(&getrtl_mutex); -+ -+ if ( res = getpwuid(uid) ) -+ { -+ size_t pw_name, pw_passwd, pw_class, pw_gecos, pw_dir, pw_shell; -+ -+ pw_name = strlen(res->pw_name)+1; -+ pw_passwd = strlen(res->pw_passwd)+1; -+ pw_class = strlen(res->pw_class)+1; -+ pw_gecos = strlen(res->pw_gecos)+1; -+ pw_dir = strlen(res->pw_dir)+1; -+ pw_shell = strlen(res->pw_shell)+1; -+ -+ if (pw_name+pw_passwd+pw_class+pw_gecos -+ +pw_dir+pw_shell < buflen) -+ { -+ memcpy(pwd, res, sizeof(struct passwd)); -+ -+ strncpy(buffer, res->pw_name, pw_name); -+ pwd->pw_name = buffer; -+ buffer += pw_name; -+ -+ strncpy(buffer, res->pw_passwd, pw_passwd); -+ pwd->pw_passwd = buffer; -+ buffer += pw_passwd; -+ -+ strncpy(buffer, res->pw_class, pw_class); -+ pwd->pw_class = buffer; -+ buffer += pw_class; -+ -+ strncpy(buffer, res->pw_gecos, pw_gecos); -+ pwd->pw_gecos = buffer; -+ buffer += pw_gecos; -+ -+ strncpy(buffer, res->pw_dir, pw_dir); -+ pwd->pw_dir = buffer; -+ buffer += pw_dir; -+ -+ strncpy(buffer, res->pw_shell, pw_shell); -+ pwd->pw_shell = buffer; -+ buffer += pw_shell; -+ -+ *result = pwd ; -+ res = 0 ; -+ -+ } else { -+ -+ res = ENOMEM ; -+ -+ } -+ -+ } else { -+ -+ res = errno ; -+ -+ } -+ -+ pthread_mutex_unlock(&getrtl_mutex); -+ -+ return res; -+} -+ - struct tm *localtime_r(const time_t *timep, struct tm *buffer) - { - struct tm* res; -@@ -712,3 +780,50 @@ - } - #endif - -+#if defined(NETBSD) || defined(FREEBSD) -+char *fcvt(double value, int ndigit, int *decpt, int *sign) -+{ -+ static char ret[256]; -+ char buf[256],zahl[256],format[256]="%"; -+ char *v1,*v2; -+ -+ if (value==0.0) value=1e-30; -+ -+ if (value<0.0) *sign=1; else *sign=0; -+ -+ if (value<1.0) -+ { -+ *decpt=(int)log10(value); -+ value*=pow(10.0,1-*decpt); -+ ndigit+=*decpt-1; -+ if (ndigit<0) ndigit=0; -+ } -+ else -+ { -+ *decpt=(int)log10(value)+1; -+ } -+ -+ sprintf(zahl,"%d",ndigit); -+ strcat(format,zahl); -+ strcat(format,"."); -+ strcat(format,zahl); -+ strcat(format,"f"); -+ -+ sprintf(buf,format,value); -+ -+ if (ndigit!=0) -+ { -+ v1=strtok(buf,"."); -+ v2=strtok(NULL,"."); -+ strcpy(ret,v1); -+ strcat(ret,v2); -+ } -+ else -+ { -+ strcpy(ret,buf); -+ } -+ -+ return(ret); -+} -+ -+#endif diff --git a/editors/openoffice.org-1.0/files/patch-sal+osl+unx+system.h b/editors/openoffice.org-1.0/files/patch-sal+osl+unx+system.h deleted file mode 100644 index f41646595af3..000000000000 --- a/editors/openoffice.org-1.0/files/patch-sal+osl+unx+system.h +++ /dev/null @@ -1,71 +0,0 @@ ---- sal/osl/unx/system.h.orig Tue Aug 20 15:54:55 2002 -+++ sal/osl/unx/system.h Thu May 8 20:31:08 2003 -@@ -203,12 +203,19 @@ - # include <dlfcn.h> - # include <sys/filio.h> - # include <sys/ioctl.h> -+# include <sys/param.h> - # include <sys/time.h> - # include <sys/uio.h> -+# include <sys/exec.h> -+# include <vm/vm.h> -+# include <vm/vm_param.h> -+# include <vm/pmap.h> -+# include <vm/swap_pager.h> - # include <sys/un.h> - # include <netinet/tcp.h> - # define IORESOURCE_TRANSFER_BSD - # include <machine/endian.h> -+#ifdef __FreeBSD_version < 500000 - # if BYTE_ORDER == LITTLE_ENDIAN - # define _LITTLE_ENDIAN - # elif BYTE_ORDER == BIG_ENDIAN -@@ -216,12 +223,14 @@ - # elif BYTE_ORDER == PDP_ENDIAN - # define _PDP_ENDIAN - # endif --# define sched_yield() pthread_yield() --# define pthread_testcancel() -+#endif - # define NO_PTHREAD_RTL --# define NO_PTHREAD_PRIORITY --# define CMD_ARG_PRG __progname --# define CMD_ARG_ENV environ -+/* __progname isn't sufficient here. We need the full path as well -+ * for e.g. setup and __progname only points to the binary name. -+ */ -+# define CMD_ARG_PRG_IS_DEFINED -+# define CMD_ARG_PRG *((struct ps_strings *)PS_STRINGS)->ps_argvstr -+# define CMD_ARG_ENV environ - #endif - - #ifdef SCO -@@ -569,12 +578,14 @@ - #endif - - #ifdef NO_PTHREAD_RTL -+#if !defined FREEBSD || (__FreeBSD_version < 500112) - struct passwd *getpwent_r(struct passwd *pwd, char *buffer, int buflen); - extern struct spwd *getspnam_r(const char *name, struct spwd *result, - char *buffer, int buflen); - - struct tm *localtime_r(const time_t *timep, struct tm *buffer); - struct tm *gmtime_r(const time_t *timep, struct tm *buffer); -+#endif /* !defined FREEBSD || (__FreeBSD_version < 500112) */ - struct hostent *gethostbyname_r(const char *name, struct hostent *result, - char *buffer, int buflen, int *h_errnop); - #endif - ---- sal/osl/unx/system.h.orig Fri Aug 15 20:38:50 2003 -+++ sal/osl/unx/system.h Sun Sep 10 13:32:43 2006 -@@ -576,8 +576,10 @@ - struct tm *localtime_r(const time_t *timep, struct tm *buffer); - struct tm *gmtime_r(const time_t *timep, struct tm *buffer); - #endif /* !defined FREEBSD || (__FreeBSD_version < 500112) */ -+#if !defined(FREEBSD) || (__FreeBSD_version < 601103) - struct hostent *gethostbyname_r(const char *name, struct hostent *result, - char *buffer, int buflen, int *h_errnop); -+#endif /* !defined(FREEBSD) || (__FreeBSD_version < 601103) */ - #endif - - #endif /* __OSL_SYSTEM_H__ */ diff --git a/editors/openoffice.org-1.0/files/patch-sal+rtl+source+strtmpl.c b/editors/openoffice.org-1.0/files/patch-sal+rtl+source+strtmpl.c deleted file mode 100644 index 7630ff8cf8c1..000000000000 --- a/editors/openoffice.org-1.0/files/patch-sal+rtl+source+strtmpl.c +++ /dev/null @@ -1,19 +0,0 @@ ---- sal/rtl/source/strtmpl.c.orig Mon Mar 11 01:28:38 2002 -+++ sal/rtl/source/strtmpl.c Mon Mar 11 01:30:42 2002 -@@ -1104,10 +1104,12 @@ - } - else if ( *pStr == '+' ) - { -- if ( bExp && (nExp != 0) ) -- break; -- if ( fRet != 0.0 ) -- break; -+ if ( bExp ) { -+ if ( nExp != 0 ) -+ break; -+ } -+ else if ( fRet != 0.0 ) -+ break; - } - /* Exponent separator */ - else if ( (*pStr == 'e') || (*pStr == 'E') ) diff --git a/editors/openoffice.org-1.0/files/patch-sal+textenc+tcvtest1.tab b/editors/openoffice.org-1.0/files/patch-sal+textenc+tcvtest1.tab deleted file mode 100644 index 3fd7b4a43560..000000000000 --- a/editors/openoffice.org-1.0/files/patch-sal+textenc+tcvtest1.tab +++ /dev/null @@ -1,173 +0,0 @@ ---- sal/textenc/tcvtest1.tab.orig Fri Oct 12 13:44:53 2001 -+++ sal/textenc/tcvtest1.tab Tue Feb 25 16:47:50 2003 -@@ -4328,3 +4328,170 @@ - "koi8-r", - RTL_TEXTENCODING_INFO_ASCII | RTL_TEXTENCODING_INFO_MIME }; - /* SCRIPT_CYRILLIC, pc code page 866 (855?), mac encoding 7 */ -+ -+/* ======================================================================= */ -+ -+/* KOI8_U */ -+/* Standard Charset for Ukrainian Cyrillic */ -+/* 1-Byte, 0x00-0x7F ASCII ohne Ausnahme */ -+/* Convert-Tables: typed per hand */ -+/* Last-Changes from us: */ -+ -+#define KOI8UUNI_START 0x80 -+#define KOI8UUNI_END 0xFF -+static sal_uInt16 const aImplKOI8UToUniTab[KOI8UUNI_END - KOI8UUNI_START + 1] = -+{ -+/* 0 1 2 3 4 5 6 7 */ -+/* 8 9 A B C D E F */ -+ 0x2500, 0x2502, 0x250C, 0x2510, 0x2514, 0x2518, 0x251C, 0x2524, /* 0x80 */ -+ 0x252C, 0x2534, 0x253C, 0x2580, 0x2584, 0x2588, 0x258C, 0x2590, /* 0x80 */ -+ 0x2591, 0x2592, 0x2593, 0x2320, 0x25A0, 0x2219, 0x221A, 0x2248, /* 0x90 */ -+ 0x2264, 0x2265, 0x00A0, 0x2321, 0x00B0, 0x00B2, 0x00B7, 0x00F7, /* 0x90 */ -+ 0x2550, 0x2551, 0x2552, 0x0451, 0x0454, 0x2554, 0x0456, 0x0457, /* 0xA0 */ -+ 0x2557, 0x2558, 0x2559, 0x255A, 0x255B, 0x0491, 0x255D, 0x255E, /* 0xA0 */ -+ 0x255F, 0x2560, 0x2561, 0x0401, 0x0404, 0x2563, 0x0406, 0x0407, /* 0xB0 */ -+ 0x2566, 0x2567, 0x2568, 0x2569, 0x256A, 0x0490, 0x256C, 0x00A9, /* 0xB0 */ -+ 0x044E, 0x0430, 0x0431, 0x0446, 0x0434, 0x0435, 0x0444, 0x0433, /* 0xC0 */ -+ 0x0445, 0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E, /* 0xC0 */ -+ 0x043F, 0x044F, 0x0440, 0x0441, 0x0442, 0x0443, 0x0436, 0x0432, /* 0xD0 */ -+ 0x044C, 0x044B, 0x0437, 0x0448, 0x044D, 0x0449, 0x0447, 0x044A, /* 0xD0 */ -+ 0x042E, 0x0410, 0x0411, 0x0426, 0x0414, 0x0415, 0x0424, 0x0413, /* 0xE0 */ -+ 0x0425, 0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E, /* 0xE0 */ -+ 0x041F, 0x042F, 0x0420, 0x0421, 0x0422, 0x0423, 0x0416, 0x0412, /* 0xF0 */ -+ 0x042C, 0x042B, 0x0417, 0x0428, 0x042D, 0x0429, 0x0427, 0x042A /* 0xF0 */ -+}; -+ -+/* ----------------------------------------------------------------------- */ -+ -+#define KOI8UCHAR_START 0x0410 -+#define KOI8UCHAR_END 0x044F -+static sal_uChar const aImplKOI8UToCharTab[KOI8UCHAR_END - KOI8UCHAR_START + 1] = -+{ -+/* 0 1 2 3 4 5 6 7 */ -+/* 8 9 A B C D E F */ -+ 0xE1, 0xE2, 0xF7, 0xE7, 0xE4, 0xE5, 0xF6, 0xFA, /* 0x0410 */ -+ 0xE9, 0xEA, 0xEB, 0xEC, 0xED, 0xEE, 0xEF, 0xF0, /* 0x0410 */ -+ 0xF2, 0xF3, 0xF4, 0xF5, 0xE6, 0xE8, 0xE3, 0xFE, /* 0x0420 */ -+ 0xFB, 0xFD, 0xFF, 0xF9, 0xF8, 0xFC, 0xE0, 0xF1, /* 0x0420 */ -+ 0xC1, 0xC2, 0xD7, 0xC7, 0xC4, 0xC5, 0xD6, 0xDA, /* 0x0430 */ -+ 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, /* 0x0430 */ -+ 0xD2, 0xD3, 0xD4, 0xD5, 0xC6, 0xC8, 0xC3, 0xDE, /* 0x0440 */ -+ 0xDB, 0xDD, 0xDF, 0xD9, 0xD8, 0xDC, 0xC0, 0xD1 /* 0x0440 */ -+}; -+ -+/* ----------------------------------------------------------------------- */ -+ -+#define KOI8UTOCHARTABEX_COUNT 72 -+static ImplUniCharTabData const aImplKOI8UToCharTabEx[KOI8UTOCHARTABEX_COUNT] = -+{ -+ { 0x00A0, 0x9A }, -+ { 0x00A9, 0xBF }, -+ { 0x00B0, 0x9C }, -+ { 0x00B2, 0x9D }, -+ { 0x00B7, 0x9E }, -+ { 0x00F7, 0x9F }, -+ { 0x0401, 0xB3 }, -+ { 0x0404, 0xB4 }, -+ { 0x0406, 0xB6 }, -+ { 0x0407, 0xB7 }, -+ { 0x0451, 0xA3 }, -+ { 0x0454, 0xA4 }, -+ { 0x0456, 0xA6 }, -+ { 0x0457, 0xA7 }, -+ { 0x0490, 0xBD }, -+ { 0x0491, 0xAD }, -+ { 0x2219, 0x95 }, -+ { 0x221A, 0x96 }, -+ { 0x2248, 0x97 }, -+ { 0x2264, 0x98 }, -+ { 0x2265, 0x99 }, -+ { 0x2320, 0x93 }, -+ { 0x2321, 0x9B }, -+ { 0x2500, 0x80 }, -+ { 0x2502, 0x81 }, -+ { 0x250C, 0x82 }, -+ { 0x2510, 0x83 }, -+ { 0x2514, 0x84 }, -+ { 0x2518, 0x85 }, -+ { 0x251C, 0x86 }, -+ { 0x2524, 0x87 }, -+ { 0x252C, 0x88 }, -+ { 0x2534, 0x89 }, -+ { 0x253C, 0x8A }, -+ { 0x2550, 0xA0 }, -+ { 0x2551, 0xA1 }, -+ { 0x2552, 0xA2 }, -+ { 0x2553, 0xA4 }, -+ { 0x2554, 0xA5 }, -+ { 0x2555, 0xA6 }, -+ { 0x2556, 0xA7 }, -+ { 0x2557, 0xA8 }, -+ { 0x2558, 0xA9 }, -+ { 0x2559, 0xAA }, -+ { 0x255A, 0xAB }, -+ { 0x255B, 0xAC }, -+ { 0x255C, 0xAD }, -+ { 0x255D, 0xAE }, -+ { 0x255E, 0xAF }, -+ { 0x255F, 0xB0 }, -+ { 0x2560, 0xB1 }, -+ { 0x2561, 0xB2 }, -+ { 0x2562, 0xB4 }, -+ { 0x2563, 0xB5 }, -+ { 0x2564, 0xB6 }, -+ { 0x2565, 0xB7 }, -+ { 0x2566, 0xB8 }, -+ { 0x2567, 0xB9 }, -+ { 0x2568, 0xBA }, -+ { 0x2569, 0xBB }, -+ { 0x256A, 0xBC }, -+ { 0x256B, 0xBD }, -+ { 0x256C, 0xBE }, -+ { 0x2580, 0x8B }, -+ { 0x2584, 0x8C }, -+ { 0x2588, 0x8D }, -+ { 0x258C, 0x8E }, -+ { 0x2590, 0x8F }, -+ { 0x2591, 0x90 }, -+ { 0x2592, 0x91 }, -+ { 0x2593, 0x92 }, -+ { 0x25A0, 0x94 } -+}; -+ -+/* ----------------------------------------------------------------------- */ -+ -+static ImplByteConvertData const aImplKOI8UByteCvtData = -+{ -+ aImplKOI8UToUniTab, -+ NULL, -+ KOI8UUNI_START, KOI8UUNI_END, -+ NOTABUNI_START, NOTABUNI_END, -+ aImplKOI8UToCharTab, -+ NULL, -+ aImplKOI8UToCharTabEx, -+ KOI8UCHAR_START, KOI8UCHAR_END, -+ NOTABCHAR_START, NOTABCHAR_END, -+ KOI8UTOCHARTABEX_COUNT -+}; -+ -+/* ----------------------------------------------------------------------- */ -+ -+static ImplTextEncodingData const aImplKOI8UTextEncodingData -+ = { { &aImplKOI8UByteCvtData, -+ ImplCharToUnicode, -+ ImplUnicodeToChar, -+ NULL, -+ NULL, -+ NULL, -+ NULL, -+ NULL, -+ NULL }, -+ RTL_TEXTENCODING_KOI8_U, -+ 1, -+ 1, -+ 1, -+ 204, -+ "koi8-u", -+ "koi8-u", -+ RTL_TEXTENCODING_INFO_ASCII | RTL_TEXTENCODING_INFO_MIME }; -+ /* SCRIPT_CYRILLIC, pc code page 866 (855?), mac encoding 7 */ diff --git a/editors/openoffice.org-1.0/files/patch-sal+textenc+tencinfo.c b/editors/openoffice.org-1.0/files/patch-sal+textenc+tencinfo.c deleted file mode 100644 index d91b0fecccc6..000000000000 --- a/editors/openoffice.org-1.0/files/patch-sal+textenc+tencinfo.c +++ /dev/null @@ -1,37 +0,0 @@ ---- sal/textenc/tencinfo.c.orig Wed Jul 31 11:44:35 2002 -+++ sal/textenc/tencinfo.c Wed Jul 31 11:45:47 2002 -@@ -532,6 +532,7 @@ - static ImplStrCharsetDef const aUnixCharsetKOI8Tab[] = - { - { "r", RTL_TEXTENCODING_KOI8_R }, -+ { "u", RTL_TEXTENCODING_KOI8_U }, - { NULL, RTL_TEXTENCODING_DONTKNOW } - }; - -@@ -695,6 +695,10 @@ - /* characters. The function search for the first equal string in */ - /* the table. In this table are only the most used mime types. */ - /* Sort order: important */ -+ -+ if (pMimeCharset == NULL) -+ pMimeCharset = "usascii"; -+ - static ImplStrCharsetDef const aVIPMimeCharsetTab[] = - { - { "usascii", RTL_TEXTENCODING_ASCII_US }, -@@ -741,6 +742,7 @@ - { "windows1256", RTL_TEXTENCODING_MS_1256 }, - { "windows1257", RTL_TEXTENCODING_MS_1257 }, - { "windows1258", RTL_TEXTENCODING_MS_1258 }, -+ { "koi8u", RTL_TEXTENCODING_KOI8_U }, - { NULL, RTL_TEXTENCODING_DONTKNOW } - }; - -@@ -815,6 +817,7 @@ - { "iso10646us", RTL_TEXTENCODING_ASCII_US }, - { "iso646irv", RTL_TEXTENCODING_ASCII_US }, - { "cskoi8r", RTL_TEXTENCODING_KOI8_R }, -+ { "cskoi8u", RTL_TEXTENCODING_KOI8_U }, - { "ibm437", RTL_TEXTENCODING_IBM_437 }, - { "cp437", RTL_TEXTENCODING_IBM_437 }, - { "437", RTL_TEXTENCODING_IBM_437 }, diff --git a/editors/openoffice.org-1.0/files/patch-sal+textenc+textenc.c b/editors/openoffice.org-1.0/files/patch-sal+textenc+textenc.c deleted file mode 100644 index 47cfbbdca8bd..000000000000 --- a/editors/openoffice.org-1.0/files/patch-sal+textenc+textenc.c +++ /dev/null @@ -1,12 +0,0 @@ ---- sal/textenc/textenc.c.orig Mon Feb 24 17:46:29 2003 -+++ sal/textenc/textenc.c Tue Feb 25 16:51:28 2003 -@@ -254,7 +254,8 @@ - &aImplJISX0212TextEncodingData, /* JIS_X_0212 */ - &aImplMS1361TextEncodingData, /* MS_1361 */ - &aImplGb18030TextEncodingData, /* GB_18030 */ -- &aImplBig5HkscsTextEncodingData }; /* BIG5_HKSCS */ -+ &aImplBig5HkscsTextEncodingData, /* BIG5_HKSCS */ -+ &aImplKOI8UTextEncodingData }; /* KOI8_U */ - OSL_ENSURE(nEncoding >= RTL_TEXTENCODING_DONTKNOW - && nEncoding <= RTL_TEXTENCODING_UNICODE, - "specification violation"); diff --git a/editors/openoffice.org-1.0/files/patch-sal+workben+makefile.mk b/editors/openoffice.org-1.0/files/patch-sal+workben+makefile.mk deleted file mode 100644 index 103ddd1b4166..000000000000 --- a/editors/openoffice.org-1.0/files/patch-sal+workben+makefile.mk +++ /dev/null @@ -1,29 +0,0 @@ ---- sal/workben/makefile.mk.orig Tue May 15 14:11:20 2001 -+++ sal/workben/makefile.mk Sun Mar 10 23:46:59 2002 -@@ -113,7 +113,7 @@ - - .IF "$(TESTAPP)" == "salstattest" - -- CFLAGS+= /DUSE_SAL_STATIC -+ CFLAGS+= -DUSE_SAL_STATIC - - OBJFILES= $(OBJ)$/salstattest.obj - -@@ -325,7 +325,7 @@ - # tgetpwnam - # - .IF "$(TESTAPP)" == "tgetpwnam" --.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD" -+.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - - CXXFILES= tgetpwnam.cxx - OBJFILES= $(OBJ)$/tgetpwnam.obj -@@ -335,7 +335,7 @@ - APP5STDLIBS=$(SALLIB) - APP5DEPN= $(SLB)$/sal.lib - --.ENDIF # (sco | netbsd) -+.ENDIF # (sco | netbsd | freebsd) - .ENDIF # tgetpwname - - # --- Targets ------------------------------------------------------ diff --git a/editors/openoffice.org-1.0/files/patch-salhelper+source+gcc2_freebsd_intel.map b/editors/openoffice.org-1.0/files/patch-salhelper+source+gcc2_freebsd_intel.map deleted file mode 100644 index 15efdfc2a5d1..000000000000 --- a/editors/openoffice.org-1.0/files/patch-salhelper+source+gcc2_freebsd_intel.map +++ /dev/null @@ -1,31 +0,0 @@ ---- /dev/null Thu Jun 6 20:06:24 2002 -+++ salhelper/source/gcc2_freebsd_intel.map Thu Jun 6 20:02:18 2002 -@@ -0,0 +1,28 @@ -+SALHLP_1_0 { -+global: -+GetVersionInfo; -+_._Q28salhelper18ORealDynamicLoader; -+__Q29salhelper18ORealDynamicLoaderPPQ29salhelper18ORealDynamicLoaderRCQ23rtl8OUStringT2PvT4; -+__tfQ29salhelper18ORealDynamicLoader; -+__tiQ29salhelper18ORealDynamicLoader; -+__vt_Q29salhelper18ORealDynamicLoader; -+_fini; -+_init; -+acquire__Q29salhelper18ORealDynamicLoader; -+getApi__CQ29salhelper18ORealDynamicLoader; -+newInstance__Q29salhelper18ORealDynamicLoaderPPQ29salhelper18ORealDynamicLoaderRCQ23rtl8OUStringT2; -+release__Q29salhelper18ORealDynamicLoader; -+_._Q29salhelper21SimpleReferenceObject; -+__Q29salhelper21SimpleReferenceObject; -+__dl__Q29salhelper21SimpleReferenceObjectPv; -+__dl__Q29salhelper21SimpleReferenceObjectPvRC9nothrow_t; -+__nw__Q29salhelper21SimpleReferenceObjectUi; -+__nw__Q29salhelper21SimpleReferenceObjectUiRC9nothrow_t; -+__tfQ29salhelper21SimpleReferenceObject; -+__tiQ29salhelper21SimpleReferenceObject; -+__vt_Q29salhelper21SimpleReferenceObject; -+acquire__Q29salhelper21SimpleReferenceObject; -+release__Q29salhelper21SimpleReferenceObject; -+local: -+*; -+}; diff --git a/editors/openoffice.org-1.0/files/patch-salhelper+source+gcc3_freebsd_intel.map b/editors/openoffice.org-1.0/files/patch-salhelper+source+gcc3_freebsd_intel.map deleted file mode 100644 index 0b7d6c6ddf86..000000000000 --- a/editors/openoffice.org-1.0/files/patch-salhelper+source+gcc3_freebsd_intel.map +++ /dev/null @@ -1,34 +0,0 @@ ---- /dev/null Thu Jun 6 20:06:34 2002 -+++ salhelper/source/gcc3_freebsd_intel.map Thu Jun 6 20:02:29 2002 -@@ -0,0 +1,31 @@ -+UDK_3_0_0 { -+ global: -+GetVersionInfo; -+_DYNAMIC; -+_GLOBAL_OFFSET_TABLE_; -+_ZN9salhelper18ORealDynamicLoader11newInstanceEPPS0_RKN3rtl8OUStringES6_; -+_ZN9salhelper18ORealDynamicLoader7acquireEv; -+_ZN9salhelper18ORealDynamicLoader7releaseEv; -+_ZN9salhelper18ORealDynamicLoaderC1EPPS0_RKN3rtl8OUStringES6_PvS7_; -+_ZN9salhelper18ORealDynamicLoaderC2EPPS0_RKN3rtl8OUStringES6_PvS7_; -+_ZN9salhelper18ORealDynamicLoaderD0Ev; -+_ZN9salhelper18ORealDynamicLoaderD1Ev; -+_ZN9salhelper18ORealDynamicLoaderD2Ev; -+_ZN9salhelper21SimpleReferenceObjectD0Ev; -+_ZN9salhelper21SimpleReferenceObjectD1Ev; -+_ZN9salhelper21SimpleReferenceObjectD2Ev; -+_ZN9salhelper21SimpleReferenceObjectdlEPv; -+_ZN9salhelper21SimpleReferenceObjectnwEj; -+_ZNK9salhelper18ORealDynamicLoader6getApiEv; -+_ZTVN9salhelper18ORealDynamicLoaderE; -+_ZTVN9salhelper21SimpleReferenceObjectE; -+__bss_start; -+_edata; -+_end; -+_fini; -+_init; -+component_getDescriptionFunc; -+ local: -+ *; -+}; -+ diff --git a/editors/openoffice.org-1.0/files/patch-salhelper+source+makefile.mk b/editors/openoffice.org-1.0/files/patch-salhelper+source+makefile.mk deleted file mode 100644 index aa0f41647531..000000000000 --- a/editors/openoffice.org-1.0/files/patch-salhelper+source+makefile.mk +++ /dev/null @@ -1,13 +0,0 @@ ---- salhelper/source/makefile.mk.orig Wed Nov 14 14:19:21 2001 -+++ salhelper/source/makefile.mk Sun Mar 3 17:58:15 2002 -@@ -109,6 +109,10 @@ - SHL1VERSIONMAP=lngi.map - .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3" - SHL1VERSIONMAP=gcc3_linux_intel.map -+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc2" -+SHL1VERSIONMAP=gcc2_freebsd_intel.map -+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3" -+SHL1VERSIONMAP=gcc3_freebsd_intel.map - .ENDIF - - diff --git a/editors/openoffice.org-1.0/files/patch-salhelper+test+rtti+makefile.mk b/editors/openoffice.org-1.0/files/patch-salhelper+test+rtti+makefile.mk deleted file mode 100644 index 3abd9347b78e..000000000000 --- a/editors/openoffice.org-1.0/files/patch-salhelper+test+rtti+makefile.mk +++ /dev/null @@ -1,13 +0,0 @@ ---- salhelper/test/rtti/makefile.mk.orig Sat Jul 20 23:11:56 2002 -+++ salhelper/test/rtti/makefile.mk Sat Jul 20 23:12:01 2002 -@@ -116,6 +116,10 @@ - SHL1VERSIONMAP= sols.map - .ELIF "$(OS)$(CPU)"=="LINUXI" - SHL1VERSIONMAP= lngi.map -+.ELIF "$(OS)$(CPU)$(COMNAME)" == "GCCFREEBSDIgcc2" -+SHL1VERSIONMAP= gcc2_freebsd_intel.map -+.ELIF "$(OS)$(CPU)$(COMNAME)" == "GCCFREEBSDIgcc3" -+SHL1VERSIONMAP= gcc3_freebsd_intel.map - .ENDIF - - diff --git a/editors/openoffice.org-1.0/files/patch-sc+source+core+data+cell.cxx b/editors/openoffice.org-1.0/files/patch-sc+source+core+data+cell.cxx deleted file mode 100644 index 15b6118abc52..000000000000 --- a/editors/openoffice.org-1.0/files/patch-sc+source+core+data+cell.cxx +++ /dev/null @@ -1,11 +0,0 @@ ---- sc/source/core/data/cell.cxx.orig Sun Jul 21 00:39:25 2002 -+++ sc/source/core/data/cell.cxx Sun Jul 21 00:39:26 2002 -@@ -75,7 +75,7 @@ - #include <mac_end.h> - #endif - --#ifdef SOLARIS -+#if defined (SOLARIS) || defined (FREEBSD) - #include <ieeefp.h> - #elif ( defined ( LINUX ) && ( GLIBC < 2 ) ) - #include <i386/ieeefp.h> diff --git a/editors/openoffice.org-1.0/files/patch-scp+source+player+player.scp b/editors/openoffice.org-1.0/files/patch-scp+source+player+player.scp deleted file mode 100644 index d1fbf56ad0d3..000000000000 --- a/editors/openoffice.org-1.0/files/patch-scp+source+player+player.scp +++ /dev/null @@ -1,20 +0,0 @@ ---- scp/source/player/player.scp.orig Sun Jul 21 00:30:27 2002 -+++ scp/source/player/player.scp Sun Jul 21 00:30:28 2002 -@@ -62,7 +62,7 @@ - // directories - //////////////////////// - --#ifdef LINUX -+#if defined(LINUX) || defined(FREEBSD) - - Directory GID_DIR_KDE2 - ParentID = PREDEFINED_HOMEDIR; -@@ -701,7 +701,7 @@ - Name = "gnomeappplayer.zip"; - End - --#ifdef LINUX -+#if defined(LINUX) || defined(FREEBSD) - - File GID_FILE_EXTRA_KDEAPPPLAYER - Dir = GID_DIR_KDE2_SHARE_APPLNK_STAR; diff --git a/editors/openoffice.org-1.0/files/patch-scptools+source+linker+searchcache b/editors/openoffice.org-1.0/files/patch-scptools+source+linker+searchcache deleted file mode 100644 index 1a2067f1fa61..000000000000 --- a/editors/openoffice.org-1.0/files/patch-scptools+source+linker+searchcache +++ /dev/null @@ -1,27 +0,0 @@ ---- scptools/source/linker/searchcache.hxx.orig Thu Mar 27 23:21:09 2003 -+++ scptools/source/linker/searchcache.hxx Thu Mar 27 23:21:40 2003 -@@ -72,11 +72,11 @@ - // types - /////////////////////////////////////////////////////////////////////////////// - --DECLARE_LIST( FileList, ByteString* ) -+DECLARE_LIST( SCacheFileList, ByteString* ) - struct Include - { - ByteString aBaseDir; -- FileList aFileLst; -+ SCacheFileList aFileLst; - }; - DECLARE_LIST( IncludeList, Include* ) - ---- scptools/source/linker/searchcache.cxx.orig Thu Mar 27 23:23:04 2003 -+++ scptools/source/linker/searchcache.cxx Thu Mar 27 23:23:51 2003 -@@ -218,7 +218,7 @@ - rPath += aDelim; - } - --void ScanFileList( const ByteString& rPath, FileList& rLst ) -+void ScanFileList( const ByteString& rPath, SCacheFileList& rLst ) - { - Dir aFiles( rPath, FSYS_KIND_FILE ); - for( USHORT i = 0; i < aFiles.Count(); ++i ) diff --git a/editors/openoffice.org-1.0/files/patch-scptools+source+linker+ziplst.cxx b/editors/openoffice.org-1.0/files/patch-scptools+source+linker+ziplst.cxx deleted file mode 100644 index d15aba2f7b2e..000000000000 --- a/editors/openoffice.org-1.0/files/patch-scptools+source+linker+ziplst.cxx +++ /dev/null @@ -1,19 +0,0 @@ ---- scptools/source/linker/ziplst.cxx.orig Sun Jul 21 00:32:40 2002 -+++ scptools/source/linker/ziplst.cxx Sun Jul 21 00:32:43 2002 -@@ -278,6 +278,7 @@ - #define OS_SOLI "solia" - #define OS_WINDOWS "windows" - #define OS_LINUX "linux" -+#define OS_FREEBSD "freebsd" - #define OS_OS2 "os2" - - ByteString _OS2Alpha( const ByteString& rStr ) -@@ -290,6 +291,8 @@ - return OS_SOLI; - else if( rStr.CompareIgnoreCaseToAscii("unxlngi",7) == COMPARE_EQUAL ) - return OS_LINUX; -+ else if( rStr.CompareIgnoreCaseToAscii("unxfbsdi",7) == COMPARE_EQUAL ) -+ return OS_FREEBSD; - else if( rStr.CompareIgnoreCaseToAscii("os2icci",7) == COMPARE_EQUAL ) - return OS_OS2; - diff --git a/editors/openoffice.org-1.0/files/patch-setup2+inc+fields.hxx b/editors/openoffice.org-1.0/files/patch-setup2+inc+fields.hxx deleted file mode 100644 index f2637f906727..000000000000 --- a/editors/openoffice.org-1.0/files/patch-setup2+inc+fields.hxx +++ /dev/null @@ -1,10 +0,0 @@ ---- setup2/inc/fields.hxx.orig Sun Jul 21 00:19:07 2002 -+++ setup2/inc/fields.hxx Sun Jul 21 00:19:12 2002 -@@ -104,6 +104,7 @@ - extern char const VALUE_YES_IF_HPUX_HP9000[]; - extern char const VALUE_YES_IF_AIX_RS6000[]; - extern char const VALUE_YES_IF_LINUX_X86[]; -+extern char const VALUE_YES_IF_FREEBSD_X86[]; - extern char const VALUE_KEEP_OLD_VERSION[]; - extern char const VALUE_NETWORK[]; - extern char const VALUE_NO[]; diff --git a/editors/openoffice.org-1.0/files/patch-setup2+mow+source+loader+loader.c b/editors/openoffice.org-1.0/files/patch-setup2+mow+source+loader+loader.c deleted file mode 100644 index f15dd902f548..000000000000 --- a/editors/openoffice.org-1.0/files/patch-setup2+mow+source+loader+loader.c +++ /dev/null @@ -1,30 +0,0 @@ ---- setup2/mow/source/loader/loader.c.orig Thu Oct 31 21:46:52 2002 -+++ setup2/mow/source/loader/loader.c Wed Jan 22 14:56:44 2003 -@@ -85,6 +85,12 @@ - # include <sys/statvfs.h> - #endif - -+#ifdef FREEBSD -+#if (OSVERSION < 500000) -+#define iswspace(c) ((c)==' ' || (c)=='\t' || (c)=='\n') -+#endif -+#endif -+ - #include "bitmap" - #include "logo.xpm" - -@@ -650,6 +656,14 @@ - " export LD_LIBRARY_PATH\n" \ - " ;;\n" \ - " Linux)\n" \ -+" LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \ -+" export LD_LIBRARY_PATH\n" \ -+" ;;\n" \ -+" FreeBSD)\n" \ -+" LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \ -+" export LD_LIBRARY_PATH\n" \ -+" ;;\n" \ -+" NetBSD)\n" \ - " LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \ - " export LD_LIBRARY_PATH\n" \ - " ;;\n" \ diff --git a/editors/openoffice.org-1.0/files/patch-setup2+mow+source+loader+makefile.mk b/editors/openoffice.org-1.0/files/patch-setup2+mow+source+loader+makefile.mk deleted file mode 100644 index 8c143732b985..000000000000 --- a/editors/openoffice.org-1.0/files/patch-setup2+mow+source+loader+makefile.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- setup2/mow/source/loader/makefile.mk.orig Sun Mar 3 01:45:18 2002 -+++ setup2/mow/source/loader/makefile.mk Sun Mar 3 01:45:22 2002 -@@ -85,7 +85,7 @@ - APP1NOSAL=TRUE - APP1TARGET= $(TARGET) - APP1OBJS= $(OBJFILES) --APP1STDLIBS= $(SVUNZIPLIB) $(LOADERLIB) -+APP1STDLIBS= $(SVUNZIPLIB) $(LOADERLIB) -lX11 - - .ENDIF # "$(OS)"=="MACOSX" - diff --git a/editors/openoffice.org-1.0/files/patch-setup2+patch+makefile.mk b/editors/openoffice.org-1.0/files/patch-setup2+patch+makefile.mk deleted file mode 100644 index 4614208daac9..000000000000 --- a/editors/openoffice.org-1.0/files/patch-setup2+patch+makefile.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- setup2/patch/makefile.mk.orig Sun Jul 21 00:21:46 2002 -+++ setup2/patch/makefile.mk Sun Jul 21 00:21:52 2002 -@@ -92,7 +92,7 @@ - .IF "$(OS)"=="SOLARIS" - STATIC_LIBS+= -Bdynamic -lnsl -lsocket -lposix4 - .ENDIF --.IF "$(OS)"=="LINUX" -+.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD" - STATIC_LIBS+= -Bdynamic -lcrypt - .ENDIF - .ELSE diff --git a/editors/openoffice.org-1.0/files/patch-setup2+script+setupserver b/editors/openoffice.org-1.0/files/patch-setup2+script+setupserver deleted file mode 100644 index d637810f69b7..000000000000 --- a/editors/openoffice.org-1.0/files/patch-setup2+script+setupserver +++ /dev/null @@ -1,10 +0,0 @@ ---- setup2/script/setupserver.orig Sat Apr 6 12:22:21 2002 -+++ setup2/script/setupserver Wed May 1 22:30:13 2002 -@@ -234,6 +234,7 @@ - sd_platform=`uname -s` - case $sd_platform in - SCO_SV) test=/bin/test ;; -+ FreeBSD) test=/bin/test ;; - NetBSD) test=/bin/test ;; - *) test=/usr/bin/test ;; - esac diff --git a/editors/openoffice.org-1.0/files/patch-setup2+source+compiler+decltor.cxx b/editors/openoffice.org-1.0/files/patch-setup2+source+compiler+decltor.cxx deleted file mode 100644 index 0f828b694ac8..000000000000 --- a/editors/openoffice.org-1.0/files/patch-setup2+source+compiler+decltor.cxx +++ /dev/null @@ -1,20 +0,0 @@ ---- setup2/source/compiler/decltor.cxx.orig Sun Jul 21 00:25:00 2002 -+++ setup2/source/compiler/decltor.cxx Sun Jul 21 00:24:06 2002 -@@ -304,6 +304,7 @@ - m_xCompiler->GetOsType() == com::sun::star::setup::OSType_UNIX_SOLSG || - m_xCompiler->GetOsType() == com::sun::star::setup::OSType_UNIX_SOLIG || - m_xCompiler->GetOsType() == com::sun::star::setup::OSType_UNIX_LINUX || -+ m_xCompiler->GetOsType() == com::sun::star::setup::OSType_UNIX_FREEBSD || - m_xCompiler->GetOsType() == com::sun::star::setup::OSType_UNIX_HP || - m_xCompiler->GetOsType() == com::sun::star::setup::OSType_UNIX_SCO; - } ---- setup2/source/compiler/fields.cxx.orig Sun Jul 21 00:25:42 2002 -+++ setup2/source/compiler/fields.cxx Sun Jul 21 00:25:45 2002 -@@ -105,6 +105,7 @@ - char const VALUE_YES_IF_HPUX_HP9000[] = "YES_IF_HPUX_HP9000"; - char const VALUE_YES_IF_AIX_RS6000[] = "YES_IF_AIX_RS6000"; - char const VALUE_YES_IF_LINUX_X86[] = "YES_IF_LINUX_X86"; -+char const VALUE_YES_IF_FREEBSD_X86[] = "YES_IF_FREEBSD_X86"; - char const VALUE_KEEP_OLD_VERSION[] = "KEEP_OLD_VERSION"; - char const VALUE_NETWORK[] = "NETWORK"; - char const VALUE_NO[] = "NO"; diff --git a/editors/openoffice.org-1.0/files/patch-setup2+source+custom+jvmsetup+jvmdlg.cxx b/editors/openoffice.org-1.0/files/patch-setup2+source+custom+jvmsetup+jvmdlg.cxx deleted file mode 100644 index f8a044ad3b62..000000000000 --- a/editors/openoffice.org-1.0/files/patch-setup2+source+custom+jvmsetup+jvmdlg.cxx +++ /dev/null @@ -1,11 +0,0 @@ ---- setup2/source/custom/jvmsetup/jvmdlg.cxx.orig Sat Jul 20 23:33:50 2002 -+++ setup2/source/custom/jvmsetup/jvmdlg.cxx Sat Jul 20 23:34:00 2002 -@@ -154,7 +154,7 @@ - - #if defined (OS2) - maHelpEdit.SetText( ResId(STR_HELP_TEXT_OS2, pResMgr) ); --#elif defined (LINUX) -+#elif defined (LINUX) || defined (FREEBSD) || defined (NETBSD) - maHelpEdit.SetText( ResId(STR_HELP_TEXT_LINUX, pResMgr) ); - #elif defined (SOLARIS) - maHelpEdit.SetText( ResId(STR_HELP_TEXT_SOLARIS, pResMgr) ); diff --git a/editors/openoffice.org-1.0/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh b/editors/openoffice.org-1.0/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh deleted file mode 100644 index 9caaf49ec0d2..000000000000 --- a/editors/openoffice.org-1.0/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh +++ /dev/null @@ -1,10 +0,0 @@ ---- setup2/source/custom/jvmsetup/loader/jvmsetup.sh.orig Sat Apr 6 12:22:21 2002 -+++ setup2/source/custom/jvmsetup/loader/jvmsetup.sh Wed May 1 22:38:21 2002 -@@ -66,6 +66,7 @@ - case $sd_platform in - SCO_SV) test=/bin/test ;; - NetBSD) test=/bin/test ;; -+ FreeBSD) test=/bin/test ;; - *) test=/usr/bin/test ;; - esac - diff --git a/editors/openoffice.org-1.0/files/patch-setup2+source+service+interface.cxx b/editors/openoffice.org-1.0/files/patch-setup2+source+service+interface.cxx deleted file mode 100644 index 3a7d3d70c689..000000000000 --- a/editors/openoffice.org-1.0/files/patch-setup2+source+service+interface.cxx +++ /dev/null @@ -1,35 +0,0 @@ ---- setup2/source/service/interface.cxx.orig Sat Jul 20 23:29:33 2002 -+++ setup2/source/service/interface.cxx Sat Jul 20 23:30:02 2002 -@@ -126,6 +126,8 @@ - aExtension = "UNIX_SOLIG"; - else if( eType == OSType_UNIX_LINUX ) - aExtension = "UNIX_LINUX"; -+ else if( eType == OSType_UNIX_LINUX ) -+ aExtension = "UNIX_FREEBSD"; - else if( eType == OSType_UNIX_HP ) - aExtension = "UNIX_HP"; - else if( eType == OSType_UNIX_SCO ) -@@ -238,6 +240,7 @@ - readOSConfiguration( OSType_UNIX_SOLSG ); - readOSConfiguration( OSType_UNIX_SOLIG ); - readOSConfiguration( OSType_UNIX_LINUX ); -+ readOSConfiguration( OSType_UNIX_FREEBSD ); - readOSConfiguration( OSType_UNIX_HP ); - readOSConfiguration( OSType_UNIX_SCO ); - fprintf( stdout, "\n" ); -@@ -577,6 +580,7 @@ - case OSType_UNIX_SOLSG: - case OSType_UNIX_SOLIG: - case OSType_UNIX_LINUX: -+ case OSType_UNIX_FREEBSD: - case OSType_UNIX_HP: - case OSType_UNIX_SCO: - return ByteString(UNX_README_FILE_NAME); -@@ -599,6 +603,7 @@ - case OSType_UNIX_SOLSG: - case OSType_UNIX_SOLIG: - case OSType_UNIX_LINUX: -+ case OSType_UNIX_FREEBSD: - case OSType_UNIX_HP: - case OSType_UNIX_SCO: - return ByteString(UNX_LICENSE_FILE_NAME); diff --git a/editors/openoffice.org-1.0/files/patch-sfx2+source+appl+officeacceptthread.cxx b/editors/openoffice.org-1.0/files/patch-sfx2+source+appl+officeacceptthread.cxx deleted file mode 100644 index e99ad46303a5..000000000000 --- a/editors/openoffice.org-1.0/files/patch-sfx2+source+appl+officeacceptthread.cxx +++ /dev/null @@ -1,18 +0,0 @@ ---- sfx2/source/appl/officeacceptthread.cxx.orig Sat Jul 20 22:56:19 2002 -+++ sfx2/source/appl/officeacceptthread.cxx Sat Jul 20 22:56:54 2002 -@@ -123,13 +123,13 @@ - sal_Bool static isProcessRunning( ::vos::OProcess::TProcessInfo& aProcessInfo ) - { - int nRet; --#if defined (SOLARIS) || defined (IRIX) -+#if defined (SOLARIS) || defined (IRIX) || defined (FREEBSD) || defined (NETBSD) - int status; - nRet = waitpid(aProcessInfo.Ident, &status,WNOHANG); - #elif defined(LINUX) - nRet = kill(aProcessInfo.Ident, 0); - #endif --#if defined (LINUX) || defined (SOLARIS) || defined (IRIX) -+#if defined (LINUX) || defined (SOLARIS) || defined (IRIX) || defined (FREEBSD) || defined (NETBSD) - if ( nRet == 0 ) - return sal_True; // process is running - if ( nRet < 0 ) diff --git a/editors/openoffice.org-1.0/files/patch-shell+source+proxysettings+soprxsettings.cxx b/editors/openoffice.org-1.0/files/patch-shell+source+proxysettings+soprxsettings.cxx deleted file mode 100644 index ea41c8e28b7f..000000000000 --- a/editors/openoffice.org-1.0/files/patch-shell+source+proxysettings+soprxsettings.cxx +++ /dev/null @@ -1,18 +0,0 @@ -Index: shell/source/proxysettings/soprxsettings.cxx -=================================================================== -RCS file: /cvs/gsl/shell/source/proxysettings/Attic/soprxsettings.cxx,v -retrieving revision 1.4 -diff -u -r1.4 soprxsettings.cxx ---- shell/source/proxysettings/soprxsettings.cxx 15 Aug 2002 13:26:49 -0000 1.4 -+++ shell/source/proxysettings/soprxsettings.cxx 28 Jul 2005 22:03:30 -0000 -@@ -87,9 +87,7 @@ - #include <osl/thread.h> - #endif - --#ifndef MACOSX --#include <malloc.h> --#endif -+#include <stdlib.h> - #include <map> - #include <utility> - diff --git a/editors/openoffice.org-1.0/files/patch-solenv+bin+addsym.awk b/editors/openoffice.org-1.0/files/patch-solenv+bin+addsym.awk deleted file mode 100644 index c8e3464a75b1..000000000000 --- a/editors/openoffice.org-1.0/files/patch-solenv+bin+addsym.awk +++ /dev/null @@ -1,10 +0,0 @@ ---- solenv/bin/addsym.awk.kan Sat Jul 27 10:10:19 2002 -+++ solenv/bin/addsym.awk Thu Jul 25 14:49:30 2002 -@@ -62,6 +62,7 @@ - BEGIN { global_found = "false" } - /[ \t]*local:/ { global_found = "false" } - global_found == "true" { -+ print "\t\tGetVersionInfo;" - print "\t\t_ZTS*;" - print "\t\t_ZTI*;" - global_found = "false" } diff --git a/editors/openoffice.org-1.0/files/patch-solenv+bin+mapgen.pl b/editors/openoffice.org-1.0/files/patch-solenv+bin+mapgen.pl deleted file mode 100644 index 15514eaba176..000000000000 --- a/editors/openoffice.org-1.0/files/patch-solenv+bin+mapgen.pl +++ /dev/null @@ -1,21 +0,0 @@ ---- solenv/bin/mapgen.pl.orig Sat Jul 20 22:30:21 2002 -+++ solenv/bin/mapgen.pl Sat Jul 20 22:31:31 2002 -@@ -112,7 +112,7 @@ - - if ($ENV{OS} eq 'SOLARIS') { - &gen_sol; --} elsif ($ENV{OS} eq 'LINUX') { -+} elsif ($ENV{OS} eq 'LINUX' || $ENV{OS} eq 'FREEBSD') { - &gen_lnx; - } else { - &print_error ('Environment not set!!'); -@@ -169,7 +169,8 @@ - s/\n//; - $env_section = '1' and next if ((/^# SOLARIS #$/) && ($ENV{OS} eq 'SOLARIS')); - $env_section = '1' and next if ((/^# LINUX #$/) && ($ENV{OS} eq 'LINUX')); -- last if ($env_section && ((/^# SOLARIS #$/) || (/^# LINUX #$/))); -+ $env_section = '1' and next if ((/^# FREEBSD #$/) && ($ENV{OS} eq 'FREEBSD')); -+ last if ($env_section && ((/^# SOLARIS #$/) || (/^# LINUX #$/) || (/^# FREEBSD #$/))); - next if (!$_ || /^#/); - push(@filters, $_); - }; diff --git a/editors/openoffice.org-1.0/files/patch-solenv+inc+postset.mk b/editors/openoffice.org-1.0/files/patch-solenv+inc+postset.mk deleted file mode 100644 index fec8ea1b4ab6..000000000000 --- a/editors/openoffice.org-1.0/files/patch-solenv+inc+postset.mk +++ /dev/null @@ -1,22 +0,0 @@ ---- solenv/inc/postset.mk.orig Tue Jan 7 17:22:04 2003 -+++ solenv/inc/postset.mk Tue Feb 25 16:52:34 2003 -@@ -220,6 +220,19 @@ - RCLANGFLAGS_07+= -d RUSS - iso_07=ru - -+.IF "$(RES_UKRA)"!="" || "$(give_me_all_languages)"!="" -+alllangext+=38 -+ukra$(LANG_GUI)*=$(default$(LANG_GUI)) -+cmd_ukra:=ukra 38 -lgUKRAINIAN $(IBM_PC_852) $(ukra$(LANG_GUI)) -+lang_38=ukra -+longlang_38=ukrainian -+langext_38=38 -+rsclang_38=-lgUKRAINIAN $(IBM_PC_852) -+rescharset_38=$(ukra$(LANG_GUI)) -+RCLANGFLAGS_38+= -d UKRA -+iso_38=uk -+.ENDIF -+ - .IF "$(RES_POL)"!="" || "$(give_me_all_languages)"!="" - alllangext+=48 - .ENDIF diff --git a/editors/openoffice.org-1.0/files/patch-solenv+inc+startup+FREEBSD+macros.mk b/editors/openoffice.org-1.0/files/patch-solenv+inc+startup+FREEBSD+macros.mk deleted file mode 100644 index b624b834495c..000000000000 --- a/editors/openoffice.org-1.0/files/patch-solenv+inc+startup+FREEBSD+macros.mk +++ /dev/null @@ -1,5 +0,0 @@ ---- /dev/null Mon Mar 11 14:55:01 2002 -+++ solenv/inc/startup/FREEBSD/macros.mk Mon Mar 11 14:54:59 2002 -@@ -0,0 +1,2 @@ -+ -+.INCLUDE .NOINFER .IGNORE : $(INCFILENAME:d:d:d)UNIX$/macros.mk diff --git a/editors/openoffice.org-1.0/files/patch-solenv+inc+tg_ext.mk b/editors/openoffice.org-1.0/files/patch-solenv+inc+tg_ext.mk deleted file mode 100644 index dd3cc059345a..000000000000 --- a/editors/openoffice.org-1.0/files/patch-solenv+inc+tg_ext.mk +++ /dev/null @@ -1,12 +0,0 @@ ---- solenv/inc/tg_ext.mk.orig Fri May 10 14:12:12 2002 -+++ solenv/inc/tg_ext.mk Mon Jul 15 14:34:30 2002 -@@ -81,7 +81,9 @@ - .ENDIF # "$(GUI)"=="WNT" - - .IF "$(OS)"!="NETBSD" -+.IF "$(OS)"!="FREEBSD" - PATCHFLAGS=-b -+.ENDIF # "$(OS)"=="FREEBSD" - .ENDIF # "$(OS)"=="NETBSD" - - #override diff --git a/editors/openoffice.org-1.0/files/patch-solenv+inc+tg_moz.mk b/editors/openoffice.org-1.0/files/patch-solenv+inc+tg_moz.mk deleted file mode 100644 index f5d6a86d7346..000000000000 --- a/editors/openoffice.org-1.0/files/patch-solenv+inc+tg_moz.mk +++ /dev/null @@ -1,17 +0,0 @@ ---- solenv/inc/tg_moz.mk.orig Sat Jul 20 23:57:37 2002 -+++ solenv/inc/tg_moz.mk Sat Jul 20 23:57:55 2002 -@@ -36,6 +36,14 @@ - CPUCFG=_linux.cfg - .ENDIF - -+.IF "$(OS)"=="FREEBSD" -+CPUCFG=_freebsd.cfg -+.ENDIF -+ -+.IF "$(OS)"=="NETBSD" -+CPUCFG=_netbsd.cfg -+.ENDIF -+ - .IF "$(GEN_PRCPUCFG)"!="" - $(GEN_PRCPUCFG): $(PRJ)$/pr$/include$/md$/$(CPUCFG) - @+$(COPY) $(PRJ)$/pr$/include$/md$/$(CPUCFG) $@ diff --git a/editors/openoffice.org-1.0/files/patch-solenv+inc+tg_shl.mk b/editors/openoffice.org-1.0/files/patch-solenv+inc+tg_shl.mk deleted file mode 100644 index d7657528eade..000000000000 --- a/editors/openoffice.org-1.0/files/patch-solenv+inc+tg_shl.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- solenv/inc/tg_shl.mk.orig Tue Jan 7 16:22:13 2003 -+++ solenv/inc/tg_shl.mk Sat Jan 18 12:51:58 2003 -@@ -319,7 +319,7 @@ - .IF "$(GUI)" == "WNT" - .IF "$(UPDATER)"=="YES" - .IF "$(COM)"=="GCC" -- gcc -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ ${CC} -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ELSE - $(CXX) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ENDIF # "$(COM)"=="GCC" diff --git a/editors/openoffice.org-1.0/files/patch-solenv+inc+unitools.mk b/editors/openoffice.org-1.0/files/patch-solenv+inc+unitools.mk deleted file mode 100644 index 983adcf1cf4f..000000000000 --- a/editors/openoffice.org-1.0/files/patch-solenv+inc+unitools.mk +++ /dev/null @@ -1,16 +0,0 @@ -Index: solenv/inc/unitools.mk -=================================================================== -RCS file: /cvs/tools/solenv/inc/unitools.mk,v -retrieving revision 1.12.4.2 -diff -u -r1.12.4.2 unitools.mk ---- solenv/inc/unitools.mk 7 Jan 2003 15:22:16 -0000 1.12.4.2 -+++ solenv/inc/unitools.mk 4 Aug 2005 01:42:23 -0000 -@@ -147,7 +147,7 @@ - GNUPATCH=gnupatch - .ELSE # "$(OS)"=="SOLARIS" - AWK=awk --GNUCOPY=cp -+GNUCOPY=%%GNUCOPY%% - GNUPATCH=patch - .ENDIF # "$(OS)"=="SOLARIS" - .IF "$(OS)"=="LINUX" || "$(OS)"=="MACOSX" diff --git a/editors/openoffice.org-1.0/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-1.0/files/patch-solenv+inc+unxfbsdi.mk deleted file mode 100644 index 9213811f8e55..000000000000 --- a/editors/openoffice.org-1.0/files/patch-solenv+inc+unxfbsdi.mk +++ /dev/null @@ -1,285 +0,0 @@ -Index: solenv/inc/unxfbsdi.mk -=================================================================== -RCS file: /cvs/tools/solenv/inc/unxfbsdi.mk,v -retrieving revision 1.4.4.1 -diff -u -r1.4.4.1 unxfbsdi.mk ---- solenv/inc/unxfbsdi.mk 7 Jan 2003 15:22:18 -0000 1.4.4.1 -+++ solenv/inc/unxfbsdi.mk 18 Jul 2005 04:00:18 -0000 -@@ -1,49 +1,162 @@ -+#************************************************************************* -+# -+# $RCSfile:$ -+# -+# $Revision:$ -+# -+# last change: $Author:$ -+# -+# The Contents of this file are made available subject to the terms of -+# either of the following licenses -+# -+# - GNU Lesser General Public License Version 2.1 -+# - Sun Industry Standards Source License Version 1.1 -+# -+# Sun Microsystems Inc., October, 2000 -+# -+# GNU Lesser General Public License Version 2.1 -+# ============================================= -+# Copyright 2000 by Sun Microsystems, Inc. -+# 901 San Antonio Road, Palo Alto, CA 94303, USA -+# -+# This library is free software; you can redistribute it and/or -+# modify it under the terms of the GNU Lesser General Public -+# License version 2.1, as published by the Free Software Foundation. -+# -+# This library is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+# Lesser General Public License for more details. -+# -+# You should have received a copy of the GNU Lesser General Public -+# License along with this library; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+# MA 02111-1307 USA -+# -+# -+# Sun Industry Standards Source License Version 1.1 -+# ================================================= -+# The contents of this file are subject to the Sun Industry Standards -+# Source License Version 1.1 (the "License"); You may not use this file -+# except in compliance with the License. You may obtain a copy of the -+# License at http://www.openoffice.org/license.html. -+# -+# Software provided under this License is provided on an "AS IS" basis, -+# WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, -+# WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, -+# MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. -+# See the License for the specific provisions governing your rights and -+# obligations concerning the Software. -+# -+# The Initial Developer of the Original Code is: Sun Microsystems, Inc. -+# -+# Copyright: 2000 by Sun Microsystems, Inc. -+# -+# All Rights Reserved. -+# -+# Contributor(s): _______________________________________ -+# -+# -+# -+#************************************************************************* - --# mak file fuer unxfbsdi -- -+# mk file for unxfbsdi - ASM= - AFLAGS= - - SOLAR_JAVA=TRUE - JAVAFLAGSDEBUG=-g - --LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter" -- -+# filter for supressing verbose messages from linker -+#not needed at the moment -+#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter" -+ -+# options for C and C++ Compiler -+CDEFS+=-DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450 -DOSVERSION=$(OSVERSION) $(PTHREAD_CFLAGS) -+ -+# this is a platform with JAVA support -+.IF "$(SOLAR_JAVA)"!="" -+JAVADEF=-DSOLAR_JAVA -+.IF "$(debug)"=="" -+JAVA_RUNTIME=-ljava -+.ELSE -+JAVA_RUNTIME=-ljava_g -+.ENDIF -+.ENDIF - --CC= gcc --CXX= g++ --CDEFS+= -D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=400 --CDEFS+= -D_REENTRANT -D_PTHREADS -D_THREAD_SAFE --CFLAGS+= -w -c $(INCLUDE) --CFLAGS+= -I/usr/X11R6/include --CFLAGSCC= -pipe --CFLAGSCXX= -pipe -fno-for-scope -fpermissive --CFLAGSEXCEPTIONS= -fexceptions --CFLAGS_NO_EXCEPTIONS= -fno-exceptions --CFLAGSOBJGUIST= -fPIC --CFLAGSOBJCUIST= -fPIC --CFLAGSOBJGUIMT= -fPIC --CFLAGSOBJCUIMT= -fPIC --CFLAGSSLOGUIMT= -fPIC --CFLAGSSLOCUIMT= -fPIC --CFLAGSPROF= -pg --CFLAGSDEBUG= -g -+# name of C++ Compiler -+CXX*=g++ -+# name of C Compiler -+CC*=gcc -+# flags for C and C++ Compiler -+# do not use standard header search paths -+# if installed elsewhere -+.IF "$(BUILD_SOSL)"!="" -+CFLAGS= -+.ENDIF -+CFLAGS+=-fmessage-length=0 -c $(INCLUDE) -+# flags for the C++ Compiler -+CFLAGSCC= -pipe -mcpu=pentiumpro -+# Flags for enabling exception handling -+CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs -+# Flags for disabling exception handling -+CFLAGS_NO_EXCEPTIONS=-fno-exceptions -+ -+# -fpermissive should be removed as soon as possible -+CFLAGSCXX= -pipe -mcpu=pentiumpro -fno-for-scope -fpermissive -+ -+# FIXME: This 'if' does not work due to a sequence error in files. -+#.IF "$(CCNUMVER)"<"000300020000" -+#CFLAGSCXX+=-fno-rtti -+#.ENDIF -+ -+# Compiler flags for compiling static object in single threaded environment with graphical user interface -+CFLAGSOBJGUIST= -+# Compiler flags for compiling static object in single threaded environment with character user interface -+CFLAGSOBJCUIST= -+# Compiler flags for compiling static object in multi threaded environment with graphical user interface -+CFLAGSOBJGUIMT= -+# Compiler flags for compiling static object in multi threaded environment with character user interface -+CFLAGSOBJCUIMT= -+# Compiler flags for compiling shared object in multi threaded environment with graphical user interface -+CFLAGSSLOGUIMT=-fpic -+# Compiler flags for compiling shared object in multi threaded environment with character user interface -+CFLAGSSLOCUIMT=-fpic -+# Compiler flags for profiling -+CFLAGSPROF= -+# Compiler flags for debugging -+CFLAGSDEBUG=-g - CFLAGSDBGUTIL= --CFLAGSOPT= -O2 --CFLAGSNOOPT= -O --CFLAGSOUTOBJ= -o -- --STATIC= -Wl,-Bstatic --DYNAMIC= -Wl,-Bdynamic -- --#THREADLIB= -pthread --LINK= gcc --# -v -nostdlib -+# Compiler flags for enabling optimazations -+# CFLAGSOPT=-O2 -+# reduce to -O1 to avoid optimisation problems -+CFLAGSOPT=-O1 -+# Compiler flags for disabling optimazations -+CFLAGSNOOPT=-O -+# Compiler flags for discibing the output path -+CFLAGSOUTOBJ=-o -+# Enable all warnings -+CFLAGSWALL=-Wall -+# Set default warn level -+CFLAGSDFLTWARN=-w -+ -+# switches for dynamic and static linking -+STATIC = -Wl,-Bstatic -+DYNAMIC = -Wl,-Bdynamic -+ -+# name of linker -+LINK*=$(CC) -+# default linker flags - LINKFLAGS= --LINKFLAGSAPPGUI= -Wl,-export-dynamic --LINKFLAGSAPPCUI= -Wl,-export-dynamic -+ -+# linker flags for linking applications -+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec -+LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec -+ -+# linker flags for linking shared libraries - LINKFLAGSSHLGUI= -shared - LINKFLAGSSHLCUI= -shared -+ - LINKFLAGSTACK= - LINKFLAGSPROF= - LINKFLAGSDEBUG=-g -@@ -51,35 +164,46 @@ - - .IF "$(NO_BSYMBOLIC)"=="" - .IF "$(PRJNAME)" != "envtest" --LINKFLAGSSHLGUI+= -Wl,-Bsymbolic --LINKFLAGSSHLCUI+= -Wl,-Bsymbolic --.ENDIF -+LINKFLAGSSHLGUI+=-Wl,-Bsymbolic -+LINKFLAGSSHLCUI+=-Wl,-Bsymbolic - .ENDIF -+.ENDIF # "$(NO_BSYMBOLIC)"=="" - - LINKVERSIONMAPFLAG=-Wl,--version-script - --STDLIBCPP=-lstdc++ -+SONAME_SWITCH=-Wl,-h - --# _SYSLIBS= -L/usr/lib -lm --# _X11LIBS= -L/usr/X11R6/lib -lXext -lX11 --# _CXXLIBS= -L/usr/lib -lstdc++ -L/usr/local/lib -+# Sequence of libs does matter ! - -+STDLIBCPP=-lstdc++ -+ -+# default objectfilenames to link - STDOBJGUI= - STDSLOGUI= - STDOBJCUI= - STDSLOCUI= - -+# libraries for linking applications - STDLIBCUIST=-lm -+STDLIBGUIMT=-lX11 $(PTHREAD_LIBS) -lm -+STDLIBCUIMT=$(PTHREAD_LIBS) -lm - STDLIBGUIST=-lX11 -lm --STDLIBGUIMT=-lX11 -lXext -pthread -lm -lstlport_gcc --STDLIBCUIMT=-pthread -lm -lstlport_gcc --STDSHLGUIMT=-lX11 -lXext -pthread -lm -lstlport_gcc --STDSHLCUIMT=-pthread -lm -lstlport_gcc -- --LIBMGR= ar --LIBFLAGS= -r --LIBEXT= .a -+# libraries for linking shared libraries -+STDSHLGUIMT=-lX11 -lXext $(PTHREAD_LIBS) -lm -+STDSHLCUIMT=$(PTHREAD_LIBS) -lm -+STDSHLGUIST=-lX11 -lXext -lm -+STDSHLCUIST=-lm -+# adding $(PTHREAD_LIBS) is just a workaround for FreeBSD 4. no side effects for othre FreeBSDs. -+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc -lstdc++ $(PTHREAD_LIBS) -+LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) $(PTHREAD_LIBS) -+ -+#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC) -+ -+# name of library manager -+LIBMGR=ar -+LIBFLAGS=-r - -+# tool for generating import libraries - IMPLIB= - IMPLIBFLAGS= - -@@ -87,12 +211,13 @@ - MAPSYMFLAGS= - - RC=irc --RCFLAGS= -fo$@ $(RCFILES) -+RCFLAGS=-fo$@ $(RCFILES) - RCLINK= - RCLINKFLAGS= - RCSETVERSION= - --DLLPOSTFIX= fi --DLLPRE= lib --DLLPOST= .so --LDUMP= -+# platform specific identifier for shared libs -+DLLPOSTFIX=fi -+DLLPRE=lib -+DLLPOST=.so -+ diff --git a/editors/openoffice.org-1.0/files/patch-soltools+mkdepend+main.c b/editors/openoffice.org-1.0/files/patch-soltools+mkdepend+main.c deleted file mode 100644 index aec4487ae529..000000000000 --- a/editors/openoffice.org-1.0/files/patch-soltools+mkdepend+main.c +++ /dev/null @@ -1,12 +0,0 @@ ---- soltools/mkdepend/main.c.orig Mon Apr 15 15:55:43 2002 -+++ soltools/mkdepend/main.c Mon Apr 15 16:54:06 2002 -@@ -27,6 +27,9 @@ - - */ - -+#include <sys/types.h> -+#include <sys/stat.h> -+ - #include "def.h" - #ifdef hpux - #define sigvec sigvector diff --git a/editors/openoffice.org-1.0/files/patch-stlport+STLport-4.5.patch b/editors/openoffice.org-1.0/files/patch-stlport+STLport-4.5.patch deleted file mode 100644 index 230fbf3c7067..000000000000 --- a/editors/openoffice.org-1.0/files/patch-stlport+STLport-4.5.patch +++ /dev/null @@ -1,152 +0,0 @@ ---- stlport/STLport-4.5.patch.orig Mon Jan 14 18:33:17 2002 -+++ stlport/STLport-4.5.patch Tue May 28 23:55:42 2002 -@@ -65,7 +65,7 @@ - ! - *** misc/STLport-4.5/stlport/config/stl_gcc.h Tue Sep 4 13:10:16 2001 - --- misc/build/STLport-4.5/stlport/config/stl_gcc.h Mon Nov 11 09:37:18 2002 --*************** typedef unsigned int wint_t; -+*************** - *** 226,233 **** - - # if (__GNUC__ >= 3) -@@ -74,12 +74,27 @@ - ! # define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward - - # elif (__GNUC_MINOR__ < 8) -- ----- 226,235 ---- -+ -+--- 244,268 ---- - - # if (__GNUC__ >= 3) - - ! /* properly determine the STLP_NATIVE_INCLUDE_PATH */ -+! #ifdef i386 -+! #undef i386 -+! #define i386 i386 -+! #endif -+! -+! #ifdef mips -+! #undef mips -+! #define mips mips -+! #endif -+! -+! #ifdef sgi -+! #undef sgi -+! #define sgi sgi -+! #endif -+! - ! # define _STLP_NATIVE_INCLUDE_PATH GXX_INCLUDE_PATH - ! # define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH \ - ! GXX_INCLUDE_PATH/backward -@@ -104,3 +119,110 @@ - class _STLP_CLASS_DECLSPEC __Named_exception : public _STLP_EXCEPTION_BASE { - public: - __Named_exception(const string& __str) -+--- misc/STLport-4.5/src/gcc-freebsd.mak Sun Jul 29 05:36:25 2001 -++++ misc/build/STLport-4.5/src/gcc-freebsd.mak Tue May 28 23:04:27 2002 -+@@ -5,8 +5,8 @@ -+ # -+ # compiler -+ # -+-CC = gcc -pthread -+-CXX = c++ -pthread -fexceptions -++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT -++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions -+ -+ # -+ # Basename for libraries -+@@ -19,7 +19,7 @@ -+ # -+ LINK=ar cr -+ # 2.95 flag -+-DYN_LINK=c++ -pthread -fexceptions -shared -o -++DYN_LINK=${CXX} ${PTHREAD_LIBS} -fexceptions -shared -o -+ -+ OBJEXT=o -+ DYNEXT=so -+@@ -41,8 +41,8 @@ -+ -+ CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS} -+ -+-CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2 -+-CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fPIC -++CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) ${CXXFLAGS} -++CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) ${CXXFLAGS} -fPIC -+ -+ CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g -+ CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC -+--- /dev/null Tue May 28 22:55:00 2002 -++++ misc/build/STLport-4.5/src/gcc-3.0-freebsd.mak Tue May 28 22:38:52 2002 -+@@ -0,0 +1,59 @@ -++# -++# Note : this makefile is for gcc-3 ! -++# -++ -++# -++# compiler -++# -++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT -++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions -++ -++# -++# Basename for libraries -++# -++LIB_BASENAME = libstlport_gcc -++ -++# -++# guts for common stuff -++# -++# -++LINK=ar cr -++DYN_LINK=${CXX} ${PTHREAD_LIBS} --fexceptions -shared -o -++ -++OBJEXT=o -++DYNEXT=so -++STEXT=a -++RM=rm -rf -++PATH_SEP=/ -++MKDIR=mkdir -p -++COMP=GCC-FREEBSD -++INSTALL_STEP = install_unix -++ -++all: all_dynamic all_static symbolic_links -++ -++include common_macros.mak -++ -++WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized -ftemplate-depth-32 -++ -++CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS} -++ -++CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) ${CXXFLAGS} -++CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) ${CXXFLAGS} -fPIC -++ -++CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g -++CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC -++ -++CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG -++CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG -++ -++include common_percent_rules.mak -++include common_rules.mak -++ -++ -++#install: all -++# cp -p $(LIB_TARGET) ${D_LIB_TARGET} ../lib -++ -++#%.s: %.cpp -++# $(CXX) $(CXXFLAGS) -O4 -S -pto $< -o $@ -++ -++ -+--- misc/STLport-4.5/stlport/cwchar.orig Tue May 28 22:51:31 2002 -++++ misc/build/STLport-4.5/stlport/cwchar Tue May 28 22:55:33 2002 -+@@ -21,6 +21,9 @@ -+ # include <stl/_prolog.h> -+ # endif -+ -++#ifdef __FreeBSD__ -++# include <../wchar.h> -++#endif -+ # include <stl/_cwchar.h> -+ -+ # if (_STLP_OUTERMOST_HEADER_ID == 0x120) diff --git a/editors/openoffice.org-1.0/files/patch-stlport+makefile.mk b/editors/openoffice.org-1.0/files/patch-stlport+makefile.mk deleted file mode 100644 index 2341f7225a25..000000000000 --- a/editors/openoffice.org-1.0/files/patch-stlport+makefile.mk +++ /dev/null @@ -1,36 +0,0 @@ ---- stlport/makefile.mk.orig Tue Jan 7 13:13:37 2003 -+++ stlport/makefile.mk Sat Jan 18 13:01:53 2003 -@@ -98,16 +98,28 @@ - - .IF "$(COM)"=="GCC" - .IF "$(COMID)"=="gcc3" --BUILD_FLAGS=-f gcc-3.0.mak -+.IF # "$(OS)"=="FREEBSD" -+ BUILD_FLAGS=-f gcc-3.0-freebsd.mak -+.ELSE -+ BUILD_FLAGS=-f gcc-3.0.mak -+.ENDIF - .ELSE # "$(COMID)"=="gcc3" --# MacOS X/Darwin need a special makefile -+# FreeBSD / MacOS X/Darwin need a special makefile - .IF "$(OS)"=="MACOSX" - BUILD_FLAGS=-f gcc-apple-macosx.mak --.ELSE # "$(OS)"=="MACOSX" -+.ELSIF # "$(OS)"=="FREEBSD" -+ BUILD_FLAGS=-f gcc-freebsd.mak -+.ELSE - BUILD_FLAGS=-f gcc.mak --.ENDIF # "$(OS)"=="MACOSX" -+.ENDIF # "$(OS)"=="MACOSX || $(OS)"=="FREEBSD" - .ENDIF # "$(COMID)"=="gcc3" --BUILD_ACTION=make -+ -+.IF "$(OS)"=="FREEBSD" -+ BUILD_ACTION=gmake -+.ELSE -+ BUILD_ACTION=make -+.ENDIF -+ - # build in parallel - BUILD_FLAGS+= -j$(MAXPROCESS) - .ENDIF diff --git a/editors/openoffice.org-1.0/files/patch-stoc+source+corereflection+criface.cxx b/editors/openoffice.org-1.0/files/patch-stoc+source+corereflection+criface.cxx deleted file mode 100644 index 6016d8eade94..000000000000 --- a/editors/openoffice.org-1.0/files/patch-stoc+source+corereflection+criface.cxx +++ /dev/null @@ -1,23 +0,0 @@ -Index: stoc/source/corereflection/criface.cxx -=================================================================== -RCS file: /cvs/udk/stoc/source/corereflection/criface.cxx,v -retrieving revision 1.6 -diff -u -r1.6 criface.cxx ---- stoc/source/corereflection/criface.cxx 3 May 2001 13:56:57 -0000 1.6 -+++ stoc/source/corereflection/criface.cxx 28 Jul 2005 12:24:08 -0000 -@@ -60,14 +60,7 @@ - ************************************************************************/ - - #include <sal/config.h> --#ifdef SAL_UNX --#if !(defined(MACOSX) || defined(NETBSD) || defined(FREEBSD)) --#include <alloca.h> --#endif --#endif --#ifndef MACOSX --#include <malloc.h> --#endif -+#include <stdlib.h> - #ifndef _RTL_ALLOC_H_ - #include <rtl/alloc.h> - #endif diff --git a/editors/openoffice.org-1.0/files/patch-stoc+source+implementationregistration+implreg.cxx b/editors/openoffice.org-1.0/files/patch-stoc+source+implementationregistration+implreg.cxx deleted file mode 100644 index f82860ca0c4b..000000000000 --- a/editors/openoffice.org-1.0/files/patch-stoc+source+implementationregistration+implreg.cxx +++ /dev/null @@ -1,11 +0,0 @@ ---- stoc/source/implementationregistration/implreg.cxx.orig Tue Apr 16 19:54:58 2002 -+++ stoc/source/implementationregistration/implreg.cxx Tue Apr 16 19:55:26 2002 -@@ -60,6 +60,8 @@ - ************************************************************************/ - #include <list> - -+#include <unistd.h> -+ - #ifndef _CPPUHELPER_QUERYINTERFACE_HXX_ - #include <cppuhelper/queryinterface.hxx> - #endif diff --git a/editors/openoffice.org-1.0/files/patch-svx+source+dialog+txenctab.src b/editors/openoffice.org-1.0/files/patch-svx+source+dialog+txenctab.src deleted file mode 100644 index c48a6f485bdd..000000000000 --- a/editors/openoffice.org-1.0/files/patch-svx+source+dialog+txenctab.src +++ /dev/null @@ -1,44 +0,0 @@ ---- svx/source/dialog/txenctab.src.orig Thu Oct 31 23:18:23 2002 -+++ svx/source/dialog/txenctab.src Tue Feb 25 16:57:06 2003 -@@ -147,6 +147,7 @@ - < "Japanisch (ISO-2022-JP)" ; RTL_TEXTENCODING_ISO_2022_JP ; > ; - < "Chinesisch vereinfacht (ISO-2022-CN)" ; RTL_TEXTENCODING_ISO_2022_CN ; > ; - < "Kyrillisch (KOI8-R)" ; RTL_TEXTENCODING_KOI8_R ; > ; -+ < "Kyrillisch (KOI8-U)" ; RTL_TEXTENCODING_KOI8_U ; > ; - < "Unicode (UTF-7)" ; RTL_TEXTENCODING_UTF7 ; > ; - < "Unicode (UTF-8)" ; RTL_TEXTENCODING_UTF8 ; > ; - < "Osteuropa (ISO-8859-10)" ; RTL_TEXTENCODING_ISO_8859_10 ; > ; -@@ -235,6 +236,7 @@ - < "Japanese (ISO-2022-JP)" ; RTL_TEXTENCODING_ISO_2022_JP ; > ; - < "Chinese Simplified (ISO-2022-CN)" ; RTL_TEXTENCODING_ISO_2022_CN ; > ; - < "Cyrillic (KOI8-R)" ; RTL_TEXTENCODING_KOI8_R ; > ; -+ < "Cyrillic (KOI8-U)" ; RTL_TEXTENCODING_KOI8_U ; > ; - < "Unicode (UTF-7)" ; RTL_TEXTENCODING_UTF7 ; > ; - < "Unicode (UTF-8)" ; RTL_TEXTENCODING_UTF8 ; > ; - < "Central European (ISO-8859-10)" ; RTL_TEXTENCODING_ISO_8859_10 ; > ; -@@ -308,6 +310,7 @@ - < "Japanisch (ISO-2022-JP)" ; RTL_TEXTENCODING_ISO_2022_JP ; > ; - < "Chinesisch vereinfacht (ISO-2022-CN)" ; RTL_TEXTENCODING_ISO_2022_CN ; > ; - < "Kyrillisch (KOI8-R)" ; RTL_TEXTENCODING_KOI8_R ; > ; -+ < "Kyrillisch (KOI8-U)" ; RTL_TEXTENCODING_KOI8_U ; > ; - < "Unicode (UTF-7)" ; RTL_TEXTENCODING_UTF7 ; > ; - < "Unicode (UTF-8)" ; RTL_TEXTENCODING_UTF8 ; > ; - < "Osteuropa (ISO-8859-10)" ; RTL_TEXTENCODING_ISO_8859_10 ; > ; -@@ -378,6 +381,7 @@ - < "Japanese (ISO-2022-JP)" ; RTL_TEXTENCODING_ISO_2022_JP ; > ; - < "Chinese simplified (ISO-2022-CN)" ; RTL_TEXTENCODING_ISO_2022_CN ; > ; - < "Cyrillic (KOI8-R)" ; RTL_TEXTENCODING_KOI8_R ; > ; -+ < "Cyrillic (KOI8-U)" ; RTL_TEXTENCODING_KOI8_U ; > ; - < "Unicode (UTF-7)" ; RTL_TEXTENCODING_UTF7 ; > ; - < "Unicode (UTF-8)" ; RTL_TEXTENCODING_UTF8 ; > ; - < "Eastern Europe (ISO-8859-10)" ; RTL_TEXTENCODING_ISO_8859_10 ; > ; -@@ -1217,7 +1221,8 @@ - < "ç¹ä½“å—ä¸å›½èªž (EUC-TW)" ; RTL_TEXTENCODING_EUC_TW ; > ; - < "日本語 (ISO-2022-JP)" ; RTL_TEXTENCODING_ISO_2022_JP ; > ; - < "簡体å—ä¸å›½èªž (ISO-2022-CN)" ; RTL_TEXTENCODING_ISO_2022_CN ; > ; -- < "ã‚リル語 (KOI8-R)" ; RTL_TEXTENCODING_KOI8_R ; > ; -+ < "\xe3\x82\xad\xe3\x83\xaa\xe3\x83\xab\xe8\xaa\x9e (KOI8-R)" ; RTL_TEXTENCODING_KOI8_R ; > ; -+ < "\xe3\x82\xad\xe3\x83\xaa\xe3\x83\xab\xe8\xaa\x9e (KOI8-U)" ; RTL_TEXTENCODING_KOI8_U ; > ; - < "Unicode (UTF-7)" ; RTL_TEXTENCODING_UTF7 ; > ; - < "Unicode (UTF-8)" ; RTL_TEXTENCODING_UTF8 ; > ; - < "æ±æ¬§ (ISO-8859-10)" ; RTL_TEXTENCODING_ISO_8859_10 ; > ; diff --git a/editors/openoffice.org-1.0/files/patch-sw+source+filter+basflt+fltini.cxx b/editors/openoffice.org-1.0/files/patch-sw+source+filter+basflt+fltini.cxx deleted file mode 100644 index c3ed62994322..000000000000 --- a/editors/openoffice.org-1.0/files/patch-sw+source+filter+basflt+fltini.cxx +++ /dev/null @@ -1,22 +0,0 @@ ---- sw/source/filter/basflt/fltini.cxx.orig Mon Feb 24 17:46:43 2003 -+++ sw/source/filter/basflt/fltini.cxx Tue Feb 25 16:59:03 2003 -@@ -1007,7 +1007,8 @@ - sToken081[] = "JIS_X_212", - sToken082[] = "MS_1361", - sToken083[] = "GB_18030", -- sToken084[] = "UNICODE_2" -+ sToken084[] = "KOI8_U", -+ sToken085[] = "UNICODE_2" - ; - struct _Dummy_MAP - { -@@ -1099,7 +1100,8 @@ - RTL_TEXTENCODING_JIS_X_0212, sToken081, - RTL_TEXTENCODING_MS_1361, sToken082, - RTL_TEXTENCODING_GB_18030, sToken083, -- RTL_TEXTENCODING_UCS2, sToken084 -+ RTL_TEXTENCODING_KOI8_U, sToken084, -+ RTL_TEXTENCODING_UCS2, sToken085 - }; - - BOOL bFnd = FALSE; diff --git a/editors/openoffice.org-1.0/files/patch-sysui+oounix+office+gnome-vfs-filetype-registration.cxx b/editors/openoffice.org-1.0/files/patch-sysui+oounix+office+gnome-vfs-filetype-registration.cxx deleted file mode 100644 index d194744fd4e1..000000000000 --- a/editors/openoffice.org-1.0/files/patch-sysui+oounix+office+gnome-vfs-filetype-registration.cxx +++ /dev/null @@ -1,11 +0,0 @@ ---- sysui/oounix/office/gnome/gnome-vfs-filetype-registration.cxx.orig Fri Aug 16 18:56:19 2002 -+++ sysui/oounix/office/gnome/gnome-vfs-filetype-registration.cxx Sat Jan 18 13:06:16 2003 -@@ -62,7 +62,7 @@ - #include <stdlib.h> - #include <stdio.h> - #include <dlfcn.h> --#ifndef MACOSX -+#if !(defined NETBSD || defined FREEBSD || defined MACOSX) - #include <alloca.h> - #endif - #include <string.h> diff --git a/editors/openoffice.org-1.0/files/patch-sysui+tools+lngconv+lngconv.cxx b/editors/openoffice.org-1.0/files/patch-sysui+tools+lngconv+lngconv.cxx deleted file mode 100644 index 106f6d3ed063..000000000000 --- a/editors/openoffice.org-1.0/files/patch-sysui+tools+lngconv+lngconv.cxx +++ /dev/null @@ -1,19 +0,0 @@ ---- sysui/tools/lngconv/lngconv.cxx.orig Sat Jul 20 23:14:29 2002 -+++ sysui/tools/lngconv/lngconv.cxx Sat Jul 20 23:14:34 2002 -@@ -62,7 +62,7 @@ - #include <stdlib.h> - #include <stdio.h> - --#if defined( LINUX ) || defined (SOLARIS) || defined(IRIX) -+#if defined(LINUX) || defined (SOLARIS) || defined(IRIX) || defined (FREEBSD) - #include <locale.h> - #include <langinfo.h> - #endif -@@ -143,6 +143,7 @@ - { "iso8859-8", RTL_TEXTENCODING_ISO_8859_8 }, - { "iso8859-9", RTL_TEXTENCODING_ISO_8859_9 }, - { "koi8-r", RTL_TEXTENCODING_KOI8_R }, -+ { "koi8-u", RTL_TEXTENCODING_KOI8_U }, - { "pck", RTL_TEXTENCODING_MS_932 }, - #if (0) - { "sun_eu_greek", RTL_TEXTENCODING_DONTKNOW }, diff --git a/editors/openoffice.org-1.0/files/patch-sysui+unix+office+cde+locales.tab b/editors/openoffice.org-1.0/files/patch-sysui+unix+office+cde+locales.tab deleted file mode 100644 index 51149a8e797c..000000000000 --- a/editors/openoffice.org-1.0/files/patch-sysui+unix+office+cde+locales.tab +++ /dev/null @@ -1,10 +0,0 @@ ---- sysui/unix/office/cde/locales.tab.orig Tue Nov 20 19:26:28 2001 -+++ sysui/unix/office/cde/locales.tab Tue Feb 25 17:04:36 2003 -@@ -7,6 +7,7 @@ - locales+=$(assign locale_34 = es es.UTF-8) - locales+=$(assign locale_35 = fi fi.UTF-8) - locales+=$(assign locale_37 = ca) -+locales+=$(assign locale_38 = uk uk_UA.KOI8-U) - locales+=$(assign locale_39 = it it.UTF-8) - locales+=$(assign locale_45 = da da.UTF-8) - locales+=$(assign locale_46 = sv sv.UTF-8) diff --git a/editors/openoffice.org-1.0/files/patch-tools+bootstrp+static.mk b/editors/openoffice.org-1.0/files/patch-tools+bootstrp+static.mk deleted file mode 100644 index edc1e226b8a3..000000000000 --- a/editors/openoffice.org-1.0/files/patch-tools+bootstrp+static.mk +++ /dev/null @@ -1,20 +0,0 @@ -Index: tools/bootstrp/static.mk -=================================================================== -RCS file: /cvs/util/tools/bootstrp/Attic/static.mk,v -retrieving revision 1.14.6.1 -diff -u -r1.14.6.1 static.mk ---- tools/bootstrp/static.mk 17 Dec 2002 15:10:48 -0000 1.14.6.1 -+++ tools/bootstrp/static.mk 28 Jul 2005 11:29:46 -0000 -@@ -154,10 +154,11 @@ - .IF "$(OS)"=="SOLARIS" - STATIC_LIBS += -lnsl -lsocket -lposix4 -lc - .ENDIF --.IF "$(OS)"=="LINUX" -+.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD" - STATIC_LIBS += -lsupc++ -lX11 -lXext - .ENDIF - -+ - # ----------------------------------------------------------- - - .ELSE diff --git a/editors/openoffice.org-1.0/files/patch-tools+inc+inetdef.hxx b/editors/openoffice.org-1.0/files/patch-tools+inc+inetdef.hxx deleted file mode 100644 index 3344734ef143..000000000000 --- a/editors/openoffice.org-1.0/files/patch-tools+inc+inetdef.hxx +++ /dev/null @@ -1,11 +0,0 @@ ---- tools/inc/inetdef.hxx.orig Sun Jul 21 00:59:36 2002 -+++ tools/inc/inetdef.hxx Sun Jul 21 00:59:38 2002 -@@ -90,6 +90,8 @@ - #define TOOLS_INETDEF_OS "NETBSD Sparc" - #elif defined LINUX && defined X86 - #define TOOLS_INETDEF_OS "Linux" -+#elif defined FREEBSD && defined X86 -+#define TOOLS_INETDEF_OS "FreeBSD" - #elif defined SINIX - #define TOOLS_INETDEF_OS "SINIX" - #elif defined IRIX diff --git a/editors/openoffice.org-1.0/files/patch-tools+source+inet+inetmime.cxx b/editors/openoffice.org-1.0/files/patch-tools+source+inet+inetmime.cxx deleted file mode 100644 index 77201507ac1d..000000000000 --- a/editors/openoffice.org-1.0/files/patch-tools+source+inet+inetmime.cxx +++ /dev/null @@ -1,54 +0,0 @@ ---- tools/source/inet/inetmime.cxx.orig Mon Feb 24 17:46:55 2003 -+++ tools/source/inet/inetmime.cxx Tue Feb 25 17:08:22 2003 -@@ -1633,7 +1633,8 @@ - "ISO-8859-10", // RTL_TEXTENCODING_ISO_8859_10, RFC 2047 - "ISO-8859-13", // RTL_TEXTENCODING_ISO_8859_13, RFC 2047 - "EUC-KR", // RTL_TEXTENCODING_EUC_KR -- "ISO-2022-KR" }; // RTL_TEXTENCODING_ISO_2022_KR -+ "ISO-2022-KR", // RTL_TEXTENCODING_ISO_2022_KR -+ "KOI8-U" }; // RTL_TEXTENCODING_KOI8_U - DBG_ASSERT(aMap[eEncoding], - "INetMIME::getCharsetName(): Unsupported encoding"); - return aMap[eEncoding]; -@@ -1841,7 +1842,8 @@ - { "ISO-10646-UCS-4", RTL_TEXTENCODING_UCS4 }, - { "CSUCS4", RTL_TEXTENCODING_UCS4 }, - { "ISO-10646-UCS-2", RTL_TEXTENCODING_UCS2 }, -- { "CSUNICODE", RTL_TEXTENCODING_UCS2 } }; -+ { "CSUNICODE", RTL_TEXTENCODING_UCS2 }, -+ { "KOI8-U", RTL_TEXTENCODING_KOI8_U } }; - - //============================================================================ - template< typename T > -@@ -2012,6 +2014,18 @@ - // <ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/MISC/KOI8-R.TXT> - // version 1.0 of 18 August 1999 - -+ static const sal_uInt32 aKOI8URanges[] -+ = { 0, 0x7F, 0xA0, 0xA0, 0xA9, 0xA9, 0xB0, 0xB0, 0xB2, 0xB2, -+ 0xB7, 0xB7, 0xF7, 0xF7, 0x401, 0x401, 0x410, 0x44F, 0x451, 0x451, -+ 0x2219, 0x221A, 0x2248, 0x2248, 0x2264, 0x2265, 0x2320, 0x2321, -+ 0x2500, 0x2500, 0x2502, 0x2502, 0x250C, 0x250C, 0x2510, 0x2510, -+ 0x2514, 0x2514, 0x2518, 0x2518, 0x251C, 0x251C, 0x2524, 0x2524, -+ 0x252C, 0x252C, 0x2534, 0x2534, 0x253C, 0x253C, 0x2550, 0x256C, -+ 0x2580, 0x2580, 0x2584, 0x2584, 0x2588, 0x2588, 0x258C, 0x258C, -+ 0x2590, 0x2593, 0x25A0, 0x25A0, sal_uInt32(-1) }; -+ // <ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/MISC/KOI8-R.TXT> -+ // version 1.0 of 18 August 1999 -+ - static const sal_uInt32 aWindows1252Ranges[] - = { 0, 0x7F, 0xA0, 0xFF, 0x152, 0x153, 0x160, 0x161, 0x178, 0x178, - 0x17D, 0x17E, 0x192, 0x192, 0x2C6, 0x2C6, 0x2DC, 0x2DC, -@@ -2133,6 +2147,12 @@ - pList->prepend(Charset(RTL_TEXTENCODING_ISO_8859_5, - aISO88595Ranges)); - pList->prepend(Charset(RTL_TEXTENCODING_KOI8_R, aKOI8RRanges)); -+ break; -+ -+ case RTL_TEXTENCODING_KOI8_U: -+ pList->prepend(Charset(RTL_TEXTENCODING_ISO_8859_5, -+ aISO88595Ranges)); -+ pList->prepend(Charset(RTL_TEXTENCODING_KOI8_U, aKOI8URanges)); - break; - - default: //@@@ more cases are missing! diff --git a/editors/openoffice.org-1.0/files/patch-tools+source+rc+resmgr.cxx b/editors/openoffice.org-1.0/files/patch-tools+source+rc+resmgr.cxx deleted file mode 100644 index c00b4f3d4a9f..000000000000 --- a/editors/openoffice.org-1.0/files/patch-tools+source+rc+resmgr.cxx +++ /dev/null @@ -1,19 +0,0 @@ ---- tools/source/rc/resmgr.cxx.orig Mon Feb 24 17:46:55 2003 -+++ tools/source/rc/resmgr.cxx Tue Feb 25 17:09:39 2003 -@@ -1189,6 +1189,8 @@ - return "36"; - case LANGUAGE_RUSSIAN: - return "07"; -+ case LANGUAGE_UKRAINIAN: -+ return "38"; - case LANGUAGE_SLOVAK: - return "04"; - case LANGUAGE_GREEK: -@@ -1339,6 +1341,7 @@ - LANGUAGE_HUNGARIAN, - LANGUAGE_CZECH, - LANGUAGE_RUSSIAN, -+ LANGUAGE_UKRAINIAN, - LANGUAGE_ARABIC, - LANGUAGE_GREEK, - LANGUAGE_KOREAN, diff --git a/editors/openoffice.org-1.0/files/patch-transex3+inc+export.hxx b/editors/openoffice.org-1.0/files/patch-transex3+inc+export.hxx deleted file mode 100644 index 0a4d4b9977c2..000000000000 --- a/editors/openoffice.org-1.0/files/patch-transex3+inc+export.hxx +++ /dev/null @@ -1,31 +0,0 @@ -Adding ukrainian language - ---- transex3/inc/export.hxx.orig Fri May 24 15:26:18 2002 -+++ transex3/inc/export.hxx Tue Feb 25 17:13:09 2003 -@@ -187,18 +187,22 @@ - #define CATALAN_ISO "ca" - #define CATALAN_INDEX 28 - -+#define UKRAINIAN 38 -+#define UKRAINIAN_ISO "uk" -+#define UKRAINIAN_INDEX 29 -+ - #define THAI 66 - #define THAI_ISO "th" --#define THAI_INDEX 29 -+#define THAI_INDEX 30 - - // special language for l10n framework - #define EXTERN 99 --#define EXTERN_INDEX 30 -+#define EXTERN_INDEX 31 - --#define LANGUAGES 31 -+#define LANGUAGES 32 - - #define LANGUAGE_ALLOWED( n ) (( n != 0xFFFF ) && ( Export::LanguageAllowed( Export::LangId[ n ] )) && \ -- (( Export::LangId[ n ] == 01 ) || ( Export::LangId[ n ] == 03 ) || ( Export::LangId[ n ] == 07 ) || \ -+ (( Export::LangId[ n ] == 01 ) || ( Export::LangId[ n ] == 03 ) || ( Export::LangId[ n ] == 07 ) || ( Export::LangId[ n ] == 38 ) || \ - ( Export::LangId[ n ] == 30 ) || ( Export::LangId[ n ] == 31 ) || ( Export::LangId[ n ] == 33 ) || \ - ( Export::LangId[ n ] == 34 ) || ( Export::LangId[ n ] == 35 ) || ( Export::LangId[ n ] == 37 ) || \ - ( Export::LangId[ n ] == 39 ) || ( Export::LangId[ n ] == 45 ) || ( Export::LangId[ n ] == 46 ) || \ diff --git a/editors/openoffice.org-1.0/files/patch-transex3+source+export.cxx b/editors/openoffice.org-1.0/files/patch-transex3+source+export.cxx deleted file mode 100644 index fc2d31d92048..000000000000 --- a/editors/openoffice.org-1.0/files/patch-transex3+source+export.cxx +++ /dev/null @@ -1,13 +0,0 @@ -Adding UKRAINIAN language - ---- transex3/source/export.cxx.orig Mon Feb 24 17:45:55 2003 -+++ transex3/source/export.cxx Tue Feb 25 17:14:06 2003 -@@ -1205,6 +1205,8 @@ - return PORTUGUESE_INDEX; - else if ( sLang == "RUSSIAN" ) - return RUSSIAN_INDEX; -+ else if ( sLang == "UKRAINIAN" ) -+ return UKRAINIAN_INDEX; - else if ( sLang == "GREEK" ) - return GREEK_INDEX; - else if ( sLang == "DUTCH" ) diff --git a/editors/openoffice.org-1.0/files/patch-transex3+source+export2.cxx b/editors/openoffice.org-1.0/files/patch-transex3+source+export2.cxx deleted file mode 100644 index bf9f89ae2688..000000000000 --- a/editors/openoffice.org-1.0/files/patch-transex3+source+export2.cxx +++ /dev/null @@ -1,44 +0,0 @@ -adding ukrainian language ---- transex3/source/export2.cxx.orig Mon Feb 24 17:45:55 2003 -+++ transex3/source/export2.cxx Tue Feb 25 17:19:19 2003 -@@ -144,6 +144,7 @@ - ARABIC, - HEBREW, - CATALAN, -+ UKRAINIAN, - THAI, - EXTERN - }; -@@ -192,6 +193,7 @@ - case ARABIC: return RTL_TEXTENCODING_MS_1256; - case HEBREW: return RTL_TEXTENCODING_MS_1255; - case CATALAN: return RTL_TEXTENCODING_MS_1252; -+ case UKRAINIAN: return RTL_TEXTENCODING_MS_1251; - case THAI: return RTL_TEXTENCODING_UTF8; - case EXTERN: return RTL_TEXTENCODING_UTF8; - } -@@ -214,6 +216,8 @@ - return PORTUGUESE; - else if ( sLang == ByteString( RUSSIAN_ISO ).ToUpperAscii()) - return RUSSIAN; -+ else if ( sLang == ByteString( UKRAINIAN_ISO ).ToUpperAscii()) -+ return UKRAINIAN; - else if ( sLang == ByteString( GREEK_ISO ).ToUpperAscii()) - return GREEK; - else if ( sLang == ByteString( DUTCH_ISO ).ToUpperAscii()) -@@ -279,6 +283,7 @@ - case ENGLISH_US_INDEX: return ENGLISH_US_ISO; - case PORTUGUESE_INDEX: return PORTUGUESE_ISO; - case RUSSIAN_INDEX: return RUSSIAN_ISO; -+ case UKRAINIAN_INDEX: return UKRAINIAN_ISO; - case GREEK_INDEX: return GREEK_ISO; - case DUTCH_INDEX: return DUTCH_ISO; - case FRENCH_INDEX: return FRENCH_ISO; -@@ -429,6 +434,7 @@ - "arabic", - "hebrew", - "catalan", -+ "ukrainian", - "thai", - "extern" - }; diff --git a/editors/openoffice.org-1.0/files/patch-transex3+source+gsiconv.cxx b/editors/openoffice.org-1.0/files/patch-transex3+source+gsiconv.cxx deleted file mode 100644 index e712f262edc7..000000000000 --- a/editors/openoffice.org-1.0/files/patch-transex3+source+gsiconv.cxx +++ /dev/null @@ -1,12 +0,0 @@ -adding ukrainian language - ---- transex3/source/gsiconv.cxx.orig Mon Feb 24 17:45:55 2003 -+++ transex3/source/gsiconv.cxx Tue Feb 25 17:20:08 2003 -@@ -210,6 +210,7 @@ - fprintf( stdout, " 34 => SPANISH\n" ); - fprintf( stdout, " 35 => FINNISH\n" ); - fprintf( stdout, " 36 => HUNGARIAN\n" ); -+ fprintf( stdout, " 38 => UKRAINIAN\n" ); - fprintf( stdout, " 39 => ITALIAN\n" ); - fprintf( stdout, " 42 => CZECH\n" ); - fprintf( stdout, " 44 => ENGLISH (UK)\n" ); diff --git a/editors/openoffice.org-1.0/files/patch-transex3+source+merge.cxx b/editors/openoffice.org-1.0/files/patch-transex3+source+merge.cxx deleted file mode 100644 index bfc0c3ef5d10..000000000000 --- a/editors/openoffice.org-1.0/files/patch-transex3+source+merge.cxx +++ /dev/null @@ -1,12 +0,0 @@ -adding ukrainian language - ---- transex3/source/merge.cxx.orig Mon Feb 24 17:45:55 2003 -+++ transex3/source/merge.cxx Tue Feb 25 17:20:43 2003 -@@ -388,6 +388,7 @@ - case ENGLISH_US: return ENGLISH_US_INDEX; - case PORTUGUESE: return PORTUGUESE_INDEX; - case RUSSIAN: return RUSSIAN_INDEX; -+ case UKRAINIAN: return UKRAINIAN_INDEX; - case GREEK: return GREEK_INDEX; - case DUTCH: return DUTCH_INDEX; - case FRENCH: return FRENCH_INDEX; diff --git a/editors/openoffice.org-1.0/files/patch-ucb+source+ucp+hierarchy+makefile.mk b/editors/openoffice.org-1.0/files/patch-ucb+source+ucp+hierarchy+makefile.mk deleted file mode 100644 index 8ab5b3ec9f19..000000000000 --- a/editors/openoffice.org-1.0/files/patch-ucb+source+ucp+hierarchy+makefile.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- ucb/source/ucp/hierarchy/makefile.mk.orig Wed Jun 12 01:34:50 2002 -+++ ucb/source/ucp/hierarchy/makefile.mk Wed Jun 12 01:34:52 2002 -@@ -96,7 +96,7 @@ - - SHL1TARGET=$(TARGET)$(UCPHIER_MAJOR) - SHL1IMPLIB=i$(TARGET) --.IF "$(OS)"=="MACOSX"||"$(OS)"=="FREEBSD" -+.IF "$(OS)"=="MACOSX" - .ELSE - SHL1VERSIONMAP= $(TARGET).map - .ENDIF diff --git a/editors/openoffice.org-1.0/files/patch-ucb+source+ucp+webdav+makefile.mk b/editors/openoffice.org-1.0/files/patch-ucb+source+ucp+webdav+makefile.mk deleted file mode 100644 index 7f344e226745..000000000000 --- a/editors/openoffice.org-1.0/files/patch-ucb+source+ucp+webdav+makefile.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- ucb/source/ucp/webdav/makefile.mk.orig Wed Jun 12 01:04:43 2002 -+++ ucb/source/ucp/webdav/makefile.mk Wed Jun 12 01:04:53 2002 -@@ -120,7 +120,7 @@ - - SHL1TARGET=$(TARGET)$(UCP_VERSION) - SHL1IMPLIB=i$(TARGET) --.IF "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD" -+.IF "$(OS)"=="MACOSX" - .ELSE - SHL1VERSIONMAP=exports.map - .ENDIF diff --git a/editors/openoffice.org-1.0/files/patch-unzip+source+file_io.c b/editors/openoffice.org-1.0/files/patch-unzip+source+file_io.c deleted file mode 100644 index 44061a540707..000000000000 --- a/editors/openoffice.org-1.0/files/patch-unzip+source+file_io.c +++ /dev/null @@ -1,13 +0,0 @@ -FreeBSD support - ---- unzip/source/file_io.c.orig Sat Apr 6 12:13:38 2002 -+++ unzip/source/file_io.c Wed May 1 22:34:51 2002 -@@ -864,7 +864,7 @@ - #ifndef __386BSD__ - static struct timeb tbp; - #endif /* !__386BSD__ */ --#elif !defined(NETBSD) /* !BSD */ -+#elif (!defined(NETBSD) && !defined(FREEBSD))/* !BSD */ - extern long timezone; - #endif /* ?BSD */ - #endif /* ?AMIGA */ diff --git a/editors/openoffice.org-1.0/files/patch-unzip+source+misc.c b/editors/openoffice.org-1.0/files/patch-unzip+source+misc.c deleted file mode 100644 index 32db9ec72246..000000000000 --- a/editors/openoffice.org-1.0/files/patch-unzip+source+misc.c +++ /dev/null @@ -1,16 +0,0 @@ -FreeBSD support ---- unzip/source/misc.c.orig Mon Jul 15 14:25:32 2002 -+++ unzip/source/misc.c Mon Jul 15 14:27:15 2002 -@@ -300,9 +300,9 @@ - static short yday[]={0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}; - int yr, mo, dy, hh, mm, ss, leap; - long m_time, days=0; --#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD)) --#if (defined(BSD) || defined(MTS) || defined(FREEBSD)) --#if !defined __386BSD__ && !defined FREEBSD -+#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD) && !defined(FREEBSD)) -+#if (defined(BSD) || defined(MTS) -+#if !defined __386BSD__ - static struct timeb tbp; - #endif /* __386BSD__ */ - #else /* !(BSD || MTS) */ diff --git a/editors/openoffice.org-1.0/files/patch-vcl+source+gdi+print.cxx b/editors/openoffice.org-1.0/files/patch-vcl+source+gdi+print.cxx deleted file mode 100644 index 05f264c7316b..000000000000 --- a/editors/openoffice.org-1.0/files/patch-vcl+source+gdi+print.cxx +++ /dev/null @@ -1,11 +0,0 @@ ---- vcl/source/gdi/print.cxx.orig Thu Apr 17 18:58:42 2003 -+++ vcl/source/gdi/print.cxx Thu Apr 17 18:59:10 2003 -@@ -532,7 +532,7 @@ - if ( (pJobSetup->maPrinterName != pInfo->maPrinterName) || - (pJobSetup->maDriver != pInfo->maDriver) ) - { -- rtl_freeMemory( pJobSetup->mpDriverData ); -+ delete pJobSetup->mpDriverData; - pJobSetup->mpDriverData = NULL; - pJobSetup->mnDriverDataLen = 0; - } diff --git a/editors/openoffice.org-1.0/files/patch-vcl+unx+source+app+osssound.cxx b/editors/openoffice.org-1.0/files/patch-vcl+unx+source+app+osssound.cxx deleted file mode 100644 index 56c5645f9126..000000000000 --- a/editors/openoffice.org-1.0/files/patch-vcl+unx+source+app+osssound.cxx +++ /dev/null @@ -1,14 +0,0 @@ ---- vcl/unx/source/app/osssound.cxx.orig Sun Jul 21 10:20:34 2002 -+++ vcl/unx/source/app/osssound.cxx Sun Jul 21 10:21:28 2002 -@@ -72,7 +72,11 @@ - #include <unistd.h> - #include <string.h> - #include <sys/ioctl.h> -+#ifdef LINUX - #include <linux/soundcard.h> -+#else -+#include <sys/soundcard.h> -+#endif - #include <errno.h> - - #ifdef _USE_NAMESPACE diff --git a/editors/openoffice.org-1.0/files/patch-vcl+unx+source+app+rptpsound.cxx b/editors/openoffice.org-1.0/files/patch-vcl+unx+source+app+rptpsound.cxx deleted file mode 100644 index 92b3c2e99673..000000000000 --- a/editors/openoffice.org-1.0/files/patch-vcl+unx+source+app+rptpsound.cxx +++ /dev/null @@ -1,13 +0,0 @@ ---- vcl/unx/source/app/rptpsound.cxx.orig Wed Oct 24 18:32:21 2001 -+++ vcl/unx/source/app/rptpsound.cxx Sun Jun 2 22:01:07 2002 -@@ -78,6 +78,10 @@ - extern "C" int usleep(unsigned int); - #endif - -+#ifdef FREEBSD -+#include <unistd.h> -+#endif -+ - #ifdef _USE_NAMESPACE - using namespace vcl_sal; - using namespace vos; diff --git a/editors/openoffice.org-1.0/files/patch-vcl+unx+source+app+saldata.cxx b/editors/openoffice.org-1.0/files/patch-vcl+unx+source+app+saldata.cxx deleted file mode 100644 index 482d8b351787..000000000000 --- a/editors/openoffice.org-1.0/files/patch-vcl+unx+source+app+saldata.cxx +++ /dev/null @@ -1,14 +0,0 @@ ---- vcl/unx/source/app/saldata.cxx.orig Sun Jun 2 22:07:34 2002 -+++ vcl/unx/source/app/saldata.cxx Sun Jun 2 22:08:22 2002 -@@ -78,6 +78,11 @@ - #ifdef AIX - #include <strings.h> - #endif -+#ifdef FREEBSD -+#include <sys/types.h> -+#include <sys/time.h> -+#include <unistd.h> -+#endif - - #ifndef _VOS_MUTEX_HXX - #include <vos/mutex.hxx> diff --git a/editors/openoffice.org-1.0/files/patch-vcl+unx+source+app+vsound.hxx b/editors/openoffice.org-1.0/files/patch-vcl+unx+source+app+vsound.hxx deleted file mode 100644 index 4f3246b24589..000000000000 --- a/editors/openoffice.org-1.0/files/patch-vcl+unx+source+app+vsound.hxx +++ /dev/null @@ -1,20 +0,0 @@ ---- vcl/unx/source/app/vsound.hxx.orig Sun Jul 21 00:10:24 2002 -+++ vcl/unx/source/app/vsound.hxx Sun Jul 21 00:10:27 2002 -@@ -61,7 +61,7 @@ - #ifndef _VCL_VSOUND_HXX - #define _VCL_VSOUND_HXX - --#ifdef LINUX -+#if defined(LINUX) || defined(FREEBSD) - #define USE_OSS - #endif - -@@ -69,7 +69,7 @@ - #define USE_DEVAUDIO - #endif - --#if defined LINUX || defined SOLARIS -+#if defined (LINUX) || defined(FREEBSD) || defined (SOLARIS) - #define USE_NAS - #endif - diff --git a/editors/openoffice.org-1.0/files/patch-vcl+unx+source+gdi+salcvt.cxx b/editors/openoffice.org-1.0/files/patch-vcl+unx+source+gdi+salcvt.cxx deleted file mode 100644 index 81bdd1fa836d..000000000000 --- a/editors/openoffice.org-1.0/files/patch-vcl+unx+source+gdi+salcvt.cxx +++ /dev/null @@ -1,20 +0,0 @@ ---- vcl/unx/source/gdi/salcvt.cxx.orig Mon Feb 24 17:46:21 2003 -+++ vcl/unx/source/gdi/salcvt.cxx Tue Feb 25 17:21:50 2003 -@@ -261,6 +261,17 @@ - || ( nChar >= 0x2500 && nChar <= 0x25a0 ); - break; - -+ case RTL_TEXTENCODING_KOI8_U: -+ bMatch = ( nChar >= 0x0020 && nChar <= 0x007e ) -+ || ( nChar >= 0x00a0 && nChar <= 0x00b7 ) -+ || ( nChar == 0x00f7 ) -+ || ( nChar >= 0x0401 && nChar <= 0x0491 ) -+ || ( nChar >= 0x2219 && nChar <= 0x221a ) -+ || ( nChar >= 0x2248 && nChar <= 0x2265 ) -+ || ( nChar >= 0x2320 && nChar <= 0x2321 ) -+ || ( nChar >= 0x2500 && nChar <= 0x25a0 ); -+ break; -+ - case RTL_TEXTENCODING_UNICODE: - bMatch = True; - break; diff --git a/editors/openoffice.org-1.0/files/patch-vcl+unx+source+gdi+xlfd_extd.cxx b/editors/openoffice.org-1.0/files/patch-vcl+unx+source+gdi+xlfd_extd.cxx deleted file mode 100644 index 9f86be8199c5..000000000000 --- a/editors/openoffice.org-1.0/files/patch-vcl+unx+source+gdi+xlfd_extd.cxx +++ /dev/null @@ -1,10 +0,0 @@ ---- vcl/unx/source/gdi/xlfd_extd.cxx.orig Mon Feb 24 17:46:21 2003 -+++ vcl/unx/source/gdi/xlfd_extd.cxx Tue Feb 25 17:22:26 2003 -@@ -205,6 +205,7 @@ - case RTL_TEXTENCODING_ISO_8859_15: - case RTL_TEXTENCODING_MS_1251: - case RTL_TEXTENCODING_KOI8_R: -+ case RTL_TEXTENCODING_KOI8_U: - case RTL_TEXTENCODING_JIS_X_0201: - if ( nLargestRange < 0x0080 ) - { diff --git a/editors/openoffice.org-1.0/files/patch-vcl+util+makefile.mk b/editors/openoffice.org-1.0/files/patch-vcl+util+makefile.mk deleted file mode 100644 index 907a9d874f0e..000000000000 --- a/editors/openoffice.org-1.0/files/patch-vcl+util+makefile.mk +++ /dev/null @@ -1,14 +0,0 @@ ---- vcl/util/makefile.mk.orig Sun Jul 21 00:12:09 2002 -+++ vcl/util/makefile.mk Sun Jul 21 00:12:11 2002 -@@ -293,9 +293,9 @@ - .ENDIF # "$(OS)"=="MACOSX" - .ENDIF # "$(OS)"=="SOLARIS" - --.IF "$(OS)"=="LINUX" || "$(OS)"=="SOLARIS" -+.IF "$(OS)"=="LINUX" || "$(OS)"=="SOLARIS" || "$(OS)"=="FREEBSD" - SHL1STDLIBS += -laudio --.ENDIF # "$(OS)"=="LINUX" || "$(OS)"=="SOLARIS" -+.ENDIF # "$(OS)"=="LINUX" || "$(OS)"=="SOLARIS" || "$(OS)"=="FREEBSD" - - .ENDIF # "$(GUI)"=="UNX" - diff --git a/editors/openoffice.org-1.0/files/pkg-message.in b/editors/openoffice.org-1.0/files/pkg-message.in deleted file mode 100644 index 4e72dc891b04..000000000000 --- a/editors/openoffice.org-1.0/files/pkg-message.in +++ /dev/null @@ -1,64 +0,0 @@ -OpenOffice.org Build 1.0.3 Personal Install How-To - -Written by: Martin Blapp <mbr@freebsd.org> - -OpenOffice.org will soon been installed in -${PREFIX}/OpenOffice.org1.0.3/ - -1 User installation -------------------- - -Just type "openoffice.org" after you have successfully -installed the package. If there is no installed -OO.org dir in your homedir, you'll be prompted to -install some files and choose a installed JDK. -The setup installs a "OpenOffice.org1.0.3" folder -in your homedir. - -If the setup tells you there is already an installed -version, you may look at the file ".sversionrc" in -your homedir. In this file OpenOffice.org and StarOffice -have both a line for each version which is installed. -After removing the problematic line you should be able to -install again. - -2 Start OO.org --------------- - -There are some wrappers installed for fast startup. -Add "${PREFIX}/bin/" to your PATH and you will be able -to use them. - -${PREFIX}/bin/openoffice.org-1.0.3 -${PREFIX}/bin/openoffice.org-1.0.3-sagenda -${PREFIX}/bin/openoffice.org-1.0.3-scalc -${PREFIX}/bin/openoffice.org-1.0.3-sdraw -${PREFIX}/bin/openoffice.org-1.0.3-setup -${PREFIX}/bin/openoffice.org-1.0.3-sfax -${PREFIX}/bin/openoffice.org-1.0.3-simpress -${PREFIX}/bin/openoffice.org-1.0.3-spadmin -${PREFIX}/bin/openoffice.org-1.0.3-sweb -${PREFIX}/bin/openoffice.org-1.0.3-swriter - -OO.org does need $LANG to be set to a suitable value. -Some old X-Servers before XFree86 4.2 do not like the -western locale with Euro symbol (ISO_8859-15). -You should ignore the warning message then or upgrade to -to a more recent X-server. - -If you have chosen US-ASCII as locale, you cannot load -and save documents with special characters and these -characters are also not available in swriter and scalc. - -3 Crash at startup after using a localized version --------------------------------------------------- - -If you had installed the english version, and then have -switched to a localized OO.org, it will crash instantly. - -To solve this issue, please remove the already installed -OpenOffice.org1.0.3 dir in your homedir and remove the -appropriate entry from ".sversionrc". After you have done -this, redo the user installation and the problem will -go away. - diff --git a/editors/openoffice.org-1.0/pkg-descr b/editors/openoffice.org-1.0/pkg-descr deleted file mode 100644 index 31fd1b12161a..000000000000 --- a/editors/openoffice.org-1.0/pkg-descr +++ /dev/null @@ -1,14 +0,0 @@ -OpenOffice.org is an Open Source, community-developed, multi-platform office -productivity suite. It includes the key desktop applications, such as a -word processor, spreadsheet, presentation manager, and drawing program, -with a user interface and feature set similar to other office suites. - -Components include: - * A universal word processing application for creating business - letters, extensive text documents, professional layouts, and HTML - documents. - * A sophisticated application for performing advanced spreadsheet - functions, such as analyzing figures, creating lists, and viewing data. - * A tool for creating effective eye-catching presentations. - * A vector-oriented draw module that enables the creation of 3D - illustrations diff --git a/editors/openoffice.org-1.0/pkg-plist b/editors/openoffice.org-1.0/pkg-plist deleted file mode 100644 index 28bd78453b52..000000000000 --- a/editors/openoffice.org-1.0/pkg-plist +++ /dev/null @@ -1 +0,0 @@ -# Dummy file, do not delete. Package list is generated automatically. diff --git a/editors/openoffice.org-1.1-devel/Makefile b/editors/openoffice.org-1.1-devel/Makefile deleted file mode 100644 index ebe205b2a6bf..000000000000 --- a/editors/openoffice.org-1.1-devel/Makefile +++ /dev/null @@ -1,264 +0,0 @@ -# New ports collection makefile for: OpenOffice.org -# Date created: 28 February 2002 -# Whom: Martin Blapp -# -# $FreeBSD$ -# - -PORTNAME= openoffice.org -PORTVERSION= 1.1.5.${SNAPDATE} -PORTREVISION= 4 -CATEGORIES+= editors -MASTER_SITES+= http://ooopackages.good-day.net/pub/OpenOffice.org/sources/1.1/ \ - http://openoffice.lunarshells.com/sources/1.1/ \ - ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc -DISTFILES+= OOo_SRX645_m${MILESTONE}_source.tar.bz2 -.if defined(WITH_GPC) -DISTFILES+= gpc231.tar.Z:gpc -.endif -EXTRACT_ONLY= OOo_SRX645_m${MILESTONE}_source.tar.bz2 - -MAINTAINER= openoffice@FreeBSD.org -COMMENT?= Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser - -NO_LATEST_LINK= yes - -MOZILLA_PROJECT= cws_srx645_mozooo.20040203.tar.gz -MOZILLA_VERSION= 1.0 -MOZILLA_SOURCE= mozilla-source-${MOZILLA_VERSION}.tar.gz -.if !defined(WITHOUT_MOZILLA) -DISTFILES+= ${MOZILLA_PROJECT} ${MOZILLA_SOURCE} -USE_GNOME+= orbit -.endif - -USE_PERL5= yes -USE_BISON= build -USE_GMAKE= yes -USE_BZIP2= yes -USE_GNOME+= gtk20 -WITHOUT_CPU_CFLAGS= true - -ONLY_FOR_ARCHS= i386 - -#.if !defined(WITHOUT_JAVA) -USE_JAVA= yes -JAVA_VERSION= 1.4+ -JAVA_BUILD= jdk -JAVA_VENDOR= freebsd bsdjava -#.endif - -.include <bsd.port.pre.mk> -.include <${FILESDIR}/Makefile.localized> -.if ${OSVERSION} >= 700042 -BROKEN= fails to install; consider upgrading to editors/openoffice.org-2 -.endif - -LANG_EXT?= 01 -LANG_CONFIGURE_ARG?= ENUS -L10NHELP?= helpcontent_01_unix.tgz - -DISTFILES+= ${L10NHELP} -.if defined(ALL_LOCALIZED_LANGS) -DISTFILES+= helpcontent_07_unix.tgz \ - helpcontent_31_unix.tgz helpcontent_33_unix.tgz \ - helpcontent_34_unix.tgz helpcontent_39_unix.tgz \ - helpcontent_42_unix.tgz helpcontent_43_unix.tgz \ - helpcontent_46_unix.tgz helpcontent_49_unix.tgz \ - helpcontent_50_unix.tgz helpcontent_55_unix.tgz \ - helpcontent_81_unix.tgz helpcontent_82_unix.tgz \ - helpcontent_86_unix.tgz helpcontent_88_unix.tgz \ - helpcontent_90_unix.tgz -L10NHELPS= helpcontent_01_unix.tgz helpcontent_07_unix.tgz \ - helpcontent_31_unix.tgz helpcontent_33_unix.tgz \ - helpcontent_34_unix.tgz helpcontent_39_unix.tgz \ - helpcontent_42_unix.tgz helpcontent_43_unix.tgz \ - helpcontent_46_unix.tgz helpcontent_49_unix.tgz \ - helpcontent_50_unix.tgz helpcontent_55_unix.tgz \ - helpcontent_81_unix.tgz helpcontent_82_unix.tgz \ - helpcontent_86_unix.tgz helpcontent_88_unix.tgz \ - helpcontent_90_unix.tgz -.endif - -CODELINE= 645 -RELEASE_NR= 1.1.5 -MILESTONE= 67 -SNAPDATE= 20070906 -INSTALLATION_BASEDIR= OpenOffice.org${RELEASE_NR} -EXECBASE= openoffice.org-${RELEASE_NR}m${MILESTONE} -DIST_SUBDIR= openoffice.org1.1 -SIMPLEOSVER= ${OSREL:C/\.//g} -PACKAGE_BASENAME= OOo_${RELEASE_NR}m${MILESTONE}_${OPSYS}${SIMPLEOSVER}Intel - -# FIXME (Somehow INDEX build fails) -.if defined(LANG_PKGNAME) -PKGNAMEPREFIX= ${LANG_PKGNAME}- -.endif -.if defined(LANG_SUFFIX) -PKGNAMESUFFIX?= -${LANG_SUFFIX} -.endif - -USE_GCC= 3.3 #3.3 is the best -.if defined(WITH_CCACHE) -BUILD_DEPENDS+= ccache:${PORTSDIR}/devel/ccache -CCACHE_PREFIX= ccache -OOOCC= ${CCACHE_PREFIX} ${CC} -OOOCXX= ${CCACHE_PREFIX} ${CXX} -.else -OOOCC= ${CC} -OOOCXX= ${CXX} -.endif -CONFIGURE_ENV+= CC="${OOOCC}" CXX="${OOOCXX}" \ - CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" - -BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \ - unzip:${PORTSDIR}/archivers/unzip \ - gcp:${PORTSDIR}/sysutils/coreutils \ - imake:${PORTSDIR}/devel/imake -#.if defined(WITHOUT_JAVA) -#LIB_DEPENDS+= xslt.2:${PORTSDIR}/textproc/libxslt -#.endif -.if !defined(WITH_GPC) -LIB_DEPENDS= art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl -.endif -GNU_CONFIGURE= yes -WRKSRC= ${WRKDIR}/SRX645_m${MILESTONE} -CONFIGURE_WRKSRC= ${WRKSRC}/config_office -TCSH?= /bin/tcsh -PKGMESSAGE= ${WRKDIR}/pkg-message -NUMOFPROCESSES?= 1 - -CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --enable-pasf --enable-crashdump --enable-symbols=SMALL #gcc3.2.3 is broken with -g1 - -.include <${FILESDIR}/Makefile.knobs> - -pre-everything:: -# really tweak, extremely useful when you build all localized language versions -# needed after when you build with ALL_LOCALIZED_LANGS. -.if defined(TWEAK_L10N) - @${RM} -f ${WRKDIR}/.PLIST* - @${RM} -f ${WRKDIR}/.install_done.* - @${RM} -f ${WRKDIR}/.package_done.* - @${RM} -f ${WRKDIR}/.extract_done.* - @${RM} -f ${WRKDIR}/.patch_done.* - @${RM} -f ${WRKDIR}/.configure_done.* - @${RM} -f ${WRKDIR}/.build_done.* - @${TOUCH} ${EXTRACT_COOKIE} - @${TOUCH} ${PATCH_COOKIE} - @${TOUCH} ${CONFIGURE_COOKIE} - @${TOUCH} ${BUILD_COOKIE} -.endif - -post-extract: -.if defined(WITH_TTF_BYTECODE_ENABLED) - @cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/optpatch-freetype -.endif -.if defined(WITH_GPC) - @cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/gpc231.tar.Z | ${TAR} xfz - - @${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/external/gpc/ - @${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/external/gpc/ -.endif - @${MKDIR} ${WRKDIR}/L10NHELP - @cd ${WRKDIR}/L10NHELP ; \ - ${CAT} ${DISTDIR}/${DIST_SUBDIR}/${L10NHELP} | ${GZIP_CMD} -d | ${TAR} xf - -.if defined(ALL_LOCALIZED_LANGS) - @cd ${WRKDIR}/L10NHELP ; \ - for helpfile in ${L10NHELPS}; do \ - ${CAT} ${DISTDIR}/${DIST_SUBDIR}/$$helpfile | ${GZIP_CMD} -d | ${TAR} xf - ; \ - done -.endif -.if !defined(WITHOUT_MOZILLA) - @(cd ${WRKSRC} ; ${MV} moz moz.old ; ${TAR} xfz ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_PROJECT} ; ${PATCH} < ${FILESDIR}/moz-patch) - @${MKDIR} ${WRKSRC}/moz/download - @${CP} ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_SOURCE} ${WRKSRC}/moz/download - @cd ${WRKSRC} ; ${MV} moz moz.runtime ; ${MV} moz.old moz -.endif - -pre-configure: -#Workaround for moz project, it uses gcc directly. - @${LN} -sf `which ${CC}` ${WRKSRC}/solenv/bin/gcc - @${LN} -sf `which ${CC}` ${WRKSRC}/solenv/bin/cc - @${LN} -sf `which ${CXX}` ${WRKSRC}/solenv/bin/g++ - @${LN} -sf `which ${CXX}` ${WRKSRC}/solenv/bin/c++ - -do-build: - @cd ${WRKSRC} ; ./bootstrap -.if !defined(WITHOUT_MOZILLA) - @cd ${WRKSRC}/moz.runtime ; ${SETENV} "BUILD_MOZAB=TRUE" ${TCSH} -c 'source ../FreeBSDEnv.Set ; build.pl ; dmake zip' ; ${CP} unxfbsd.pro/zipped/FREEBSD*.zip ../moz/zipped -.endif - @${MKDIR} ${WRKSRC}/solver/${CODELINE}/unxfbsd.pro/pck - @${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/solver/${CODELINE}/unxfbsd.pro/pck -# PR:84786 -.if (${NUMOFPROCESSES}>1) - @cd ${WRKSRC} ; ${SETENV} "LC_ALL=C" "LANG=C" ${TCSH} -c "source FreeBSDEnv.Set ; setenv TMP ${WRKSRC} ; cd instsetoo ; build.pl -P${NUMOFPROCESSES} --all" -.else - @cd ${WRKSRC} ; ${SETENV} "LC_ALL=C" "LANG=C" ${TCSH} -c "source FreeBSDEnv.Set ; setenv TMP ${WRKSRC} ; dmake" -.endif - -do-install: - @cd ${WRKSRC}/instsetoo/*.pro/${LANG_EXT}/normal/ ; ./install --prefix=${PREFIX} - -install-user: - @${PREFIX}/${INSTALLATION_BASEDIR}/program/setup - -post-install: - @${ECHO_MSG} "===> Add wrapper scripts"; - @${CP} ${FILESDIR}/openoffice.org-wrapper ${WRKDIR}/ - @${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \ - -e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \ - -e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \ - ${WRKDIR}/openoffice.org-wrapper - @${INSTALL_SCRIPT} ${WRKDIR}/openoffice.org-wrapper \ - ${PREFIX}/bin/${EXECBASE} - @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/openoffice.org - @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sagenda - @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-scalc - @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sdraw - @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-setup - @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sfax - @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-smath - @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-simpress - @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-spadmin - @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sweb - @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-swriter - @${PRINTF} "bin/openoffice.org\n" > ${TMPPLIST} - @cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} >> ${TMPPLIST} - @cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} ${EXECBASE} >> ${TMPPLIST} - @cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST} - @cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST} - @cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp - @${SORT} -r ${WRKDIR}/dir.tmp | ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST} - @${CP} ${FILESDIR}/pkg-message.in ${PKGMESSAGE} - @${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \ - -e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \ - -e 's#%%EXECBASE%%#${EXECBASE}#g' \ - -e 's#%%MILESTONE%%#${MILESTONE}#g' \ - -e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \ - ${PKGMESSAGE} - @${ECHO_CMD} - @${CAT} ${PKGMESSAGE} - @${ECHO_CMD} - -package-rename: - @${ECHO_MSG} "===> Rename package for OOo mirror upload"; -.if defined(LANG_SUFFIX) - @${MV} ${PKGFILE} \ - ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel_install_${LANG_PKGNAME}-${LANG_SUFFIX}${PKG_SUFX} -.elif defined(LANG_PKGNAME) - @${MV} ${PKGFILE} \ - ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel_install_${LANG_PKGNAME}${PKG_SUFX} -.else - @${MV} ${PKGFILE} \ - ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel_install${PKG_SUFX} -.endif - -sdk: - @${ECHO_MSG} "===> Make SDK of OpenOffice.org" - @cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd sdk_oo ; build.pl ; deliver.pl' - @${MV} ${WRKSRC}/solver/${CODELINE}/unxfbsd.pro/bin/OpenOffice.org${RELEASE_NR}_SDK.tar.gz ${WRKDIR}/../${PACKAGE_BASENAME}_sdk.tar.gz - -solver: - @${ECHO_MSG} "===> Make Solver of OpenOffice.org" - @cd ${WRKSRC} ; ${TAR} cfz ${WRKDIR}/../${PACKAGE_BASENAME}_solver.tar.gz solver - -.include <bsd.port.post.mk> diff --git a/editors/openoffice.org-1.1-devel/distinfo b/editors/openoffice.org-1.1-devel/distinfo deleted file mode 100644 index 3095b743bf9d..000000000000 --- a/editors/openoffice.org-1.1-devel/distinfo +++ /dev/null @@ -1,63 +0,0 @@ -MD5 (openoffice.org1.1/OOo_SRX645_m67_source.tar.bz2) = b098bc2855e26bebec93f03cc6eb2b18 -SHA256 (openoffice.org1.1/OOo_SRX645_m67_source.tar.bz2) = c4bd3c2b3b2b1f8016d7c0529bf6d4a0a5511b2e25dd01ba00368f58ca63c2ef -SIZE (openoffice.org1.1/OOo_SRX645_m67_source.tar.bz2) = 201137427 -MD5 (openoffice.org1.1/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 -SHA256 (openoffice.org1.1/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e -SIZE (openoffice.org1.1/gpc231.tar.Z) = 27917 -MD5 (openoffice.org1.1/cws_srx645_mozooo.20040203.tar.gz) = 1239aad43c65d6808b6261ea9d60fb67 -SHA256 (openoffice.org1.1/cws_srx645_mozooo.20040203.tar.gz) = 842984e791f0e674f7daa42ab368e2f32acfedad3b97e99e3ea84309f4cc227f -SIZE (openoffice.org1.1/cws_srx645_mozooo.20040203.tar.gz) = 39708 -MD5 (openoffice.org1.1/mozilla-source-1.0.tar.gz) = 35a7524c2fbb773e23449179c5cb1f20 -SHA256 (openoffice.org1.1/mozilla-source-1.0.tar.gz) = 9440b80a02ab87d4fb0f7116d43784e45c48782ebefb4ac7c53f5dbadbf92eea -SIZE (openoffice.org1.1/mozilla-source-1.0.tar.gz) = 39881558 -MD5 (openoffice.org1.1/helpcontent_01_unix.tgz) = 7da2aff674c2c84aba8b21ac2ab16bb6 -SHA256 (openoffice.org1.1/helpcontent_01_unix.tgz) = abc582c2ccb9a66a737c20e15385fb77a79090120168f2f88323dcd04d170884 -SIZE (openoffice.org1.1/helpcontent_01_unix.tgz) = 12052480 -MD5 (openoffice.org1.1/helpcontent_07_unix.tgz) = e3ab37cbf2407d909953f06467b27611 -SHA256 (openoffice.org1.1/helpcontent_07_unix.tgz) = a6ae171dbd159be1e6c2d739e779b9cb88e20e29366909587a361aa0842bd85c -SIZE (openoffice.org1.1/helpcontent_07_unix.tgz) = 13820401 -MD5 (openoffice.org1.1/helpcontent_31_unix.tgz) = c7e618e2d9b8bd25cae12954ef2548c9 -SHA256 (openoffice.org1.1/helpcontent_31_unix.tgz) = 6372ad8ab1563a9fc92e9f60809d32c841a81854e4f943910a1c413eca6e879f -SIZE (openoffice.org1.1/helpcontent_31_unix.tgz) = 12073861 -MD5 (openoffice.org1.1/helpcontent_33_unix.tgz) = 68d58bc30b485a77c0a0fba08af3aee3 -SHA256 (openoffice.org1.1/helpcontent_33_unix.tgz) = ffa6fcfc7bf88c06a4685c00bea137fc573c70cdf875e14a6fe7727fc87821d0 -SIZE (openoffice.org1.1/helpcontent_33_unix.tgz) = 12574720 -MD5 (openoffice.org1.1/helpcontent_34_unix.tgz) = 8696bbee3dc4d5b6fd60218123016e29 -SHA256 (openoffice.org1.1/helpcontent_34_unix.tgz) = 4b04d126f0c6a7effad6a6c343d2d64400ce3b9c30c709a7326a6ac05e66f820 -SIZE (openoffice.org1.1/helpcontent_34_unix.tgz) = 12554240 -MD5 (openoffice.org1.1/helpcontent_39_unix.tgz) = c2ae86d02f462d2b663d621190f5ef34 -SHA256 (openoffice.org1.1/helpcontent_39_unix.tgz) = 32d13d5278f521d650c59b4a8b4242700964257001e5112872010bdd444aba09 -SIZE (openoffice.org1.1/helpcontent_39_unix.tgz) = 12482560 -MD5 (openoffice.org1.1/helpcontent_42_unix.tgz) = 1b5f3f30c7939c2244f654bab0a68d91 -SHA256 (openoffice.org1.1/helpcontent_42_unix.tgz) = a75f60f44eb979595a163d172e5c80eb269ac5b0acd08aa2a8bacc964747a2ae -SIZE (openoffice.org1.1/helpcontent_42_unix.tgz) = 13250743 -MD5 (openoffice.org1.1/helpcontent_43_unix.tgz) = 1869d02ead606229a1fb94ec7abc33d9 -SHA256 (openoffice.org1.1/helpcontent_43_unix.tgz) = 99903a6da10a504ef148e2dc64cd2452f4ef0ba45f1295330975618ba7bdf4e1 -SIZE (openoffice.org1.1/helpcontent_43_unix.tgz) = 9016309 -MD5 (openoffice.org1.1/helpcontent_46_unix.tgz) = 7b013981edce2fabe4a8751ff64a8d58 -SHA256 (openoffice.org1.1/helpcontent_46_unix.tgz) = b47fe8c510b72b35a008e63a95a9693a1353f7dad38148b0f482d42a675a6747 -SIZE (openoffice.org1.1/helpcontent_46_unix.tgz) = 12072960 -MD5 (openoffice.org1.1/helpcontent_49_unix.tgz) = a39f44ec40f452c963a4a187f31d1acb -SHA256 (openoffice.org1.1/helpcontent_49_unix.tgz) = 1f4c28fc65df26cd538b90c30f7ec57f1101f95766422233e13aae9d5421d31b -SIZE (openoffice.org1.1/helpcontent_49_unix.tgz) = 13649920 -MD5 (openoffice.org1.1/helpcontent_50_unix.tgz) = 5e0464e3940d589c6358da4f2a3fbfae -SHA256 (openoffice.org1.1/helpcontent_50_unix.tgz) = 26ce7fed08498bbc3b3008dcaf5d9fcdae7735c01dc92b2f8db83a4a09bcf3f8 -SIZE (openoffice.org1.1/helpcontent_50_unix.tgz) = 15804777 -MD5 (openoffice.org1.1/helpcontent_55_unix.tgz) = 804d3ce61e11335193a410aaf9603f8e -SHA256 (openoffice.org1.1/helpcontent_55_unix.tgz) = fda279f73155211e00ebb7cbbb5246a98f11bd4e20f9b803987ff5f222f21ead -SIZE (openoffice.org1.1/helpcontent_55_unix.tgz) = 11549758 -MD5 (openoffice.org1.1/helpcontent_81_unix.tgz) = 81b705057a0e14ebcbf02fac4762781a -SHA256 (openoffice.org1.1/helpcontent_81_unix.tgz) = 720a260e2fdf21eab6a336773ae560ac49d7f7f157ff1cd15cf4214f24106851 -SIZE (openoffice.org1.1/helpcontent_81_unix.tgz) = 12902400 -MD5 (openoffice.org1.1/helpcontent_82_unix.tgz) = 3121fbd251176d7c7b6e33ecec744c65 -SHA256 (openoffice.org1.1/helpcontent_82_unix.tgz) = 9734bc94337252b7dfa7d238c4846403f8052f40da0e307a1f38360c556cf670 -SIZE (openoffice.org1.1/helpcontent_82_unix.tgz) = 12369920 -MD5 (openoffice.org1.1/helpcontent_86_unix.tgz) = aee37935139c5ccd4b6d8abdd2037c66 -SHA256 (openoffice.org1.1/helpcontent_86_unix.tgz) = 1578e0f45c4fc2eeda6f0348df5892c30db11d923b458ec2d07ad3092d141d58 -SIZE (openoffice.org1.1/helpcontent_86_unix.tgz) = 12769280 -MD5 (openoffice.org1.1/helpcontent_88_unix.tgz) = 3b00571318e45965dee0545d86306d65 -SHA256 (openoffice.org1.1/helpcontent_88_unix.tgz) = f31bbc3ab5b25be9b517554e1cb7d2beff11b054dc1774acf7e3430295624ee0 -SIZE (openoffice.org1.1/helpcontent_88_unix.tgz) = 12953600 -MD5 (openoffice.org1.1/helpcontent_90_unix.tgz) = 9521a01c5817e87178f356762f8cdab5 -SHA256 (openoffice.org1.1/helpcontent_90_unix.tgz) = 9b8e26d12afd8d92c4bd370cee2c04a45ea0989052822371a7b53b70ca981688 -SIZE (openoffice.org1.1/helpcontent_90_unix.tgz) = 12495734 diff --git a/editors/openoffice.org-1.1-devel/files/Makefile.knobs b/editors/openoffice.org-1.1-devel/files/Makefile.knobs deleted file mode 100644 index c6f11485627b..000000000000 --- a/editors/openoffice.org-1.1-devel/files/Makefile.knobs +++ /dev/null @@ -1,100 +0,0 @@ -# Makefile for knobs -# Whom: Maho Nakata <maho@FreeBSD.org> -# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-1.1-devel/files/Attic/Makefile.knobs,v 1.5 2006-05-28 10:03:53 maho Exp $ - -#.if defined(WITHOUT_JAVA) -#CONFIGURE_ARGS+= --disable-java -#.else -CONFIGURE_ARGS+= --with-jdk-home="${JAVA_HOME}" -#.endif - -.if !defined(WITH_GPC) -CONFIGURE_ARGS+= --enable-libart -.endif - -.if defined(WITHOUT_MOZILLA) -CONFIGURE_ARGS+= --disable-mozilla -.endif - -.if defined(ALL_LOCALIZED_LANGS) -CONFIGURE_ARGS+= --with-lang=ALL -.else -CONFIGURE_ARGS+= --with-lang=${LANG_CONFIGURE_ARG} -.endif - -.if defined(WITH_DEBUG) -.if ${WITH_DEBUG} == 2 -CONFIGURE_ARGS+= --enable-debug -.else -CONFIGURE_ARGS+= --enable-symbols -.endif -.endif - -pre-fetch: -.if (${OSVERSION} < 503001 && ${OSVERSION} >= 500000) || (${OSVERSION} < 492000) - @${ECHO} - @${ECHO} "WARNING" - @${ECHO} "Your rtld seems to be old." - @${ECHO} "Please remake your rtld by:" - @${ECHO} "[1] if you use 4-series:" - @${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng4" - @${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng4" - @${ECHO} "# make ; make depend ; make install" - @${ECHO} "[2] if you use 5-series:" - @${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng5" - @${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng5" - @${ECHO} "# make ; make depend ; make install" - @${ECHO} "AT YOUR OWN RISK!" -.endif - @${ECHO} "OPTIONS:" -.if !defined(WITH_DEBUG) - @${ECHO} - @${ECHO} "You can compile OOo with debug symbols with WITH_DEBUG=1" - @${ECHO} - @${ECHO} "If you set WITH_DEBUG=2, you add internal" - @${ECHO} "OOo debug support." -.endif -.if !defined(WITHOUT_MOZILLA) - @${ECHO} - @${ECHO} "You can compile OOo without Mozilla connectivity by" - @${ECHO} "make -DWITHOUT_MOZILLA" -.endif -.if !defined(WITH_TTF_BYTECODE_ENABLED) - @${ECHO} - @${ECHO} "You may get better quality of glyphs" - @${ECHO} "at small bitmap sizes, If you have" - @${ECHO} "licensed the Apple patents" - @${ECHO} "US05155805 US05159668 and US05325479, by" - @${ECHO} "make -DWITH_TTF_BYTECODE_ENABLED" - @${ECHO} "See http://www.freetype.org/patents.html for details" -.endif -.if !defined(LOCALIZED_LANG) - @${ECHO} - @${ECHO} "You can select the language for OOo by making it with 'make LOCALIZED_LANG=xx'" - @${ECHO} "while xx can be one of the following:" - @${ECHO} "af ar ca cs de dk el es et eu fi fr gl-ES he hi-IN" - @${ECHO} "hu it ja kn-IN ko lt nb nl nn ns pl pt pt-BR ru sk" - @${ECHO} "sl-SI sv th tn tr we zh-CN zh-TW zu" - @${ECHO} -.endif -#.if !defined(WITHOUT_JAVA) -# @${ECHO} -# @${ECHO} "You can compile OOo without Java support by" -# @${ECHO} "make -DWITHOUT_JAVA" -#.endif -.if !defined(WITH_GPC) - @${ECHO} - @${ECHO} "You can compile OOo with gpc instead of libart by" - @${ECHO} "make -DWITH_GPC" -.endif - @${ECHO} - @${ECHO} "NOTICE:" - @${ECHO} - @${ECHO} "To build OpenOffice.org, you should have a lot" -.if defined(WITH_DEBUG) - @${ECHO} "of free diskspace (~ 8GB)." -.else - @${ECHO} "of free diskspace (~ 4GB)." -.endif - @${ECHO} "If you want SDK and/or solver, please type make sdk and/or make solver" - diff --git a/editors/openoffice.org-1.1-devel/files/Makefile.localized b/editors/openoffice.org-1.1-devel/files/Makefile.localized deleted file mode 100644 index 142de09a2e70..000000000000 --- a/editors/openoffice.org-1.1-devel/files/Makefile.localized +++ /dev/null @@ -1,290 +0,0 @@ -# localized makefile -# Whom: Maho Nakata <maho@FreeBSD.org> -# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-1.1-devel/files/Attic/Makefile.localized,v 1.8 2008-04-19 17:48:18 miwi Exp $ - -################################################################ -# consult config_office/set_soenv.in for available languages -################################################################ -.if defined(LOCALIZED_LANG) -.if ${LOCALIZED_LANG} == "af" -LANG_PKGNAME= af -LANG_EXT= 27 -LANG_CONFIGURE_ARG= AFRIK -.endif -################################################################ -.if ${LOCALIZED_LANG} == "ar" -CATEGORIES+= arabic -LANG_PKGNAME= ar -LANG_EXT= 96 -LANG_CONFIGURE_ARG= ARAB -.endif -################################################################ -.if ${LOCALIZED_LANG} == "eu" -LANG_PKGNAME= eu -LANG_EXT= 10 -LANG_CONFIGURE_ARG= BASQUE -.endif -################################################################ -.if ${LOCALIZED_LANG} == "ca" -LANG_PKGNAME= ca -LANG_EXT= 37 -LANG_CONFIGURE_ARG= CAT -.endif -################################################################ -.if ${LOCALIZED_LANG} == "zh-CN" -CATEGORIES+= chinese -LANG_PKGNAME= zh -LANG_SUFFIX= CN -LANG_EXT= 86 -LANG_CONFIGURE_ARG= CHINSIM -BUILD_DEPENDS+= ${PREFIX}/share/fonts/TrueType/gbsn00lp.ttf:${PORTSDIR}/chinese/arphicttf -L10NHELP= helpcontent_${LANG_EXT}_unix.tgz -.endif -################################################################ -.if ${LOCALIZED_LANG} == "zh-TW" -CATEGORIES+= chinese -LANG_PKGNAME= zh -LANG_SUFFIX= TW -LANG_EXT= 88 -LANG_CONFIGURE_ARG= CHINTRAD -BUILD_DEPENDS+= ${PREFIX}/share/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/arphicttf -L10NHELP= helpcontent_${LANG_EXT}_unix.tgz -.endif -################################################################ -.if ${LOCALIZED_LANG} == "cs" -LANG_PKGNAME= cs -LANG_EXT= 42 -LANG_CONFIGURE_ARG= CZECH -L10NHELP= helpcontent_${LANG_EXT}_unix.tgz -.endif -################################################################ -.if ${LOCALIZED_LANG} == "dk" -LANG_PKGNAME= dk -LANG_EXT= 45 -LANG_CONFIGURE_ARG= DAN -.endif -################################################################ -.if ${LOCALIZED_LANG} == "nl" -LANG_PKGNAME= nl -LANG_EXT= 31 -L10NHELP= helpcontent_${LANG_EXT}_unix.tgz -LANG_CONFIGURE_ARG= DTCH -.endif -################################################################ -.if ${LOCALIZED_LANG} == "et" -LANG_PKGNAME= et -LANG_EXT= 77 -LANG_CONFIGURE_ARG= ESTONIAN -.endif -################################################################ -.if ${LOCALIZED_LANG} == "fi" -LANG_PKGNAME= fi -LANG_EXT= 35 -LANG_CONFIGURE_ARG= FINN -.endif -################################################################ -.if ${LOCALIZED_LANG} == "fr" -CATEGORIES+= french -LANG_PKGNAME= fr -LANG_EXT= 33 -L10NHELP= helpcontent_${LANG_EXT}_unix.tgz -LANG_CONFIGURE_ARG= FREN -.endif -################################################################ -.if ${LOCALIZED_LANG} == "gl-ES" -LANG_PKGNAME= gl -LANG_SUFFIX= ES -LANG_EXT= 38 -LANG_CONFIGURE_ARG= GAL -.endif -################################################################ -.if ${LOCALIZED_LANG} == "de" -CATEGORIES+= german -LANG_PKGNAME= de -LANG_EXT= 49 -L10NHELP= helpcontent_${LANG_EXT}_unix.tgz -LANG_CONFIGURE_ARG= GER -COMMENT= Office-Suite mit Textverarbeitung, Tabellenkalkulation, Datenbank und Praesentationsprogramm -.endif -################################################################ -.if ${LOCALIZED_LANG} == "el" -LANG_PKGNAME= el -LANG_EXT= 30 -LANG_CONFIGURE_ARG= GREEK -.endif -################################################################ -.if ${LOCALIZED_LANG} == "he" -LANG_PKGNAME= he -LANG_EXT= 97 -LANG_CONFIGURE_ARG= HEBREW -.endif -################################################################ -.if ${LOCALIZED_LANG} == "hi-IN" -LANG_PKGNAME= hi -LANG_EXT= 91 -LANG_CONFIGURE_ARG= HINDI -.endif -################################################################ -.if ${LOCALIZED_LANG} == "hu" -CATEGORIES+= hungarian -LANG_PKGNAME= hu -LANG_EXT= 36 -LANG_CONFIGURE_ARG= HUNG -.endif -################################################################ -.if ${LOCALIZED_LANG} == "it" -LANG_PKGNAME= it -LANG_EXT= 39 -L10NHELP= helpcontent_${LANG_EXT}_unix.tgz -LANG_CONFIGURE_ARG= ITAL -.endif -################################################################ -.if ${LOCALIZED_LANG} == "ja" -CATEGORIES+= japanese -LANG_PKGNAME= ja -LANG_EXT= 81 -LANG_CONFIGURE_ARG= JAPN -MASTER_SITES+= ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/stable/&,} -RUN_DEPENDS+= ${LOCALBASE}/lib/X11/fonts/TrueType/sazanami-mincho.ttf:${PORTSDIR}/japanese/sazanami-ttf -L10NHELP= helpcontent_${LANG_EXT}_unix.tgz -.endif -################################################################ -.if ${LOCALIZED_LANG} == "kn-IN" -LANG_PKGNAME= kn -LANG_SUFFIX= IN -LANG_EXT= 93 -LANG_CONFIGURE_ARG= KANNADA -.endif -################################################################ -.if ${LOCALIZED_LANG} == "ko" -CATEGORIES+= korean -LANG_PKGNAME= ko -LANG_EXT= 82 -LANG_CONFIGURE_ARG= KOREAN -L10NHELP= helpcontent_${LANG_EXT}_unix.tgz -.endif -################################################################ -.if ${LOCALIZED_LANG} == "lt" -LANG_PKGNAME= lt -LANG_EXT= 58 -LANG_CONFIGURE_ARG= LITHUANIAN -.endif -################################################################ -.if ${LOCALIZED_LANG} == "nb" -LANG_PKGNAME= nb -LANG_EXT= 47 -LANG_CONFIGURE_ARG= NORBOK -.endif -################################################################ -.if ${LOCALIZED_LANG} == "nn" -LANG_PKGNAME= nn -LANG_EXT= 79 -LANG_CONFIGURE_ARG= NORNYN -.endif -################################################################ -.if ${LOCALIZED_LANG} == "ns" -LANG_PKGNAME= ns -LANG_EXT= 26 -LANG_CONFIGURE_ARG= NSOTHO -.endif -################################################################ -.if ${LOCALIZED_LANG} == "pl" -CATEGORIES+= polish -LANG_PKGNAME= pl -LANG_EXT= 48 -LANG_CONFIGURE_ARG= POL -.endif -################################################################ -.if ${LOCALIZED_LANG} == "pt" -COMMENT= Editor texto/grBaGico, banco de dados/planilha/navegador integrado -CATEGORIES+= portuguese -LANG_PKGNAME= pt -LANG_EXT= 03 -LANG_CONFIGURE_ARG= PORT -.endif -################################################################ -.if ${LOCALIZED_LANG} == "pt-BR" -COMMENT= Editor texto/grBaGico, banco de dados/planilha/navegador integrado -CATEGORIES+= portuguese -LANG_PKGNAME= pt -LANG_SUFFIX= BR -L10NHELP= helpcontent_${LANG_EXT}_unix.tgz -LANG_EXT= 55 -LANG_CONFIGURE_ARG= PORTBR -.endif -################################################################ -.if ${LOCALIZED_LANG} == "ru" -CATEGORIES+= russian -LANG_PKGNAME= ru -LANG_EXT= 07 -LANG_CONFIGURE_ARG= RUSS -L10NHELP= helpcontent_${LANG_EXT}_unix.tgz -.endif -################################################################ -.if ${LOCALIZED_LANG} == "sk" -LANG_PKGNAME= sk -LANG_EXT= 43 -LANG_CONFIGURE_ARG= SLOVAK -L10NHELP= helpcontent_${LANG_EXT}_unix.tgz -.endif -################################################################ -.if ${LOCALIZED_LANG} == "sl-SI" -LANG_PKGNAME= sl -LANG_SUFFIX= SI -LANG_EXT= 50 -LANG_CONFIGURE_ARG= SLOVENIAN -L10NHELP= helpcontent_${LANG_EXT}_unix.tgz -.endif -################################################################ -.if ${LOCALIZED_LANG} == "es" -LANG_PKGNAME= es -LANG_EXT= 34 -L10NHELP= helpcontent_${LANG_EXT}_unix.tgz -LANG_CONFIGURE_ARG= SPAN -.endif -################################################################ -.if ${LOCALIZED_LANG} == "sv" -LANG_PKGNAME= sv -LANG_EXT= 46 -L10NHELP= helpcontent_${LANG_EXT}_unix.tgz -LANG_CONFIGURE_ARG= SWED -.endif -################################################################ -.if ${LOCALIZED_LANG} == "th" -LANG_PKGNAME= th -LANG_EXT= 66 -LANG_CONFIGURE_ARG= THAI -.endif -################################################################ -.if ${LOCALIZED_LANG} == "tn" -LANG_PKGNAME= tn -LANG_EXT= 29 -LANG_CONFIGURE_ARG= TSWANA -.endif -################################################################ -.if ${LOCALIZED_LANG} == "tr" -LANG_PKGNAME= tr -LANG_EXT= 90 -LANG_CONFIGURE_ARG= TURK -.endif -################################################################ -.if ${LOCALIZED_LANG} == "we" -LANG_PKGNAME= cy -LANG_EXT= 53 -LANG_CONFIGURE_ARG= WELSH -.endif -################################################################ -.if ${LOCALIZED_LANG} == "zu" -LANG_PKGNAME= zu -LANG_EXT= 28 -LANG_CONFIGURE_ARG= ZULU -.endif -################################################################ -.if defined(LANG_PKGNAME) -PKGNAMEPREFIX= ${LANG_PKGNAME}- -.endif -.if defined(LANG_SUFFIX) -PKGNAMESUFFIX?= -${LANG_SUFFIX} -.endif -.endif - diff --git a/editors/openoffice.org-1.1-devel/files/generate.pl b/editors/openoffice.org-1.1-devel/files/generate.pl deleted file mode 100644 index 2a3cb48b1ea7..000000000000 --- a/editors/openoffice.org-1.1-devel/files/generate.pl +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/perl -# generate full build shell script for OpenOffice.org -# Whom: Maho Nakata <maho@FreeBSD.org> -# $FreeBSD$ - -print "#!/bin/csh\n"; -print "make deinstall clean\n"; -print "/usr/bin/time -h make WITH_CCACHE=yes install package package-rename solver sdk deinstall >& log.en\n"; -print "rm work/.configure* work/.build* \n"; -print "/usr/bin/time -h make ALL_LOCALIZED_LANGS=yes >& log.all\n"; - -open ( FILE, "< Makefile.localized") ; -while(<FILE>){ -@tmp=split (' ',$_); -@tmp2=split ('"',$tmp[3]); -if ( $tmp[1] eq "\${LOCALIZED_LANG}") { $LANG=$tmp2[1]; - print "make TWEAK_L10N=yes LOCALIZED_LANG=$LANG pre-everything\n"; - print "/usr/bin/time -h make LOCALIZED_LANG=$LANG WITH_CCACHE=yes package package-rename deinstall >& log.$LANG\n"; - } -} -close FILE; diff --git a/editors/openoffice.org-1.1-devel/files/moz-patch b/editors/openoffice.org-1.1-devel/files/moz-patch deleted file mode 100644 index b37c1cbc1b37..000000000000 --- a/editors/openoffice.org-1.1-devel/files/moz-patch +++ /dev/null @@ -1,278 +0,0 @@ -#iZ 28398 -#iZ 11424 - -http://qa.openoffice.org/issues/show_bug.cgi?id=28398 -http://qa.openoffice.org/issues/show_bug.cgi?id=11424 - -disable freetype2 support since build broken and -this functionality is not used at all. - -fix build after /usr/bin/objformat removal - ---- moz/extractfiles.mk.org Sat Oct 30 22:01:49 2004 -+++ moz/extractfiles.mk Sat Oct 30 22:00:21 2004 -@@ -269,8 +269,8 @@ - +$(COPY) /QSZ $(INCLUDE_PATH)* $(INCLUDE_DIR) - +$(COPY) /QSZ $(PUBLIC_PATH)* $(INCLUDE_DIR) - .ELSE -- +$(GNUCOPY) -pr $(INCLUDE_PATH)* $(INCLUDE_DIR) -- +$(GNUCOPY) -pr $(PUBLIC_PATH)* $(INCLUDE_DIR) -+ +$(GNUCOPY) -Lr $(INCLUDE_PATH)* $(INCLUDE_DIR) -+ +$(GNUCOPY) -Lr $(PUBLIC_PATH)* $(INCLUDE_DIR) - .ENDIF - - .IF "$(GUI)"=="UNX" - ---- moz/mozilla-source-1.0.patch Thu May 3 09:11:47 2007 -+++ moz/mozilla-source-1.0.patch Thu May 3 09:10:12 2007 -@@ -4473,12 +4473,15 @@ - - --- misc/build/mozilla/.mozconfig Tue Jul 22 21:52:27 2003 - +++ misc/build/mozilla/.mozconfig Mon Jul 28 15:07:20 2003 --@@ -0,0 +1,8 @@ -+@@ -0,0 +1,11 @@ - +ac_add_options --disable-tests - +ac_add_options --disable-xprint - +ac_add_options --without-system-zlib - +ac_add_options --enable-ldap - +ac_add_options --disable-debug -++ac_add_options --disable-freetype2 -++ac_add_options --enable-default-toolkit=xlib -++ac_add_options --disable-pedantic - +ac_add_options --enable-optimize - +ac_add_options --enable-crypto - +ac_add_options --enable-strip -@@ -4497,3 +4500,233 @@ - endif - - # Windows equivalents -+ -+--- misc/build/mozilla/xpcom/typelib/xpidl/xpidl.h Wed Apr 10 12:38:31 2002 -++++ misc/build/mozilla/xpcom/typelib/xpidl/xpidl.h Sat Oct 29 12:34:19 2005 -+@@ -71,10 +71,10 @@ -+ * parens, e.g. XPIDL_WARNING((foo, bar, "sil")) -+ * -+ * Probably best removed when we leave 6.5. */ -+-#define XPIDL_WARNING(x) IDL_tree_warning##x -++#define XPIDL_WARNING(x) IDL_tree_warning x -+ #else -+ extern void xpidl_tree_warning(IDL_tree p, int level, const char *fmt, ...); -+-#define XPIDL_WARNING(x) xpidl_tree_warning##x -++#define XPIDL_WARNING(x) xpidl_tree_warning x -+ #endif -+ -+ /* -+*** misc/mozilla/configure Tue May 28 04:29:00 2002 -+--- misc/build/mozilla/configure Sun Sep 10 11:56:33 2006 -+*************** -+*** 4565,4571 **** -+ ;; -+ -+ *-freebsd*) -+! if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` != "elf"; then -+ DLL_SUFFIX=".so.1.0" -+ DSO_LDOPTS="-shared" -+ fi -+--- 4565,4571 ---- -+ ;; -+ -+ *-freebsd*) -+! if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` != "elf"; then -+ DLL_SUFFIX=".so.1.0" -+ DSO_LDOPTS="-shared" -+ fi -+*************** -+*** 6589,6594 **** -+--- 6589,6596 ---- -+ case $target in -+ *-hpux11.*) -+ ;; -++ *-freebsd*) -++ ;; -+ *) -+ echo $ac_n "checking for gethostbyname_r in -lc_r""... $ac_c" 1>&6 -+ echo "configure:6595: checking for gethostbyname_r in -lc_r" >&5 -+*** misc/mozilla/configure.in Tue May 28 04:29:12 2002 -+--- misc/build/mozilla/configure.in Sun Sep 10 11:56:18 2006 -+*************** -+*** 787,793 **** -+ ;; -+ -+ *-freebsd*) -+! if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` != "elf"; then -+ DLL_SUFFIX=".so.1.0" -+ DSO_LDOPTS="-shared" -+ fi -+--- 787,793 ---- -+ ;; -+ -+ *-freebsd*) -+! if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` != "elf"; then -+ DLL_SUFFIX=".so.1.0" -+ DSO_LDOPTS="-shared" -+ fi -+*************** -+*** 1606,1611 **** -+--- 1606,1613 ---- -+ case $target in -+ *-hpux11.*) -+ ;; -++ *-freebsd*) -++ ;; -+ *) -+ AC_CHECK_LIB(c_r, gethostbyname_r) -+ ;; -+*** misc/mozilla/directory/c-sdk/config/FreeBSD.mk Wed Apr 10 11:31:55 2002 -+--- misc/build/mozilla/directory/c-sdk/config/FreeBSD.mk Thu May 3 07:55:57 2007 -+*************** -+*** 66,72 **** -+ -+ ARCH = freebsd -+ -+! MOZ_OBJFORMAT := $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo aout) -+ -+ ifeq ($(MOZ_OBJFORMAT),elf) -+ DLL_SUFFIX = so -+--- 66,72 ---- -+ -+ ARCH = freebsd -+ -+! MOZ_OBJFORMAT := $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo elf) -+ -+ ifeq ($(MOZ_OBJFORMAT),elf) -+ DLL_SUFFIX = so -+*** misc/mozilla/directory/c-sdk/configure Wed Apr 10 11:31:53 2002 -+--- misc/build/mozilla/directory/c-sdk/configure Thu May 3 07:58:33 2007 -+*************** -+*** 3410,3416 **** -+ EOF -+ -+ CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall" -+! MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ if test "$MOZ_OBJFORMAT" = "elf"; then -+ DLL_SUFFIX=so -+ else -+--- 3410,3416 ---- -+ EOF -+ -+ CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall" -+! MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ if test "$MOZ_OBJFORMAT" = "elf"; then -+ DLL_SUFFIX=so -+ else -+*** misc/mozilla/directory/c-sdk/configure.in Wed Apr 10 11:31:54 2002 -+--- misc/build/mozilla/directory/c-sdk/configure.in Thu May 3 07:58:48 2007 -+*************** -+*** 900,906 **** -+ AC_DEFINE(FREEBSD) -+ AC_DEFINE(HAVE_BSD_FLOCK) -+ CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall" -+! MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ if test "$MOZ_OBJFORMAT" = "elf"; then -+ DLL_SUFFIX=so -+ else -+--- 900,906 ---- -+ AC_DEFINE(FREEBSD) -+ AC_DEFINE(HAVE_BSD_FLOCK) -+ CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall" -+! MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ if test "$MOZ_OBJFORMAT" = "elf"; then -+ DLL_SUFFIX=so -+ else -+*** misc/mozilla/nsprpub/configure Tue Sep 14 17:14:38 2004 -+--- misc/build/mozilla/nsprpub/configure Wed Apr 4 20:56:33 2007 -+*************** -+*** 3407,3413 **** -+ EOF -+ -+ CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall" -+! MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ if test "$MOZ_OBJFORMAT" = "elf"; then -+ DLL_SUFFIX=so -+ else -+--- 3407,3413 ---- -+ EOF -+ -+ CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall" -+! MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ if test "$MOZ_OBJFORMAT" = "elf"; then -+ DLL_SUFFIX=so -+ else -+*** misc/mozilla/nsprpub/configure.in Tue Sep 14 17:14:38 2004 -+--- misc/build/mozilla/nsprpub/configure.in Wed Apr 4 20:56:40 2007 -+*************** -+*** 922,928 **** -+ AC_DEFINE(HAVE_BSD_FLOCK) -+ AC_DEFINE(HAVE_SOCKLEN_T) -+ CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall" -+! MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ if test "$MOZ_OBJFORMAT" = "elf"; then -+ DLL_SUFFIX=so -+ else -+--- 922,928 ---- -+ AC_DEFINE(HAVE_BSD_FLOCK) -+ AC_DEFINE(HAVE_SOCKLEN_T) -+ CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall" -+! MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ if test "$MOZ_OBJFORMAT" = "elf"; then -+ DLL_SUFFIX=so -+ else -+ -+*** misc/mozilla/security/coreconf/FreeBSD.mk Wed Mar 26 20:17:25 2003 -+--- misc/build/mozilla/security/coreconf/FreeBSD.mk Wed Apr 4 20:56:48 2007 -+*************** -+*** 63,69 **** -+ -+ ARCH = freebsd -+ -+! MOZ_OBJFORMAT := $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo aout) -+ -+ ifeq ($(MOZ_OBJFORMAT),elf) -+ DLL_SUFFIX = so -+--- 63,69 ---- -+ -+ ARCH = freebsd -+ -+! MOZ_OBJFORMAT := $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo elf) -+ -+ ifeq ($(MOZ_OBJFORMAT),elf) -+ DLL_SUFFIX = so -+*** misc/mozilla/nsprpub/config/FreeBSD.mk Wed Apr 10 12:16:03 2002 -+--- misc/build/mozilla/nsprpub/config/FreeBSD.mk Thu May 3 08:07:27 2007 -+*************** -+*** 66,72 **** -+ -+ ARCH = freebsd -+ -+! MOZ_OBJFORMAT := $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo aout) -+ -+ ifeq ($(MOZ_OBJFORMAT),elf) -+ DLL_SUFFIX = so -+--- 66,72 ---- -+ -+ ARCH = freebsd -+ -+! MOZ_OBJFORMAT := $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo elf) -+ -+ ifeq ($(MOZ_OBJFORMAT),elf) -+ DLL_SUFFIX = so -+*** misc/mozilla/nsprpub/pr/src/misc/prnetdb.c Wed Apr 10 12:17:35 2002 -+--- misc/build/mozilla/nsprpub/pr/src/misc/prnetdb.c Sun Sep 10 11:55:27 2006 -+*************** -+*** 105,111 **** -+ #define _PR_HAVE_GETPROTO_R_INT -+ #endif -+ -+! #if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) -+ #define _PR_HAVE_GETPROTO_R -+ #define _PR_HAVE_5_ARG_GETPROTO_R -+ #endif -+--- 105,112 ---- -+ #define _PR_HAVE_GETPROTO_R_INT -+ #endif -+ -+! #if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) || \ -+! (defined(__FreeBSD__) && __FreeBSD_version > 601103) -+ #define _PR_HAVE_GETPROTO_R -+ #define _PR_HAVE_5_ARG_GETPROTO_R -+ #endif diff --git a/editors/openoffice.org-1.1-devel/files/openoffice.org-wrapper b/editors/openoffice.org-1.1-devel/files/openoffice.org-wrapper deleted file mode 100644 index b164e90f03fc..000000000000 --- a/editors/openoffice.org-1.1-devel/files/openoffice.org-wrapper +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -# -# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-1.1-devel/files/Attic/openoffice.org-wrapper,v 1.1 2005-07-29 01:44:40 maho Exp $ - -oopath=%%PREFIX%%/%%INSTALLATION_BASEDIR%%/program/ -program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%-||'` - -case $program in -$0) - $oopath/soffice "$@" - ;; - *) - $oopath/$program "$@" - ;; -esac diff --git a/editors/openoffice.org-1.1-devel/files/optpatch-freetype b/editors/openoffice.org-1.1-devel/files/optpatch-freetype deleted file mode 100644 index fb96fb1fadac..000000000000 --- a/editors/openoffice.org-1.1-devel/files/optpatch-freetype +++ /dev/null @@ -1,87 +0,0 @@ -Index: freetype/freetype-2.1.4.patch -=================================================================== -RCS file: /cvs/external/freetype/freetype-2.1.4.patch,v -retrieving revision 1.2 -diff -u -r1.2 freetype-2.1.4.patch ---- freetype/freetype-2.1.4.patch 17 Apr 2003 15:11:01 -0000 1.2 -+++ freetype/freetype-2.1.4.patch 16 Jan 2005 08:29:56 -0000 -@@ -1,5 +1,5 @@ --*** misc/freetype-2.1.4/builds/compiler/visualc.mk Thu Dec 14 00:44:33 2000 ----- misc/build/freetype-2.1.4/builds/compiler/visualc.mk Wed Apr 9 16:45:16 2003 -+*** misc/freetype-2.1.4/builds/compiler/visualc.mk Thu Dec 14 08:44:33 2000 -+--- misc/build/freetype-2.1.4/builds/compiler/visualc.mk Sun Jan 16 17:01:31 2005 - *************** - *** 63,69 **** - # ANSI compliance. -@@ -17,8 +17,8 @@ - endif - - # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant. --*** misc/freetype-2.1.4/builds/unix/ltmain.sh Sat Jan 18 17:39:18 2003 ----- misc/build/freetype-2.1.4/builds/unix/ltmain.sh Wed Apr 9 16:45:16 2003 -+*** misc/freetype-2.1.4/builds/unix/ltmain.sh Sun Jan 19 01:39:18 2003 -+--- misc/build/freetype-2.1.4/builds/unix/ltmain.sh Sun Jan 16 17:01:31 2005 - *************** - *** 2296,2302 **** - ;; -@@ -36,8 +36,8 @@ - - case $version_type in - nonstopux) verstring_prefix=nonstopux ;; --*** misc/freetype-2.1.4/builds/win32/visualc/freetype.dsp Fri Jan 31 00:24:18 2003 ----- misc/build/freetype-2.1.4/builds/win32/visualc/freetype.dsp Wed Apr 9 16:45:16 2003 -+*** misc/freetype-2.1.4/builds/win32/visualc/freetype.dsp Fri Jan 31 08:24:18 2003 -+--- misc/build/freetype-2.1.4/builds/win32/visualc/freetype.dsp Sun Jan 16 17:01:32 2005 - *************** - *** 44,51 **** - # PROP Output_Dir "..\..\..\objs\release" -@@ -57,8 +57,8 @@ - # SUBTRACT CPP /nologo /YX - # ADD BASE RSC /l 0x409 /d "NDEBUG" - # ADD RSC /l 0x409 /d "NDEBUG" --*** misc/freetype-2.1.4/include/freetype/config/ftmodule.h Thu Oct 31 09:29:31 2002 ----- misc/build/freetype-2.1.4/include/freetype/config/ftmodule.h Wed Apr 9 16:45:16 2003 -+*** misc/freetype-2.1.4/include/freetype/config/ftmodule.h Thu Oct 31 17:29:31 2002 -+--- misc/build/freetype-2.1.4/include/freetype/config/ftmodule.h Sun Jan 16 17:01:32 2005 - *************** - *** 1,8 **** - FT_USE_MODULE(autohint_module_class) -@@ -92,8 +92,8 @@ - FT_USE_MODULE(winfnt_driver_class) - + #endif - --*** misc/freetype-2.1.4/include/freetype/config/ftoption.h Fri Jan 31 00:24:18 2003 ----- misc/build/freetype-2.1.4/include/freetype/config/ftoption.h Wed Apr 9 16:45:16 2003 -+*** misc/freetype-2.1.4/include/freetype/config/ftoption.h Fri Jan 31 08:24:18 2003 -+--- misc/build/freetype-2.1.4/include/freetype/config/ftoption.h Sun Jan 16 17:04:45 2005 - *************** - *** 108,114 **** - /* this will however force you to link the zlib to any program that */ -@@ -111,8 +111,25 @@ - - - /*************************************************************************/ --*** misc/freetype-2.1.4/src/base/ftobjs.c Thu Mar 27 22:35:43 2003 ----- misc/build/freetype-2.1.4/src/base/ftobjs.c Sun Apr 13 17:57:51 2003 -+*************** -+*** 378,384 **** -+ /* do not #undef this macro here, since the build system might */ -+ /* define for certain configurations */ -+ /* */ -+! /* #define TT_CONFIG_OPTION_BYTECODE_INTERPRETER */ -+ -+ -+ /*************************************************************************/ -+--- 378,384 ---- -+ /* do not #undef this macro here, since the build system might */ -+ /* define for certain configurations */ -+ /* */ -+! #define TT_CONFIG_OPTION_BYTECODE_INTERPRETER -+ -+ -+ /*************************************************************************/ -+*** misc/freetype-2.1.4/src/base/ftobjs.c Fri Mar 28 06:35:43 2003 -+--- misc/build/freetype-2.1.4/src/base/ftobjs.c Sun Jan 16 17:01:32 2005 - *************** - *** 804,810 **** - { diff --git a/editors/openoffice.org-1.1-devel/files/patch-backtrace b/editors/openoffice.org-1.1-devel/files/patch-backtrace deleted file mode 100644 index 41daab73dede..000000000000 --- a/editors/openoffice.org-1.1-devel/files/patch-backtrace +++ /dev/null @@ -1,96 +0,0 @@ -Issuetracker : #iXXXXX# -CWS : N/A -Author : <maho@openoffice.org> (JCA) -Description : FreeBSD porting : An implementation of backtrace at sal/osl/unx -To pass the compilation, we preparing dummy function at sal. -We implemented this. - ---- sal/osl/unx/backtrace.c Tue Jul 6 19:35:44 2004 -+++ sal/osl/unx/backtrace.c Sun Oct 23 12:07:07 2005 -@@ -155,6 +155,7 @@ - #include <pthread.h> - #include <setjmp.h> - #include <stdio.h> -+#include <stddef.h> - #include "backtrace.h" - - #define FRAME_PTR_OFFSET 1 -@@ -162,11 +163,55 @@ - - int backtrace( void **buffer, int max_frames ) - { -- return 1; -+ struct frame *fp; -+ jmp_buf ctx; -+ int i; -+ /* get stack- and framepointer */ -+ setjmp(ctx); -+ fp = (struct frame*)(((size_t*)(ctx))[FRAME_PTR_OFFSET]); -+ for ( i=0; (i<FRAME_OFFSET) && (fp!=0); i++) -+ fp = fp->fr_savfp; -+ /* iterate through backtrace */ -+ for (i=0; fp && fp->fr_savpc && i<max_frames; i++) -+ { -+ /* store frame */ -+ *(buffer++) = (void *)fp->fr_savpc; -+ /* next frame */ -+ fp=fp->fr_savfp; -+ } -+ return i; - } - - void backtrace_symbols_fd( void **buffer, int size, int fd ) - { -+ FILE *fp = fdopen( fd, "w" ); -+ -+ if ( fp ) -+ { -+ void **pFramePtr; -+ for ( pFramePtr = buffer; size > 0 && pFramePtr && *pFramePtr; pFramePtr++, size-- ) -+ { -+ Dl_info dli; -+ ptrdiff_t offset; -+ -+ if ( 0 != dladdr( *pFramePtr, &dli ) ) -+ { -+ if ( dli.dli_fname && dli.dli_fbase ) -+ { -+ offset = (ptrdiff_t)*pFramePtr - (ptrdiff_t)dli.dli_fbase; -+ fprintf( fp, "%s+0x%x", dli.dli_fname, offset ); -+ } -+ if ( dli.dli_sname && dli.dli_saddr ) -+ { -+ offset = (ptrdiff_t)*pFramePtr - (ptrdiff_t)dli.dli_saddr; -+ fprintf( fp, "(%s+0x%x)", dli.dli_sname, offset ); -+ } -+ } -+ fprintf( fp, "[0x%x]\n", *pFramePtr ); -+ } -+ fflush( fp ); -+ fclose( fp ); -+ } - - } - #endif /* defined FREEBSD */ -Only in sal/osl/unx: backtrace.c.orig -diff -ur ../../src/OOo_1.1.5/sal/osl/unx/backtrace.h sal/osl/unx/backtrace.h ---- sal/osl/unx/backtrace.h Tue Jul 6 19:36:01 2004 -+++ sal/osl/unx/backtrace.h Sun Oct 23 12:07:07 2005 -@@ -72,6 +72,16 @@ - - void backtrace_symbols_fd( void **buffer, int size, int fd ); - -+/* no frame.h on FreeBSD */ -+#if defined FREEBSD -+struct frame { -+ long arg0[8]; -+ long arg1[6]; -+ struct frame *fr_savfp; -+ long fr_savpc; -+}; -+#endif -+ - #ifdef __cplusplus - } /* extern "C" */ - #endif -Only in sal/osl/unx: backtrace.h.orig diff --git a/editors/openoffice.org-1.1-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel b/editors/openoffice.org-1.1-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel deleted file mode 100644 index 5726cb84a6d7..000000000000 --- a/editors/openoffice.org-1.1-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel +++ /dev/null @@ -1,120 +0,0 @@ -Index: bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx -=================================================================== -RCS file: /cvs/udk/bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx,v -retrieving revision 1.3 -diff -u -r1.3 cpp2uno.cxx ---- bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx 28 Apr 2003 16:28:20 -0000 1.3 -+++ bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx 8 Jan 2007 00:45:53 -0000 -@@ -59,9 +59,9 @@ - * - ************************************************************************/ - -+#include <stdlib.h> - #include <hash_map> - --#include <sal/alloca.h> - #include <rtl/alloc.h> - #include <osl/mutex.hxx> - -Index: bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx -=================================================================== -RCS file: /cvs/udk/bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx,v -retrieving revision 1.4 -diff -u -r1.4 except.cxx ---- bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx 28 Apr 2003 16:41:25 -0000 1.4 -+++ bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx 8 Jan 2007 00:45:53 -0000 -@@ -63,6 +63,7 @@ - #include <dlfcn.h> - #include <cxxabi.h> - #include <hash_map> -+#include <sys/param.h> - - #include <rtl/strbuf.hxx> - #include <rtl/ustrbuf.hxx> -@@ -147,7 +148,11 @@ - }; - //__________________________________________________________________________________________________ - RTTI::RTTI() SAL_THROW( () ) -+#if __FreeBSD_version < 602103 /* #i22253# */ -+ : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) ) -+#else - : m_hApp( dlopen( 0, RTLD_LAZY ) ) -+#endif - { - } - //__________________________________________________________________________________________________ -@@ -182,7 +187,11 @@ - buf.append( 'E' ); - - OString symName( buf.makeStringAndClear() ); -+#if __FreeBSD_version < 602103 /* #i22253# */ -+ rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() ); -+#else - rtti = (type_info *)dlsym( m_hApp, symName.getStr() ); -+#endif - - if (rtti) - { -@@ -253,7 +262,7 @@ - //================================================================================================== - void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) - { --#if defined DEBUG -+#if OSL_DEBUG_LEVEL > 1 - OString cstr( - OUStringToOString( - *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ), -@@ -275,7 +284,7 @@ - *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ), - Reference< XInterface >() ); - } -- -+ - pCppExc = __cxa_allocate_exception( pTypeDescr->nSize ); - ::uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp ); - -@@ -321,16 +330,16 @@ - Reference< XInterface >() ); - Type const & rType = ::getCppuType( &aRE ); - uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno ); --#if defined _DEBUG -+#if OSL_DEBUG_LEVEL > 0 - OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) ); - OSL_ENSURE( 0, cstr.getStr() ); - #endif - return; - } -- -+ - typelib_TypeDescription * pExcTypeDescr = 0; - OUString unoName( toUNOname( header->exceptionType->name() ) ); --#if defined DEBUG -+#if OSL_DEBUG_LEVEL > 1 - OString cstr_unoName( OUStringToOString( unoName, RTL_TEXTENCODING_ASCII_US ) ); - fprintf( stderr, "> c++ exception occured: %s\n", cstr_unoName.getStr() ); - #endif -@@ -342,7 +351,7 @@ - Reference< XInterface >() ); - Type const & rType = ::getCppuType( &aRE ); - uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno ); --#if defined _DEBUG -+#if OSL_DEBUG_LEVEL > 0 - OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) ); - OSL_ENSURE( 0, cstr.getStr() ); - #endif -Index: bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx -=================================================================== -RCS file: /cvs/udk/bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx,v -retrieving revision 1.4 -diff -u -r1.4 uno2cpp.cxx ---- bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx 28 Apr 2003 16:28:35 -0000 1.4 -+++ bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx 8 Jan 2007 00:45:53 -0000 -@@ -59,7 +59,7 @@ - * - ************************************************************************/ - --#include <sal/alloca.h> -+#include <stdlib.h> - #include <rtl/alloc.h> - - #include <uno/data.h> diff --git a/editors/openoffice.org-1.1-devel/files/patch-gethostbyname_r b/editors/openoffice.org-1.1-devel/files/patch-gethostbyname_r deleted file mode 100644 index 63b243e146f9..000000000000 --- a/editors/openoffice.org-1.1-devel/files/patch-gethostbyname_r +++ /dev/null @@ -1,55 +0,0 @@ -Index: sal/osl/unx/socket.c -=================================================================== -RCS file: /cvs/porting/sal/osl/unx/socket.c,v -retrieving revision 1.22.10.1 -diff -u -r1.22.10.1 socket.c ---- sal/osl/unx/socket.c 18 Aug 2003 15:12:26 -0000 1.22.10.1 -+++ sal/osl/unx/socket.c 10 Sep 2006 03:18:08 -0000 -@@ -836,7 +836,7 @@ - const char *name, struct hostent *result, - char *buffer, int buflen, int *h_errnop) - { --#ifdef LINUX -+#if defined(LINUX) || (defined(FREEBSD) && (__FreeBSD_version >= 601103)) - struct hostent *__result; /* will be the same as result */ - int __error; - __error = gethostbyname_r (name, result, buffer, buflen, -Index: sal/osl/unx/system.c -=================================================================== -RCS file: /cvs/porting/sal/osl/unx/system.c,v -retrieving revision 1.8 -diff -u -r1.8 system.c ---- sal/osl/unx/system.c 16 Jul 2003 17:21:47 -0000 1.8 -+++ sal/osl/unx/system.c 10 Sep 2006 03:18:08 -0000 -@@ -371,6 +371,8 @@ - - extern int h_errno; - -+#if !defined(FREEBSD) || (__FreeBSD_version < 601103) -+ - struct hostent *gethostbyname_r(const char *name, struct hostent *result, - char *buffer, int buflen, int *h_errnop) - { -@@ -459,6 +461,8 @@ - - return res; - } -+#endif /* !defined(FREEBSD) || (__FreeBSD_version < 601103) */ -+ - - #if defined(MACOSX) - /* - ---- sal/osl/unx/system.h.orig Fri Aug 15 20:38:50 2003 -+++ sal/osl/unx/system.h Sun Sep 10 13:32:43 2006 -@@ -576,8 +576,10 @@ - struct tm *localtime_r(const time_t *timep, struct tm *buffer); - struct tm *gmtime_r(const time_t *timep, struct tm *buffer); - #endif /* !defined FREEBSD || (__FreeBSD_version < 500112) */ -+#if !defined(FREEBSD) || (__FreeBSD_version < 601103) - struct hostent *gethostbyname_r(const char *name, struct hostent *result, - char *buffer, int buflen, int *h_errnop); -+#endif /* !defined(FREEBSD) || (__FreeBSD_version < 601103) */ - #endif - - #endif /* __OSL_SYSTEM_H__ */ diff --git a/editors/openoffice.org-1.1-devel/files/patch-icu+icu-2.2.patch b/editors/openoffice.org-1.1-devel/files/patch-icu+icu-2.2.patch deleted file mode 100644 index 443730140dd5..000000000000 --- a/editors/openoffice.org-1.1-devel/files/patch-icu+icu-2.2.patch +++ /dev/null @@ -1,94 +0,0 @@ -Issuetracker : #iXXXXX# -CWS : N/A -Author : <maho@openoffice.org> (JCA) -Description : FreeBSD porting : Passing $ORIGIN to linker at icu project -We also want to pass -rpath $ORIGIN to linker as GNU/Linux and/or Solaris's case. -and unbreak the build with -ccache gcc33 -O -Wl,-rpath,'$ORIGIN' -o genrb errmsg.o genrb.o parse.o read.o reslist.o ustr.o util.o wrtjava.o rle.o -L../../i18n -licui18n -L../../tools/toolutil -licutoolutil -L../../common -licuuc -L../../data/out -L../../stubdata -licudata -lpthread -lm -../../i18n/libicui18n.so: undefined reference to `vtable for __cxxabiv1::__class_type_info@GLIBCPP_3.2' -../../i18n/libicui18n.so: undefined reference to `vtable for __cxxabiv1::__vmi_class_type_info@GLIBCPP_3.2' -../../i18n/libicui18n.so: undefined reference to `__gxx_personality_v0@CXXABI_1.2' -../../i18n/libicui18n.so: undefined reference to `vtable for __cxxabiv1::__si_class_type_info@GLIBCPP_3.2' -../../i18n/libicui18n.so: undefined reference to `__cxa_pure_virtual@CXXABI_1.2' -collect2: ld returned 1 exit status -gmake[2]: *** [genrb] Error 1 - -Index: icu/icu-2.2.patch -=================================================================== -RCS file: /cvs/external/icu/Attic/icu-2.2.patch,v -retrieving revision 1.17.6.2 -diff -u -r1.17.6.2 icu-2.2.patch ---- icu/icu-2.2.patch 6 Jul 2004 10:40:19 -0000 1.17.6.2 -+++ icu/icu-2.2.patch 21 Jun 2006 13:15:33 -0000 -@@ -1127,3 +1127,71 @@ - return tempGlyphCount; - }; - -+*** misc/icu/source/config/mh-bsd-gcc Thu May 2 08:48:10 2002 -+--- misc/build/icu/source/config/mh-bsd-gcc Mon Oct 24 18:21:04 2005 -+*************** -+*** 10,15 **** -+--- 10,18 ---- -+ GEN_DEPS.cc= $(CXX) -E -MM $(DEFS) $(CPPFLAGS) -+ -+ ## Flags for position independent code -++ STATICCFLAGS = -fPIC -++ STATICCXXFLAGS = -fPIC -++ STATICCPPFLAGS = -DPIC -+ SHAREDLIBCFLAGS = -fPIC -+ SHAREDLIBCXXFLAGS = -fPIC -+ SHAREDLIBCPPFLAGS = -DPIC -+*************** -+*** 17,22 **** -+--- 20,32 ---- -+ ## Compiler switch to embed a runtime search path -+ LD_RPATH= -+ LD_RPATH_PRE= -Wl,-rpath, -++ -++ ## Force RPATH=$ORIGIN to locate own dependencies w/o need for LD_LIBRARY_PATH -++ ENABLE_RPATH=YES -++ RPATHLDFLAGS=${LD_RPATH_PRE}'$$ORIGIN' -++ -++ #SH# ENABLE_RPATH=YES -++ #SH# RPATHLDFLAGS="${LD_RPATH_PRE}'$$ORIGIN'" -+ -+ ## Compiler switch to embed a library name -+ LD_SONAME = -Wl,-soname -Wl,$(MIDDLE_SO_TARGET) -+*** misc/icu/source/common/Makefile.in Tue Aug 13 05:30:14 2002 -+--- misc/build/icu/source/common/Makefile.in Wed Jun 21 21:58:59 2006 -+*************** -+*** 142,148 **** -+ -+ ifneq ($(ENABLE_SHARED),) -+ $(FINAL_SO_TARGET): $(OBJECTS) -+! $(SHLIB.cc) $(LD_SONAME) -o $@ $^ $(LIBS) -+ -+ ifeq ($(OS390BATCH),1) -+ $(BATCH_TARGET): $(OBJECTS) -+--- 142,148 ---- -+ -+ ifneq ($(ENABLE_SHARED),) -+ $(FINAL_SO_TARGET): $(OBJECTS) -+! $(SHLIB.c) $(LD_SONAME) -o $@ $^ $(LIBS) -+ -+ ifeq ($(OS390BATCH),1) -+ $(BATCH_TARGET): $(OBJECTS) -+*** misc/icu/source/i18n/Makefile.in Wed Aug 14 09:38:40 2002 -+--- misc/build/icu/source/i18n/Makefile.in Wed Jun 21 22:07:23 2006 -+*************** -+*** 134,140 **** -+ -+ ifneq ($(ENABLE_SHARED),) -+ $(FINAL_SO_TARGET): $(OBJECTS) -+! $(SHLIB.cc) $(LD_SONAME) -o $@ $^ $(LIBS) -+ -+ ifeq ($(OS390BATCH),1) -+ $(BATCH_TARGET):$(OBJECTS) -+--- 134,140 ---- -+ -+ ifneq ($(ENABLE_SHARED),) -+ $(FINAL_SO_TARGET): $(OBJECTS) -+! $(SHLIB.c) $(LD_SONAME) -o $@ $^ $(LIBS) -+ -+ ifeq ($(OS390BATCH),1) -+ $(BATCH_TARGET):$(OBJECTS) diff --git a/editors/openoffice.org-1.1-devel/files/patch-jdk15 b/editors/openoffice.org-1.1-devel/files/patch-jdk15 deleted file mode 100644 index f39b5414c9fa..000000000000 --- a/editors/openoffice.org-1.1-devel/files/patch-jdk15 +++ /dev/null @@ -1,778 +0,0 @@ -Index: jvmaccess/source/javainfoimpl.cxx -=================================================================== -RCS file: /cvs/udk/jvmaccess/source/Attic/javainfoimpl.cxx,v -retrieving revision 1.7.12.6 -diff -u -r1.7.12.6 javainfoimpl.cxx ---- jvmaccess/source/javainfoimpl.cxx 2 May 2005 13:30:59 -0000 1.7.12.6 -+++ jvmaccess/source/javainfoimpl.cxx 10 Sep 2006 04:51:58 -0000 -@@ -244,6 +244,8 @@ - "jdk1.4.2", \ - "diablo-jre1.3.1", \ - "diablo-jdk1.3.1", \ -+ "diablo-jre1.5.0", \ -+ "diablo-jdk1.5.0", \ - "linux-sun-jdk1.3.1", \ - "linux-sun-jdk1.4.2", \ - "linux-ibm-jdk1.3.1", \ - - -taken from http://wiki.linuxfromscratch.org/blfs/browser/trunk/patches/OOo_1.1.5-jdk_1.5.0_fix-1.patch?rev=5150&format=txt ---- XmlSearch/src/com/sun/xmlsearch/db/VectorBtree.java 2000-11-30 12:02:54.000000000 -0600 -+++ XmlSearch/src/com/sun/xmlsearch/db/VectorBtree.java 2005-04-19 01:56:30.289021048 -0500 -@@ -274,10 +274,10 @@ - return accessBlock(bl.integerAt(index*4)); - } - -- public static void assert(boolean assertion) { -+ /*public static void assert(boolean assertion) { - if (assertion == false) - System.err.println("assertion failed"); -- } -+ }*/ - - public int getIteratorBufferLength() { - return _blockSize + _vecLen*2; - ---- javaunohelper/com/sun/star/comp/helper/Bootstrap.java 2004-03-30 08:23:53.000000000 -0600 -+++ javaunohelper/com/sun/star/comp/helper/Bootstrap.java 2005-04-19 01:56:30.000000000 -0500 -@@ -220,11 +220,11 @@ - if (null != bootstrap_parameters) - { - pairs = new String [ 2 * bootstrap_parameters.size() ]; -- Enumeration enum = bootstrap_parameters.keys(); -+ Enumeration enumer = bootstrap_parameters.keys(); - int n = 0; -- while (enum.hasMoreElements()) -+ while (enumer.hasMoreElements()) - { -- String name = (String)enum.nextElement(); -+ String name = (String)enumer.nextElement(); - pairs[ n++ ] = name; - pairs[ n++ ] = (String)bootstrap_parameters.get( name ); - } - ---- javaunohelper/com/sun/star/lib/loader/Loader.java 2004-03-30 08:25:21.000000000 -0600 -+++ javaunohelper/com/sun/star/lib/loader/Loader.java 2005-04-19 01:56:30.000000000 -0500 -@@ -106,9 +106,9 @@ - ClassLoader loader = clazz.getClassLoader(); - Vector res = new Vector(); - try { -- Enumeration enum = loader.getResources( "META-INF/MANIFEST.MF" ); -- while ( enum.hasMoreElements() ) { -- res.add( (URL) enum.nextElement() ); -+ Enumeration enumer = loader.getResources( "META-INF/MANIFEST.MF" ); -+ while ( enumer.hasMoreElements() ) { -+ res.add( (URL) enumer.nextElement() ); - } - // the jarfile with the com/sun/star/lib/loader/Loader.class - // per-entry attribute is most probably the last resource in the - ---- jurt/com/sun/star/comp/servicemanager/ServiceManager.java 2002-10-30 09:28:39.000000000 -0600 -+++ jurt/com/sun/star/comp/servicemanager/ServiceManager.java 2005-04-19 01:56:30.000000000 -0500 -@@ -500,10 +500,10 @@ - throws com.sun.star.uno.RuntimeException - { - if (eventListener != null) { -- java.util.Enumeration enum = eventListener.elements(); -+ java.util.Enumeration enumer = eventListener.elements(); - -- while (enum.hasMoreElements()) { -- XEventListener listener = (XEventListener) enum.nextElement(); -+ while (enumer.hasMoreElements()) { -+ XEventListener listener = (XEventListener) enumer.nextElement(); - listener.disposing(new com.sun.star.lang.EventObject(this)); - } - } -@@ -732,16 +732,16 @@ - public XEnumeration createContentEnumeration( String serviceName ) - throws com.sun.star.uno.RuntimeException - { -- XEnumeration enum = null; -+ XEnumeration xenum = null; - - java.util.Vector serviceList = (java.util.Vector) factoriesByServiceNames.get(serviceName); - - if (serviceList != null) -- enum = new ServiceEnumerationImpl( serviceList.elements() ); -+ xenum = new ServiceEnumerationImpl( serviceList.elements() ); - else -- enum = new ServiceEnumerationImpl(); -+ xenum = new ServiceEnumerationImpl(); - -- return enum; -+ return xenum; - } - - /** -@@ -809,11 +809,11 @@ - /** - * Constructs a new instance with a given enumeration. - * <p> -- * @param enum is the enumeration which should been wrapped. -+ * @param enumer is the enumeration which should been wrapped. - * @see com.sun.star.container.XEnumeration - */ -- public ServiceEnumerationImpl(java.util.Enumeration enum) { -- enumeration = enum; -+ public ServiceEnumerationImpl(java.util.Enumeration enumer) { -+ enumeration = enumer; - } - - /** - ---- jurt/com/sun/star/comp/typedescriptionmanager/EnumTypeDescription.java 2001-12-03 05:00:41.000000000 -0600 -+++ jurt/com/sun/star/comp/typedescriptionmanager/EnumTypeDescription.java 2005-04-19 01:56:30.000000000 -0500 -@@ -136,12 +136,12 @@ - Field field = fields[nPos]; - int nMod = field.getModifiers(); - -- if (Enum.class.isAssignableFrom( field.getType() ) && -+ if (com.sun.star.uno.Enum.class.isAssignableFrom( field.getType() ) && - Modifier.isPublic( nMod ) && Modifier.isFinal( nMod ) && Modifier.isStatic( nMod )) - { - try - { -- values[nLen] = ((Enum)field.get( null )).getValue(); -+ values[nLen] = ((com.sun.star.uno.Enum)field.get( null )).getValue(); - names[nLen] = field.getName(); - ++nLen; - } - ---- jurt/com/sun/star/comp/typedescriptionmanager/TypeDescriptionManager.java 2000-09-18 10:27:52.000000000 -0500 -+++ jurt/com/sun/star/comp/typedescriptionmanager/TypeDescriptionManager.java 2005-04-19 01:56:30.000000000 -0500 -@@ -236,7 +236,7 @@ - ret = new InterfaceTypeDescription( this, c ); - else if (c.isArray()) - ret = new SequenceTypeDescription( (XTypeDescription)getByClass( c.getComponentType(), bUnsigned, bInterface ) ); -- else if (Enum.class.isAssignableFrom( c )) -+ else if (com.sun.star.uno.Enum.class.isAssignableFrom( c )) - ret = new EnumTypeDescription( c ); - // else if (com.sun.star.uno.Union.class.isAssignableFrom( c )) - // ret = new UnionTypeDescription( c ); - ---- jurt/com/sun/star/lib/uno/protocols/iiop/Marshal.java 2001-01-16 12:01:30.000000000 -0600 -+++ jurt/com/sun/star/lib/uno/protocols/iiop/Marshal.java 2005-04-19 01:56:30.000000000 -0500 -@@ -446,10 +446,10 @@ - writeObject(typeDescription, object); - } - -- void writeEnum(Enum enum) throws Exception { -- if(DEBUG) System.err.println("##### " + getClass().getName() + ".writeEnum:" + enum + " " + enum.getValue()); -+ void writeEnum(Enum writeenum) throws Exception { -+ if(DEBUG) System.err.println("##### " + getClass().getName() + ".writeEnum:" + writeenum + " " + writeenum.getValue()); - -- write_long(enum.getValue()); -+ write_long(writeenum.getValue()); - } - - void writeThrowable(TypeDescription typeDescription, Throwable throwable) throws Exception { - ---- jurt/com/sun/star/lib/uno/protocols/iiop/iiop.java 2001-02-02 03:01:03.000000000 -0600 -+++ jurt/com/sun/star/lib/uno/protocols/iiop/iiop.java 2005-04-19 01:56:30.000000000 -0500 -@@ -588,13 +588,13 @@ - Enumeration elements = _flushList.elements(); - while(elements.hasMoreElements()) { - Object objects[] = (Object[])elements.nextElement(); -- Enum enum = (Enum)objects[0]; -+ Enum enumer = (Enum)objects[0]; - Marshal marshal = (Marshal)objects[1]; - - int size = marshal.getSize(); - byte bytes[] = marshal.reset(); - -- writeMessageHeader(enum.getValue(), size, dataOutput); -+ writeMessageHeader(enumer.getValue(), size, dataOutput); - if(DEBUG) System.err.println("##### " + getClass().getName() + ".flush - bytes:" + size); - - dataOutput.write(bytes, 0, size); - ---- jurt/com/sun/star/lib/uno/protocols/urp/Marshal.java 2003-03-26 06:33:00.000000000 -0600 -+++ jurt/com/sun/star/lib/uno/protocols/urp/Marshal.java 2005-04-19 01:56:30.000000000 -0500 -@@ -293,10 +293,10 @@ - writedouble(zDouble.doubleValue()); - } - -- void writeEnum(Enum enum) { -- if(DEBUG) System.err.println("##### " + getClass().getName() + ".writeEnum:" + enum + " " + enum.getValue()); -+ void writeEnum(Enum writeenum) { -+ if(DEBUG) System.err.println("##### " + getClass().getName() + ".writeEnum:" + writeenum + " " + writeenum.getValue()); - -- writeint(enum.getValue()); -+ writeint(writeenum.getValue()); - } - - void writeThrowable(ITypeDescription iTypeDescription, Throwable throwable) { - ---- odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOAddInCreateIterator.java 2003-03-26 07:40:24.000000000 -0600 -+++ odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOAddInCreateIterator.java 2005-04-19 01:56:30.000000000 -0500 -@@ -200,7 +200,7 @@ - index--; - } - -- public org.openide.WizardDescriptor$Panel current() { -+ public org.openide.WizardDescriptor.Panel current() { - return panels[index]; - } - - ---- odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOIDLWizardIterator.java 2002-09-03 11:25:06.000000000 -0500 -+++ odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOIDLWizardIterator.java 2005-04-19 01:56:30.000000000 -0500 -@@ -207,7 +207,7 @@ - index--; - } - -- public org.openide.WizardDescriptor$Panel current() -+ public org.openide.WizardDescriptor.Panel current() - { - return panels[index]; - } - ---- odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOServiceCreateIterator.java 2003-03-26 07:40:24.000000000 -0600 -+++ odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOServiceCreateIterator.java 2005-04-19 01:56:30.000000000 -0500 -@@ -214,7 +214,7 @@ - index--; - } - -- public org.openide.WizardDescriptor$Panel current() { -+ public org.openide.WizardDescriptor.Panel current() { - return panels[index]; - } - - ---- qadevOOo/runner/base/java_complex.java 2003-06-11 11:24:17.000000000 -0500 -+++ qadevOOo/runner/base/java_complex.java 2005-04-19 01:56:30.000000000 -0500 -@@ -178,9 +178,9 @@ - java.io.InputStream in = connection.getInputStream(); - Properties props = new Properties(); - props.load(in); -- Enumeration enum = props.keys(); -- while (enum.hasMoreElements()) { -- String key = (String)enum.nextElement(); -+ Enumeration enumer = props.keys(); -+ while (enumer.hasMoreElements()) { -+ String key = (String)enumer.nextElement(); - String value = (String)props.get(key); - param.put(key.trim(), value.trim()); - } - ---- qadevOOo/runner/org/openoffice/RunnerService.java 2003-03-31 11:01:51.000000000 -0600 -+++ qadevOOo/runner/org/openoffice/RunnerService.java 2005-04-19 01:56:30.000000000 -0500 -@@ -252,10 +252,10 @@ - // get Jar file from connection - java.util.jar.JarFile f = con.getJarFile(); - // Enumerate over all entries -- java.util.Enumeration enum = f.entries(); -+ java.util.Enumeration enumer = f.entries(); - -- while (enum.hasMoreElements()) { -- String entry = enum.nextElement().toString(); -+ while (enumer.hasMoreElements()) { -+ String entry = enumer.nextElement().toString(); - if (entry.endsWith(".csv")) { - String module = null; - String object = null; - ---- qadevOOo/runner/util/DBTools.java 2003-01-27 10:27:05.000000000 -0600 -+++ qadevOOo/runner/util/DBTools.java 2005-04-19 01:56:30.000000000 -0500 -@@ -673,12 +673,12 @@ - XEnumerationAccess dbContEA = (XEnumerationAccess) - UnoRuntime.queryInterface(XEnumerationAccess.class, dbContext) ; - -- XEnumeration enum = dbContEA.createEnumeration() ; -+ XEnumeration enumer = dbContEA.createEnumeration() ; - - out.println("DatabaseContext registered DataSource's :") ; -- while (enum.hasMoreElements()) { -+ while (enumer.hasMoreElements()) { - try { -- DataSourceInfo inf = new DataSourceInfo(enum.nextElement()) ; -+ DataSourceInfo inf = new DataSourceInfo(enumer.nextElement()) ; - inf.printInfo(out) ; - } catch (com.sun.star.container.NoSuchElementException e) {} - catch (com.sun.star.lang.WrappedTargetException e) {} -@@ -849,4 +849,4 @@ - throws java.sql.SQLException { - statement.executeUpdate("drop table if exists " + tbl_name); - } --} -\ No newline at end of file -+} - ---- qadevOOo/tests/java/ifc/reflection/_XTypeDescriptionEnumerationAccess.java 2003-01-27 12:11:20.000000000 -0600 -+++ qadevOOo/tests/java/ifc/reflection/_XTypeDescriptionEnumerationAccess.java 2005-04-19 01:56:30.000000000 -0500 -@@ -94,13 +94,13 @@ - return; - } - try { -- XTypeDescriptionEnumeration enum = -+ XTypeDescriptionEnumeration enumer = - oObj.createTypeDescriptionEnumeration(sString, tClass, - TypeDescriptionSearchDepth.INFINITE); - try { - log.println("Got an enumeration."); - while (true) { -- XTypeDescription desc = enum.nextTypeDescription(); -+ XTypeDescription desc = enumer.nextTypeDescription(); - i++; - log.println("\tdesc name: " + desc.getName()); - } - ---- qadevOOo/tests/java/mod/_dbaccess/SbaXGridControl.java 2003-05-27 07:37:57.000000000 -0500 -+++ qadevOOo/tests/java/mod/_dbaccess/SbaXGridControl.java 2005-04-19 01:56:30.000000000 -0500 -@@ -376,7 +376,7 @@ - new Object[]{ new Integer(0) }, new Object[]{ new Integer(1) }}); - tEnv.addObjRelation("Comparer", new Comparator() { - public int compare(Object o1, Object o2) { -- return ((Integer)o1).compareTo(o2); -+ return compare((Integer) o1, o2); - } - public boolean equals(Object obj) { - return compare(this, obj) == 0; - ---- qadevOOo/tests/java/mod/_servicemgr.uno/OServiceManager.java 2003-05-27 08:25:05.000000000 -0500 -+++ qadevOOo/tests/java/mod/_servicemgr.uno/OServiceManager.java 2005-04-19 01:56:30.000000000 -0500 -@@ -162,12 +162,12 @@ - (XSet.class, oInterface) ; - XSet set1 = (XSet) UnoRuntime.queryInterface - (XSet.class, srvMan) ; -- XEnumeration enum = set1.createEnumeration(); -- Object srv = enum.nextElement(); -+ XEnumeration enumer = set1.createEnumeration(); -+ Object srv = enumer.nextElement(); - - set.insert(srv) ; - -- newElement = enum.nextElement(); -+ newElement = enumer.nextElement(); - - XPropertySet xProp = (XPropertySet)UnoRuntime.queryInterface( - XPropertySet.class, oInterface); - ---- qadevOOo/tests/java/mod/_smgr/OServiceManager.java 2003-05-27 08:28:36.000000000 -0500 -+++ qadevOOo/tests/java/mod/_smgr/OServiceManager.java 2005-04-19 01:56:30.000000000 -0500 -@@ -162,12 +162,12 @@ - (XSet.class, oInterface) ; - XSet set1 = (XSet) UnoRuntime.queryInterface - (XSet.class, srvMan) ; -- XEnumeration enum = set1.createEnumeration(); -- Object srv = enum.nextElement(); -+ XEnumeration enumer = set1.createEnumeration(); -+ Object srv = enumer.nextElement(); - - set.insert(srv) ; - -- newElement = enum.nextElement(); -+ newElement = enumer.nextElement(); - - XPropertySet xProp = (XPropertySet)UnoRuntime.queryInterface( - XPropertySet.class, oInterface); - ---- sandbox/com/sun/star/lib/sandbox/ClassContextImpl.java 2002-11-21 10:49:00.000000000 -0600 -+++ sandbox/com/sun/star/lib/sandbox/ClassContextImpl.java 2005-04-19 01:56:30.000000000 -0500 -@@ -304,10 +304,10 @@ - m_class_path_jars = class_path_jars; - } - -- java.util.Enumeration enum = m_class_path_jars.elements(); -- while (enum.hasMoreElements()) -+ java.util.Enumeration enumer = m_class_path_jars.elements(); -+ while (enumer.hasMoreElements()) - { -- ClassContext context = (ClassContext)enum.nextElement(); -+ ClassContext context = (ClassContext)enumer.nextElement(); - try - { - xClass = context.loadClass( className ); - ---- sj2/stardiv/app/AppletProps.java 2000-09-18 11:54:03.000000000 -0500 -+++ sj2/stardiv/app/AppletProps.java 2005-04-19 01:56:30.000000000 -0500 -@@ -138,7 +138,7 @@ - if (System.getProperty("http.proxyHost") != null) { - proxyHost.setText(System.getProperty("http.proxyHost")); - proxyPort.setText(System.getProperty("http.proxyPort")); -- HttpClient.proxyPort = Integer.valueOf(System.getProperty("http.proxyPort")).intValue(); -+ //HttpClient.proxyPort = Integer.valueOf(System.getProperty("http.proxyPort")).intValue(); - } - else { - proxyHost.setText(""); - ---- sj2/stardiv/controller/PropertyEditor.java 2000-09-18 11:54:03.000000000 -0500 -+++ sj2/stardiv/controller/PropertyEditor.java 2005-04-19 01:56:30.000000000 -0500 -@@ -197,10 +197,10 @@ - - m_DefaultList.removeAll(); - m_List.removeAll(); -- java.util.Enumeration enum = m_Properties.propertyNames(); -- while (enum.hasMoreElements()) -+ java.util.Enumeration enumer = m_Properties.propertyNames(); -+ while (enumer.hasMoreElements()) - { -- String strKey = (String)enum.nextElement(); -+ String strKey = (String)enumer.nextElement(); - - if (isDefaultKey(strKey)) - addToList(m_DefaultList, strKey, m_Properties.getProperty(strKey)); -@@ -551,19 +551,19 @@ - { - int nMax = 0; - -- java.util.Enumeration enum = props.propertyNames(); -- while (enum.hasMoreElements()) -- nMax = Math.max(nMax, ((String)enum.nextElement()).length()); -+ java.util.Enumeration enumer = props.propertyNames(); -+ while (enumer.hasMoreElements()) -+ nMax = Math.max(nMax, ((String)enumer.nextElement()).length()); - - return nMax+2; - } - - protected static boolean isDefaultKey(String strKey) - { -- java.util.Enumeration enum = c_DefaultProperties.elements(); -- while (enum.hasMoreElements()) -+ java.util.Enumeration enumer = c_DefaultProperties.elements(); -+ while (enumer.hasMoreElements()) - { -- if (strKey.equals((String)enum.nextElement())) -+ if (strKey.equals((String)enumer.nextElement())) - return true; - } - -@@ -574,10 +574,10 @@ - { - java.util.Properties saveProps = new java.util.Properties(); - -- java.util.Enumeration enum = m_Properties.propertyNames(); -- while (enum.hasMoreElements()) -+ java.util.Enumeration enumer = m_Properties.propertyNames(); -+ while (enumer.hasMoreElements()) - { -- String strKey = (String)enum.nextElement(); -+ String strKey = (String)enumer.nextElement(); - - if (!isDefaultKey(strKey)) - saveProps.put(strKey, m_Properties.getProperty(strKey)); -@@ -623,9 +623,9 @@ - - try - { -- java.util.Enumeration enum = System.getProperties().propertyNames(); -- while (enum.hasMoreElements()) -- c_DefaultProperties.addElement(enum.nextElement()); -+ java.util.Enumeration enumer = System.getProperties().propertyNames(); -+ while (enumer.hasMoreElements()) -+ c_DefaultProperties.addElement(enumer.nextElement()); - } - catch (Exception ignore0) {} - } -@@ -656,10 +656,10 @@ - } - catch (Exception ignore2) {} - -- java.util.Enumeration enum = props.propertyNames(); -- while (enum.hasMoreElements()) -+ java.util.Enumeration enumer = props.propertyNames(); -+ while (enumer.hasMoreElements()) - { -- String propKey = (String)enum.nextElement(); -+ String propKey = (String)enumer.nextElement(); - - // if the key is not a default put the new property into the table - if (!isDefaultKey(propKey)) - ---- sj2/stardiv/controller/StreamObserver.java 2000-09-18 11:54:04.000000000 -0500 -+++ sj2/stardiv/controller/StreamObserver.java 2005-04-19 01:56:30.000000000 -0500 -@@ -65,8 +65,7 @@ - import java.util.Observable; - import java.net.URL; - import java.net.MalformedURLException; --import sun.net.ProgressData; --import sun.net.ProgressEntry; -+import sun.net.ProgressSource; - - - /** -@@ -79,12 +78,12 @@ - { - public StreamObserver() - { -- ProgressData.pdata.addObserver( this ); -+ progressSource.beginTracking(); - } - - public void dispose() - { -- ProgressData.pdata.deleteObserver( this ); -+ progressSource.finishTracking(); - } - - static long nLastTime; -@@ -95,48 +94,47 @@ - nLastTime = System.currentTimeMillis(); - - String aStatus = null; -- ProgressEntry pEntry = (ProgressEntry)aArg; -- switch( pEntry.what ) -+ switch( progressSource.getState() ) - { -- case ProgressData.CONNECTED: -+ case CONNECTED: - { - try - { -- URL aURL = new URL( pEntry.label ); -+ URL aURL = progressSource.getURL(); - aStatus = "Connect: Host " + aURL.getHost() + " contacted. Waiting for reply..."; - } -- catch( MalformedURLException e ) -+ catch( Exception e ) - { -- aStatus = "Connect: " + pEntry.label; -+ aStatus = "Connect: " + progressSource.getURL().toString(); - } - } - break; - -- case ProgressData.UPDATE: -+ case UPDATE: - if( System.currentTimeMillis() - nLastTime > 3000 ) - // Only 1 update / 3s - return; -- if( pEntry.need != 0 ) -+ if( progressSource.getExpected() > 0 ) - { - // Java kommt mit dem letzten Byte nicht r"uber -- aStatus = "Transfered: " + pEntry.label + " - "; -- int nPercent = (int)(((long)pEntry.read * 100) / pEntry.need); -+ aStatus = "Transfered: " + progressSource.getURL().toString() + " - "; -+ int nPercent = (int)(((long)progressSource.getProgress() * 100) / progressSource.getExpected()); - aStatus += String.valueOf( nPercent ) + "% of "; -- if( pEntry.need >= 1000 ) -- aStatus += String.valueOf( pEntry.need / 1000 ) + "K "; -+ if( progressSource.getExpected() >= 1000 ) -+ aStatus += String.valueOf( progressSource.getExpected() / 1000 ) + "K "; - else -- aStatus += String.valueOf( pEntry.need ); -+ aStatus += String.valueOf( progressSource.getExpected() ); - aStatus += "bytes."; - } - else -- aStatus = "Transfered: " + pEntry.label; -+ aStatus = "Transfered: " + progressSource.getURL().toString(); - break; - -- case ProgressData.NEW: -- aStatus = "Try: " + pEntry.label; -+ case NEW: -+ aStatus = "Try: " + progressSource.getURL().toString(); - break; -- case ProgressData.DELETE: -- aStatus = "Done: " + pEntry.label; -+ case DELETE: -+ aStatus = "Done: " + progressSource.getURL().toString(); - break; - } - if( aStatus != null ) -@@ -179,6 +177,7 @@ - System.out.println( pStatus ); - } - } -+ private ProgressSource progressSource; - } - - - ---- unoil/makefile.pmk 2002-06-20 11:41:33.000000000 -0500 -+++ unoil/makefile.pmk 2005-04-19 01:56:30.000000000 -0500 -@@ -77,7 +77,7 @@ - GENJAVAFILES := $(foreach,i,$(JAVAFILESLIST) $(GENJAVADIR)$/$(PACKAGE)$/$i) - GENCLASSFILES := $(foreach,i,$(JAVAFILESLIST:b) $(GENCLASSDIR)$/$(PACKAGE)$/$i.class) - --JAVAFLAGS = -target 1.1 -+#JAVAFLAGS = -target 1.1 - # --- Targets ------------------------------------------------------ - - JAVAFILES=$(GENJAVAFILES) - ---- xmerge/java/org/openoffice/xmerge/ConvertData.java 2002-03-07 10:45:20.000000000 -0600 -+++ xmerge/java/org/openoffice/xmerge/ConvertData.java 2005-04-19 01:56:30.000000000 -0500 -@@ -127,8 +127,8 @@ - * <code>Vector</code> of <code>Document</code> objects. - */ - public Enumeration getDocumentEnumeration() { -- Enumeration enum = v.elements(); -- return (enum); -+ Enumeration enumer = v.elements(); -+ return (enumer); - } - - - ---- xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java 2003-05-29 04:03:38.000000000 -0500 -+++ xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java 2005-04-19 01:56:30.000000000 -0500 -@@ -155,14 +155,14 @@ - */ - public Document deserialize() throws ConvertException, IOException { - log("\nFound the XSLT deserializer"); -- Enumeration enum = cd.getDocumentEnumeration(); -+ Enumeration enumer = cd.getDocumentEnumeration(); - org.w3c.dom.Document domDoc=null; - DOMDocument docOut=null; - GenericOfficeDocument doc = null; - ByteArrayOutputStream baos =null; - GenericOfficeDocument sxwDoc = new GenericOfficeDocument("output"); -- while (enum.hasMoreElements()) { -- docOut = (DOMDocument) enum.nextElement(); -+ while (enumer.hasMoreElements()) { -+ docOut = (DOMDocument) enumer.nextElement(); - } - domDoc = docOut.getContentDOM(); - try{ - ---- xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java 2002-04-09 07:18:44.000000000 -0500 -+++ xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java 2005-04-19 01:56:30.000000000 -0500 -@@ -183,9 +183,9 @@ - String ext= ".txt"; - String mimeType = null; - ConverterInfo ci = this.getConverterInfo(); -- Enumeration enum = ci.getDeviceMime(); -- while (enum.hasMoreElements()) { -- mimeType= (String) enum.nextElement(); -+ Enumeration enumer = ci.getDeviceMime(); -+ while (enumer.hasMoreElements()) { -+ mimeType= (String) enumer.nextElement(); - } - try { - props.load(is); - ---- xmlhelp/source/com/sun/star/help/HelpIndexer.java 2004-10-28 06:52:44.000000000 -0500 -+++ xmlhelp/source/com/sun/star/help/HelpIndexer.java 2005-04-19 01:56:30.000000000 -0500 -@@ -197,13 +197,13 @@ - table.close( 0 ); - - System.out.println( "Indexing..." ); -- Enumeration enum = _hashDocInfo.elements(); -+ Enumeration enumer = _hashDocInfo.elements(); - int cut = 0; -- while( enum.hasMoreElements() && cut < 100000000 ) -+ while( enumer.hasMoreElements() && cut < 100000000 ) - { - try - { -- DocInfo info = ( DocInfo ) enum.nextElement(); -+ DocInfo info = ( DocInfo ) enumer.nextElement(); - String url = info.getURL(); - if( url == null ) - { -@@ -421,12 +421,12 @@ - - void dump() - { -- Enumeration enum = _hash.keys(); -+ Enumeration enumer = _hash.keys(); - int j = 0; - String[] list = new String[ _hash.size() ]; -- while( enum.hasMoreElements() ) -+ while( enumer.hasMoreElements() ) - { -- list[j++] = ( String ) enum.nextElement(); -+ list[j++] = ( String ) enumer.nextElement(); - } - - Db table; -@@ -462,12 +462,12 @@ - - void dumpHelptext() - { -- Enumeration enum = _hashHelptext.keys(); -+ Enumeration enumer = _hashHelptext.keys(); - int j = 0; - String[] list = new String[ _hashHelptext.size() ]; -- while( enum.hasMoreElements() ) -+ while( enumer.hasMoreElements() ) - { -- list[j++] = ( String ) enum.nextElement(); -+ list[j++] = ( String ) enumer.nextElement(); - } - - Db table; - ---- xmlhelp/source/com/sun/star/help/HelpTransformer.java 2001-02-07 03:35:47.000000000 -0600 -+++ xmlhelp/source/com/sun/star/help/HelpTransformer.java 2005-04-19 01:56:30.000000000 -0500 -@@ -14,11 +14,11 @@ - { - String styleName; - Hashtable styles; -- Enumeration enum = defs.getTable().keys(); -+ Enumeration enumer = defs.getTable().keys(); - -- while( enum.hasMoreElements() ) -+ while( enumer.hasMoreElements() ) - { -- styleName = ( String ) enum.nextElement(); -+ styleName = ( String ) enumer.nextElement(); - styles = defs.getEffectiveStyle( styleName ); - - Enumeration styleOptions = styles.keys(); -@@ -112,11 +112,11 @@ - while( it.hasNext() ) - { - Hashtable curr; -- Enumeration enum = (curr = ( Hashtable )it.next()).keys(); -- while( enum.hasMoreElements() ) -+ Enumeration enumer = (curr = ( Hashtable )it.next()).keys(); -+ while( enumer.hasMoreElements() ) - { - String str; -- if( result.get( str = ( String ) enum.nextElement() ) == null ) -+ if( result.get( str = ( String ) enumer.nextElement() ) == null ) - result.put( str,curr.get( str ) ); - } - } -@@ -129,11 +129,11 @@ - { - String str; - Hashtable a = getEffectiveStyle( "p.def1" ); -- Enumeration enum = a.keys(); -+ Enumeration enumer = a.keys(); - -- while( enum.hasMoreElements() ) -+ while( enumer.hasMoreElements() ) - { -- System.out.println( (str = ( String ) enum.nextElement()) + " : " + ((String)a.get(str)) ); -+ System.out.println( (str = ( String ) enumer.nextElement()) + " : " + ((String)a.get(str)) ); - } - } - -Index: config_office/set_soenv.in -=================================================================== -RCS file: /cvs/tools/config_office/set_soenv.in,v -retrieving revision 1.10.6.12 -diff -u -r1.10.6.12 set_soenv.in ---- config_office/set_soenv.in 29 Apr 2005 14:58:58 -0000 1.10.6.12 -+++ config_office/set_soenv.in 10 Sep 2006 08:15:16 -0000 -@@ -63,7 +63,7 @@ - my ( $BIG_SVX, $COM, $CPU, $CPUNAME, $CVER, $DLLSUFFIX, $GLIBC, $GUI, $GUIBASE, $GUIENV, - $GVER, $GVERDIR, $OS, $OSVERSION, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH, - $DEMO_ENV, $DYNAMIC_CRT, $SET_EXCEPTIONS, $emergency, $use_shl_versions, $CDPATHx, $JRELIBDIR, -- $JRETOOLKITDIR, $JRETHREADDIR, $EXCEPTIONS, $WRAPCMD ); -+ $JREEXTRALIBDIR, $JRETOOLKITDIR, $JRETHREADDIR, $EXCEPTIONS, $WRAPCMD ); - # - #------------------------------------------- - # IIc. Declaring the environment variables. -@@ -364,6 +364,7 @@ - $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386"; - $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client"; - $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads"; -+ $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."xawt"; - } - elsif ( $platform eq "$Linux" ) - { -@@ -901,6 +902,7 @@ - $ps.$JRELIBDIR. - $ps.$JRETOOLKITDIR. - $ps.$JRETHREADDIR. -+ $ps.$JREEXTRALIBDIR. - $ps.$par_dir.$LIB. - $ps_STLPORT_LIB. - $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB. diff --git a/editors/openoffice.org-1.1-devel/files/patch-jvmaccess+source+sunversion.cxx b/editors/openoffice.org-1.1-devel/files/patch-jvmaccess+source+sunversion.cxx deleted file mode 100644 index bbed543f1021..000000000000 --- a/editors/openoffice.org-1.1-devel/files/patch-jvmaccess+source+sunversion.cxx +++ /dev/null @@ -1,72 +0,0 @@ -Issuetracker : #iXXXXX# -CWS : N/A -Author : <maho@openoffice.org> -Description : FreeBSD porting : do not hardcode pXX of Java version and FreeBSD native Java is always superior to Linux's one. - -1. we had been hard coding Java's version by p1, p2 ... etc. but apparently -it is not a good habit. in this patch we eleminate this. - -2. we'd better to use FreeBSD's native Java, and not GNU/Linux's ones if both are exist -in the system. We add 100 as micro version number, so that we treat FreeBSD's version of -java 1.4.1-p10 for example to 1.4.1_110. - -3. Java version of 1.5.0_13-p7 will be treated as 1.5.0_13. -p part will be ignored. - ---- jvmaccess/source/sunversion.cxx Thu Jun 16 21:45:26 2005 -+++ jvmaccess/source/sunversion.cxx Sat Oct 22 16:42:01 2005 -@@ -193,7 +193,7 @@ - pCur ++; - // nPartPos ++; - } -- else if (nUpdatePart == 0 && (pCur == pEnd || isalpha(*pCur))) -+ else if (nUpdatePart == 0 && (pCur == pEnd || isalpha(*pCur) || (*pCur)=='-' )) - { - int len = pCur - pLast; - if (len >= 127) -@@ -246,30 +247,22 @@ - m_preRelease = Rel_RC2; - #if defined FREEBSD || defined NETBSD - // #i40617# and #i21615#: FreeBSD adds p1-p12 to their JDK port. -- else if (! strcmp(pCur, "p12")) -- m_preRelease = Rel_BETA; -- else if (! strcmp(pCur, "p11")) -- m_preRelease = Rel_BETA; -- else if (! strcmp(pCur, "p10")) -- m_preRelease = Rel_BETA; -- else if (! strcmp(pCur, "p9")) -- m_preRelease = Rel_BETA; -- else if (! strcmp(pCur, "p8")) -- m_preRelease = Rel_BETA; -- else if (! strcmp(pCur, "p7")) -- m_preRelease = Rel_BETA; -- else if (! strcmp(pCur, "p6")) -- m_preRelease = Rel_BETA; -- else if (! strcmp(pCur, "p5")) -- m_preRelease = Rel_BETA; -- else if (! strcmp(pCur, "p4")) -- m_preRelease = Rel_BETA; -- else if (! strcmp(pCur, "p3")) -- m_preRelease = Rel_BETA; -- else if (! strcmp(pCur, "p2")) -- m_preRelease = Rel_BETA; -- else if (! strcmp(pCur, "p1")) -- m_preRelease = Rel_BETA; -+ else if (!strncmp(pCur,"p",1)) //must be p[1-9]* -+ { -+ pCur++; //elemnate `p' -+ if (pCur < pEnd && isdigit(*pCur)) -+ { -+ if (pCur < pEnd) -+ pCur ++; -+ } -+ int len = pCur - pLast -1; //elemenate `p' -+ if (len >= 127) -+ return false; -+ strncpy(buf, (pLast+1), len); //elemenate `p' -+ buf[len] = 0; -+ //temporal hack we should use BSD's JDK... -+ m_arVersionParts[nPart] = atoi(buf)+100; -+ } - #endif - else - return false; diff --git a/editors/openoffice.org-1.1-devel/files/patch-libgcc b/editors/openoffice.org-1.1-devel/files/patch-libgcc deleted file mode 100644 index a3197c00be66..000000000000 --- a/editors/openoffice.org-1.1-devel/files/patch-libgcc +++ /dev/null @@ -1,39 +0,0 @@ -Index: work/OOo_1.1.5/external/gcc3_specific/makefile.mk -=================================================================== -RCS file: /cvs/util/external/gcc3_specific/makefile.mk,v -retrieving revision 1.3 -diff -u -r1.3 makefile.mk ---- external/gcc3_specific/makefile.mk 18 Jun 2003 12:44:10 -0000 1.3 -+++ external/gcc3_specific/makefile.mk 8 Jan 2008 03:22:55 -0000 -@@ -11,7 +11,6 @@ - - .IF "$(OS)"!="MACOSX" - .IF "$(OS)"!="IRIX" --.IF "$(OS)"!="FREEBSD" - - - all : $(SOLARLIBDIR)$/libstdc++.so.$(SHORTSTDCPP3) $(SOLARLIBDIR)$/libgcc_s.so.1 $(SOLARLIBDIR)$/libgcc_s.so -@@ -27,7 +26,6 @@ - -rm -f $@ - +ln -s libgcc_s.so.1 $@ - --.ENDIF - .ENDIF - .ENDIF - -Index: work/OOo_1.1.5/scp/source/global/udk_base.scp -=================================================================== -RCS file: /cvs/installation/scp/source/global/Attic/udk_base.scp,v -retrieving revision 1.7.24.2 -diff -u -r1.7.24.2 udk_base.scp ---- scp/source/global/udk_base.scp 28 Jan 2004 17:18:34 -0000 1.7.24.2 -+++ scp/source/global/udk_base.scp 8 Jan 2008 03:24:54 -0000 -@@ -6,7 +6,7 @@ - // Temporary solution/hack: at the moment libstdc++.so and libgcc_s.so are - // needed for unxlngi4 environment (setup is linked against it). - --#if ! (defined (FREEBSD) || defined(MACOSX) || defined(NETBSD) ) -+#if ! (defined(MACOSX) || defined(NETBSD) ) - #if ( defined( _gcc3 ) && ( defined( C300 ) || defined( C322 ) )) - - File gid_File_Lib_gcc diff --git a/editors/openoffice.org-1.1-devel/files/patch-objformat b/editors/openoffice.org-1.1-devel/files/patch-objformat deleted file mode 100644 index 53587fc236d8..000000000000 --- a/editors/openoffice.org-1.1-devel/files/patch-objformat +++ /dev/null @@ -1,230 +0,0 @@ ---- /dev/null Thu May 3 10:02:14 2007 -+++ berkeleydb/db-4.2.52.patch Thu May 3 09:52:51 2007 -@@ -0,0 +1,70 @@ -+*** misc/db-4.2.52.NC/dist/configure 2003-12-03 22:10:02.000000000 +0100 -+--- misc/build/db-4.2.52.NC/dist/configure 2007-02-19 16:12:12.000000000 +0100 -+*************** -+*** 9328,9334 **** -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+--- 9328,9334 ---- -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+*************** -+*** 12872,12878 **** -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+--- 12872,12878 ---- -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+*************** -+*** 15849,15855 **** -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+--- 15849,15855 ---- -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+*************** -+*** 18114,18120 **** -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+--- 18114,18120 ---- -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -Index: berkeleydb/makefile.mk -=================================================================== -RCS file: /cvs/external/berkeleydb/makefile.mk,v -retrieving revision 1.13.12.2 -diff -u -r1.13.12.2 makefile.mk ---- berkeleydb/makefile.mk 28 Oct 2004 11:54:48 -0000 1.13.12.2 -+++ berkeleydb/makefile.mk 3 May 2007 01:04:40 -0000 -@@ -73,6 +73,8 @@ - - TARFILE_NAME=db-4.2.52.NC - -+PATCH_FILE_NAME=db-4.2.52.patch -+ - # not needed for win32. comment out when causing problems... - - .IF "$(GUI)"=="UNX" - -Index: curl/unx1-curl-7.9.8.patch -=================================================================== -RCS file: /cvs/external/curl/Attic/unx1-curl-7.9.8.patch,v -retrieving revision 1.2.18.1 -diff -u -r1.2.18.1 unx1-curl-7.9.8.patch ---- curl/unx1-curl-7.9.8.patch 3 May 2004 16:32:05 -0000 1.2.18.1 -+++ curl/unx1-curl-7.9.8.patch 3 May 2007 01:13:15 -0000 -@@ -251,3 +251,22 @@ - /************************************************************* - * No protocol part in URL was used, add it! - *************************************************************/ -+*** misc/curl-7.9.8/configure Wed Jun 12 00:16:54 2002 -+--- misc/build/curl-7.9.8/configure Thu May 3 10:10:42 2007 -+*************** -+*** 6292,6298 **** -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+--- 6292,6298 ---- -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -Index: freetype/freetype-2.1.4.patch -=================================================================== -RCS file: /cvs/external/freetype/Attic/freetype-2.1.4.patch,v -retrieving revision 1.2 -diff -u -r1.2 freetype-2.1.4.patch ---- freetype/freetype-2.1.4.patch 17 Apr 2003 15:11:01 -0000 1.2 -+++ freetype/freetype-2.1.4.patch 3 May 2007 01:15:56 -0000 -@@ -131,3 +131,22 @@ - - /* XXX If some new encodings to represent UCS-4 are added, */ - /* they should be added here. */ -+*** misc/freetype-2.1.4/builds/unix/configure Sun Jan 19 01:39:18 2003 -+--- misc/build/freetype-2.1.4/builds/unix/configure Thu May 3 10:14:26 2007 -+*************** -+*** 7203,7209 **** -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+--- 7203,7209 ---- -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) - -Index: sndfile/libsndfile-1.0.9.patch -=================================================================== -RCS file: /cvs/external/sndfile/libsndfile-1.0.9.patch,v -retrieving revision 1.2 -diff -u -r1.2 libsndfile-1.0.9.patch ---- sndfile/libsndfile-1.0.9.patch 31 May 2005 16:31:31 -0000 1.2 -+++ sndfile/libsndfile-1.0.9.patch 3 May 2007 01:21:01 -0000 -@@ -83,6 +83,23 @@ - shlibpath_var=DYLD_LIBRARY_PATH - shrext='$(test .$module = .yes && echo .so || echo .dylib)' - *************** -+*** 7871,7877 **** -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+--- 7878,7884 ---- -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+*************** - *** 9111,9120 **** - ;; - esac -@@ -143,6 +160,23 @@ - module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - hardcode_direct_CXX=no - *************** -+*** 11560,11566 **** -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+--- 11567,11573 ---- -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+*************** - *** 14069,14084 **** - lt_int_apple_cc_single_mod=yes - fi -@@ -178,6 +212,23 @@ - module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - hardcode_direct_F77=no - *************** -+*** 14700,14706 **** -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+--- 14707,14713 ---- -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+*************** - *** 16414,16429 **** - lt_int_apple_cc_single_mod=yes - fi diff --git a/editors/openoffice.org-1.1-devel/files/patch-odk+configure.pl b/editors/openoffice.org-1.1-devel/files/patch-odk+configure.pl deleted file mode 100644 index 31c4d23cd943..000000000000 --- a/editors/openoffice.org-1.1-devel/files/patch-odk+configure.pl +++ /dev/null @@ -1,47 +0,0 @@ -Issuetracker : #iXXXXX# -CWS : N/A -Author : NAKATA Maho <maho@openoffice.org> (JCA) -Description : most pop name of installated GNU make is gmake, not make for FreeBSD - -Index: configure.pl -=================================================================== -RCS file: /cvs/api/odk/configure.pl,v -retrieving revision 1.4.12.3 -diff -u -r1.4.12.3 configure.pl ---- odk/configure.pl.orig 18 May 2004 10:02:00 -0000 1.4.12.3 -+++ odk/configure.pl 11 Aug 2004 08:21:04 -0000 -@@ -19,7 +19,7 @@ - chop ($main::OFFICE_HOME_SUGGESTION); - - $main::OO_SDK_MAKE_HOME = ""; --$main::OO_SDK_MAKE_HOME_SUGGESTION = searchprog("make"); -+$main::OO_SDK_MAKE_HOME_SUGGESTION = searchprog("gmake"); - $main::makeVersion = "3.79.1"; - $main::correctVersion = 0; - -@@ -101,7 +101,7 @@ - # prepare GNU make path - while ( (!$main::correctVersion) && - ((! -d "$main::OO_SDK_MAKE_HOME" ) || -- ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/make"))) ) -+ ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/gmake"))) ) - { - print "Enter GNU make ($main::makeVersion or higher) tools directory [$main::OO_SDK_MAKE_HOME_SUGGESTION]: "; - $main::OO_SDK_MAKE_HOME = <STDIN>; -@@ -111,14 +111,14 @@ - $main::OO_SDK_MAKE_HOME = $main::OO_SDK_MAKE_HOME_SUGGESTION; - } - if ( (! -d "$main::OO_SDK_MAKE_HOME") || -- ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/make")) ) -+ ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/gmake")) ) - { - $main::OO_SDK_MAKE_HOME = ""; - print "Error: GNU make is required, please specify a GNU make tools directory.\n"; - } else - { - #check version -- my $testVersion = `$OO_SDK_MAKE_HOME/make --version`; -+ my $testVersion = `$OO_SDK_MAKE_HOME/gmake --version`; - if ( $testVersion eq "") - { - print "The 'make' command found at $main::OO_SDK_MAKE_HOME/make is not GNU Make\n"; diff --git a/editors/openoffice.org-1.1-devel/files/patch-rsc+source+rscpp+makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-rsc+source+rscpp+makefile.mk deleted file mode 100644 index 2959319805b5..000000000000 --- a/editors/openoffice.org-1.1-devel/files/patch-rsc+source+rscpp+makefile.mk +++ /dev/null @@ -1,21 +0,0 @@ -Issuetracker : #i54178# -CWS : hr17 -Author: : -Description : - -Index: rsc/source/rscpp/makefile.mk -=================================================================== -RCS file: /cvs/gsl/rsc/source/rscpp/makefile.mk,v -retrieving revision 1.5 -diff -u -r1.5 makefile.mk ---- rsc/source/rscpp/makefile.mk 8 Sep 2005 14:00:27 -0000 1.5 -+++ rsc/source/rscpp/makefile.mk 21 Sep 2005 10:18:09 -0000 -@@ -36,6 +36,8 @@ - - TARGETTYPE=CUI - TARGETTHREAD=ST -+# we don't need STL in this project -+NO_DEFAULT_STL=TRUE - - PRJNAME=rsc - TARGET=rscpp diff --git a/editors/openoffice.org-1.1-devel/files/patch-scp+source+office+unxbasic.scp b/editors/openoffice.org-1.1-devel/files/patch-scp+source+office+unxbasic.scp deleted file mode 100644 index 9a058c27dd9a..000000000000 --- a/editors/openoffice.org-1.1-devel/files/patch-scp+source+office+unxbasic.scp +++ /dev/null @@ -1,25 +0,0 @@ -Issuetracker : #iXXXXX# -CWS : N/A -Author : NAKATA Maho <maho@openoffice.org> (JCA) -Description : Do not make a link as /usr/bin/soffice - -Index: scp/source/office/unxbasic.scp -=================================================================== -RCS file: /cvs/installation/scp/source/office/Attic/unxbasic.scp,v -retrieving revision 1.49.8.9 -diff -u -r1.49.8.9 unxbasic.scp ---- scp/source/office/unxbasic.scp 27 Aug 2004 11:43:50 -0000 1.49.8.9 -+++ scp/source/office/unxbasic.scp 15 Jan 2005 10:22:08 -0000 -@@ -924,12 +924,6 @@ - Dim sofficeFile As String - Dim linkName As String - -- sofficeFile = DirEntry(GetSetupEnv.DestPath, "program", "soffice") -- -- linkName = "/usr/bin/soffice" -- -- shell("/bin/sh -c " & "'ln -s " & chr(34) & sofficeFile & chr(34) & " " & linkName & " >/dev/null 2>&1'") -- - End Sub - - }; diff --git a/editors/openoffice.org-1.1-devel/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx b/editors/openoffice.org-1.1-devel/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx deleted file mode 100644 index 08684375eb4a..000000000000 --- a/editors/openoffice.org-1.1-devel/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx +++ /dev/null @@ -1,32 +0,0 @@ -Issuetracker : #iXXXXX# -CWS : N/A -Author : NAKATA Maho <maho@openoffice.org> (JCA) -Description : -In solver/645/unxfbsd.pro/inc/rtl/string.hxx, -even though there is a descrioptin like -static OString valueOf( sal_Int32 i, sal_Int16 radix = 10 ) SAL_THROW(()) -and In /usr/include/machine/_types.h, -typedef int __int32_t; -typedef __int32_t __time_t; /* time()... */ -and -/usr/include/time.h:typedef __time_t time_t; -this cast seems to be mandatory. Why?? - ---- shell/source/unix/sysshell/recently_used_file_handler.cxx.orig Tue Jan 13 00:56:37 2004 -+++ shell/source/unix/sysshell/recently_used_file_handler.cxx Tue Jan 13 00:57:26 2004 -@@ -188,9 +188,12 @@ - write_xml_start_tag(TAG_RECENT_ITEM, file, true); - write_xml_tag(TAG_URI, uri_, file); - write_xml_tag(TAG_MIME_TYPE, mime_type_, file); -- -- rtl::OString ts = rtl::OString::valueOf(timestamp_); -- write_xml_tag(TAG_TIMESTAMP, ts.getStr(), file); -+#if defined FREEBSD -+ rtl::OString ts = rtl::OString::valueOf((sal_Int32)timestamp_); -+#else -+ rtl::OString ts = rtl::OString::valueOf(timestamp_); -+#endif -+ write_xml_tag(TAG_TIMESTAMP, ts.getStr(), file); - - if (is_private_) - write_xml_tag(TAG_PRIVATE, file); diff --git a/editors/openoffice.org-1.1-devel/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-1.1-devel/files/patch-solenv+inc+unxfbsdi.mk deleted file mode 100644 index 275882d765bb..000000000000 --- a/editors/openoffice.org-1.1-devel/files/patch-solenv+inc+unxfbsdi.mk +++ /dev/null @@ -1,248 +0,0 @@ -Issuetracker : #iXXXXX# -CWS : N/A -Author : <maho@openoffice.org> (JCA) -Description : FreeBSD porting : catch up recent version of solenv/inc/unxlngi5.mk -catch up recent version of solenv/inc/unxlngi5.mk - ---- solenv/inc/unxfbsdi.mk.orig Tue May 4 01:27:08 2004 -+++ solenv/inc/unxfbsdi.mk Mon Oct 24 11:39:05 2005 -@@ -60,16 +60,21 @@ - # - #************************************************************************* - --# mak file for unxfbsdi --ASM=$(CC) --AFLAGS=-x assembler-with-cpp -c $(CDEFS) -+# ma file for unxfbsdi -+ASM= -+AFLAGS= -+ -+SOLAR_JAVA*=TRUE -+JAVAFLAGSDEBUG=-g - - # filter for supressing verbose messages from linker - #not needed at the moment - #LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter" - -+# _PTHREADS is needed for the stl -+CDEFS+= -DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450 -DOSVERSION=$(OSVERSION) $(PTHREAD_CFLAGS) -+ - # this is a platform with JAVA support --SOLAR_JAVA*=TRUE - .IF "$(SOLAR_JAVA)"!="" - JAVADEF=-DSOLAR_JAVA - .IF "$(debug)"=="" -@@ -83,89 +88,81 @@ - CXX*=g++ - # name of C Compiler - CC*=gcc -+.IF "$(SYSBASE)"!="" -+CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include -+CXX+:=$(CFLAGS_SYSBASE) -+CC+:=$(CFLAGS_SYSBASE) -+.ENDIF # "$(SYSBASE)"!="" -+# flags for C and C++ Compiler -+# do not use standard header search paths -+# if installed elsewhere -+.IF "$(BUILD_SOSL)"!="" -+CFLAGS= -+.ENDIF -+CFLAGS+=-fmessage-length=0 -c $(INCLUDE) - --# filter for supressing verbose messages from linker --# not needed at the moment --LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter" -- --# options for C and C++ Compiler --CDEFS+= -D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=450 -DOSVERSION=$(OSVERSION) --CDEFS+= $(PTHREAD_CFLAGS) -D_REENTRANT -- --# flags for C and C++ Compile --CFLAGS+= -w -c $(INCLUDE) --CFLAGS+= -I/usr/X11R6/include -+# flags to enable build with symbols; required for crashdump feature -+.IF "$(ENABLE_SYMBOLS)"=="SMALL" -+CFLAGSENABLESYMBOLS=-g1 -+.ELSE -+CFLAGSENABLESYMBOLS=-g -+.ENDIF - - # flags for the C++ Compiler --CFLAGSCC= -pipe -fno-rtti --CFLAGSCXX= -pipe -fno-for-scope -fpermissive -fno-rtti -- -+CFLAGSCC= -pipe -mcpu=pentiumpro - # Flags for enabling exception handling --CFLAGSEXCEPTIONS= -fexceptions --CFLAGS_NO_EXCEPTIONS= -fno-exceptions -- --# Compiler flags for compiling static object in single threaded --# environment with graphical user interface --CFLAGSOBJGUIST= -fPIC -- --# Compiler flags for compiling static object in single threaded --# environment with character user interface --CFLAGSOBJCUIST= -fPIC -- --# Compiler flags for compiling static object in multi threaded --# environment with graphical user interface --CFLAGSOBJGUIMT= -fPIC -- --# Compiler flags for compiling static object in multi threaded --# environment with character user interface --CFLAGSOBJCUIMT= -fPIC -- --# Compiler flags for compiling shared object in multi threaded --# environment with graphical user interface --CFLAGSSLOGUIMT= -fPIC -- --# Compiler flags for compiling shared object in multi threaded --# environment with character user interface --CFLAGSSLOCUIMT= -fPIC -- --# Compiler flags for profilin --CFLAGSPROF= -pg -- -+CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs -+# Flags for disabling exception handling -+CFLAGS_NO_EXCEPTIONS=-fno-exceptions -+ -+# -fpermissive should be removed as soon as possible -+CFLAGSCXX= -pipe -mcpu=pentiumpro -fno-for-scope -fpermissive -fno-rtti -+ -+# Compiler flags for compiling static object in single threaded environment with graphical user interface -+CFLAGSOBJGUIST= -+# Compiler flags for compiling static object in single threaded environment with character user interface -+CFLAGSOBJCUIST= -+# Compiler flags for compiling static object in multi threaded environment with graphical user interface -+CFLAGSOBJGUIMT= -+# Compiler flags for compiling static object in multi threaded environment with character user interface -+CFLAGSOBJCUIMT= -+# Compiler flags for compiling shared object in multi threaded environment with graphical user interface -+CFLAGSSLOGUIMT=-fpic -+# Compiler flags for compiling shared object in multi threaded environment with character user interface -+CFLAGSSLOCUIMT=-fpic -+# Compiler flags for profiling -+CFLAGSPROF= - # Compiler flags for debugging --CFLAGSDEBUG= -g -+CFLAGSDEBUG=-g - CFLAGSDBGUTIL= -- --# Compiler flags to enable optimizations --# -02 is broken for FreeBSD --CFLAGSOPT= -O -- --# Compiler flags to disable optimizations --# -0 is broken for STLport for FreeBSD --CFLAGSNOOPT= -O0 -- --# Compiler flags for the output path --CFLAGSOUTOBJ= -o -- -+# Compiler flags for enabling optimazations -+# CFLAGSOPT=-O2 -+# reduce to -O1 to avoid optimisation problems -+CFLAGSOPT=-O1 -+# Compiler flags for disabling optimazations -+CFLAGSNOOPT=-O0 -+# Compiler flags for discibing the output path -+CFLAGSOUTOBJ=-o - # Enable all warnings - CFLAGSWALL=-Wall -- - # Set default warn level - CFLAGSDFLTWARN=-w - - # switches for dynamic and static linking --STATIC= -Wl,-Bstatic --DYNAMIC= -Wl,-Bdynamic -+STATIC = -Wl,-Bstatic -+DYNAMIC = -Wl,-Bdynamic - - # name of linker --LINK=$(CC) -+LINK*=$(CC) - - # default linker flags --# LINKFLAGSRUNPATH*=-Wl,-rpath\''$$ORIGIN'\' --LINKFLAGS=$(LINKFLAGSRUNPATH) -+LINKFLAGSDEFS*=-z defs -+LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\' -+LINKFLAGS=-z combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH) - - # linker flags for linking applications --LINKFLAGSAPPGUI= -Wl,--noinhibit-exec --LINKFLAGSAPPCUI= -Wl,--noinhibit-exec -+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec -+LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec - - # linker flags for linking shared libraries - LINKFLAGSSHLGUI= -shared -@@ -176,21 +173,16 @@ - LINKFLAGSDEBUG=-g - LINKFLAGSOPT= - --.IF "$(NO_BSYMBOLIC)"=="" --.IF "$(PRJNAME)" != "envtest" --LINKFLAGSSHLGUI+= -Wl,-Bsymbolic --LINKFLAGSSHLCUI+= -Wl,-Bsymbolic --.ENDIF --.ENDIF -+# linker flags for optimization (symbol hashtable) -+# for now, applied to symbol scoped libraries, only -+LINKFLAGSOPTIMIZE*=-Wl,-O1 -+LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script - --LINKVERSIONMAPFLAG=-Wl,--version-script -+SONAME_SWITCH=-Wl,-h - - # Sequence of libs does matter ! --STDLIBCPP=-lstdc++ - --# _SYSLIBS= -L/usr/lib -lm --# _X11LIBS= -L/usr/X11R6/lib -lXext -lX11 --# _CXXLIBS= -L/usr/lib -lstdc++ -L/usr/local/lib -+STDLIBCPP=-lstdc++ - - # default objectfilenames to link - STDOBJGUI= -@@ -200,24 +192,26 @@ - - # libraries for linking applications - STDLIBCUIST=-lm --STDLIBGUIST=-lXaw -lXt -lX11 -lm --STDLIBGUIMT=-lXaw -lXt -lX11 $(PTHREAD_LIBS) -lm -+STDLIBGUIMT=-lX11 $(PTHREAD_LIBS) -lm - STDLIBCUIMT=$(PTHREAD_LIBS) -lm -+STDLIBGUIST=-lX11 -lm - - # libraries for linking shared libraries --STDSHLGUIMT=-lXaw -lXt -lX11 -lXext $(PTHREAD_LIBS) -lm -+STDSHLGUIMT=-lX11 -lXext $(PTHREAD_LIBS) -lm - STDSHLCUIMT=$(PTHREAD_LIBS) -lm -+STDSHLGUIST=-lX11 -lXext -lm -+STDSHLCUIST=-lm - - LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive - --# STLport always needs pthread. --LIBSTLPORT=$(DYNAMIC) -lstlport_gcc $(STDLIBCPP) $(PTHREAD_LIBS) --LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) $(PTHREAD_LIBS) -+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc -lstdc++ -+LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) -+ -+#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC) - - # name of library manager - LIBMGR=ar - LIBFLAGS=-r --LIBEXT= .a - - # tool for generating import libraries - IMPLIB= -@@ -236,3 +230,4 @@ - DLLPOSTFIX=fi - DLLPRE=lib - DLLPOST=.so -+ diff --git a/editors/openoffice.org-1.1-devel/files/patch-translation_limit_64k b/editors/openoffice.org-1.1-devel/files/patch-translation_limit_64k deleted file mode 100644 index 612b19dfc575..000000000000 --- a/editors/openoffice.org-1.1-devel/files/patch-translation_limit_64k +++ /dev/null @@ -1,124 +0,0 @@ -Issuetracker : #i33228#, #i34210# -CWS : N/A -Author : -Description : Kannada doesn't build since some resources are -limited to 64k. it won't fix for 1.1.x officially - -Index: inc/sc.hrc -=================================================================== -RCS file: /cvs/sc/sc/inc/sc.hrc,v -retrieving revision 1.35 -retrieving revision 1.35.288.2 -diff -u -r1.35 -r1.35.288.2 ---- sc/inc/sc.hrc 3 Dec 2002 15:26:06 -0000 1.35 -+++ sc/inc/sc.hrc 17 Sep 2004 14:25:38 -0000 1.35.288.2 -@@ -1141,8 +1141,12 @@ - #define RID_TBXCTL_INSOBJ (SC_RESOURCE_START+40) - #define RID_BMP_REFBTN1 (SC_RESOURCE_START+41) - #define RID_BMP_REFBTN2 (SC_RESOURCE_START+42) --#define RID_SC_FUNCTION_DESCRIPTIONS1 (SC_RESOURCE_START+43) --#define RID_SC_FUNCTION_DESCRIPTIONS2 (SC_RESOURCE_START+44) -+// #i34210# split function resources due to 64k limit, don't reuse old values -+// to have obviously empty function lists in case some localisation used the -+// old values for any reason. Don't even reuse the exact name because of the -+// translation database IDs. -+//#define RID_SC_FUNCTION_DESCRIPTIONS1 (SC_RESOURCE_START+43) -+//#define RID_SC_FUNCTION_DESCRIPTIONS2 (SC_RESOURCE_START+44) - #define RID_POPUP_CONTROL (SC_RESOURCE_START+45) - #define RID_POPUP_PAGEBREAK (SC_RESOURCE_START+46) - #define RID_OBJECTBAR_DRAWFORM (SC_RESOURCE_START+47) -@@ -1158,6 +1162,10 @@ - #define RID_IMAGELIST_H_NAVCONT (SC_RESOURCE_START+57) - #define RID_OUTLINEBITMAPS_H (SC_RESOURCE_START+58) - #define RID_OBJECTMENU_EDIT (SC_RESOURCE_START+59) -+#define RID_SC_FUNCTION_DESCRIPTIONS_1 (SC_RESOURCE_START+60) -+#define RID_SC_FUNCTION_DESCRIPTIONS_2 (SC_RESOURCE_START+61) -+#define RID_SC_FUNCTION_DESCRIPTIONS_3 (SC_RESOURCE_START+62) -+#define RID_SC_FUNCTION_DESCRIPTIONS_4 (SC_RESOURCE_START+63) - - #define STR_START (SC_RESOURCE_START+100) - #define STR_ROWHEIGHT (STR_START) -Index: source/core/data/global.cxx -=================================================================== -RCS file: /cvs/sc/sc/source/core/data/global.cxx,v -retrieving revision 1.31 -retrieving revision 1.31.166.2 -diff -u -r1.31 -r1.31.166.2 ---- sc/source/core/data/global.cxx 17 Apr 2003 09:54:45 -0000 1.31 -+++ sc/source/core/data/global.cxx 17 Sep 2004 14:25:38 -0000 1.31.166.2 -@@ -1475,10 +1475,12 @@ - USHORT i,j; - USHORT nDescBlock[] = - { -- RID_SC_FUNCTION_DESCRIPTIONS1, -- RID_SC_FUNCTION_DESCRIPTIONS2 -+ RID_SC_FUNCTION_DESCRIPTIONS_1, -+ RID_SC_FUNCTION_DESCRIPTIONS_2, -+ RID_SC_FUNCTION_DESCRIPTIONS_3, -+ RID_SC_FUNCTION_DESCRIPTIONS_4 - }; -- const USHORT nBlocks = sizeof(nDescBlock) / sizeof(USHORT); -+ const USHORT nBlocks = sizeof(nDescBlock) / sizeof(nDescBlock[0]); - - aFunctionList.Clear(); - -Index: source/ui/src/scfuncs.src -=================================================================== -RCS file: /cvs/sc/sc/source/ui/src/scfuncs.src,v -retrieving revision 1.76.22.8 -retrieving revision 1.76.22.8.4.2 -diff -u -r1.76.22.8 -r1.76.22.8.4.2 ---- sc/source/ui/src/scfuncs.src 10 Sep 2004 14:45:52 -0000 1.76.22.8 -+++ sc/source/ui/src/scfuncs.src 17 Sep 2004 14:25:39 -0000 1.76.22.8.4.2 -@@ -93,10 +93,16 @@ - // RID_SC_FUNCTION_DESCRIPTIONS1 - // RID_SC_FUNCTION_DESCRIPTIONS2 - -+ // #i34210# again splitted resources due to 64k limit -+ // RID_SC_FUNCTION_DESCRIPTIONS_1 -+ // RID_SC_FUNCTION_DESCRIPTIONS_2 -+ // RID_SC_FUNCTION_DESCRIPTIONS_3 -+ // RID_SC_FUNCTION_DESCRIPTIONS_4 -+ - #include "scfuncs.hrc" // ID_FUNCTION_GRP_XXX, HID_FUNC_XXX - #include "compiler.hrc" // SC_OPCODE_XXX - --Resource RID_SC_FUNCTION_DESCRIPTIONS1 -+Resource RID_SC_FUNCTION_DESCRIPTIONS_1 - { - // -=*# Resource for function DBANZAHL #*=- - Resource SC_OPCODE_DB_COUNT -@@ -15963,6 +15969,11 @@ - Text[ galician ] = "Valor 1; Valor 2;... son de 1 a 30 argumentos que representan os pagamentos e ingresos."; - }; - }; -+}; -+ -+ -+Resource RID_SC_FUNCTION_DESCRIPTIONS_2 -+{ - // -=*# Resource for function IKV #*=- - Resource SC_OPCODE_IKV - { -@@ -32174,7 +32185,8 @@ - }; - }; - --Resource RID_SC_FUNCTION_DESCRIPTIONS2 -+ -+Resource RID_SC_FUNCTION_DESCRIPTIONS_3 - { - // -=*# Resource for function DBANZAHL2 #*=- - // -=*# Resource for function HÄUFIGKEIT #*=- -@@ -49230,6 +49242,11 @@ - Text[ galician ] = "é o n—ãro de graos de liberdade."; - }; - }; -+}; -+ -+ -+Resource RID_SC_FUNCTION_DESCRIPTIONS_4 -+{ - // -=*# Resource for function STANDARDISIERUNG #*=- - Resource SC_OPCODE_STANDARD - { diff --git a/editors/openoffice.org-1.1-devel/files/pkg-message.in b/editors/openoffice.org-1.1-devel/files/pkg-message.in deleted file mode 100644 index 8b63380621c8..000000000000 --- a/editors/openoffice.org-1.1-devel/files/pkg-message.in +++ /dev/null @@ -1,55 +0,0 @@ -OpenOffice.org Build %%RELEASE_NR%% Personal Install How-To - -Written by: Martin Blapp <mbr@freebsd.org> - and Maho Nakata <maho@FreeBSD.org> - -OpenOffice.org %%RELEASE_NR%% will soon been installed in -%%PREFIX%%/%%EXECBASE%% - -1 User installation -------------------- - -Just type "%%EXECBASE%%" after you have successfully -installed the package. If there is no installed -OO.org dir in your homedir, you'll be prompted to -install some files and choose a installed JDK. -The setup installs a "OpenOffice.org%%RELEASE_NR%%" folder -in your homedir. - -If the setup tells you there is already an installed -version, you may look at the file ".sversionrc" in -your homedir. In this file OpenOffice and StarOffice -have both a line for each version which is installed. -After removing the problematic line you should be able to -install again. - -2 Start OO.org --------------- - -There are some wrappers installed for fast startup. -Add "%%PREFIX%%/bin/" to your PATH and you will be able -to use them. - -%%PREFIX%%/bin/openoffice.org -%%PREFIX%%/bin/%%EXECBASE%% -%%PREFIX%%/bin/%%EXECBASE%%-sagenda -%%PREFIX%%/bin/%%EXECBASE%%-scalc -%%PREFIX%%/bin/%%EXECBASE%%-sdraw -%%PREFIX%%/bin/%%EXECBASE%%-setup -%%PREFIX%%/bin/%%EXECBASE%%-sfax -%%PREFIX%%/bin/%%EXECBASE%%-simpress -%%PREFIX%%/bin/%%EXECBASE%%-spadmin -%%PREFIX%%/bin/%%EXECBASE%%-sweb -%%PREFIX%%/bin/%%EXECBASE%%-swriter - -OO.org does need $LANG to be set to a suitable value. -If it is not already set, a default value is chosen. - -3 If you stuck into a trouble --------------------------------------------------- -Somehow you can stuck into a trouble. -To solve this issue, please remove the already installed -"OpenOffice.org%%RELEASE_NR%%" dir in your homedir and remove the -appropriate entry from ".sversionrc". After you have done -this, redo the user installation and the problem will -go away. diff --git a/editors/openoffice.org-1.1-devel/pkg-descr b/editors/openoffice.org-1.1-devel/pkg-descr deleted file mode 100644 index bc2ede1b8c2b..000000000000 --- a/editors/openoffice.org-1.1-devel/pkg-descr +++ /dev/null @@ -1,17 +0,0 @@ -OpenOffice.org is an Open Source, community-developed, multi-platform office -productivity suite. It includes the key desktop applications, such as a -word processor, spreadsheet, presentation manager, and drawing program, -with a user interface and feature set similar to other office suites. - -Components include: - * A universal word processing application for creating business - letters, extensive text documents, professional layouts, and HTML - documents. - * A sophisticated application for performing advanced spreadsheet - functions, such as analyzing figures, creating lists, and viewing data. - * A tool for creating effective eye-catching presentations. - * A vector-oriented draw module that enables the creation of 3D - illustrations - -WWW: http://www.openoffice.org/ - http://porting.openoffice.org/freebsd/ diff --git a/editors/openoffice.org-1.1-devel/pkg-plist b/editors/openoffice.org-1.1-devel/pkg-plist deleted file mode 100644 index 28bd78453b52..000000000000 --- a/editors/openoffice.org-1.1-devel/pkg-plist +++ /dev/null @@ -1 +0,0 @@ -# Dummy file, do not delete. Package list is generated automatically. diff --git a/editors/openoffice.org-1.1/Makefile b/editors/openoffice.org-1.1/Makefile deleted file mode 100644 index 3dfbf3bfb823..000000000000 --- a/editors/openoffice.org-1.1/Makefile +++ /dev/null @@ -1,259 +0,0 @@ -# New ports collection makefile for: OpenOffice.org -# Date created: 28 February 2002 -# Whom: Martin Blapp -# -# $FreeBSD$ -# - -PORTNAME= openoffice.org -PORTVERSION= 1.1.5 -PORTREVISION= 9 -CATEGORIES+= editors java -MASTER_SITES+= http://ooopackages.good-day.net/pub/OpenOffice.org/sources/1.1/ \ - http://openoffice.lunarshells.com/sources/1.1/ \ - ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc -DISTFILES+= OOo_${RELEASE_NR}_src.tar.gz -.if defined(WITH_GPC) -DISTFILES+= gpc231.tar.Z:gpc -.endif -EXTRACT_ONLY= OOo_${RELEASE_NR}_src.tar.gz - -MAINTAINER= openoffice@FreeBSD.org -COMMENT?= Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser - -MOZILLA_PROJECT= cws_srx645_mozooo.20040203.tar.gz -MOZILLA_VERSION= 1.0 -MOZILLA_SOURCE= mozilla-source-${MOZILLA_VERSION}.tar.gz -.if !defined(WITHOUT_MOZILLA) -DISTFILES+= ${MOZILLA_PROJECT} ${MOZILLA_SOURCE} -USE_GNOME+= orbit -.endif - -USE_PERL5= yes -USE_BISON= build -USE_GMAKE= yes -USE_GNOME+= gtk20 -WITHOUT_CPU_CFLAGS= true - -ONLY_FOR_ARCHS= i386 - -#.if !defined(WITHOUT_JAVA) -USE_JAVA= yes -JAVA_VERSION= 1.4+ -JAVA_BUILD= jdk -JAVA_VENDOR= freebsd bsdjava -#.endif - -.include <bsd.port.pre.mk> -.include <${FILESDIR}/Makefile.localized> -.if ${OSVERSION} >= 700042 -BROKEN= fails to install; consider upgrading to editors/openoffice.org-2 -.endif - -LANG_EXT?= 01 -LANG_CONFIGURE_ARG?= ENUS -L10NHELP?= helpcontent_01_unix.tgz - -DISTFILES+= ${L10NHELP} -.if defined(ALL_LOCALIZED_LANGS) -DISTFILES+= helpcontent_07_unix.tgz \ - helpcontent_31_unix.tgz helpcontent_33_unix.tgz \ - helpcontent_34_unix.tgz helpcontent_39_unix.tgz \ - helpcontent_42_unix.tgz helpcontent_43_unix.tgz \ - helpcontent_46_unix.tgz helpcontent_49_unix.tgz \ - helpcontent_50_unix.tgz helpcontent_55_unix.tgz \ - helpcontent_81_unix.tgz helpcontent_82_unix.tgz \ - helpcontent_86_unix.tgz helpcontent_88_unix.tgz \ - helpcontent_90_unix.tgz -L10NHELPS= helpcontent_01_unix.tgz helpcontent_07_unix.tgz \ - helpcontent_31_unix.tgz helpcontent_33_unix.tgz \ - helpcontent_34_unix.tgz helpcontent_39_unix.tgz \ - helpcontent_42_unix.tgz helpcontent_43_unix.tgz \ - helpcontent_46_unix.tgz helpcontent_49_unix.tgz \ - helpcontent_50_unix.tgz helpcontent_55_unix.tgz \ - helpcontent_81_unix.tgz helpcontent_82_unix.tgz \ - helpcontent_86_unix.tgz helpcontent_88_unix.tgz \ - helpcontent_90_unix.tgz -.endif - -CODELINE= 645 -RELEASE_NR= 1.1.5 -INSTALLATION_BASEDIR= OpenOffice.org${RELEASE_NR} -EXECBASE= openoffice.org-${PORTVERSION} -DIST_SUBDIR= openoffice.org1.1 -SIMPLEOSVER= ${OSREL:C/\.//g} -PACKAGE_BASENAME= OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel - -# FIXME (Somehow INDEX build fails) -.if defined(LANG_PKGNAME) -PKGNAMEPREFIX= ${LANG_PKGNAME}- -.endif -.if defined(LANG_SUFFIX) -PKGNAMESUFFIX?= -${LANG_SUFFIX} -.endif - -USE_GCC= 3.3 #3.3 is the best -.if defined(WITH_CCACHE) -BUILD_DEPENDS+= ccache:${PORTSDIR}/devel/ccache -CCACHE_PREFIX= ccache -OOOCC= ${CCACHE_PREFIX} ${CC} -OOOCXX= ${CCACHE_PREFIX} ${CXX} -.else -OOOCC= ${CC} -OOOCXX= ${CXX} -.endif -CONFIGURE_ENV+= CC="${OOOCC}" CXX="${OOOCXX}" \ - CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" - -BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \ - unzip:${PORTSDIR}/archivers/unzip \ - gcp:${PORTSDIR}/sysutils/coreutils \ - imake:${PORTSDIR}/devel/imake -#.if defined(WITHOUT_JAVA) -#LIB_DEPENDS+= xslt.2:${PORTSDIR}/textproc/libxslt -#.endif -.if !defined(WITH_GPC) -LIB_DEPENDS= art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl -.endif -GNU_CONFIGURE= yes -WRKSRC= ${WRKDIR}/OOo_${RELEASE_NR} -CONFIGURE_WRKSRC= ${WRKSRC}/config_office -TCSH?= /bin/tcsh -PKGMESSAGE= ${WRKDIR}/pkg-message -NUMOFPROCESSES?= 1 - -CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --enable-pasf --enable-crashdump --enable-symbols=SMALL #gcc3.2.3 is broken with -g1 - -.include <${FILESDIR}/Makefile.knobs> - -pre-everything:: -# really tweak, extremely useful when you build all localized language versions -# needed after when you build with ALL_LOCALIZED_LANGS. -.if defined(TWEAK_L10N) - @${RM} -f ${WRKDIR}/.PLIST* - @${RM} -f ${WRKDIR}/.install_done.* - @${RM} -f ${WRKDIR}/.package_done.* - @${RM} -f ${WRKDIR}/.extract_done.* - @${RM} -f ${WRKDIR}/.patch_done.* - @${RM} -f ${WRKDIR}/.configure_done.* - @${RM} -f ${WRKDIR}/.build_done.* - @${TOUCH} ${EXTRACT_COOKIE} - @${TOUCH} ${PATCH_COOKIE} - @${TOUCH} ${CONFIGURE_COOKIE} - @${TOUCH} ${BUILD_COOKIE} -.endif - -post-extract: -.if defined(WITH_TTF_BYTECODE_ENABLED) - @cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/optpatch-freetype -.endif -.if defined(WITH_GPC) - @cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/gpc231.tar.Z | ${TAR} xfz - - @${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/external/gpc/ - @${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/external/gpc/ -.endif - @${MKDIR} ${WRKDIR}/L10NHELP - @cd ${WRKDIR}/L10NHELP ; \ - ${CAT} ${DISTDIR}/${DIST_SUBDIR}/${L10NHELP} | ${GZIP_CMD} -d | ${TAR} xf - -.if defined(ALL_LOCALIZED_LANGS) - @cd ${WRKDIR}/L10NHELP ; \ - for helpfile in ${L10NHELPS}; do \ - ${CAT} ${DISTDIR}/${DIST_SUBDIR}/$$helpfile | ${GZIP_CMD} -d | ${TAR} xf - ; \ - done -.endif -.if !defined(WITHOUT_MOZILLA) - @(cd ${WRKSRC} ; ${MV} moz moz.old ; ${TAR} xfz ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_PROJECT} ; ${PATCH} < ${FILESDIR}/moz-patch) - @${MKDIR} ${WRKSRC}/moz/download - @${CP} ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_SOURCE} ${WRKSRC}/moz/download - @cd ${WRKSRC} ; ${MV} moz moz.runtime ; ${MV} moz.old moz -.endif - -pre-configure: -#Workaround for moz project, it uses gcc directly. - @${LN} -sf `which ${CC}` ${WRKSRC}/solenv/bin/gcc - @${LN} -sf `which ${CC}` ${WRKSRC}/solenv/bin/cc - @${LN} -sf `which ${CXX}` ${WRKSRC}/solenv/bin/g++ - @${LN} -sf `which ${CXX}` ${WRKSRC}/solenv/bin/c++ - -do-build: - @cd ${WRKSRC} ; ./bootstrap -.if !defined(WITHOUT_MOZILLA) - @cd ${WRKSRC}/moz.runtime ; ${SETENV} "BUILD_MOZAB=TRUE" ${TCSH} -c 'source ../FreeBSDEnv.Set ; build.pl ; dmake zip' ; ${CP} unxfbsd.pro/zipped/FREEBSD*.zip ../moz/zipped -.endif - @${MKDIR} ${WRKSRC}/solver/${CODELINE}/unxfbsd.pro/pck - @${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/solver/${CODELINE}/unxfbsd.pro/pck -# PR:84786 -.if (${NUMOFPROCESSES}>1) - @cd ${WRKSRC} ; ${SETENV} "LC_ALL=C" "LANG=C" ${TCSH} -c "source FreeBSDEnv.Set ; setenv TMP ${WRKSRC} ; cd instsetoo ; build.pl -P${NUMOFPROCESSES} --all" -.else - @cd ${WRKSRC} ; ${SETENV} "LC_ALL=C" "LANG=C" ${TCSH} -c "source FreeBSDEnv.Set ; setenv TMP ${WRKSRC} ; dmake" -.endif - -do-install: - @cd ${WRKSRC}/instsetoo/*.pro/${LANG_EXT}/normal/ ; ./install --prefix=${PREFIX} - -install-user: - @${PREFIX}/${INSTALLATION_BASEDIR}/program/setup - -post-install: - @${ECHO_MSG} "===> Add wrapper scripts"; - @${CP} ${FILESDIR}/openoffice.org-wrapper ${WRKDIR}/ - @${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \ - -e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \ - -e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \ - ${WRKDIR}/openoffice.org-wrapper - @${INSTALL_SCRIPT} ${WRKDIR}/openoffice.org-wrapper \ - ${PREFIX}/bin/${EXECBASE} - @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/openoffice.org - @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sagenda - @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-scalc - @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sdraw - @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-setup - @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sfax - @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-smath - @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-simpress - @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-spadmin - @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sweb - @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-swriter - @${PRINTF} "bin/openoffice.org\n" > ${TMPPLIST} - @cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} >> ${TMPPLIST} - @cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} ${EXECBASE} >> ${TMPPLIST} - @cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST} - @cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST} - @cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp - @${SORT} -r ${WRKDIR}/dir.tmp | ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST} - @${CP} ${FILESDIR}/pkg-message.in ${PKGMESSAGE} - @${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \ - -e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \ - -e 's#%%EXECBASE%%#${EXECBASE}#g' \ - -e 's#%%MILESTONE%%#${MILESTONE}#g' \ - -e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \ - ${PKGMESSAGE} - @${ECHO_CMD} - @${CAT} ${PKGMESSAGE} - @${ECHO_CMD} - -package-rename: - @${ECHO_MSG} "===> Rename package for OOo mirror upload"; -.if defined(LANG_SUFFIX) - @${MV} ${PKGFILE} \ - ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel_install_${LANG_PKGNAME}-${LANG_SUFFIX}${PKG_SUFX} -.elif defined(LANG_PKGNAME) - @${MV} ${PKGFILE} \ - ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel_install_${LANG_PKGNAME}${PKG_SUFX} -.else - @${MV} ${PKGFILE} \ - ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel_install${PKG_SUFX} -.endif - -sdk: - @${ECHO_MSG} "===> Make SDK of OpenOffice.org" - @cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd sdk_oo ; build.pl ; deliver.pl' - @${MV} ${WRKSRC}/solver/${CODELINE}/unxfbsd.pro/bin/OpenOffice.org${RELEASE_NR}_SDK.tar.gz ${WRKDIR}/../${PACKAGE_BASENAME}_sdk.tar.gz - -solver: - @${ECHO_MSG} "===> Make Solver of OpenOffice.org" - @cd ${WRKSRC} ; ${TAR} cfz ${WRKDIR}/../${PACKAGE_BASENAME}_solver.tar.gz solver - -.include <bsd.port.post.mk> diff --git a/editors/openoffice.org-1.1/distinfo b/editors/openoffice.org-1.1/distinfo deleted file mode 100644 index 647d281e7273..000000000000 --- a/editors/openoffice.org-1.1/distinfo +++ /dev/null @@ -1,63 +0,0 @@ -MD5 (openoffice.org1.1/OOo_1.1.5_src.tar.gz) = 1c8e860adae05087a53bdba5646962a9 -SHA256 (openoffice.org1.1/OOo_1.1.5_src.tar.gz) = 7c30a804d5c826fc9900a7e80b948f52ac5e35a35ae2659b26cc8845d8a9212b -SIZE (openoffice.org1.1/OOo_1.1.5_src.tar.gz) = 223418209 -MD5 (openoffice.org1.1/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 -SHA256 (openoffice.org1.1/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e -SIZE (openoffice.org1.1/gpc231.tar.Z) = 27917 -MD5 (openoffice.org1.1/cws_srx645_mozooo.20040203.tar.gz) = 1239aad43c65d6808b6261ea9d60fb67 -SHA256 (openoffice.org1.1/cws_srx645_mozooo.20040203.tar.gz) = 842984e791f0e674f7daa42ab368e2f32acfedad3b97e99e3ea84309f4cc227f -SIZE (openoffice.org1.1/cws_srx645_mozooo.20040203.tar.gz) = 39708 -MD5 (openoffice.org1.1/mozilla-source-1.0.tar.gz) = 35a7524c2fbb773e23449179c5cb1f20 -SHA256 (openoffice.org1.1/mozilla-source-1.0.tar.gz) = 9440b80a02ab87d4fb0f7116d43784e45c48782ebefb4ac7c53f5dbadbf92eea -SIZE (openoffice.org1.1/mozilla-source-1.0.tar.gz) = 39881558 -MD5 (openoffice.org1.1/helpcontent_01_unix.tgz) = 7da2aff674c2c84aba8b21ac2ab16bb6 -SHA256 (openoffice.org1.1/helpcontent_01_unix.tgz) = abc582c2ccb9a66a737c20e15385fb77a79090120168f2f88323dcd04d170884 -SIZE (openoffice.org1.1/helpcontent_01_unix.tgz) = 12052480 -MD5 (openoffice.org1.1/helpcontent_07_unix.tgz) = e3ab37cbf2407d909953f06467b27611 -SHA256 (openoffice.org1.1/helpcontent_07_unix.tgz) = a6ae171dbd159be1e6c2d739e779b9cb88e20e29366909587a361aa0842bd85c -SIZE (openoffice.org1.1/helpcontent_07_unix.tgz) = 13820401 -MD5 (openoffice.org1.1/helpcontent_31_unix.tgz) = c7e618e2d9b8bd25cae12954ef2548c9 -SHA256 (openoffice.org1.1/helpcontent_31_unix.tgz) = 6372ad8ab1563a9fc92e9f60809d32c841a81854e4f943910a1c413eca6e879f -SIZE (openoffice.org1.1/helpcontent_31_unix.tgz) = 12073861 -MD5 (openoffice.org1.1/helpcontent_33_unix.tgz) = 68d58bc30b485a77c0a0fba08af3aee3 -SHA256 (openoffice.org1.1/helpcontent_33_unix.tgz) = ffa6fcfc7bf88c06a4685c00bea137fc573c70cdf875e14a6fe7727fc87821d0 -SIZE (openoffice.org1.1/helpcontent_33_unix.tgz) = 12574720 -MD5 (openoffice.org1.1/helpcontent_34_unix.tgz) = 8696bbee3dc4d5b6fd60218123016e29 -SHA256 (openoffice.org1.1/helpcontent_34_unix.tgz) = 4b04d126f0c6a7effad6a6c343d2d64400ce3b9c30c709a7326a6ac05e66f820 -SIZE (openoffice.org1.1/helpcontent_34_unix.tgz) = 12554240 -MD5 (openoffice.org1.1/helpcontent_39_unix.tgz) = c2ae86d02f462d2b663d621190f5ef34 -SHA256 (openoffice.org1.1/helpcontent_39_unix.tgz) = 32d13d5278f521d650c59b4a8b4242700964257001e5112872010bdd444aba09 -SIZE (openoffice.org1.1/helpcontent_39_unix.tgz) = 12482560 -MD5 (openoffice.org1.1/helpcontent_42_unix.tgz) = 1b5f3f30c7939c2244f654bab0a68d91 -SHA256 (openoffice.org1.1/helpcontent_42_unix.tgz) = a75f60f44eb979595a163d172e5c80eb269ac5b0acd08aa2a8bacc964747a2ae -SIZE (openoffice.org1.1/helpcontent_42_unix.tgz) = 13250743 -MD5 (openoffice.org1.1/helpcontent_43_unix.tgz) = 1869d02ead606229a1fb94ec7abc33d9 -SHA256 (openoffice.org1.1/helpcontent_43_unix.tgz) = 99903a6da10a504ef148e2dc64cd2452f4ef0ba45f1295330975618ba7bdf4e1 -SIZE (openoffice.org1.1/helpcontent_43_unix.tgz) = 9016309 -MD5 (openoffice.org1.1/helpcontent_46_unix.tgz) = 7b013981edce2fabe4a8751ff64a8d58 -SHA256 (openoffice.org1.1/helpcontent_46_unix.tgz) = b47fe8c510b72b35a008e63a95a9693a1353f7dad38148b0f482d42a675a6747 -SIZE (openoffice.org1.1/helpcontent_46_unix.tgz) = 12072960 -MD5 (openoffice.org1.1/helpcontent_49_unix.tgz) = a39f44ec40f452c963a4a187f31d1acb -SHA256 (openoffice.org1.1/helpcontent_49_unix.tgz) = 1f4c28fc65df26cd538b90c30f7ec57f1101f95766422233e13aae9d5421d31b -SIZE (openoffice.org1.1/helpcontent_49_unix.tgz) = 13649920 -MD5 (openoffice.org1.1/helpcontent_50_unix.tgz) = 5e0464e3940d589c6358da4f2a3fbfae -SHA256 (openoffice.org1.1/helpcontent_50_unix.tgz) = 26ce7fed08498bbc3b3008dcaf5d9fcdae7735c01dc92b2f8db83a4a09bcf3f8 -SIZE (openoffice.org1.1/helpcontent_50_unix.tgz) = 15804777 -MD5 (openoffice.org1.1/helpcontent_55_unix.tgz) = 804d3ce61e11335193a410aaf9603f8e -SHA256 (openoffice.org1.1/helpcontent_55_unix.tgz) = fda279f73155211e00ebb7cbbb5246a98f11bd4e20f9b803987ff5f222f21ead -SIZE (openoffice.org1.1/helpcontent_55_unix.tgz) = 11549758 -MD5 (openoffice.org1.1/helpcontent_81_unix.tgz) = 81b705057a0e14ebcbf02fac4762781a -SHA256 (openoffice.org1.1/helpcontent_81_unix.tgz) = 720a260e2fdf21eab6a336773ae560ac49d7f7f157ff1cd15cf4214f24106851 -SIZE (openoffice.org1.1/helpcontent_81_unix.tgz) = 12902400 -MD5 (openoffice.org1.1/helpcontent_82_unix.tgz) = 3121fbd251176d7c7b6e33ecec744c65 -SHA256 (openoffice.org1.1/helpcontent_82_unix.tgz) = 9734bc94337252b7dfa7d238c4846403f8052f40da0e307a1f38360c556cf670 -SIZE (openoffice.org1.1/helpcontent_82_unix.tgz) = 12369920 -MD5 (openoffice.org1.1/helpcontent_86_unix.tgz) = aee37935139c5ccd4b6d8abdd2037c66 -SHA256 (openoffice.org1.1/helpcontent_86_unix.tgz) = 1578e0f45c4fc2eeda6f0348df5892c30db11d923b458ec2d07ad3092d141d58 -SIZE (openoffice.org1.1/helpcontent_86_unix.tgz) = 12769280 -MD5 (openoffice.org1.1/helpcontent_88_unix.tgz) = 3b00571318e45965dee0545d86306d65 -SHA256 (openoffice.org1.1/helpcontent_88_unix.tgz) = f31bbc3ab5b25be9b517554e1cb7d2beff11b054dc1774acf7e3430295624ee0 -SIZE (openoffice.org1.1/helpcontent_88_unix.tgz) = 12953600 -MD5 (openoffice.org1.1/helpcontent_90_unix.tgz) = 9521a01c5817e87178f356762f8cdab5 -SHA256 (openoffice.org1.1/helpcontent_90_unix.tgz) = 9b8e26d12afd8d92c4bd370cee2c04a45ea0989052822371a7b53b70ca981688 -SIZE (openoffice.org1.1/helpcontent_90_unix.tgz) = 12495734 diff --git a/editors/openoffice.org-1.1/files/Makefile.knobs b/editors/openoffice.org-1.1/files/Makefile.knobs deleted file mode 100644 index 0d25b5a75cfb..000000000000 --- a/editors/openoffice.org-1.1/files/Makefile.knobs +++ /dev/null @@ -1,100 +0,0 @@ -# Makefile for knobs -# Whom: Maho Nakata <maho@FreeBSD.org> -# $FreeBSD$ - -#.if defined(WITHOUT_JAVA) -#CONFIGURE_ARGS+= --disable-java -#.else -CONFIGURE_ARGS+= --with-jdk-home="${JAVA_HOME}" -#.endif - -.if !defined(WITH_GPC) -CONFIGURE_ARGS+= --enable-libart -.endif - -.if defined(WITHOUT_MOZILLA) -CONFIGURE_ARGS+= --disable-mozilla -.endif - -.if defined(ALL_LOCALIZED_LANGS) -CONFIGURE_ARGS+= --with-lang=ALL -.else -CONFIGURE_ARGS+= --with-lang=${LANG_CONFIGURE_ARG} -.endif - -.if defined(WITH_DEBUG) -.if ${WITH_DEBUG} == 2 -CONFIGURE_ARGS+= --enable-debug -.else -CONFIGURE_ARGS+= --enable-symbols -.endif -.endif - -pre-fetch: -.if (${OSVERSION} < 503001 && ${OSVERSION} >= 500000) || (${OSVERSION} < 492000) - @${ECHO} - @${ECHO} "WARNING" - @${ECHO} "Your rtld seems to be old." - @${ECHO} "Please remake your rtld by:" - @${ECHO} "[1] if you use 4-series:" - @${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng4" - @${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng4" - @${ECHO} "# make ; make depend ; make install" - @${ECHO} "[2] if you use 5-series:" - @${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng5" - @${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng5" - @${ECHO} "# make ; make depend ; make install" - @${ECHO} "AT YOUR OWN RISK!" -.endif - @${ECHO} "OPTIONS:" -.if !defined(WITH_DEBUG) - @${ECHO} - @${ECHO} "You can compile OOo with debug symbols with WITH_DEBUG=1" - @${ECHO} - @${ECHO} "If you set WITH_DEBUG=2, you add internal" - @${ECHO} "OOo debug support." -.endif -.if !defined(WITHOUT_MOZILLA) - @${ECHO} - @${ECHO} "You can compile OOo without Mozilla connectivity by" - @${ECHO} "make -DWITHOUT_MOZILLA" -.endif -.if !defined(WITH_TTF_BYTECODE_ENABLED) - @${ECHO} - @${ECHO} "You may get better quality of glyphs" - @${ECHO} "at small bitmap sizes, If you have" - @${ECHO} "licensed the Apple patents" - @${ECHO} "US05155805 US05159668 and US05325479, by" - @${ECHO} "make -DWITH_TTF_BYTECODE_ENABLED" - @${ECHO} "See http://www.freetype.org/patents.html for details" -.endif -.if !defined(LOCALIZED_LANG) - @${ECHO} - @${ECHO} "You can select the language for OOo by making it with 'make LOCALIZED_LANG=xx'" - @${ECHO} "while xx can be one of the following:" - @${ECHO} "af ar ca cs de dk el es et eu fi fr gl-ES he hi-IN" - @${ECHO} "hu it ja kn-IN ko lt nb nl nn ns pl pt pt-BR ru sk" - @${ECHO} "sl-SI sv th tn tr we zh-CN zh-TW zu" - @${ECHO} -.endif -#.if !defined(WITHOUT_JAVA) -# @${ECHO} -# @${ECHO} "You can compile OOo without Java support by" -# @${ECHO} "make -DWITHOUT_JAVA" -#.endif -.if !defined(WITH_GPC) - @${ECHO} - @${ECHO} "You can compile OOo with gpc instead of libart by" - @${ECHO} "make -DWITH_GPC" -.endif - @${ECHO} - @${ECHO} "NOTICE:" - @${ECHO} - @${ECHO} "To build OpenOffice.org, you should have a lot" -.if defined(WITH_DEBUG) - @${ECHO} "of free diskspace (~ 8GB)." -.else - @${ECHO} "of free diskspace (~ 4GB)." -.endif - @${ECHO} "If you want SDK and/or solver, please type make sdk and/or make solver" - diff --git a/editors/openoffice.org-1.1/files/Makefile.localized b/editors/openoffice.org-1.1/files/Makefile.localized deleted file mode 100644 index 999a45f528e7..000000000000 --- a/editors/openoffice.org-1.1/files/Makefile.localized +++ /dev/null @@ -1,290 +0,0 @@ -# localized makefile -# Whom: Maho Nakata <maho@FreeBSD.org> -# $FreeBSD$ - -################################################################ -# consult config_office/set_soenv.in for available languages -################################################################ -.if defined(LOCALIZED_LANG) -.if ${LOCALIZED_LANG} == "af" -LANG_PKGNAME= af -LANG_EXT= 27 -LANG_CONFIGURE_ARG= AFRIK -.endif -################################################################ -.if ${LOCALIZED_LANG} == "ar" -CATEGORIES+= arabic -LANG_PKGNAME= ar -LANG_EXT= 96 -LANG_CONFIGURE_ARG= ARAB -.endif -################################################################ -.if ${LOCALIZED_LANG} == "eu" -LANG_PKGNAME= eu -LANG_EXT= 10 -LANG_CONFIGURE_ARG= BASQUE -.endif -################################################################ -.if ${LOCALIZED_LANG} == "ca" -LANG_PKGNAME= ca -LANG_EXT= 37 -LANG_CONFIGURE_ARG= CAT -.endif -################################################################ -.if ${LOCALIZED_LANG} == "zh-CN" -CATEGORIES+= chinese -LANG_PKGNAME= zh -LANG_SUFFIX= CN -LANG_EXT= 86 -LANG_CONFIGURE_ARG= CHINSIM -BUILD_DEPENDS+= ${PREFIX}/share/fonts/TrueType/gbsn00lp.ttf:${PORTSDIR}/chinese/arphicttf -L10NHELP= helpcontent_${LANG_EXT}_unix.tgz -.endif -################################################################ -.if ${LOCALIZED_LANG} == "zh-TW" -CATEGORIES+= chinese -LANG_PKGNAME= zh -LANG_SUFFIX= TW -LANG_EXT= 88 -LANG_CONFIGURE_ARG= CHINTRAD -BUILD_DEPENDS+= ${PREFIX}/share/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/arphicttf -L10NHELP= helpcontent_${LANG_EXT}_unix.tgz -.endif -################################################################ -.if ${LOCALIZED_LANG} == "cs" -LANG_PKGNAME= cs -LANG_EXT= 42 -LANG_CONFIGURE_ARG= CZECH -L10NHELP= helpcontent_${LANG_EXT}_unix.tgz -.endif -################################################################ -.if ${LOCALIZED_LANG} == "dk" -LANG_PKGNAME= dk -LANG_EXT= 45 -LANG_CONFIGURE_ARG= DAN -.endif -################################################################ -.if ${LOCALIZED_LANG} == "nl" -LANG_PKGNAME= nl -LANG_EXT= 31 -L10NHELP= helpcontent_${LANG_EXT}_unix.tgz -LANG_CONFIGURE_ARG= DTCH -.endif -################################################################ -.if ${LOCALIZED_LANG} == "et" -LANG_PKGNAME= et -LANG_EXT= 77 -LANG_CONFIGURE_ARG= ESTONIAN -.endif -################################################################ -.if ${LOCALIZED_LANG} == "fi" -LANG_PKGNAME= fi -LANG_EXT= 35 -LANG_CONFIGURE_ARG= FINN -.endif -################################################################ -.if ${LOCALIZED_LANG} == "fr" -CATEGORIES+= french -LANG_PKGNAME= fr -LANG_EXT= 33 -L10NHELP= helpcontent_${LANG_EXT}_unix.tgz -LANG_CONFIGURE_ARG= FREN -.endif -################################################################ -.if ${LOCALIZED_LANG} == "gl-ES" -LANG_PKGNAME= gl -LANG_SUFFIX= ES -LANG_EXT= 38 -LANG_CONFIGURE_ARG= GAL -.endif -################################################################ -.if ${LOCALIZED_LANG} == "de" -CATEGORIES+= german -LANG_PKGNAME= de -LANG_EXT= 49 -L10NHELP= helpcontent_${LANG_EXT}_unix.tgz -LANG_CONFIGURE_ARG= GER -COMMENT= Office-Suite mit Textverarbeitung, Tabellenkalkulation, Datenbank und Praesentationsprogramm -.endif -################################################################ -.if ${LOCALIZED_LANG} == "el" -LANG_PKGNAME= el -LANG_EXT= 30 -LANG_CONFIGURE_ARG= GREEK -.endif -################################################################ -.if ${LOCALIZED_LANG} == "he" -LANG_PKGNAME= he -LANG_EXT= 97 -LANG_CONFIGURE_ARG= HEBREW -.endif -################################################################ -.if ${LOCALIZED_LANG} == "hi-IN" -LANG_PKGNAME= hi -LANG_EXT= 91 -LANG_CONFIGURE_ARG= HINDI -.endif -################################################################ -.if ${LOCALIZED_LANG} == "hu" -CATEGORIES+= hungarian -LANG_PKGNAME= hu -LANG_EXT= 36 -LANG_CONFIGURE_ARG= HUNG -.endif -################################################################ -.if ${LOCALIZED_LANG} == "it" -LANG_PKGNAME= it -LANG_EXT= 39 -L10NHELP= helpcontent_${LANG_EXT}_unix.tgz -LANG_CONFIGURE_ARG= ITAL -.endif -################################################################ -.if ${LOCALIZED_LANG} == "ja" -CATEGORIES+= japanese -LANG_PKGNAME= ja -LANG_EXT= 81 -LANG_CONFIGURE_ARG= JAPN -MASTER_SITES+= ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/stable/&,} -RUN_DEPENDS+= ${LOCALBASE}/lib/X11/fonts/TrueType/sazanami-mincho.ttf:${PORTSDIR}/japanese/sazanami-ttf -L10NHELP= helpcontent_${LANG_EXT}_unix.tgz -.endif -################################################################ -.if ${LOCALIZED_LANG} == "kn-IN" -LANG_PKGNAME= kn -LANG_SUFFIX= IN -LANG_EXT= 93 -LANG_CONFIGURE_ARG= KANNADA -.endif -################################################################ -.if ${LOCALIZED_LANG} == "ko" -CATEGORIES+= korean -LANG_PKGNAME= ko -LANG_EXT= 82 -LANG_CONFIGURE_ARG= KOREAN -L10NHELP= helpcontent_${LANG_EXT}_unix.tgz -.endif -################################################################ -.if ${LOCALIZED_LANG} == "lt" -LANG_PKGNAME= lt -LANG_EXT= 58 -LANG_CONFIGURE_ARG= LITHUANIAN -.endif -################################################################ -.if ${LOCALIZED_LANG} == "nb" -LANG_PKGNAME= nb -LANG_EXT= 47 -LANG_CONFIGURE_ARG= NORBOK -.endif -################################################################ -.if ${LOCALIZED_LANG} == "nn" -LANG_PKGNAME= nn -LANG_EXT= 79 -LANG_CONFIGURE_ARG= NORNYN -.endif -################################################################ -.if ${LOCALIZED_LANG} == "ns" -LANG_PKGNAME= ns -LANG_EXT= 26 -LANG_CONFIGURE_ARG= NSOTHO -.endif -################################################################ -.if ${LOCALIZED_LANG} == "pl" -CATEGORIES+= polish -LANG_PKGNAME= pl -LANG_EXT= 48 -LANG_CONFIGURE_ARG= POL -.endif -################################################################ -.if ${LOCALIZED_LANG} == "pt" -COMMENT= Editor texto/grBaGico, banco de dados/planilha/navegador integrado -CATEGORIES+= portuguese -LANG_PKGNAME= pt -LANG_EXT= 03 -LANG_CONFIGURE_ARG= PORT -.endif -################################################################ -.if ${LOCALIZED_LANG} == "pt-BR" -COMMENT= Editor texto/grBaGico, banco de dados/planilha/navegador integrado -CATEGORIES+= portuguese -LANG_PKGNAME= pt -LANG_SUFFIX= BR -L10NHELP= helpcontent_${LANG_EXT}_unix.tgz -LANG_EXT= 55 -LANG_CONFIGURE_ARG= PORTBR -.endif -################################################################ -.if ${LOCALIZED_LANG} == "ru" -CATEGORIES+= russian -LANG_PKGNAME= ru -LANG_EXT= 07 -LANG_CONFIGURE_ARG= RUSS -L10NHELP= helpcontent_${LANG_EXT}_unix.tgz -.endif -################################################################ -.if ${LOCALIZED_LANG} == "sk" -LANG_PKGNAME= sk -LANG_EXT= 43 -LANG_CONFIGURE_ARG= SLOVAK -L10NHELP= helpcontent_${LANG_EXT}_unix.tgz -.endif -################################################################ -.if ${LOCALIZED_LANG} == "sl-SI" -LANG_PKGNAME= sl -LANG_SUFFIX= SI -LANG_EXT= 50 -LANG_CONFIGURE_ARG= SLOVENIAN -L10NHELP= helpcontent_${LANG_EXT}_unix.tgz -.endif -################################################################ -.if ${LOCALIZED_LANG} == "es" -LANG_PKGNAME= es -LANG_EXT= 34 -L10NHELP= helpcontent_${LANG_EXT}_unix.tgz -LANG_CONFIGURE_ARG= SPAN -.endif -################################################################ -.if ${LOCALIZED_LANG} == "sv" -LANG_PKGNAME= sv -LANG_EXT= 46 -L10NHELP= helpcontent_${LANG_EXT}_unix.tgz -LANG_CONFIGURE_ARG= SWED -.endif -################################################################ -.if ${LOCALIZED_LANG} == "th" -LANG_PKGNAME= th -LANG_EXT= 66 -LANG_CONFIGURE_ARG= THAI -.endif -################################################################ -.if ${LOCALIZED_LANG} == "tn" -LANG_PKGNAME= tn -LANG_EXT= 29 -LANG_CONFIGURE_ARG= TSWANA -.endif -################################################################ -.if ${LOCALIZED_LANG} == "tr" -LANG_PKGNAME= tr -LANG_EXT= 90 -LANG_CONFIGURE_ARG= TURK -.endif -################################################################ -.if ${LOCALIZED_LANG} == "we" -LANG_PKGNAME= cy -LANG_EXT= 53 -LANG_CONFIGURE_ARG= WELSH -.endif -################################################################ -.if ${LOCALIZED_LANG} == "zu" -LANG_PKGNAME= zu -LANG_EXT= 28 -LANG_CONFIGURE_ARG= ZULU -.endif -################################################################ -.if defined(LANG_PKGNAME) -PKGNAMEPREFIX= ${LANG_PKGNAME}- -.endif -.if defined(LANG_SUFFIX) -PKGNAMESUFFIX?= -${LANG_SUFFIX} -.endif -.endif - diff --git a/editors/openoffice.org-1.1/files/generate.pl b/editors/openoffice.org-1.1/files/generate.pl deleted file mode 100644 index b6f485b67f4e..000000000000 --- a/editors/openoffice.org-1.1/files/generate.pl +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/perl -# generate full build shell script for OpenOffice.org -# Whom: Maho Nakata <maho@FreeBSD.org> -# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-1.1/files/Attic/generate.pl,v 1.4 2005-08-31 04:28:56 maho Exp $ - -print "#!/bin/csh\n"; -print "make deinstall clean\n"; -print "/usr/bin/time -h make WITH_CCACHE=yes install package package-rename solver sdk deinstall >& log.en\n"; -print "rm work/.configure* work/.build* \n"; -print "/usr/bin/time -h make ALL_LOCALIZED_LANGS=yes >& log.all\n"; - -open ( FILE, "< Makefile.localized") ; -while(<FILE>){ -@tmp=split (' ',$_); -@tmp2=split ('"',$tmp[3]); -if ( $tmp[1] eq "\${LOCALIZED_LANG}") { $LANG=$tmp2[1]; - print "make TWEAK_L10N=yes LOCALIZED_LANG=$LANG pre-everything\n"; - print "/usr/bin/time -h make LOCALIZED_LANG=$LANG WITH_CCACHE=yes package package-rename deinstall >& log.$LANG\n"; - } -} -close FILE; diff --git a/editors/openoffice.org-1.1/files/moz-patch b/editors/openoffice.org-1.1/files/moz-patch deleted file mode 100644 index b37c1cbc1b37..000000000000 --- a/editors/openoffice.org-1.1/files/moz-patch +++ /dev/null @@ -1,278 +0,0 @@ -#iZ 28398 -#iZ 11424 - -http://qa.openoffice.org/issues/show_bug.cgi?id=28398 -http://qa.openoffice.org/issues/show_bug.cgi?id=11424 - -disable freetype2 support since build broken and -this functionality is not used at all. - -fix build after /usr/bin/objformat removal - ---- moz/extractfiles.mk.org Sat Oct 30 22:01:49 2004 -+++ moz/extractfiles.mk Sat Oct 30 22:00:21 2004 -@@ -269,8 +269,8 @@ - +$(COPY) /QSZ $(INCLUDE_PATH)* $(INCLUDE_DIR) - +$(COPY) /QSZ $(PUBLIC_PATH)* $(INCLUDE_DIR) - .ELSE -- +$(GNUCOPY) -pr $(INCLUDE_PATH)* $(INCLUDE_DIR) -- +$(GNUCOPY) -pr $(PUBLIC_PATH)* $(INCLUDE_DIR) -+ +$(GNUCOPY) -Lr $(INCLUDE_PATH)* $(INCLUDE_DIR) -+ +$(GNUCOPY) -Lr $(PUBLIC_PATH)* $(INCLUDE_DIR) - .ENDIF - - .IF "$(GUI)"=="UNX" - ---- moz/mozilla-source-1.0.patch Thu May 3 09:11:47 2007 -+++ moz/mozilla-source-1.0.patch Thu May 3 09:10:12 2007 -@@ -4473,12 +4473,15 @@ - - --- misc/build/mozilla/.mozconfig Tue Jul 22 21:52:27 2003 - +++ misc/build/mozilla/.mozconfig Mon Jul 28 15:07:20 2003 --@@ -0,0 +1,8 @@ -+@@ -0,0 +1,11 @@ - +ac_add_options --disable-tests - +ac_add_options --disable-xprint - +ac_add_options --without-system-zlib - +ac_add_options --enable-ldap - +ac_add_options --disable-debug -++ac_add_options --disable-freetype2 -++ac_add_options --enable-default-toolkit=xlib -++ac_add_options --disable-pedantic - +ac_add_options --enable-optimize - +ac_add_options --enable-crypto - +ac_add_options --enable-strip -@@ -4497,3 +4500,233 @@ - endif - - # Windows equivalents -+ -+--- misc/build/mozilla/xpcom/typelib/xpidl/xpidl.h Wed Apr 10 12:38:31 2002 -++++ misc/build/mozilla/xpcom/typelib/xpidl/xpidl.h Sat Oct 29 12:34:19 2005 -+@@ -71,10 +71,10 @@ -+ * parens, e.g. XPIDL_WARNING((foo, bar, "sil")) -+ * -+ * Probably best removed when we leave 6.5. */ -+-#define XPIDL_WARNING(x) IDL_tree_warning##x -++#define XPIDL_WARNING(x) IDL_tree_warning x -+ #else -+ extern void xpidl_tree_warning(IDL_tree p, int level, const char *fmt, ...); -+-#define XPIDL_WARNING(x) xpidl_tree_warning##x -++#define XPIDL_WARNING(x) xpidl_tree_warning x -+ #endif -+ -+ /* -+*** misc/mozilla/configure Tue May 28 04:29:00 2002 -+--- misc/build/mozilla/configure Sun Sep 10 11:56:33 2006 -+*************** -+*** 4565,4571 **** -+ ;; -+ -+ *-freebsd*) -+! if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` != "elf"; then -+ DLL_SUFFIX=".so.1.0" -+ DSO_LDOPTS="-shared" -+ fi -+--- 4565,4571 ---- -+ ;; -+ -+ *-freebsd*) -+! if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` != "elf"; then -+ DLL_SUFFIX=".so.1.0" -+ DSO_LDOPTS="-shared" -+ fi -+*************** -+*** 6589,6594 **** -+--- 6589,6596 ---- -+ case $target in -+ *-hpux11.*) -+ ;; -++ *-freebsd*) -++ ;; -+ *) -+ echo $ac_n "checking for gethostbyname_r in -lc_r""... $ac_c" 1>&6 -+ echo "configure:6595: checking for gethostbyname_r in -lc_r" >&5 -+*** misc/mozilla/configure.in Tue May 28 04:29:12 2002 -+--- misc/build/mozilla/configure.in Sun Sep 10 11:56:18 2006 -+*************** -+*** 787,793 **** -+ ;; -+ -+ *-freebsd*) -+! if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` != "elf"; then -+ DLL_SUFFIX=".so.1.0" -+ DSO_LDOPTS="-shared" -+ fi -+--- 787,793 ---- -+ ;; -+ -+ *-freebsd*) -+! if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` != "elf"; then -+ DLL_SUFFIX=".so.1.0" -+ DSO_LDOPTS="-shared" -+ fi -+*************** -+*** 1606,1611 **** -+--- 1606,1613 ---- -+ case $target in -+ *-hpux11.*) -+ ;; -++ *-freebsd*) -++ ;; -+ *) -+ AC_CHECK_LIB(c_r, gethostbyname_r) -+ ;; -+*** misc/mozilla/directory/c-sdk/config/FreeBSD.mk Wed Apr 10 11:31:55 2002 -+--- misc/build/mozilla/directory/c-sdk/config/FreeBSD.mk Thu May 3 07:55:57 2007 -+*************** -+*** 66,72 **** -+ -+ ARCH = freebsd -+ -+! MOZ_OBJFORMAT := $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo aout) -+ -+ ifeq ($(MOZ_OBJFORMAT),elf) -+ DLL_SUFFIX = so -+--- 66,72 ---- -+ -+ ARCH = freebsd -+ -+! MOZ_OBJFORMAT := $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo elf) -+ -+ ifeq ($(MOZ_OBJFORMAT),elf) -+ DLL_SUFFIX = so -+*** misc/mozilla/directory/c-sdk/configure Wed Apr 10 11:31:53 2002 -+--- misc/build/mozilla/directory/c-sdk/configure Thu May 3 07:58:33 2007 -+*************** -+*** 3410,3416 **** -+ EOF -+ -+ CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall" -+! MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ if test "$MOZ_OBJFORMAT" = "elf"; then -+ DLL_SUFFIX=so -+ else -+--- 3410,3416 ---- -+ EOF -+ -+ CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall" -+! MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ if test "$MOZ_OBJFORMAT" = "elf"; then -+ DLL_SUFFIX=so -+ else -+*** misc/mozilla/directory/c-sdk/configure.in Wed Apr 10 11:31:54 2002 -+--- misc/build/mozilla/directory/c-sdk/configure.in Thu May 3 07:58:48 2007 -+*************** -+*** 900,906 **** -+ AC_DEFINE(FREEBSD) -+ AC_DEFINE(HAVE_BSD_FLOCK) -+ CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall" -+! MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ if test "$MOZ_OBJFORMAT" = "elf"; then -+ DLL_SUFFIX=so -+ else -+--- 900,906 ---- -+ AC_DEFINE(FREEBSD) -+ AC_DEFINE(HAVE_BSD_FLOCK) -+ CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall" -+! MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ if test "$MOZ_OBJFORMAT" = "elf"; then -+ DLL_SUFFIX=so -+ else -+*** misc/mozilla/nsprpub/configure Tue Sep 14 17:14:38 2004 -+--- misc/build/mozilla/nsprpub/configure Wed Apr 4 20:56:33 2007 -+*************** -+*** 3407,3413 **** -+ EOF -+ -+ CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall" -+! MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ if test "$MOZ_OBJFORMAT" = "elf"; then -+ DLL_SUFFIX=so -+ else -+--- 3407,3413 ---- -+ EOF -+ -+ CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall" -+! MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ if test "$MOZ_OBJFORMAT" = "elf"; then -+ DLL_SUFFIX=so -+ else -+*** misc/mozilla/nsprpub/configure.in Tue Sep 14 17:14:38 2004 -+--- misc/build/mozilla/nsprpub/configure.in Wed Apr 4 20:56:40 2007 -+*************** -+*** 922,928 **** -+ AC_DEFINE(HAVE_BSD_FLOCK) -+ AC_DEFINE(HAVE_SOCKLEN_T) -+ CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall" -+! MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ if test "$MOZ_OBJFORMAT" = "elf"; then -+ DLL_SUFFIX=so -+ else -+--- 922,928 ---- -+ AC_DEFINE(HAVE_BSD_FLOCK) -+ AC_DEFINE(HAVE_SOCKLEN_T) -+ CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall" -+! MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ if test "$MOZ_OBJFORMAT" = "elf"; then -+ DLL_SUFFIX=so -+ else -+ -+*** misc/mozilla/security/coreconf/FreeBSD.mk Wed Mar 26 20:17:25 2003 -+--- misc/build/mozilla/security/coreconf/FreeBSD.mk Wed Apr 4 20:56:48 2007 -+*************** -+*** 63,69 **** -+ -+ ARCH = freebsd -+ -+! MOZ_OBJFORMAT := $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo aout) -+ -+ ifeq ($(MOZ_OBJFORMAT),elf) -+ DLL_SUFFIX = so -+--- 63,69 ---- -+ -+ ARCH = freebsd -+ -+! MOZ_OBJFORMAT := $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo elf) -+ -+ ifeq ($(MOZ_OBJFORMAT),elf) -+ DLL_SUFFIX = so -+*** misc/mozilla/nsprpub/config/FreeBSD.mk Wed Apr 10 12:16:03 2002 -+--- misc/build/mozilla/nsprpub/config/FreeBSD.mk Thu May 3 08:07:27 2007 -+*************** -+*** 66,72 **** -+ -+ ARCH = freebsd -+ -+! MOZ_OBJFORMAT := $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo aout) -+ -+ ifeq ($(MOZ_OBJFORMAT),elf) -+ DLL_SUFFIX = so -+--- 66,72 ---- -+ -+ ARCH = freebsd -+ -+! MOZ_OBJFORMAT := $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo elf) -+ -+ ifeq ($(MOZ_OBJFORMAT),elf) -+ DLL_SUFFIX = so -+*** misc/mozilla/nsprpub/pr/src/misc/prnetdb.c Wed Apr 10 12:17:35 2002 -+--- misc/build/mozilla/nsprpub/pr/src/misc/prnetdb.c Sun Sep 10 11:55:27 2006 -+*************** -+*** 105,111 **** -+ #define _PR_HAVE_GETPROTO_R_INT -+ #endif -+ -+! #if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) -+ #define _PR_HAVE_GETPROTO_R -+ #define _PR_HAVE_5_ARG_GETPROTO_R -+ #endif -+--- 105,112 ---- -+ #define _PR_HAVE_GETPROTO_R_INT -+ #endif -+ -+! #if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) || \ -+! (defined(__FreeBSD__) && __FreeBSD_version > 601103) -+ #define _PR_HAVE_GETPROTO_R -+ #define _PR_HAVE_5_ARG_GETPROTO_R -+ #endif diff --git a/editors/openoffice.org-1.1/files/openoffice.org-wrapper b/editors/openoffice.org-1.1/files/openoffice.org-wrapper deleted file mode 100644 index 33798ee0cc38..000000000000 --- a/editors/openoffice.org-1.1/files/openoffice.org-wrapper +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -# -# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-1.1/files/Attic/openoffice.org-wrapper,v 1.1 2005-07-29 01:44:40 maho Exp $ - -oopath=%%PREFIX%%/%%INSTALLATION_BASEDIR%%/program/ -program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%-||'` - -case $program in -$0) - $oopath/soffice "$@" - ;; - *) - $oopath/$program "$@" - ;; -esac diff --git a/editors/openoffice.org-1.1/files/optpatch-freetype b/editors/openoffice.org-1.1/files/optpatch-freetype deleted file mode 100644 index fb96fb1fadac..000000000000 --- a/editors/openoffice.org-1.1/files/optpatch-freetype +++ /dev/null @@ -1,87 +0,0 @@ -Index: freetype/freetype-2.1.4.patch -=================================================================== -RCS file: /cvs/external/freetype/freetype-2.1.4.patch,v -retrieving revision 1.2 -diff -u -r1.2 freetype-2.1.4.patch ---- freetype/freetype-2.1.4.patch 17 Apr 2003 15:11:01 -0000 1.2 -+++ freetype/freetype-2.1.4.patch 16 Jan 2005 08:29:56 -0000 -@@ -1,5 +1,5 @@ --*** misc/freetype-2.1.4/builds/compiler/visualc.mk Thu Dec 14 00:44:33 2000 ----- misc/build/freetype-2.1.4/builds/compiler/visualc.mk Wed Apr 9 16:45:16 2003 -+*** misc/freetype-2.1.4/builds/compiler/visualc.mk Thu Dec 14 08:44:33 2000 -+--- misc/build/freetype-2.1.4/builds/compiler/visualc.mk Sun Jan 16 17:01:31 2005 - *************** - *** 63,69 **** - # ANSI compliance. -@@ -17,8 +17,8 @@ - endif - - # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant. --*** misc/freetype-2.1.4/builds/unix/ltmain.sh Sat Jan 18 17:39:18 2003 ----- misc/build/freetype-2.1.4/builds/unix/ltmain.sh Wed Apr 9 16:45:16 2003 -+*** misc/freetype-2.1.4/builds/unix/ltmain.sh Sun Jan 19 01:39:18 2003 -+--- misc/build/freetype-2.1.4/builds/unix/ltmain.sh Sun Jan 16 17:01:31 2005 - *************** - *** 2296,2302 **** - ;; -@@ -36,8 +36,8 @@ - - case $version_type in - nonstopux) verstring_prefix=nonstopux ;; --*** misc/freetype-2.1.4/builds/win32/visualc/freetype.dsp Fri Jan 31 00:24:18 2003 ----- misc/build/freetype-2.1.4/builds/win32/visualc/freetype.dsp Wed Apr 9 16:45:16 2003 -+*** misc/freetype-2.1.4/builds/win32/visualc/freetype.dsp Fri Jan 31 08:24:18 2003 -+--- misc/build/freetype-2.1.4/builds/win32/visualc/freetype.dsp Sun Jan 16 17:01:32 2005 - *************** - *** 44,51 **** - # PROP Output_Dir "..\..\..\objs\release" -@@ -57,8 +57,8 @@ - # SUBTRACT CPP /nologo /YX - # ADD BASE RSC /l 0x409 /d "NDEBUG" - # ADD RSC /l 0x409 /d "NDEBUG" --*** misc/freetype-2.1.4/include/freetype/config/ftmodule.h Thu Oct 31 09:29:31 2002 ----- misc/build/freetype-2.1.4/include/freetype/config/ftmodule.h Wed Apr 9 16:45:16 2003 -+*** misc/freetype-2.1.4/include/freetype/config/ftmodule.h Thu Oct 31 17:29:31 2002 -+--- misc/build/freetype-2.1.4/include/freetype/config/ftmodule.h Sun Jan 16 17:01:32 2005 - *************** - *** 1,8 **** - FT_USE_MODULE(autohint_module_class) -@@ -92,8 +92,8 @@ - FT_USE_MODULE(winfnt_driver_class) - + #endif - --*** misc/freetype-2.1.4/include/freetype/config/ftoption.h Fri Jan 31 00:24:18 2003 ----- misc/build/freetype-2.1.4/include/freetype/config/ftoption.h Wed Apr 9 16:45:16 2003 -+*** misc/freetype-2.1.4/include/freetype/config/ftoption.h Fri Jan 31 08:24:18 2003 -+--- misc/build/freetype-2.1.4/include/freetype/config/ftoption.h Sun Jan 16 17:04:45 2005 - *************** - *** 108,114 **** - /* this will however force you to link the zlib to any program that */ -@@ -111,8 +111,25 @@ - - - /*************************************************************************/ --*** misc/freetype-2.1.4/src/base/ftobjs.c Thu Mar 27 22:35:43 2003 ----- misc/build/freetype-2.1.4/src/base/ftobjs.c Sun Apr 13 17:57:51 2003 -+*************** -+*** 378,384 **** -+ /* do not #undef this macro here, since the build system might */ -+ /* define for certain configurations */ -+ /* */ -+! /* #define TT_CONFIG_OPTION_BYTECODE_INTERPRETER */ -+ -+ -+ /*************************************************************************/ -+--- 378,384 ---- -+ /* do not #undef this macro here, since the build system might */ -+ /* define for certain configurations */ -+ /* */ -+! #define TT_CONFIG_OPTION_BYTECODE_INTERPRETER -+ -+ -+ /*************************************************************************/ -+*** misc/freetype-2.1.4/src/base/ftobjs.c Fri Mar 28 06:35:43 2003 -+--- misc/build/freetype-2.1.4/src/base/ftobjs.c Sun Jan 16 17:01:32 2005 - *************** - *** 804,810 **** - { diff --git a/editors/openoffice.org-1.1/files/patch-allocoverflows_wmf b/editors/openoffice.org-1.1/files/patch-allocoverflows_wmf deleted file mode 100644 index dd89158672cf..000000000000 --- a/editors/openoffice.org-1.1/files/patch-allocoverflows_wmf +++ /dev/null @@ -1,170 +0,0 @@ -Index: source/filter.vcl/wmf/enhwmf.cxx -=================================================================== -RCS file: /cvs/util/svtools/source/filter.vcl/wmf/enhwmf.cxx,v -retrieving revision 1.19.106.1 -diff -u -u -r1.19.106.1 enhwmf.cxx ---- svtools/source/filter.vcl/wmf/enhwmf.cxx 28 Apr 2004 10:25:02 -0000 1.19.106.1 -+++ svtools/source/filter.vcl/wmf/enhwmf.cxx 24 Nov 2006 15:01:16 -0000 -@@ -60,6 +60,10 @@ - ************************************************************************/ - - #include "winmtf.hxx" -+// some older OOos don't have the macro yet -+#ifndef SAL_MAX_UINT32 -+#define SAL_MAX_UINT32 ((sal_uInt32) 0xFFFFFFFF) -+#endif - - //=========================== GDI-Array =================================== - -@@ -385,33 +389,37 @@ - UINT16* pnPoints; - Point* pPtAry; - -- INT32 i, nPoly, nGesPoints; -+ UINT32 i, nPoly, nGesPoints; - pWMF->SeekRel( 0x10 ); - - // Anzahl der Polygone: - *pWMF >> nPoly >> nGesPoints; - -- // Anzahl der Punkte eines jeden Polygons holen, Gesammtzahl der Punkte ermitteln: -- pnPoints = new UINT16[ nPoly ]; -- -- for ( i = 0; i < nPoly; i++ ) -+ if (nGesPoints < SAL_MAX_UINT32 / sizeof(Point)) - { -- *pWMF >> nPoints; -- pnPoints[ i ] = (UINT16)nPoints; -- } -- // Polygonpunkte holen: -- pPtAry = (Point*) new char[ nGesPoints * sizeof(Point) ]; - -- for ( i = 0; i < nGesPoints; i++ ) -- { -- *pWMF >> nX32 >> nY32; -- pPtAry[ i ] = Point( nX32, nY32 ); -+ // Anzahl der Punkte eines jeden Polygons holen, Gesammtzahl der Punkte ermitteln: -+ pnPoints = new UINT16[ nPoly ]; -+ -+ for ( i = 0; i < nPoly; i++ ) -+ { -+ *pWMF >> nPoints; -+ pnPoints[ i ] = (UINT16)nPoints; -+ } -+ // Polygonpunkte holen: -+ pPtAry = (Point*) new char[ nGesPoints * sizeof(Point) ]; -+ -+ for ( i = 0; i < nGesPoints; i++ ) -+ { -+ *pWMF >> nX32 >> nY32; -+ pPtAry[ i ] = Point( nX32, nY32 ); -+ } -+ // PolyPolygon Actions erzeugen -+ PolyPolygon aPolyPoly( (UINT16)nPoly, pnPoints, pPtAry ); -+ pOut->DrawPolyPolygon( aPolyPoly, bRecordPath ); -+ delete[] (char*) pPtAry; -+ delete[] pnPoints; - } -- // PolyPolygon Actions erzeugen -- PolyPolygon aPolyPoly( (UINT16)nPoly, pnPoints, pPtAry ); -- pOut->DrawPolyPolygon( aPolyPoly, bRecordPath ); -- delete[] (char*) pPtAry; -- delete[] pnPoints; - } - break; - -@@ -1137,31 +1145,34 @@ - UINT16* pnPoints; - Point* pPtAry; - -- INT32 i, nPoly, nGesPoints; -+ UINT32 i, nPoly, nGesPoints; - pWMF->SeekRel( 0x10 ); - // Anzahl der Polygone: - *pWMF >> nPoly >> nGesPoints; -- // Anzahl der Punkte eines jeden Polygons holen, Gesammtzahl der Punkte ermitteln: -- pnPoints = new UINT16[ nPoly ]; -- for ( i = 0; i < nPoly; i++ ) -- { -- *pWMF >> nPoints; -- pnPoints[ i ] = (UINT16)nPoints; -- } -- // Polygonpunkte holen: -- pPtAry = (Point*) new char[ nGesPoints * sizeof(Point) ]; -- for ( i = 0; i < nGesPoints; i++ ) -+ if (nGesPoints < SAL_MAX_UINT32 / sizeof(Point)) - { -- *pWMF >> nX16 >> nY16; -- pPtAry[ i ] = Point( nX16, nY16 ); -+ // Anzahl der Punkte eines jeden Polygons holen, Gesammtzahl der Punkte ermitteln: -+ pnPoints = new UINT16[ nPoly ]; -+ for ( i = 0; i < nPoly; i++ ) -+ { -+ *pWMF >> nPoints; -+ pnPoints[ i ] = (UINT16)nPoints; -+ } -+ // Polygonpunkte holen: -+ pPtAry = (Point*) new char[ nGesPoints * sizeof(Point) ]; -+ for ( i = 0; i < nGesPoints; i++ ) -+ { -+ *pWMF >> nX16 >> nY16; -+ pPtAry[ i ] = Point( nX16, nY16 ); -+ } -+ -+ // PolyPolygon Actions erzeugen -+ PolyPolygon aPolyPoly( (UINT16)nPoly, pnPoints, pPtAry ); -+ pOut->DrawPolyPolygon( aPolyPoly, bRecordPath ); -+ delete[] (char*) pPtAry; -+ delete[] pnPoints; - } -- -- // PolyPolygon Actions erzeugen -- PolyPolygon aPolyPoly( (UINT16)nPoly, pnPoints, pPtAry ); -- pOut->DrawPolyPolygon( aPolyPoly, bRecordPath ); -- delete[] (char*) pPtAry; -- delete[] pnPoints; -- }; -+ } - break; - - case EMR_FILLRGN : -Index: source/filter.vcl/wmf/winwmf.cxx -=================================================================== -RCS file: /cvs/util/svtools/source/filter.vcl/wmf/winwmf.cxx,v -retrieving revision 1.20.106.1 -diff -u -u -r1.20.106.1 winwmf.cxx ---- svtools/source/filter.vcl/wmf/winwmf.cxx 28 Apr 2004 10:25:48 -0000 1.20.106.1 -+++ svtools/source/filter.vcl/wmf/winwmf.cxx 24 Nov 2006 15:01:16 -0000 -@@ -874,17 +874,21 @@ - aMemoryStream >> aPt.X() - >> aPt.Y() - >> nStringLen; -- sal_Unicode* pBuf = aString.AllocBuffer( (sal_uInt16)nStringLen ); -- for ( i = 0; i < nStringLen; i++ ) -- aMemoryStream >> pBuf[ i ]; -- aMemoryStream >> nDXCount; -- if ( nDXCount ) -- pDXAry = new sal_Int32[ nDXCount ]; -- for ( i = 0; i < nDXCount; i++ ) -- aMemoryStream >> pDXAry[ i ]; -- aMemoryStream >> nSkipActions; -- pOut->DrawText( aPt, aString, pDXAry ); -- delete[] pDXAry; -+ -+ if (nStringLen < STRING_MAXLEN) -+ { -+ sal_Unicode* pBuf = aString.AllocBuffer( (xub_StrLen)nStringLen ); -+ for ( i = 0; i < nStringLen; i++ ) -+ aMemoryStream >> pBuf[ i ]; -+ aMemoryStream >> nDXCount; -+ if ( nDXCount ) -+ pDXAry = new sal_Int32[ nDXCount ]; -+ for ( i = 0; i < nDXCount; i++ ) -+ aMemoryStream >> pDXAry[ i ]; -+ aMemoryStream >> nSkipActions; -+ pOut->DrawText( aPt, aString, pDXAry ); -+ delete[] pDXAry; -+ } - } - } - break; diff --git a/editors/openoffice.org-1.1/files/patch-backtrace b/editors/openoffice.org-1.1/files/patch-backtrace deleted file mode 100644 index 41daab73dede..000000000000 --- a/editors/openoffice.org-1.1/files/patch-backtrace +++ /dev/null @@ -1,96 +0,0 @@ -Issuetracker : #iXXXXX# -CWS : N/A -Author : <maho@openoffice.org> (JCA) -Description : FreeBSD porting : An implementation of backtrace at sal/osl/unx -To pass the compilation, we preparing dummy function at sal. -We implemented this. - ---- sal/osl/unx/backtrace.c Tue Jul 6 19:35:44 2004 -+++ sal/osl/unx/backtrace.c Sun Oct 23 12:07:07 2005 -@@ -155,6 +155,7 @@ - #include <pthread.h> - #include <setjmp.h> - #include <stdio.h> -+#include <stddef.h> - #include "backtrace.h" - - #define FRAME_PTR_OFFSET 1 -@@ -162,11 +163,55 @@ - - int backtrace( void **buffer, int max_frames ) - { -- return 1; -+ struct frame *fp; -+ jmp_buf ctx; -+ int i; -+ /* get stack- and framepointer */ -+ setjmp(ctx); -+ fp = (struct frame*)(((size_t*)(ctx))[FRAME_PTR_OFFSET]); -+ for ( i=0; (i<FRAME_OFFSET) && (fp!=0); i++) -+ fp = fp->fr_savfp; -+ /* iterate through backtrace */ -+ for (i=0; fp && fp->fr_savpc && i<max_frames; i++) -+ { -+ /* store frame */ -+ *(buffer++) = (void *)fp->fr_savpc; -+ /* next frame */ -+ fp=fp->fr_savfp; -+ } -+ return i; - } - - void backtrace_symbols_fd( void **buffer, int size, int fd ) - { -+ FILE *fp = fdopen( fd, "w" ); -+ -+ if ( fp ) -+ { -+ void **pFramePtr; -+ for ( pFramePtr = buffer; size > 0 && pFramePtr && *pFramePtr; pFramePtr++, size-- ) -+ { -+ Dl_info dli; -+ ptrdiff_t offset; -+ -+ if ( 0 != dladdr( *pFramePtr, &dli ) ) -+ { -+ if ( dli.dli_fname && dli.dli_fbase ) -+ { -+ offset = (ptrdiff_t)*pFramePtr - (ptrdiff_t)dli.dli_fbase; -+ fprintf( fp, "%s+0x%x", dli.dli_fname, offset ); -+ } -+ if ( dli.dli_sname && dli.dli_saddr ) -+ { -+ offset = (ptrdiff_t)*pFramePtr - (ptrdiff_t)dli.dli_saddr; -+ fprintf( fp, "(%s+0x%x)", dli.dli_sname, offset ); -+ } -+ } -+ fprintf( fp, "[0x%x]\n", *pFramePtr ); -+ } -+ fflush( fp ); -+ fclose( fp ); -+ } - - } - #endif /* defined FREEBSD */ -Only in sal/osl/unx: backtrace.c.orig -diff -ur ../../src/OOo_1.1.5/sal/osl/unx/backtrace.h sal/osl/unx/backtrace.h ---- sal/osl/unx/backtrace.h Tue Jul 6 19:36:01 2004 -+++ sal/osl/unx/backtrace.h Sun Oct 23 12:07:07 2005 -@@ -72,6 +72,16 @@ - - void backtrace_symbols_fd( void **buffer, int size, int fd ); - -+/* no frame.h on FreeBSD */ -+#if defined FREEBSD -+struct frame { -+ long arg0[8]; -+ long arg1[6]; -+ struct frame *fr_savfp; -+ long fr_savpc; -+}; -+#endif -+ - #ifdef __cplusplus - } /* extern "C" */ - #endif -Only in sal/osl/unx: backtrace.h.orig diff --git a/editors/openoffice.org-1.1/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel b/editors/openoffice.org-1.1/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel deleted file mode 100644 index 5726cb84a6d7..000000000000 --- a/editors/openoffice.org-1.1/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel +++ /dev/null @@ -1,120 +0,0 @@ -Index: bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx -=================================================================== -RCS file: /cvs/udk/bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx,v -retrieving revision 1.3 -diff -u -r1.3 cpp2uno.cxx ---- bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx 28 Apr 2003 16:28:20 -0000 1.3 -+++ bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx 8 Jan 2007 00:45:53 -0000 -@@ -59,9 +59,9 @@ - * - ************************************************************************/ - -+#include <stdlib.h> - #include <hash_map> - --#include <sal/alloca.h> - #include <rtl/alloc.h> - #include <osl/mutex.hxx> - -Index: bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx -=================================================================== -RCS file: /cvs/udk/bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx,v -retrieving revision 1.4 -diff -u -r1.4 except.cxx ---- bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx 28 Apr 2003 16:41:25 -0000 1.4 -+++ bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx 8 Jan 2007 00:45:53 -0000 -@@ -63,6 +63,7 @@ - #include <dlfcn.h> - #include <cxxabi.h> - #include <hash_map> -+#include <sys/param.h> - - #include <rtl/strbuf.hxx> - #include <rtl/ustrbuf.hxx> -@@ -147,7 +148,11 @@ - }; - //__________________________________________________________________________________________________ - RTTI::RTTI() SAL_THROW( () ) -+#if __FreeBSD_version < 602103 /* #i22253# */ -+ : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) ) -+#else - : m_hApp( dlopen( 0, RTLD_LAZY ) ) -+#endif - { - } - //__________________________________________________________________________________________________ -@@ -182,7 +187,11 @@ - buf.append( 'E' ); - - OString symName( buf.makeStringAndClear() ); -+#if __FreeBSD_version < 602103 /* #i22253# */ -+ rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() ); -+#else - rtti = (type_info *)dlsym( m_hApp, symName.getStr() ); -+#endif - - if (rtti) - { -@@ -253,7 +262,7 @@ - //================================================================================================== - void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) - { --#if defined DEBUG -+#if OSL_DEBUG_LEVEL > 1 - OString cstr( - OUStringToOString( - *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ), -@@ -275,7 +284,7 @@ - *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ), - Reference< XInterface >() ); - } -- -+ - pCppExc = __cxa_allocate_exception( pTypeDescr->nSize ); - ::uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp ); - -@@ -321,16 +330,16 @@ - Reference< XInterface >() ); - Type const & rType = ::getCppuType( &aRE ); - uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno ); --#if defined _DEBUG -+#if OSL_DEBUG_LEVEL > 0 - OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) ); - OSL_ENSURE( 0, cstr.getStr() ); - #endif - return; - } -- -+ - typelib_TypeDescription * pExcTypeDescr = 0; - OUString unoName( toUNOname( header->exceptionType->name() ) ); --#if defined DEBUG -+#if OSL_DEBUG_LEVEL > 1 - OString cstr_unoName( OUStringToOString( unoName, RTL_TEXTENCODING_ASCII_US ) ); - fprintf( stderr, "> c++ exception occured: %s\n", cstr_unoName.getStr() ); - #endif -@@ -342,7 +351,7 @@ - Reference< XInterface >() ); - Type const & rType = ::getCppuType( &aRE ); - uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno ); --#if defined _DEBUG -+#if OSL_DEBUG_LEVEL > 0 - OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) ); - OSL_ENSURE( 0, cstr.getStr() ); - #endif -Index: bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx -=================================================================== -RCS file: /cvs/udk/bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx,v -retrieving revision 1.4 -diff -u -r1.4 uno2cpp.cxx ---- bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx 28 Apr 2003 16:28:35 -0000 1.4 -+++ bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx 8 Jan 2007 00:45:53 -0000 -@@ -59,7 +59,7 @@ - * - ************************************************************************/ - --#include <sal/alloca.h> -+#include <stdlib.h> - #include <rtl/alloc.h> - - #include <uno/data.h> diff --git a/editors/openoffice.org-1.1/files/patch-gethostbyname_r b/editors/openoffice.org-1.1/files/patch-gethostbyname_r deleted file mode 100644 index 63b243e146f9..000000000000 --- a/editors/openoffice.org-1.1/files/patch-gethostbyname_r +++ /dev/null @@ -1,55 +0,0 @@ -Index: sal/osl/unx/socket.c -=================================================================== -RCS file: /cvs/porting/sal/osl/unx/socket.c,v -retrieving revision 1.22.10.1 -diff -u -r1.22.10.1 socket.c ---- sal/osl/unx/socket.c 18 Aug 2003 15:12:26 -0000 1.22.10.1 -+++ sal/osl/unx/socket.c 10 Sep 2006 03:18:08 -0000 -@@ -836,7 +836,7 @@ - const char *name, struct hostent *result, - char *buffer, int buflen, int *h_errnop) - { --#ifdef LINUX -+#if defined(LINUX) || (defined(FREEBSD) && (__FreeBSD_version >= 601103)) - struct hostent *__result; /* will be the same as result */ - int __error; - __error = gethostbyname_r (name, result, buffer, buflen, -Index: sal/osl/unx/system.c -=================================================================== -RCS file: /cvs/porting/sal/osl/unx/system.c,v -retrieving revision 1.8 -diff -u -r1.8 system.c ---- sal/osl/unx/system.c 16 Jul 2003 17:21:47 -0000 1.8 -+++ sal/osl/unx/system.c 10 Sep 2006 03:18:08 -0000 -@@ -371,6 +371,8 @@ - - extern int h_errno; - -+#if !defined(FREEBSD) || (__FreeBSD_version < 601103) -+ - struct hostent *gethostbyname_r(const char *name, struct hostent *result, - char *buffer, int buflen, int *h_errnop) - { -@@ -459,6 +461,8 @@ - - return res; - } -+#endif /* !defined(FREEBSD) || (__FreeBSD_version < 601103) */ -+ - - #if defined(MACOSX) - /* - ---- sal/osl/unx/system.h.orig Fri Aug 15 20:38:50 2003 -+++ sal/osl/unx/system.h Sun Sep 10 13:32:43 2006 -@@ -576,8 +576,10 @@ - struct tm *localtime_r(const time_t *timep, struct tm *buffer); - struct tm *gmtime_r(const time_t *timep, struct tm *buffer); - #endif /* !defined FREEBSD || (__FreeBSD_version < 500112) */ -+#if !defined(FREEBSD) || (__FreeBSD_version < 601103) - struct hostent *gethostbyname_r(const char *name, struct hostent *result, - char *buffer, int buflen, int *h_errnop); -+#endif /* !defined(FREEBSD) || (__FreeBSD_version < 601103) */ - #endif - - #endif /* __OSL_SYSTEM_H__ */ diff --git a/editors/openoffice.org-1.1/files/patch-icu+icu-2.2.patch b/editors/openoffice.org-1.1/files/patch-icu+icu-2.2.patch deleted file mode 100644 index 443730140dd5..000000000000 --- a/editors/openoffice.org-1.1/files/patch-icu+icu-2.2.patch +++ /dev/null @@ -1,94 +0,0 @@ -Issuetracker : #iXXXXX# -CWS : N/A -Author : <maho@openoffice.org> (JCA) -Description : FreeBSD porting : Passing $ORIGIN to linker at icu project -We also want to pass -rpath $ORIGIN to linker as GNU/Linux and/or Solaris's case. -and unbreak the build with -ccache gcc33 -O -Wl,-rpath,'$ORIGIN' -o genrb errmsg.o genrb.o parse.o read.o reslist.o ustr.o util.o wrtjava.o rle.o -L../../i18n -licui18n -L../../tools/toolutil -licutoolutil -L../../common -licuuc -L../../data/out -L../../stubdata -licudata -lpthread -lm -../../i18n/libicui18n.so: undefined reference to `vtable for __cxxabiv1::__class_type_info@GLIBCPP_3.2' -../../i18n/libicui18n.so: undefined reference to `vtable for __cxxabiv1::__vmi_class_type_info@GLIBCPP_3.2' -../../i18n/libicui18n.so: undefined reference to `__gxx_personality_v0@CXXABI_1.2' -../../i18n/libicui18n.so: undefined reference to `vtable for __cxxabiv1::__si_class_type_info@GLIBCPP_3.2' -../../i18n/libicui18n.so: undefined reference to `__cxa_pure_virtual@CXXABI_1.2' -collect2: ld returned 1 exit status -gmake[2]: *** [genrb] Error 1 - -Index: icu/icu-2.2.patch -=================================================================== -RCS file: /cvs/external/icu/Attic/icu-2.2.patch,v -retrieving revision 1.17.6.2 -diff -u -r1.17.6.2 icu-2.2.patch ---- icu/icu-2.2.patch 6 Jul 2004 10:40:19 -0000 1.17.6.2 -+++ icu/icu-2.2.patch 21 Jun 2006 13:15:33 -0000 -@@ -1127,3 +1127,71 @@ - return tempGlyphCount; - }; - -+*** misc/icu/source/config/mh-bsd-gcc Thu May 2 08:48:10 2002 -+--- misc/build/icu/source/config/mh-bsd-gcc Mon Oct 24 18:21:04 2005 -+*************** -+*** 10,15 **** -+--- 10,18 ---- -+ GEN_DEPS.cc= $(CXX) -E -MM $(DEFS) $(CPPFLAGS) -+ -+ ## Flags for position independent code -++ STATICCFLAGS = -fPIC -++ STATICCXXFLAGS = -fPIC -++ STATICCPPFLAGS = -DPIC -+ SHAREDLIBCFLAGS = -fPIC -+ SHAREDLIBCXXFLAGS = -fPIC -+ SHAREDLIBCPPFLAGS = -DPIC -+*************** -+*** 17,22 **** -+--- 20,32 ---- -+ ## Compiler switch to embed a runtime search path -+ LD_RPATH= -+ LD_RPATH_PRE= -Wl,-rpath, -++ -++ ## Force RPATH=$ORIGIN to locate own dependencies w/o need for LD_LIBRARY_PATH -++ ENABLE_RPATH=YES -++ RPATHLDFLAGS=${LD_RPATH_PRE}'$$ORIGIN' -++ -++ #SH# ENABLE_RPATH=YES -++ #SH# RPATHLDFLAGS="${LD_RPATH_PRE}'$$ORIGIN'" -+ -+ ## Compiler switch to embed a library name -+ LD_SONAME = -Wl,-soname -Wl,$(MIDDLE_SO_TARGET) -+*** misc/icu/source/common/Makefile.in Tue Aug 13 05:30:14 2002 -+--- misc/build/icu/source/common/Makefile.in Wed Jun 21 21:58:59 2006 -+*************** -+*** 142,148 **** -+ -+ ifneq ($(ENABLE_SHARED),) -+ $(FINAL_SO_TARGET): $(OBJECTS) -+! $(SHLIB.cc) $(LD_SONAME) -o $@ $^ $(LIBS) -+ -+ ifeq ($(OS390BATCH),1) -+ $(BATCH_TARGET): $(OBJECTS) -+--- 142,148 ---- -+ -+ ifneq ($(ENABLE_SHARED),) -+ $(FINAL_SO_TARGET): $(OBJECTS) -+! $(SHLIB.c) $(LD_SONAME) -o $@ $^ $(LIBS) -+ -+ ifeq ($(OS390BATCH),1) -+ $(BATCH_TARGET): $(OBJECTS) -+*** misc/icu/source/i18n/Makefile.in Wed Aug 14 09:38:40 2002 -+--- misc/build/icu/source/i18n/Makefile.in Wed Jun 21 22:07:23 2006 -+*************** -+*** 134,140 **** -+ -+ ifneq ($(ENABLE_SHARED),) -+ $(FINAL_SO_TARGET): $(OBJECTS) -+! $(SHLIB.cc) $(LD_SONAME) -o $@ $^ $(LIBS) -+ -+ ifeq ($(OS390BATCH),1) -+ $(BATCH_TARGET):$(OBJECTS) -+--- 134,140 ---- -+ -+ ifneq ($(ENABLE_SHARED),) -+ $(FINAL_SO_TARGET): $(OBJECTS) -+! $(SHLIB.c) $(LD_SONAME) -o $@ $^ $(LIBS) -+ -+ ifeq ($(OS390BATCH),1) -+ $(BATCH_TARGET):$(OBJECTS) diff --git a/editors/openoffice.org-1.1/files/patch-jdk15 b/editors/openoffice.org-1.1/files/patch-jdk15 deleted file mode 100644 index f39b5414c9fa..000000000000 --- a/editors/openoffice.org-1.1/files/patch-jdk15 +++ /dev/null @@ -1,778 +0,0 @@ -Index: jvmaccess/source/javainfoimpl.cxx -=================================================================== -RCS file: /cvs/udk/jvmaccess/source/Attic/javainfoimpl.cxx,v -retrieving revision 1.7.12.6 -diff -u -r1.7.12.6 javainfoimpl.cxx ---- jvmaccess/source/javainfoimpl.cxx 2 May 2005 13:30:59 -0000 1.7.12.6 -+++ jvmaccess/source/javainfoimpl.cxx 10 Sep 2006 04:51:58 -0000 -@@ -244,6 +244,8 @@ - "jdk1.4.2", \ - "diablo-jre1.3.1", \ - "diablo-jdk1.3.1", \ -+ "diablo-jre1.5.0", \ -+ "diablo-jdk1.5.0", \ - "linux-sun-jdk1.3.1", \ - "linux-sun-jdk1.4.2", \ - "linux-ibm-jdk1.3.1", \ - - -taken from http://wiki.linuxfromscratch.org/blfs/browser/trunk/patches/OOo_1.1.5-jdk_1.5.0_fix-1.patch?rev=5150&format=txt ---- XmlSearch/src/com/sun/xmlsearch/db/VectorBtree.java 2000-11-30 12:02:54.000000000 -0600 -+++ XmlSearch/src/com/sun/xmlsearch/db/VectorBtree.java 2005-04-19 01:56:30.289021048 -0500 -@@ -274,10 +274,10 @@ - return accessBlock(bl.integerAt(index*4)); - } - -- public static void assert(boolean assertion) { -+ /*public static void assert(boolean assertion) { - if (assertion == false) - System.err.println("assertion failed"); -- } -+ }*/ - - public int getIteratorBufferLength() { - return _blockSize + _vecLen*2; - ---- javaunohelper/com/sun/star/comp/helper/Bootstrap.java 2004-03-30 08:23:53.000000000 -0600 -+++ javaunohelper/com/sun/star/comp/helper/Bootstrap.java 2005-04-19 01:56:30.000000000 -0500 -@@ -220,11 +220,11 @@ - if (null != bootstrap_parameters) - { - pairs = new String [ 2 * bootstrap_parameters.size() ]; -- Enumeration enum = bootstrap_parameters.keys(); -+ Enumeration enumer = bootstrap_parameters.keys(); - int n = 0; -- while (enum.hasMoreElements()) -+ while (enumer.hasMoreElements()) - { -- String name = (String)enum.nextElement(); -+ String name = (String)enumer.nextElement(); - pairs[ n++ ] = name; - pairs[ n++ ] = (String)bootstrap_parameters.get( name ); - } - ---- javaunohelper/com/sun/star/lib/loader/Loader.java 2004-03-30 08:25:21.000000000 -0600 -+++ javaunohelper/com/sun/star/lib/loader/Loader.java 2005-04-19 01:56:30.000000000 -0500 -@@ -106,9 +106,9 @@ - ClassLoader loader = clazz.getClassLoader(); - Vector res = new Vector(); - try { -- Enumeration enum = loader.getResources( "META-INF/MANIFEST.MF" ); -- while ( enum.hasMoreElements() ) { -- res.add( (URL) enum.nextElement() ); -+ Enumeration enumer = loader.getResources( "META-INF/MANIFEST.MF" ); -+ while ( enumer.hasMoreElements() ) { -+ res.add( (URL) enumer.nextElement() ); - } - // the jarfile with the com/sun/star/lib/loader/Loader.class - // per-entry attribute is most probably the last resource in the - ---- jurt/com/sun/star/comp/servicemanager/ServiceManager.java 2002-10-30 09:28:39.000000000 -0600 -+++ jurt/com/sun/star/comp/servicemanager/ServiceManager.java 2005-04-19 01:56:30.000000000 -0500 -@@ -500,10 +500,10 @@ - throws com.sun.star.uno.RuntimeException - { - if (eventListener != null) { -- java.util.Enumeration enum = eventListener.elements(); -+ java.util.Enumeration enumer = eventListener.elements(); - -- while (enum.hasMoreElements()) { -- XEventListener listener = (XEventListener) enum.nextElement(); -+ while (enumer.hasMoreElements()) { -+ XEventListener listener = (XEventListener) enumer.nextElement(); - listener.disposing(new com.sun.star.lang.EventObject(this)); - } - } -@@ -732,16 +732,16 @@ - public XEnumeration createContentEnumeration( String serviceName ) - throws com.sun.star.uno.RuntimeException - { -- XEnumeration enum = null; -+ XEnumeration xenum = null; - - java.util.Vector serviceList = (java.util.Vector) factoriesByServiceNames.get(serviceName); - - if (serviceList != null) -- enum = new ServiceEnumerationImpl( serviceList.elements() ); -+ xenum = new ServiceEnumerationImpl( serviceList.elements() ); - else -- enum = new ServiceEnumerationImpl(); -+ xenum = new ServiceEnumerationImpl(); - -- return enum; -+ return xenum; - } - - /** -@@ -809,11 +809,11 @@ - /** - * Constructs a new instance with a given enumeration. - * <p> -- * @param enum is the enumeration which should been wrapped. -+ * @param enumer is the enumeration which should been wrapped. - * @see com.sun.star.container.XEnumeration - */ -- public ServiceEnumerationImpl(java.util.Enumeration enum) { -- enumeration = enum; -+ public ServiceEnumerationImpl(java.util.Enumeration enumer) { -+ enumeration = enumer; - } - - /** - ---- jurt/com/sun/star/comp/typedescriptionmanager/EnumTypeDescription.java 2001-12-03 05:00:41.000000000 -0600 -+++ jurt/com/sun/star/comp/typedescriptionmanager/EnumTypeDescription.java 2005-04-19 01:56:30.000000000 -0500 -@@ -136,12 +136,12 @@ - Field field = fields[nPos]; - int nMod = field.getModifiers(); - -- if (Enum.class.isAssignableFrom( field.getType() ) && -+ if (com.sun.star.uno.Enum.class.isAssignableFrom( field.getType() ) && - Modifier.isPublic( nMod ) && Modifier.isFinal( nMod ) && Modifier.isStatic( nMod )) - { - try - { -- values[nLen] = ((Enum)field.get( null )).getValue(); -+ values[nLen] = ((com.sun.star.uno.Enum)field.get( null )).getValue(); - names[nLen] = field.getName(); - ++nLen; - } - ---- jurt/com/sun/star/comp/typedescriptionmanager/TypeDescriptionManager.java 2000-09-18 10:27:52.000000000 -0500 -+++ jurt/com/sun/star/comp/typedescriptionmanager/TypeDescriptionManager.java 2005-04-19 01:56:30.000000000 -0500 -@@ -236,7 +236,7 @@ - ret = new InterfaceTypeDescription( this, c ); - else if (c.isArray()) - ret = new SequenceTypeDescription( (XTypeDescription)getByClass( c.getComponentType(), bUnsigned, bInterface ) ); -- else if (Enum.class.isAssignableFrom( c )) -+ else if (com.sun.star.uno.Enum.class.isAssignableFrom( c )) - ret = new EnumTypeDescription( c ); - // else if (com.sun.star.uno.Union.class.isAssignableFrom( c )) - // ret = new UnionTypeDescription( c ); - ---- jurt/com/sun/star/lib/uno/protocols/iiop/Marshal.java 2001-01-16 12:01:30.000000000 -0600 -+++ jurt/com/sun/star/lib/uno/protocols/iiop/Marshal.java 2005-04-19 01:56:30.000000000 -0500 -@@ -446,10 +446,10 @@ - writeObject(typeDescription, object); - } - -- void writeEnum(Enum enum) throws Exception { -- if(DEBUG) System.err.println("##### " + getClass().getName() + ".writeEnum:" + enum + " " + enum.getValue()); -+ void writeEnum(Enum writeenum) throws Exception { -+ if(DEBUG) System.err.println("##### " + getClass().getName() + ".writeEnum:" + writeenum + " " + writeenum.getValue()); - -- write_long(enum.getValue()); -+ write_long(writeenum.getValue()); - } - - void writeThrowable(TypeDescription typeDescription, Throwable throwable) throws Exception { - ---- jurt/com/sun/star/lib/uno/protocols/iiop/iiop.java 2001-02-02 03:01:03.000000000 -0600 -+++ jurt/com/sun/star/lib/uno/protocols/iiop/iiop.java 2005-04-19 01:56:30.000000000 -0500 -@@ -588,13 +588,13 @@ - Enumeration elements = _flushList.elements(); - while(elements.hasMoreElements()) { - Object objects[] = (Object[])elements.nextElement(); -- Enum enum = (Enum)objects[0]; -+ Enum enumer = (Enum)objects[0]; - Marshal marshal = (Marshal)objects[1]; - - int size = marshal.getSize(); - byte bytes[] = marshal.reset(); - -- writeMessageHeader(enum.getValue(), size, dataOutput); -+ writeMessageHeader(enumer.getValue(), size, dataOutput); - if(DEBUG) System.err.println("##### " + getClass().getName() + ".flush - bytes:" + size); - - dataOutput.write(bytes, 0, size); - ---- jurt/com/sun/star/lib/uno/protocols/urp/Marshal.java 2003-03-26 06:33:00.000000000 -0600 -+++ jurt/com/sun/star/lib/uno/protocols/urp/Marshal.java 2005-04-19 01:56:30.000000000 -0500 -@@ -293,10 +293,10 @@ - writedouble(zDouble.doubleValue()); - } - -- void writeEnum(Enum enum) { -- if(DEBUG) System.err.println("##### " + getClass().getName() + ".writeEnum:" + enum + " " + enum.getValue()); -+ void writeEnum(Enum writeenum) { -+ if(DEBUG) System.err.println("##### " + getClass().getName() + ".writeEnum:" + writeenum + " " + writeenum.getValue()); - -- writeint(enum.getValue()); -+ writeint(writeenum.getValue()); - } - - void writeThrowable(ITypeDescription iTypeDescription, Throwable throwable) { - ---- odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOAddInCreateIterator.java 2003-03-26 07:40:24.000000000 -0600 -+++ odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOAddInCreateIterator.java 2005-04-19 01:56:30.000000000 -0500 -@@ -200,7 +200,7 @@ - index--; - } - -- public org.openide.WizardDescriptor$Panel current() { -+ public org.openide.WizardDescriptor.Panel current() { - return panels[index]; - } - - ---- odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOIDLWizardIterator.java 2002-09-03 11:25:06.000000000 -0500 -+++ odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOIDLWizardIterator.java 2005-04-19 01:56:30.000000000 -0500 -@@ -207,7 +207,7 @@ - index--; - } - -- public org.openide.WizardDescriptor$Panel current() -+ public org.openide.WizardDescriptor.Panel current() - { - return panels[index]; - } - ---- odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOServiceCreateIterator.java 2003-03-26 07:40:24.000000000 -0600 -+++ odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOServiceCreateIterator.java 2005-04-19 01:56:30.000000000 -0500 -@@ -214,7 +214,7 @@ - index--; - } - -- public org.openide.WizardDescriptor$Panel current() { -+ public org.openide.WizardDescriptor.Panel current() { - return panels[index]; - } - - ---- qadevOOo/runner/base/java_complex.java 2003-06-11 11:24:17.000000000 -0500 -+++ qadevOOo/runner/base/java_complex.java 2005-04-19 01:56:30.000000000 -0500 -@@ -178,9 +178,9 @@ - java.io.InputStream in = connection.getInputStream(); - Properties props = new Properties(); - props.load(in); -- Enumeration enum = props.keys(); -- while (enum.hasMoreElements()) { -- String key = (String)enum.nextElement(); -+ Enumeration enumer = props.keys(); -+ while (enumer.hasMoreElements()) { -+ String key = (String)enumer.nextElement(); - String value = (String)props.get(key); - param.put(key.trim(), value.trim()); - } - ---- qadevOOo/runner/org/openoffice/RunnerService.java 2003-03-31 11:01:51.000000000 -0600 -+++ qadevOOo/runner/org/openoffice/RunnerService.java 2005-04-19 01:56:30.000000000 -0500 -@@ -252,10 +252,10 @@ - // get Jar file from connection - java.util.jar.JarFile f = con.getJarFile(); - // Enumerate over all entries -- java.util.Enumeration enum = f.entries(); -+ java.util.Enumeration enumer = f.entries(); - -- while (enum.hasMoreElements()) { -- String entry = enum.nextElement().toString(); -+ while (enumer.hasMoreElements()) { -+ String entry = enumer.nextElement().toString(); - if (entry.endsWith(".csv")) { - String module = null; - String object = null; - ---- qadevOOo/runner/util/DBTools.java 2003-01-27 10:27:05.000000000 -0600 -+++ qadevOOo/runner/util/DBTools.java 2005-04-19 01:56:30.000000000 -0500 -@@ -673,12 +673,12 @@ - XEnumerationAccess dbContEA = (XEnumerationAccess) - UnoRuntime.queryInterface(XEnumerationAccess.class, dbContext) ; - -- XEnumeration enum = dbContEA.createEnumeration() ; -+ XEnumeration enumer = dbContEA.createEnumeration() ; - - out.println("DatabaseContext registered DataSource's :") ; -- while (enum.hasMoreElements()) { -+ while (enumer.hasMoreElements()) { - try { -- DataSourceInfo inf = new DataSourceInfo(enum.nextElement()) ; -+ DataSourceInfo inf = new DataSourceInfo(enumer.nextElement()) ; - inf.printInfo(out) ; - } catch (com.sun.star.container.NoSuchElementException e) {} - catch (com.sun.star.lang.WrappedTargetException e) {} -@@ -849,4 +849,4 @@ - throws java.sql.SQLException { - statement.executeUpdate("drop table if exists " + tbl_name); - } --} -\ No newline at end of file -+} - ---- qadevOOo/tests/java/ifc/reflection/_XTypeDescriptionEnumerationAccess.java 2003-01-27 12:11:20.000000000 -0600 -+++ qadevOOo/tests/java/ifc/reflection/_XTypeDescriptionEnumerationAccess.java 2005-04-19 01:56:30.000000000 -0500 -@@ -94,13 +94,13 @@ - return; - } - try { -- XTypeDescriptionEnumeration enum = -+ XTypeDescriptionEnumeration enumer = - oObj.createTypeDescriptionEnumeration(sString, tClass, - TypeDescriptionSearchDepth.INFINITE); - try { - log.println("Got an enumeration."); - while (true) { -- XTypeDescription desc = enum.nextTypeDescription(); -+ XTypeDescription desc = enumer.nextTypeDescription(); - i++; - log.println("\tdesc name: " + desc.getName()); - } - ---- qadevOOo/tests/java/mod/_dbaccess/SbaXGridControl.java 2003-05-27 07:37:57.000000000 -0500 -+++ qadevOOo/tests/java/mod/_dbaccess/SbaXGridControl.java 2005-04-19 01:56:30.000000000 -0500 -@@ -376,7 +376,7 @@ - new Object[]{ new Integer(0) }, new Object[]{ new Integer(1) }}); - tEnv.addObjRelation("Comparer", new Comparator() { - public int compare(Object o1, Object o2) { -- return ((Integer)o1).compareTo(o2); -+ return compare((Integer) o1, o2); - } - public boolean equals(Object obj) { - return compare(this, obj) == 0; - ---- qadevOOo/tests/java/mod/_servicemgr.uno/OServiceManager.java 2003-05-27 08:25:05.000000000 -0500 -+++ qadevOOo/tests/java/mod/_servicemgr.uno/OServiceManager.java 2005-04-19 01:56:30.000000000 -0500 -@@ -162,12 +162,12 @@ - (XSet.class, oInterface) ; - XSet set1 = (XSet) UnoRuntime.queryInterface - (XSet.class, srvMan) ; -- XEnumeration enum = set1.createEnumeration(); -- Object srv = enum.nextElement(); -+ XEnumeration enumer = set1.createEnumeration(); -+ Object srv = enumer.nextElement(); - - set.insert(srv) ; - -- newElement = enum.nextElement(); -+ newElement = enumer.nextElement(); - - XPropertySet xProp = (XPropertySet)UnoRuntime.queryInterface( - XPropertySet.class, oInterface); - ---- qadevOOo/tests/java/mod/_smgr/OServiceManager.java 2003-05-27 08:28:36.000000000 -0500 -+++ qadevOOo/tests/java/mod/_smgr/OServiceManager.java 2005-04-19 01:56:30.000000000 -0500 -@@ -162,12 +162,12 @@ - (XSet.class, oInterface) ; - XSet set1 = (XSet) UnoRuntime.queryInterface - (XSet.class, srvMan) ; -- XEnumeration enum = set1.createEnumeration(); -- Object srv = enum.nextElement(); -+ XEnumeration enumer = set1.createEnumeration(); -+ Object srv = enumer.nextElement(); - - set.insert(srv) ; - -- newElement = enum.nextElement(); -+ newElement = enumer.nextElement(); - - XPropertySet xProp = (XPropertySet)UnoRuntime.queryInterface( - XPropertySet.class, oInterface); - ---- sandbox/com/sun/star/lib/sandbox/ClassContextImpl.java 2002-11-21 10:49:00.000000000 -0600 -+++ sandbox/com/sun/star/lib/sandbox/ClassContextImpl.java 2005-04-19 01:56:30.000000000 -0500 -@@ -304,10 +304,10 @@ - m_class_path_jars = class_path_jars; - } - -- java.util.Enumeration enum = m_class_path_jars.elements(); -- while (enum.hasMoreElements()) -+ java.util.Enumeration enumer = m_class_path_jars.elements(); -+ while (enumer.hasMoreElements()) - { -- ClassContext context = (ClassContext)enum.nextElement(); -+ ClassContext context = (ClassContext)enumer.nextElement(); - try - { - xClass = context.loadClass( className ); - ---- sj2/stardiv/app/AppletProps.java 2000-09-18 11:54:03.000000000 -0500 -+++ sj2/stardiv/app/AppletProps.java 2005-04-19 01:56:30.000000000 -0500 -@@ -138,7 +138,7 @@ - if (System.getProperty("http.proxyHost") != null) { - proxyHost.setText(System.getProperty("http.proxyHost")); - proxyPort.setText(System.getProperty("http.proxyPort")); -- HttpClient.proxyPort = Integer.valueOf(System.getProperty("http.proxyPort")).intValue(); -+ //HttpClient.proxyPort = Integer.valueOf(System.getProperty("http.proxyPort")).intValue(); - } - else { - proxyHost.setText(""); - ---- sj2/stardiv/controller/PropertyEditor.java 2000-09-18 11:54:03.000000000 -0500 -+++ sj2/stardiv/controller/PropertyEditor.java 2005-04-19 01:56:30.000000000 -0500 -@@ -197,10 +197,10 @@ - - m_DefaultList.removeAll(); - m_List.removeAll(); -- java.util.Enumeration enum = m_Properties.propertyNames(); -- while (enum.hasMoreElements()) -+ java.util.Enumeration enumer = m_Properties.propertyNames(); -+ while (enumer.hasMoreElements()) - { -- String strKey = (String)enum.nextElement(); -+ String strKey = (String)enumer.nextElement(); - - if (isDefaultKey(strKey)) - addToList(m_DefaultList, strKey, m_Properties.getProperty(strKey)); -@@ -551,19 +551,19 @@ - { - int nMax = 0; - -- java.util.Enumeration enum = props.propertyNames(); -- while (enum.hasMoreElements()) -- nMax = Math.max(nMax, ((String)enum.nextElement()).length()); -+ java.util.Enumeration enumer = props.propertyNames(); -+ while (enumer.hasMoreElements()) -+ nMax = Math.max(nMax, ((String)enumer.nextElement()).length()); - - return nMax+2; - } - - protected static boolean isDefaultKey(String strKey) - { -- java.util.Enumeration enum = c_DefaultProperties.elements(); -- while (enum.hasMoreElements()) -+ java.util.Enumeration enumer = c_DefaultProperties.elements(); -+ while (enumer.hasMoreElements()) - { -- if (strKey.equals((String)enum.nextElement())) -+ if (strKey.equals((String)enumer.nextElement())) - return true; - } - -@@ -574,10 +574,10 @@ - { - java.util.Properties saveProps = new java.util.Properties(); - -- java.util.Enumeration enum = m_Properties.propertyNames(); -- while (enum.hasMoreElements()) -+ java.util.Enumeration enumer = m_Properties.propertyNames(); -+ while (enumer.hasMoreElements()) - { -- String strKey = (String)enum.nextElement(); -+ String strKey = (String)enumer.nextElement(); - - if (!isDefaultKey(strKey)) - saveProps.put(strKey, m_Properties.getProperty(strKey)); -@@ -623,9 +623,9 @@ - - try - { -- java.util.Enumeration enum = System.getProperties().propertyNames(); -- while (enum.hasMoreElements()) -- c_DefaultProperties.addElement(enum.nextElement()); -+ java.util.Enumeration enumer = System.getProperties().propertyNames(); -+ while (enumer.hasMoreElements()) -+ c_DefaultProperties.addElement(enumer.nextElement()); - } - catch (Exception ignore0) {} - } -@@ -656,10 +656,10 @@ - } - catch (Exception ignore2) {} - -- java.util.Enumeration enum = props.propertyNames(); -- while (enum.hasMoreElements()) -+ java.util.Enumeration enumer = props.propertyNames(); -+ while (enumer.hasMoreElements()) - { -- String propKey = (String)enum.nextElement(); -+ String propKey = (String)enumer.nextElement(); - - // if the key is not a default put the new property into the table - if (!isDefaultKey(propKey)) - ---- sj2/stardiv/controller/StreamObserver.java 2000-09-18 11:54:04.000000000 -0500 -+++ sj2/stardiv/controller/StreamObserver.java 2005-04-19 01:56:30.000000000 -0500 -@@ -65,8 +65,7 @@ - import java.util.Observable; - import java.net.URL; - import java.net.MalformedURLException; --import sun.net.ProgressData; --import sun.net.ProgressEntry; -+import sun.net.ProgressSource; - - - /** -@@ -79,12 +78,12 @@ - { - public StreamObserver() - { -- ProgressData.pdata.addObserver( this ); -+ progressSource.beginTracking(); - } - - public void dispose() - { -- ProgressData.pdata.deleteObserver( this ); -+ progressSource.finishTracking(); - } - - static long nLastTime; -@@ -95,48 +94,47 @@ - nLastTime = System.currentTimeMillis(); - - String aStatus = null; -- ProgressEntry pEntry = (ProgressEntry)aArg; -- switch( pEntry.what ) -+ switch( progressSource.getState() ) - { -- case ProgressData.CONNECTED: -+ case CONNECTED: - { - try - { -- URL aURL = new URL( pEntry.label ); -+ URL aURL = progressSource.getURL(); - aStatus = "Connect: Host " + aURL.getHost() + " contacted. Waiting for reply..."; - } -- catch( MalformedURLException e ) -+ catch( Exception e ) - { -- aStatus = "Connect: " + pEntry.label; -+ aStatus = "Connect: " + progressSource.getURL().toString(); - } - } - break; - -- case ProgressData.UPDATE: -+ case UPDATE: - if( System.currentTimeMillis() - nLastTime > 3000 ) - // Only 1 update / 3s - return; -- if( pEntry.need != 0 ) -+ if( progressSource.getExpected() > 0 ) - { - // Java kommt mit dem letzten Byte nicht r"uber -- aStatus = "Transfered: " + pEntry.label + " - "; -- int nPercent = (int)(((long)pEntry.read * 100) / pEntry.need); -+ aStatus = "Transfered: " + progressSource.getURL().toString() + " - "; -+ int nPercent = (int)(((long)progressSource.getProgress() * 100) / progressSource.getExpected()); - aStatus += String.valueOf( nPercent ) + "% of "; -- if( pEntry.need >= 1000 ) -- aStatus += String.valueOf( pEntry.need / 1000 ) + "K "; -+ if( progressSource.getExpected() >= 1000 ) -+ aStatus += String.valueOf( progressSource.getExpected() / 1000 ) + "K "; - else -- aStatus += String.valueOf( pEntry.need ); -+ aStatus += String.valueOf( progressSource.getExpected() ); - aStatus += "bytes."; - } - else -- aStatus = "Transfered: " + pEntry.label; -+ aStatus = "Transfered: " + progressSource.getURL().toString(); - break; - -- case ProgressData.NEW: -- aStatus = "Try: " + pEntry.label; -+ case NEW: -+ aStatus = "Try: " + progressSource.getURL().toString(); - break; -- case ProgressData.DELETE: -- aStatus = "Done: " + pEntry.label; -+ case DELETE: -+ aStatus = "Done: " + progressSource.getURL().toString(); - break; - } - if( aStatus != null ) -@@ -179,6 +177,7 @@ - System.out.println( pStatus ); - } - } -+ private ProgressSource progressSource; - } - - - ---- unoil/makefile.pmk 2002-06-20 11:41:33.000000000 -0500 -+++ unoil/makefile.pmk 2005-04-19 01:56:30.000000000 -0500 -@@ -77,7 +77,7 @@ - GENJAVAFILES := $(foreach,i,$(JAVAFILESLIST) $(GENJAVADIR)$/$(PACKAGE)$/$i) - GENCLASSFILES := $(foreach,i,$(JAVAFILESLIST:b) $(GENCLASSDIR)$/$(PACKAGE)$/$i.class) - --JAVAFLAGS = -target 1.1 -+#JAVAFLAGS = -target 1.1 - # --- Targets ------------------------------------------------------ - - JAVAFILES=$(GENJAVAFILES) - ---- xmerge/java/org/openoffice/xmerge/ConvertData.java 2002-03-07 10:45:20.000000000 -0600 -+++ xmerge/java/org/openoffice/xmerge/ConvertData.java 2005-04-19 01:56:30.000000000 -0500 -@@ -127,8 +127,8 @@ - * <code>Vector</code> of <code>Document</code> objects. - */ - public Enumeration getDocumentEnumeration() { -- Enumeration enum = v.elements(); -- return (enum); -+ Enumeration enumer = v.elements(); -+ return (enumer); - } - - - ---- xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java 2003-05-29 04:03:38.000000000 -0500 -+++ xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java 2005-04-19 01:56:30.000000000 -0500 -@@ -155,14 +155,14 @@ - */ - public Document deserialize() throws ConvertException, IOException { - log("\nFound the XSLT deserializer"); -- Enumeration enum = cd.getDocumentEnumeration(); -+ Enumeration enumer = cd.getDocumentEnumeration(); - org.w3c.dom.Document domDoc=null; - DOMDocument docOut=null; - GenericOfficeDocument doc = null; - ByteArrayOutputStream baos =null; - GenericOfficeDocument sxwDoc = new GenericOfficeDocument("output"); -- while (enum.hasMoreElements()) { -- docOut = (DOMDocument) enum.nextElement(); -+ while (enumer.hasMoreElements()) { -+ docOut = (DOMDocument) enumer.nextElement(); - } - domDoc = docOut.getContentDOM(); - try{ - ---- xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java 2002-04-09 07:18:44.000000000 -0500 -+++ xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java 2005-04-19 01:56:30.000000000 -0500 -@@ -183,9 +183,9 @@ - String ext= ".txt"; - String mimeType = null; - ConverterInfo ci = this.getConverterInfo(); -- Enumeration enum = ci.getDeviceMime(); -- while (enum.hasMoreElements()) { -- mimeType= (String) enum.nextElement(); -+ Enumeration enumer = ci.getDeviceMime(); -+ while (enumer.hasMoreElements()) { -+ mimeType= (String) enumer.nextElement(); - } - try { - props.load(is); - ---- xmlhelp/source/com/sun/star/help/HelpIndexer.java 2004-10-28 06:52:44.000000000 -0500 -+++ xmlhelp/source/com/sun/star/help/HelpIndexer.java 2005-04-19 01:56:30.000000000 -0500 -@@ -197,13 +197,13 @@ - table.close( 0 ); - - System.out.println( "Indexing..." ); -- Enumeration enum = _hashDocInfo.elements(); -+ Enumeration enumer = _hashDocInfo.elements(); - int cut = 0; -- while( enum.hasMoreElements() && cut < 100000000 ) -+ while( enumer.hasMoreElements() && cut < 100000000 ) - { - try - { -- DocInfo info = ( DocInfo ) enum.nextElement(); -+ DocInfo info = ( DocInfo ) enumer.nextElement(); - String url = info.getURL(); - if( url == null ) - { -@@ -421,12 +421,12 @@ - - void dump() - { -- Enumeration enum = _hash.keys(); -+ Enumeration enumer = _hash.keys(); - int j = 0; - String[] list = new String[ _hash.size() ]; -- while( enum.hasMoreElements() ) -+ while( enumer.hasMoreElements() ) - { -- list[j++] = ( String ) enum.nextElement(); -+ list[j++] = ( String ) enumer.nextElement(); - } - - Db table; -@@ -462,12 +462,12 @@ - - void dumpHelptext() - { -- Enumeration enum = _hashHelptext.keys(); -+ Enumeration enumer = _hashHelptext.keys(); - int j = 0; - String[] list = new String[ _hashHelptext.size() ]; -- while( enum.hasMoreElements() ) -+ while( enumer.hasMoreElements() ) - { -- list[j++] = ( String ) enum.nextElement(); -+ list[j++] = ( String ) enumer.nextElement(); - } - - Db table; - ---- xmlhelp/source/com/sun/star/help/HelpTransformer.java 2001-02-07 03:35:47.000000000 -0600 -+++ xmlhelp/source/com/sun/star/help/HelpTransformer.java 2005-04-19 01:56:30.000000000 -0500 -@@ -14,11 +14,11 @@ - { - String styleName; - Hashtable styles; -- Enumeration enum = defs.getTable().keys(); -+ Enumeration enumer = defs.getTable().keys(); - -- while( enum.hasMoreElements() ) -+ while( enumer.hasMoreElements() ) - { -- styleName = ( String ) enum.nextElement(); -+ styleName = ( String ) enumer.nextElement(); - styles = defs.getEffectiveStyle( styleName ); - - Enumeration styleOptions = styles.keys(); -@@ -112,11 +112,11 @@ - while( it.hasNext() ) - { - Hashtable curr; -- Enumeration enum = (curr = ( Hashtable )it.next()).keys(); -- while( enum.hasMoreElements() ) -+ Enumeration enumer = (curr = ( Hashtable )it.next()).keys(); -+ while( enumer.hasMoreElements() ) - { - String str; -- if( result.get( str = ( String ) enum.nextElement() ) == null ) -+ if( result.get( str = ( String ) enumer.nextElement() ) == null ) - result.put( str,curr.get( str ) ); - } - } -@@ -129,11 +129,11 @@ - { - String str; - Hashtable a = getEffectiveStyle( "p.def1" ); -- Enumeration enum = a.keys(); -+ Enumeration enumer = a.keys(); - -- while( enum.hasMoreElements() ) -+ while( enumer.hasMoreElements() ) - { -- System.out.println( (str = ( String ) enum.nextElement()) + " : " + ((String)a.get(str)) ); -+ System.out.println( (str = ( String ) enumer.nextElement()) + " : " + ((String)a.get(str)) ); - } - } - -Index: config_office/set_soenv.in -=================================================================== -RCS file: /cvs/tools/config_office/set_soenv.in,v -retrieving revision 1.10.6.12 -diff -u -r1.10.6.12 set_soenv.in ---- config_office/set_soenv.in 29 Apr 2005 14:58:58 -0000 1.10.6.12 -+++ config_office/set_soenv.in 10 Sep 2006 08:15:16 -0000 -@@ -63,7 +63,7 @@ - my ( $BIG_SVX, $COM, $CPU, $CPUNAME, $CVER, $DLLSUFFIX, $GLIBC, $GUI, $GUIBASE, $GUIENV, - $GVER, $GVERDIR, $OS, $OSVERSION, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH, - $DEMO_ENV, $DYNAMIC_CRT, $SET_EXCEPTIONS, $emergency, $use_shl_versions, $CDPATHx, $JRELIBDIR, -- $JRETOOLKITDIR, $JRETHREADDIR, $EXCEPTIONS, $WRAPCMD ); -+ $JREEXTRALIBDIR, $JRETOOLKITDIR, $JRETHREADDIR, $EXCEPTIONS, $WRAPCMD ); - # - #------------------------------------------- - # IIc. Declaring the environment variables. -@@ -364,6 +364,7 @@ - $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386"; - $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client"; - $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads"; -+ $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."xawt"; - } - elsif ( $platform eq "$Linux" ) - { -@@ -901,6 +902,7 @@ - $ps.$JRELIBDIR. - $ps.$JRETOOLKITDIR. - $ps.$JRETHREADDIR. -+ $ps.$JREEXTRALIBDIR. - $ps.$par_dir.$LIB. - $ps_STLPORT_LIB. - $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB. diff --git a/editors/openoffice.org-1.1/files/patch-jvmaccess+source+sunversion.cxx b/editors/openoffice.org-1.1/files/patch-jvmaccess+source+sunversion.cxx deleted file mode 100644 index bbed543f1021..000000000000 --- a/editors/openoffice.org-1.1/files/patch-jvmaccess+source+sunversion.cxx +++ /dev/null @@ -1,72 +0,0 @@ -Issuetracker : #iXXXXX# -CWS : N/A -Author : <maho@openoffice.org> -Description : FreeBSD porting : do not hardcode pXX of Java version and FreeBSD native Java is always superior to Linux's one. - -1. we had been hard coding Java's version by p1, p2 ... etc. but apparently -it is not a good habit. in this patch we eleminate this. - -2. we'd better to use FreeBSD's native Java, and not GNU/Linux's ones if both are exist -in the system. We add 100 as micro version number, so that we treat FreeBSD's version of -java 1.4.1-p10 for example to 1.4.1_110. - -3. Java version of 1.5.0_13-p7 will be treated as 1.5.0_13. -p part will be ignored. - ---- jvmaccess/source/sunversion.cxx Thu Jun 16 21:45:26 2005 -+++ jvmaccess/source/sunversion.cxx Sat Oct 22 16:42:01 2005 -@@ -193,7 +193,7 @@ - pCur ++; - // nPartPos ++; - } -- else if (nUpdatePart == 0 && (pCur == pEnd || isalpha(*pCur))) -+ else if (nUpdatePart == 0 && (pCur == pEnd || isalpha(*pCur) || (*pCur)=='-' )) - { - int len = pCur - pLast; - if (len >= 127) -@@ -246,30 +247,22 @@ - m_preRelease = Rel_RC2; - #if defined FREEBSD || defined NETBSD - // #i40617# and #i21615#: FreeBSD adds p1-p12 to their JDK port. -- else if (! strcmp(pCur, "p12")) -- m_preRelease = Rel_BETA; -- else if (! strcmp(pCur, "p11")) -- m_preRelease = Rel_BETA; -- else if (! strcmp(pCur, "p10")) -- m_preRelease = Rel_BETA; -- else if (! strcmp(pCur, "p9")) -- m_preRelease = Rel_BETA; -- else if (! strcmp(pCur, "p8")) -- m_preRelease = Rel_BETA; -- else if (! strcmp(pCur, "p7")) -- m_preRelease = Rel_BETA; -- else if (! strcmp(pCur, "p6")) -- m_preRelease = Rel_BETA; -- else if (! strcmp(pCur, "p5")) -- m_preRelease = Rel_BETA; -- else if (! strcmp(pCur, "p4")) -- m_preRelease = Rel_BETA; -- else if (! strcmp(pCur, "p3")) -- m_preRelease = Rel_BETA; -- else if (! strcmp(pCur, "p2")) -- m_preRelease = Rel_BETA; -- else if (! strcmp(pCur, "p1")) -- m_preRelease = Rel_BETA; -+ else if (!strncmp(pCur,"p",1)) //must be p[1-9]* -+ { -+ pCur++; //elemnate `p' -+ if (pCur < pEnd && isdigit(*pCur)) -+ { -+ if (pCur < pEnd) -+ pCur ++; -+ } -+ int len = pCur - pLast -1; //elemenate `p' -+ if (len >= 127) -+ return false; -+ strncpy(buf, (pLast+1), len); //elemenate `p' -+ buf[len] = 0; -+ //temporal hack we should use BSD's JDK... -+ m_arVersionParts[nPart] = atoi(buf)+100; -+ } - #endif - else - return false; diff --git a/editors/openoffice.org-1.1/files/patch-libgcc b/editors/openoffice.org-1.1/files/patch-libgcc deleted file mode 100644 index a3197c00be66..000000000000 --- a/editors/openoffice.org-1.1/files/patch-libgcc +++ /dev/null @@ -1,39 +0,0 @@ -Index: work/OOo_1.1.5/external/gcc3_specific/makefile.mk -=================================================================== -RCS file: /cvs/util/external/gcc3_specific/makefile.mk,v -retrieving revision 1.3 -diff -u -r1.3 makefile.mk ---- external/gcc3_specific/makefile.mk 18 Jun 2003 12:44:10 -0000 1.3 -+++ external/gcc3_specific/makefile.mk 8 Jan 2008 03:22:55 -0000 -@@ -11,7 +11,6 @@ - - .IF "$(OS)"!="MACOSX" - .IF "$(OS)"!="IRIX" --.IF "$(OS)"!="FREEBSD" - - - all : $(SOLARLIBDIR)$/libstdc++.so.$(SHORTSTDCPP3) $(SOLARLIBDIR)$/libgcc_s.so.1 $(SOLARLIBDIR)$/libgcc_s.so -@@ -27,7 +26,6 @@ - -rm -f $@ - +ln -s libgcc_s.so.1 $@ - --.ENDIF - .ENDIF - .ENDIF - -Index: work/OOo_1.1.5/scp/source/global/udk_base.scp -=================================================================== -RCS file: /cvs/installation/scp/source/global/Attic/udk_base.scp,v -retrieving revision 1.7.24.2 -diff -u -r1.7.24.2 udk_base.scp ---- scp/source/global/udk_base.scp 28 Jan 2004 17:18:34 -0000 1.7.24.2 -+++ scp/source/global/udk_base.scp 8 Jan 2008 03:24:54 -0000 -@@ -6,7 +6,7 @@ - // Temporary solution/hack: at the moment libstdc++.so and libgcc_s.so are - // needed for unxlngi4 environment (setup is linked against it). - --#if ! (defined (FREEBSD) || defined(MACOSX) || defined(NETBSD) ) -+#if ! (defined(MACOSX) || defined(NETBSD) ) - #if ( defined( _gcc3 ) && ( defined( C300 ) || defined( C322 ) )) - - File gid_File_Lib_gcc diff --git a/editors/openoffice.org-1.1/files/patch-objformat b/editors/openoffice.org-1.1/files/patch-objformat deleted file mode 100644 index b36e94bf85e2..000000000000 --- a/editors/openoffice.org-1.1/files/patch-objformat +++ /dev/null @@ -1,231 +0,0 @@ ---- /dev/null Thu May 3 10:02:14 2007 -+++ berkeleydb/db-4.2.52.patch Thu May 3 09:52:51 2007 -@@ -0,0 +1,70 @@ -+*** misc/db-4.2.52.NC/dist/configure 2003-12-03 22:10:02.000000000 +0100 -+--- misc/build/db-4.2.52.NC/dist/configure 2007-02-19 16:12:12.000000000 +0100 -+*************** -+*** 9328,9334 **** -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+--- 9328,9334 ---- -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+*************** -+*** 12872,12878 **** -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+--- 12872,12878 ---- -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+*************** -+*** 15849,15855 **** -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+--- 15849,15855 ---- -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+*************** -+*** 18114,18120 **** -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+--- 18114,18120 ---- -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -Index: berkeleydb/makefile.mk -=================================================================== -RCS file: /cvs/external/berkeleydb/makefile.mk,v -retrieving revision 1.13.12.2 -diff -u -r1.13.12.2 makefile.mk ---- berkeleydb/makefile.mk 28 Oct 2004 11:54:48 -0000 1.13.12.2 -+++ berkeleydb/makefile.mk 3 May 2007 01:04:40 -0000 -@@ -73,6 +73,8 @@ - - TARFILE_NAME=db-4.2.52.NC - -+PATCH_FILE_NAME=db-4.2.52.patch -+ - # not needed for win32. comment out when causing problems... - - .IF "$(GUI)"=="UNX" - -Index: curl/unx1-curl-7.9.8.patch -=================================================================== -RCS file: /cvs/external/curl/Attic/unx1-curl-7.9.8.patch,v -retrieving revision 1.2.18.1 -diff -u -r1.2.18.1 unx1-curl-7.9.8.patch ---- curl/unx1-curl-7.9.8.patch 3 May 2004 16:32:05 -0000 1.2.18.1 -+++ curl/unx1-curl-7.9.8.patch 3 May 2007 01:13:15 -0000 -@@ -251,3 +251,22 @@ - /************************************************************* - * No protocol part in URL was used, add it! - *************************************************************/ -+*** misc/curl-7.9.8/configure Wed Jun 12 00:16:54 2002 -+--- misc/build/curl-7.9.8/configure Thu May 3 10:10:42 2007 -+*************** -+*** 6292,6298 **** -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+--- 6292,6298 ---- -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -Index: freetype/freetype-2.1.4.patch -=================================================================== -RCS file: /cvs/external/freetype/Attic/freetype-2.1.4.patch,v -retrieving revision 1.2 -diff -u -r1.2 freetype-2.1.4.patch ---- freetype/freetype-2.1.4.patch 17 Apr 2003 15:11:01 -0000 1.2 -+++ freetype/freetype-2.1.4.patch 3 May 2007 01:15:56 -0000 -@@ -147,5 +147,24 @@ - ! if( !unicmap ) /* HDU: #107980# Saraswati workaround */ - ! unicmap = cur; /* record we found a Unicode charmap */ - - /* XXX If some new encodings to represent UCS-4 are added, */ - /* they should be added here. */ -+*** misc/freetype-2.1.4/builds/unix/configure Sun Jan 19 01:39:18 2003 -+--- misc/build/freetype-2.1.4/builds/unix/configure Thu May 3 10:14:26 2007 -+*************** -+*** 7203,7209 **** -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+--- 7203,7209 ---- -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -Index: sndfile/libsndfile-1.0.9.patch -=================================================================== -RCS file: /cvs/external/sndfile/libsndfile-1.0.9.patch,v -retrieving revision 1.2 -diff -u -r1.2 libsndfile-1.0.9.patch ---- sndfile/libsndfile-1.0.9.patch 31 May 2005 16:31:31 -0000 1.2 -+++ sndfile/libsndfile-1.0.9.patch 3 May 2007 01:21:01 -0000 -@@ -83,6 +83,23 @@ - shlibpath_var=DYLD_LIBRARY_PATH - shrext='$(test .$module = .yes && echo .so || echo .dylib)' - *************** -+*** 7871,7877 **** -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+--- 7878,7884 ---- -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+*************** - *** 9111,9120 **** - ;; - esac -@@ -143,6 +160,23 @@ - module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - hardcode_direct_CXX=no - *************** -+*** 11560,11566 **** -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+--- 11567,11573 ---- -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+*************** - *** 14069,14084 **** - lt_int_apple_cc_single_mod=yes - fi -@@ -178,6 +212,23 @@ - module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - hardcode_direct_F77=no - *************** -+*** 14700,14706 **** -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+--- 14707,14713 ---- -+ ;; -+ -+ freebsd*) -+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+*************** - *** 16414,16429 **** - lt_int_apple_cc_single_mod=yes - fi diff --git a/editors/openoffice.org-1.1/files/patch-odk+configure.pl b/editors/openoffice.org-1.1/files/patch-odk+configure.pl deleted file mode 100644 index 31c4d23cd943..000000000000 --- a/editors/openoffice.org-1.1/files/patch-odk+configure.pl +++ /dev/null @@ -1,47 +0,0 @@ -Issuetracker : #iXXXXX# -CWS : N/A -Author : NAKATA Maho <maho@openoffice.org> (JCA) -Description : most pop name of installated GNU make is gmake, not make for FreeBSD - -Index: configure.pl -=================================================================== -RCS file: /cvs/api/odk/configure.pl,v -retrieving revision 1.4.12.3 -diff -u -r1.4.12.3 configure.pl ---- odk/configure.pl.orig 18 May 2004 10:02:00 -0000 1.4.12.3 -+++ odk/configure.pl 11 Aug 2004 08:21:04 -0000 -@@ -19,7 +19,7 @@ - chop ($main::OFFICE_HOME_SUGGESTION); - - $main::OO_SDK_MAKE_HOME = ""; --$main::OO_SDK_MAKE_HOME_SUGGESTION = searchprog("make"); -+$main::OO_SDK_MAKE_HOME_SUGGESTION = searchprog("gmake"); - $main::makeVersion = "3.79.1"; - $main::correctVersion = 0; - -@@ -101,7 +101,7 @@ - # prepare GNU make path - while ( (!$main::correctVersion) && - ((! -d "$main::OO_SDK_MAKE_HOME" ) || -- ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/make"))) ) -+ ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/gmake"))) ) - { - print "Enter GNU make ($main::makeVersion or higher) tools directory [$main::OO_SDK_MAKE_HOME_SUGGESTION]: "; - $main::OO_SDK_MAKE_HOME = <STDIN>; -@@ -111,14 +111,14 @@ - $main::OO_SDK_MAKE_HOME = $main::OO_SDK_MAKE_HOME_SUGGESTION; - } - if ( (! -d "$main::OO_SDK_MAKE_HOME") || -- ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/make")) ) -+ ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/gmake")) ) - { - $main::OO_SDK_MAKE_HOME = ""; - print "Error: GNU make is required, please specify a GNU make tools directory.\n"; - } else - { - #check version -- my $testVersion = `$OO_SDK_MAKE_HOME/make --version`; -+ my $testVersion = `$OO_SDK_MAKE_HOME/gmake --version`; - if ( $testVersion eq "") - { - print "The 'make' command found at $main::OO_SDK_MAKE_HOME/make is not GNU Make\n"; diff --git a/editors/openoffice.org-1.1/files/patch-rsc+source+rscpp+makefile.mk b/editors/openoffice.org-1.1/files/patch-rsc+source+rscpp+makefile.mk deleted file mode 100644 index 2959319805b5..000000000000 --- a/editors/openoffice.org-1.1/files/patch-rsc+source+rscpp+makefile.mk +++ /dev/null @@ -1,21 +0,0 @@ -Issuetracker : #i54178# -CWS : hr17 -Author: : -Description : - -Index: rsc/source/rscpp/makefile.mk -=================================================================== -RCS file: /cvs/gsl/rsc/source/rscpp/makefile.mk,v -retrieving revision 1.5 -diff -u -r1.5 makefile.mk ---- rsc/source/rscpp/makefile.mk 8 Sep 2005 14:00:27 -0000 1.5 -+++ rsc/source/rscpp/makefile.mk 21 Sep 2005 10:18:09 -0000 -@@ -36,6 +36,8 @@ - - TARGETTYPE=CUI - TARGETTHREAD=ST -+# we don't need STL in this project -+NO_DEFAULT_STL=TRUE - - PRJNAME=rsc - TARGET=rscpp diff --git a/editors/openoffice.org-1.1/files/patch-sax+source+expatwrap+xml2utf.cxx b/editors/openoffice.org-1.1/files/patch-sax+source+expatwrap+xml2utf.cxx deleted file mode 100644 index 0b94ee341b26..000000000000 --- a/editors/openoffice.org-1.1/files/patch-sax+source+expatwrap+xml2utf.cxx +++ /dev/null @@ -1,81 +0,0 @@ -diff -urN -x CVS -x unxlngi6.pro sax.orig/source/expatwrap/xml2utf.cxx sax/source/expatwrap/xml2utf.cxx ---- sax.orig/source/expatwrap/xml2utf.cxx 2005-09-08 14:05:22.000000000 +0200 -+++ sax/source/expatwrap/xml2utf.cxx 2006-06-22 11:04:22.000000000 +0200 -@@ -78,24 +78,26 @@ - // ensure that enough data is available to parse encoding - if( seqStart.getLength() ) - { -- seq.realloc( seqStart.getLength() + seq.getLength() ); -- memcpy( (sal_Int8*)seq.getConstArray() + seqStart.getLength() , -- seq.getConstArray() , -- seq.getLength() ); -- memcpy( (sal_Int8*)seq.getConstArray() , -- seqStart.getConstArray(), -- seqStart.getLength() ); -+ // prefix with what we had so far. -+ sal_Int32 nLength = seq.getLength(); -+ seq.realloc( seqStart.getLength() + nLength ); -+ -+ memmove (seq.getArray() + seqStart.getLength(), -+ seq.getConstArray(), -+ nLength); -+ memcpy (seq.getArray(), -+ seqStart.getConstArray(), -+ seqStart.getLength()); - } - - // autodetection with the first bytes - if( ! isEncodingRecognizable( seq ) ) - { -- seqStart.realloc( seqStart.getLength() + seq.getLength() ); -- memcpy( (sal_Int8*)seqStart.getConstArray() + seqStart.getLength(), -- seq.getConstArray(), -- seq.getLength()); -- // read more ! -- continue; -+ // remember what we have so far. -+ seqStart = seq; -+ -+ // read more ! -+ continue; - } - if( scanForEncoding( seq ) || m_sEncoding.getLength() ) { - // initialize decoding -@@ -291,7 +293,7 @@ - - // simply add the byte order mark ! - seq.realloc( seq.getLength() + 2 ); -- memmove( &( seq.getArray()[2] ) , seq.getArray() , seq.getLength() ); -+ memmove( &( seq.getArray()[2] ) , seq.getArray() , seq.getLength() - 2 ); - ((sal_uInt8*)seq.getArray())[0] = 0xFE; - ((sal_uInt8*)seq.getArray())[1] = 0xFF; - -@@ -302,7 +304,7 @@ - // The byte order mark is simply added - - seq.realloc( seq.getLength() + 2 ); -- memmove( &( seq.getArray()[2] ) , seq.getArray() , seq.getLength() ); -+ memmove( &( seq.getArray()[2] ) , seq.getArray() , seq.getLength() - 2 ); - ((sal_uInt8*)seq.getArray())[0] = 0xFF; - ((sal_uInt8*)seq.getArray())[1] = 0xFE; - -@@ -511,9 +513,7 @@ - // In general when surrogates are used, they should be rarely - // cut off between two convert()-calls. So this code is used - // rarely and the extra copy is acceptable. -- nSourceSize += m_seqSource.getLength(); -- -- puTempMem = new sal_Unicode[ nSourceSize ]; -+ puTempMem = new sal_Unicode[ nSourceSize + m_seqSource.getLength()]; - memcpy( puTempMem , - m_seqSource.getConstArray() , - m_seqSource.getLength() * sizeof( sal_Unicode ) ); -@@ -522,6 +522,7 @@ - puSource , - nSourceSize*sizeof( sal_Unicode ) ); - puSource = puTempMem; -+ nSourceSize += m_seqSource.getLength(); - - m_seqSource = Sequence< sal_Unicode > (); - } - diff --git a/editors/openoffice.org-1.1/files/patch-scp+source+office+unxbasic.scp b/editors/openoffice.org-1.1/files/patch-scp+source+office+unxbasic.scp deleted file mode 100644 index 9a058c27dd9a..000000000000 --- a/editors/openoffice.org-1.1/files/patch-scp+source+office+unxbasic.scp +++ /dev/null @@ -1,25 +0,0 @@ -Issuetracker : #iXXXXX# -CWS : N/A -Author : NAKATA Maho <maho@openoffice.org> (JCA) -Description : Do not make a link as /usr/bin/soffice - -Index: scp/source/office/unxbasic.scp -=================================================================== -RCS file: /cvs/installation/scp/source/office/Attic/unxbasic.scp,v -retrieving revision 1.49.8.9 -diff -u -r1.49.8.9 unxbasic.scp ---- scp/source/office/unxbasic.scp 27 Aug 2004 11:43:50 -0000 1.49.8.9 -+++ scp/source/office/unxbasic.scp 15 Jan 2005 10:22:08 -0000 -@@ -924,12 +924,6 @@ - Dim sofficeFile As String - Dim linkName As String - -- sofficeFile = DirEntry(GetSetupEnv.DestPath, "program", "soffice") -- -- linkName = "/usr/bin/soffice" -- -- shell("/bin/sh -c " & "'ln -s " & chr(34) & sofficeFile & chr(34) & " " & linkName & " >/dev/null 2>&1'") -- - End Sub - - }; diff --git a/editors/openoffice.org-1.1/files/patch-sfx2-6438334-macros-so7 b/editors/openoffice.org-1.1/files/patch-sfx2-6438334-macros-so7 deleted file mode 100644 index 163952e4486b..000000000000 --- a/editors/openoffice.org-1.1/files/patch-sfx2-6438334-macros-so7 +++ /dev/null @@ -1,290 +0,0 @@ -Index: inc/objsh.hxx -=================================================================== -RCS file: /cvs/framework/sfx2/inc/objsh.hxx,v -retrieving revision 1.32.12.3 -diff -u -p -r1.32.12.3 objsh.hxx ---- sfx2/inc/objsh.hxx 21 Apr 2004 09:42:09 -0000 1.32.12.3 -+++ sfx2/inc/objsh.hxx 13 Jun 2006 12:14:45 -0000 -@@ -569,6 +569,7 @@ public: - #if _SOLAR__PRIVATE - static SEQUENCE< OUSTRING > GetEventNames_Impl(); - void InitBasicManager_Impl( SvStorage *pStor, const String* pName = NULL ); -+ void CheckMacrosOnLoading_Impl(); - SfxObjectShell_Impl* Get_Impl() { return pImp; } - const SfxObjectShell_Impl* Get_Impl() const { return pImp; } - -Index: source/doc/objmisc.cxx -=================================================================== -RCS file: /cvs/framework/sfx2/source/doc/objmisc.cxx,v -retrieving revision 1.33.12.1 -diff -u -p -r1.33.12.1 objmisc.cxx ---- sfx2/source/doc/objmisc.cxx 21 Apr 2004 09:42:21 -0000 1.33.12.1 -+++ sfx2/source/doc/objmisc.cxx 13 Jun 2006 12:16:28 -0000 -@@ -126,6 +126,7 @@ - #include <svtools/securityoptions.hxx> - - -+using namespace ::com::sun::star; - using namespace ::com::sun::star::uno; - using namespace ::com::sun::star::ucb; - using namespace ::com::sun::star::document; -@@ -181,6 +182,8 @@ using namespace ::com::sun::star::docume - #include "helper.hxx" - #include "doc.hrc" - -+#include <scriptcont.hxx> -+ - // class SfxHeaderAttributes_Impl ---------------------------------------- - - class SfxHeaderAttributes_Impl : public SvKeyValueIterator -@@ -1008,6 +1011,80 @@ void SfxObjectShell::SetAutoLoad( - } - } - -+//------------------------------------------------------------------------- -+ -+void SfxObjectShell::CheckMacrosOnLoading_Impl() -+{ -+ const SfxFilter* pFilter = pMedium->GetFilter(); -+ sal_Bool bHasStorage = IsOwnStorageFormat_Impl( *pMedium ); -+ -+ if ( GetError() != ERRCODE_NONE ) -+ return; -+ -+ sal_Bool bHasMacros = sal_False; -+ -+ if ( bHasStorage && ( !pFilter || !( pFilter->GetFilterFlags() & SFX_FILTER_STARONEFILTER ) ) ) -+ { -+ SvStorageRef xStorage( pMedium->GetStorage() ); -+ if ( xStorage.Is() ) -+ { -+ if ( xStorage->IsOLEStorage() ) -+ bHasMacros = BasicManager::HasBasicWithModules( *xStorage ); -+ else -+ bHasMacros = xStorage->IsStorage( String::CreateFromAscii("Basic") ); -+ } -+ else -+ SetError( ERRCODE_IO_GENERAL ); -+ } -+ -+ if ( !bHasMacros && pImp->pBasicLibContainer != 0 ) -+ { -+ // a library container exists; check if it's empty -+ -+ // if there are libraries except "Standard" library -+ // we assume that they are not empty (because they have been created by the user) -+ try -+ { -+ if ( pImp->pBasicLibContainer->hasElements() ) -+ { -+ ::rtl::OUString aStdLibName( RTL_CONSTASCII_USTRINGPARAM( "Standard" ) ); -+ uno::Sequence< ::rtl::OUString > aElements = pImp->pBasicLibContainer->getElementNames(); -+ if ( aElements.getLength() ) -+ { -+ if ( aElements.getLength() > 1 || !aElements[0].equals( aStdLibName ) ) -+ bHasMacros = sal_True; -+ else -+ { -+ // usually a "Standard" library is always present (design) -+ // for this reason we must check if it's empty -+ uno::Reference < container::XNameAccess > xLib; -+ uno::Any aAny = pImp->pBasicLibContainer->getByName( aStdLibName ); -+ aAny >>= xLib; -+ if ( xLib.is() ) -+ bHasMacros = xLib->hasElements(); -+ } -+ } -+ } -+ } -+ catch( uno::Exception& ) -+ {} -+ } -+ -+ if ( GetError() != ERRCODE_NONE ) -+ return; -+ -+ if ( bHasMacros ) -+ { -+ AdjustMacroMode( String() ); // if macros are disabled the message will be shown here -+ } -+ else -+ { -+ // if macros will be added by the user later, the security check is obsolete -+ pImp->nMacroMode = MacroExecMode::ALWAYS_EXECUTE_NO_WARN; -+ } -+} -+//------------------------------------------------------------------------- -+ - void SfxObjectShell::FinishedLoading( sal_uInt16 nFlags ) - { - sal_Bool bSetModifiedTRUE = sal_False; -@@ -1028,6 +1105,8 @@ void SfxObjectShell::FinishedLoading( sa - SfxStringItem, SID_DOC_SALVAGE, sal_False ); - if ( pSalvageItem ) - bSetModifiedTRUE = sal_True; -+ -+ CheckMacrosOnLoading_Impl(); - } - - if( ( nFlags & SFX_LOADED_IMAGES ) && -Index: source/doc/objstor.cxx -=================================================================== -RCS file: /cvs/framework/sfx2/source/doc/objstor.cxx,v -retrieving revision 1.118.16.3 -diff -u -p -r1.118.16.3 objstor.cxx ---- sfx2/source/doc/objstor.cxx 25 Mar 2004 12:07:10 -0000 1.118.16.3 -+++ sfx2/source/doc/objstor.cxx 13 Jun 2006 12:16:34 -0000 -@@ -607,22 +607,6 @@ sal_Bool SfxObjectShell::DoLoad( SfxMedi - xStor->FillInfoList( &aList ); - if ( !aList.Count() && !xStor->IsOLEStorage() ) - SetError( ERRCODE_IO_BROKENPACKAGE ); -- else -- { -- BOOL bHasMacros = FALSE; -- if ( xStor->IsOLEStorage() ) -- bHasMacros = BasicManager::HasBasicWithModules( *xStor ); -- else -- bHasMacros = xStor->IsStorage( String::CreateFromAscii("Basic") ); -- -- if ( bHasMacros ) -- AdjustMacroMode( String() ); -- else -- { -- // if macros will be added by the user later, the security check is obsolete -- pImp->nMacroMode = MacroExecMode::ALWAYS_EXECUTE_NO_WARN; -- } -- } - } - - // Load -Index: source/doc/sfxbasemodel.cxx -=================================================================== -RCS file: /cvs/framework/sfx2/source/doc/sfxbasemodel.cxx,v -retrieving revision 1.51.10.1 -diff -u -p -r1.51.10.1 sfxbasemodel.cxx ---- sfx2/source/doc/sfxbasemodel.cxx 9 Jan 2004 17:44:22 -0000 1.51.10.1 -+++ sfx2/source/doc/sfxbasemodel.cxx 13 Jun 2006 12:16:42 -0000 -@@ -103,6 +103,10 @@ - #include <com/sun/star/view/PaperOrientation.hpp> - #endif - -+#ifndef _COM_SUN_STAR_SCRIPT_XLIBRARYCONTAINER_HPP_ -+#include <com/sun/star/script/XLibraryContainer.hpp> -+#endif -+ - #ifndef _CPPUHELPER_INTERFACECONTAINER_HXX_ - #include <cppuhelper/interfacecontainer.hxx> - #endif -@@ -578,6 +582,7 @@ SEQUENCE< sal_Int8 > SAL_CALL SfxBaseMod - - REFERENCE< XSTARBASICACCESS > implGetStarBasicAccess( SfxObjectShell* pObjectShell ) - { -+ // is not used - REFERENCE< XSTARBASICACCESS > xRet; - if( pObjectShell ) - { -@@ -593,13 +598,20 @@ REFERENCE< XNAMECONTAINER > SAL_CALL Sfx - if ( impl_isDisposed() ) - throw DISPOSEDEXCEPTION(); - -- REFERENCE< XSTARBASICACCESS >& rxAccess = m_pData->m_xStarBasicAccess; -- if( !rxAccess.is() ) -- rxAccess = implGetStarBasicAccess( m_pData->m_pObjectShell ); -+// the document library container must be used directly -+// REFERENCE< XSTARBASICACCESS >& rxAccess = m_pData->m_xStarBasicAccess; -+// if( !rxAccess.is() ) -+// rxAccess = implGetStarBasicAccess( m_pData->m_pObjectShell ); -+// -+// REFERENCE< XNAMECONTAINER > xRet; -+// if( rxAccess.is() ) -+// xRet = rxAccess->getLibraryContainer(); -+// return xRet; - - REFERENCE< XNAMECONTAINER > xRet; -- if( rxAccess.is() ) -- xRet = rxAccess->getLibraryContainer(); -+ if( m_pData->m_pObjectShell ) -+ xRet = REFERENCE< XNAMECONTAINER >( m_pData->m_pObjectShell->GetBasicContainer(), UNO_QUERY ); -+ - return xRet; - } - -@@ -614,12 +626,32 @@ void SAL_CALL SfxBaseModel::createLibrar - if ( impl_isDisposed() ) - throw DISPOSEDEXCEPTION(); - -- REFERENCE< XSTARBASICACCESS >& rxAccess = m_pData->m_xStarBasicAccess; -- if( !rxAccess.is() ) -- rxAccess = implGetStarBasicAccess( m_pData->m_pObjectShell ); -- -- if( rxAccess.is() ) -- rxAccess->createLibrary( LibName, Password, ExternalSourceURL, LinkTargetURL ); -+ if( m_pData->m_pObjectShell ) -+ { -+ Reference< ::com::sun::star::script::XLibraryContainer > xContainer = m_pData->m_pObjectShell->GetBasicContainer(); -+ if ( xContainer.is() ) -+ { -+ // insert a dummy library to let library existance be detected -+ // it is a hack to fix 136937 -+ try -+ { -+ ::rtl::OUString aDummy( RTL_CONSTASCII_USTRINGPARAM( "Dummy" ) ); -+ if ( !xContainer->hasByName( aDummy ) ) -+ xContainer->createLibrary( aDummy ); -+ } -+ catch( uno::Exception& ) -+ { -+ return; -+ } -+ -+ REFERENCE< XSTARBASICACCESS >& rxAccess = m_pData->m_xStarBasicAccess; -+ if( !rxAccess.is() ) -+ rxAccess = implGetStarBasicAccess( m_pData->m_pObjectShell ); -+ -+ if( rxAccess.is() ) -+ rxAccess->createLibrary( LibName, Password, ExternalSourceURL, LinkTargetURL ); -+ } -+ } - } - - /**___________________________________________________________________________________________________ -@@ -633,12 +665,32 @@ void SAL_CALL SfxBaseModel::addModule( c - if ( impl_isDisposed() ) - throw DISPOSEDEXCEPTION(); - -- REFERENCE< XSTARBASICACCESS >& rxAccess = m_pData->m_xStarBasicAccess; -- if( !rxAccess.is() ) -- rxAccess = implGetStarBasicAccess( m_pData->m_pObjectShell ); -- -- if( rxAccess.is() ) -- rxAccess->addModule( LibraryName, ModuleName, Language, Source ); -+ if( m_pData->m_pObjectShell ) -+ { -+ Reference< ::com::sun::star::script::XLibraryContainer > xContainer = m_pData->m_pObjectShell->GetBasicContainer(); -+ if ( xContainer.is() ) -+ { -+ // insert a dummy library to let library existance be detected -+ // it is a hack to fix 136937 -+ try -+ { -+ ::rtl::OUString aDummy( RTL_CONSTASCII_USTRINGPARAM( "Dummy" ) ); -+ if ( !xContainer->hasByName( aDummy ) ) -+ xContainer->createLibrary( aDummy ); -+ } -+ catch( uno::Exception& ) -+ { -+ return; -+ } -+ -+ REFERENCE< XSTARBASICACCESS >& rxAccess = m_pData->m_xStarBasicAccess; -+ if( !rxAccess.is() ) -+ rxAccess = implGetStarBasicAccess( m_pData->m_pObjectShell ); -+ -+ if( rxAccess.is() ) -+ rxAccess->addModule( LibraryName, ModuleName, Language, Source ); -+ } -+ } - } - - /**___________________________________________________________________________________________________ - diff --git a/editors/openoffice.org-1.1/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx b/editors/openoffice.org-1.1/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx deleted file mode 100644 index 08684375eb4a..000000000000 --- a/editors/openoffice.org-1.1/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx +++ /dev/null @@ -1,32 +0,0 @@ -Issuetracker : #iXXXXX# -CWS : N/A -Author : NAKATA Maho <maho@openoffice.org> (JCA) -Description : -In solver/645/unxfbsd.pro/inc/rtl/string.hxx, -even though there is a descrioptin like -static OString valueOf( sal_Int32 i, sal_Int16 radix = 10 ) SAL_THROW(()) -and In /usr/include/machine/_types.h, -typedef int __int32_t; -typedef __int32_t __time_t; /* time()... */ -and -/usr/include/time.h:typedef __time_t time_t; -this cast seems to be mandatory. Why?? - ---- shell/source/unix/sysshell/recently_used_file_handler.cxx.orig Tue Jan 13 00:56:37 2004 -+++ shell/source/unix/sysshell/recently_used_file_handler.cxx Tue Jan 13 00:57:26 2004 -@@ -188,9 +188,12 @@ - write_xml_start_tag(TAG_RECENT_ITEM, file, true); - write_xml_tag(TAG_URI, uri_, file); - write_xml_tag(TAG_MIME_TYPE, mime_type_, file); -- -- rtl::OString ts = rtl::OString::valueOf(timestamp_); -- write_xml_tag(TAG_TIMESTAMP, ts.getStr(), file); -+#if defined FREEBSD -+ rtl::OString ts = rtl::OString::valueOf((sal_Int32)timestamp_); -+#else -+ rtl::OString ts = rtl::OString::valueOf(timestamp_); -+#endif -+ write_xml_tag(TAG_TIMESTAMP, ts.getStr(), file); - - if (is_private_) - write_xml_tag(TAG_PRIVATE, file); diff --git a/editors/openoffice.org-1.1/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-1.1/files/patch-solenv+inc+unxfbsdi.mk deleted file mode 100644 index 275882d765bb..000000000000 --- a/editors/openoffice.org-1.1/files/patch-solenv+inc+unxfbsdi.mk +++ /dev/null @@ -1,248 +0,0 @@ -Issuetracker : #iXXXXX# -CWS : N/A -Author : <maho@openoffice.org> (JCA) -Description : FreeBSD porting : catch up recent version of solenv/inc/unxlngi5.mk -catch up recent version of solenv/inc/unxlngi5.mk - ---- solenv/inc/unxfbsdi.mk.orig Tue May 4 01:27:08 2004 -+++ solenv/inc/unxfbsdi.mk Mon Oct 24 11:39:05 2005 -@@ -60,16 +60,21 @@ - # - #************************************************************************* - --# mak file for unxfbsdi --ASM=$(CC) --AFLAGS=-x assembler-with-cpp -c $(CDEFS) -+# ma file for unxfbsdi -+ASM= -+AFLAGS= -+ -+SOLAR_JAVA*=TRUE -+JAVAFLAGSDEBUG=-g - - # filter for supressing verbose messages from linker - #not needed at the moment - #LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter" - -+# _PTHREADS is needed for the stl -+CDEFS+= -DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450 -DOSVERSION=$(OSVERSION) $(PTHREAD_CFLAGS) -+ - # this is a platform with JAVA support --SOLAR_JAVA*=TRUE - .IF "$(SOLAR_JAVA)"!="" - JAVADEF=-DSOLAR_JAVA - .IF "$(debug)"=="" -@@ -83,89 +88,81 @@ - CXX*=g++ - # name of C Compiler - CC*=gcc -+.IF "$(SYSBASE)"!="" -+CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include -+CXX+:=$(CFLAGS_SYSBASE) -+CC+:=$(CFLAGS_SYSBASE) -+.ENDIF # "$(SYSBASE)"!="" -+# flags for C and C++ Compiler -+# do not use standard header search paths -+# if installed elsewhere -+.IF "$(BUILD_SOSL)"!="" -+CFLAGS= -+.ENDIF -+CFLAGS+=-fmessage-length=0 -c $(INCLUDE) - --# filter for supressing verbose messages from linker --# not needed at the moment --LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter" -- --# options for C and C++ Compiler --CDEFS+= -D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=450 -DOSVERSION=$(OSVERSION) --CDEFS+= $(PTHREAD_CFLAGS) -D_REENTRANT -- --# flags for C and C++ Compile --CFLAGS+= -w -c $(INCLUDE) --CFLAGS+= -I/usr/X11R6/include -+# flags to enable build with symbols; required for crashdump feature -+.IF "$(ENABLE_SYMBOLS)"=="SMALL" -+CFLAGSENABLESYMBOLS=-g1 -+.ELSE -+CFLAGSENABLESYMBOLS=-g -+.ENDIF - - # flags for the C++ Compiler --CFLAGSCC= -pipe -fno-rtti --CFLAGSCXX= -pipe -fno-for-scope -fpermissive -fno-rtti -- -+CFLAGSCC= -pipe -mcpu=pentiumpro - # Flags for enabling exception handling --CFLAGSEXCEPTIONS= -fexceptions --CFLAGS_NO_EXCEPTIONS= -fno-exceptions -- --# Compiler flags for compiling static object in single threaded --# environment with graphical user interface --CFLAGSOBJGUIST= -fPIC -- --# Compiler flags for compiling static object in single threaded --# environment with character user interface --CFLAGSOBJCUIST= -fPIC -- --# Compiler flags for compiling static object in multi threaded --# environment with graphical user interface --CFLAGSOBJGUIMT= -fPIC -- --# Compiler flags for compiling static object in multi threaded --# environment with character user interface --CFLAGSOBJCUIMT= -fPIC -- --# Compiler flags for compiling shared object in multi threaded --# environment with graphical user interface --CFLAGSSLOGUIMT= -fPIC -- --# Compiler flags for compiling shared object in multi threaded --# environment with character user interface --CFLAGSSLOCUIMT= -fPIC -- --# Compiler flags for profilin --CFLAGSPROF= -pg -- -+CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs -+# Flags for disabling exception handling -+CFLAGS_NO_EXCEPTIONS=-fno-exceptions -+ -+# -fpermissive should be removed as soon as possible -+CFLAGSCXX= -pipe -mcpu=pentiumpro -fno-for-scope -fpermissive -fno-rtti -+ -+# Compiler flags for compiling static object in single threaded environment with graphical user interface -+CFLAGSOBJGUIST= -+# Compiler flags for compiling static object in single threaded environment with character user interface -+CFLAGSOBJCUIST= -+# Compiler flags for compiling static object in multi threaded environment with graphical user interface -+CFLAGSOBJGUIMT= -+# Compiler flags for compiling static object in multi threaded environment with character user interface -+CFLAGSOBJCUIMT= -+# Compiler flags for compiling shared object in multi threaded environment with graphical user interface -+CFLAGSSLOGUIMT=-fpic -+# Compiler flags for compiling shared object in multi threaded environment with character user interface -+CFLAGSSLOCUIMT=-fpic -+# Compiler flags for profiling -+CFLAGSPROF= - # Compiler flags for debugging --CFLAGSDEBUG= -g -+CFLAGSDEBUG=-g - CFLAGSDBGUTIL= -- --# Compiler flags to enable optimizations --# -02 is broken for FreeBSD --CFLAGSOPT= -O -- --# Compiler flags to disable optimizations --# -0 is broken for STLport for FreeBSD --CFLAGSNOOPT= -O0 -- --# Compiler flags for the output path --CFLAGSOUTOBJ= -o -- -+# Compiler flags for enabling optimazations -+# CFLAGSOPT=-O2 -+# reduce to -O1 to avoid optimisation problems -+CFLAGSOPT=-O1 -+# Compiler flags for disabling optimazations -+CFLAGSNOOPT=-O0 -+# Compiler flags for discibing the output path -+CFLAGSOUTOBJ=-o - # Enable all warnings - CFLAGSWALL=-Wall -- - # Set default warn level - CFLAGSDFLTWARN=-w - - # switches for dynamic and static linking --STATIC= -Wl,-Bstatic --DYNAMIC= -Wl,-Bdynamic -+STATIC = -Wl,-Bstatic -+DYNAMIC = -Wl,-Bdynamic - - # name of linker --LINK=$(CC) -+LINK*=$(CC) - - # default linker flags --# LINKFLAGSRUNPATH*=-Wl,-rpath\''$$ORIGIN'\' --LINKFLAGS=$(LINKFLAGSRUNPATH) -+LINKFLAGSDEFS*=-z defs -+LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\' -+LINKFLAGS=-z combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH) - - # linker flags for linking applications --LINKFLAGSAPPGUI= -Wl,--noinhibit-exec --LINKFLAGSAPPCUI= -Wl,--noinhibit-exec -+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec -+LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec - - # linker flags for linking shared libraries - LINKFLAGSSHLGUI= -shared -@@ -176,21 +173,16 @@ - LINKFLAGSDEBUG=-g - LINKFLAGSOPT= - --.IF "$(NO_BSYMBOLIC)"=="" --.IF "$(PRJNAME)" != "envtest" --LINKFLAGSSHLGUI+= -Wl,-Bsymbolic --LINKFLAGSSHLCUI+= -Wl,-Bsymbolic --.ENDIF --.ENDIF -+# linker flags for optimization (symbol hashtable) -+# for now, applied to symbol scoped libraries, only -+LINKFLAGSOPTIMIZE*=-Wl,-O1 -+LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script - --LINKVERSIONMAPFLAG=-Wl,--version-script -+SONAME_SWITCH=-Wl,-h - - # Sequence of libs does matter ! --STDLIBCPP=-lstdc++ - --# _SYSLIBS= -L/usr/lib -lm --# _X11LIBS= -L/usr/X11R6/lib -lXext -lX11 --# _CXXLIBS= -L/usr/lib -lstdc++ -L/usr/local/lib -+STDLIBCPP=-lstdc++ - - # default objectfilenames to link - STDOBJGUI= -@@ -200,24 +192,26 @@ - - # libraries for linking applications - STDLIBCUIST=-lm --STDLIBGUIST=-lXaw -lXt -lX11 -lm --STDLIBGUIMT=-lXaw -lXt -lX11 $(PTHREAD_LIBS) -lm -+STDLIBGUIMT=-lX11 $(PTHREAD_LIBS) -lm - STDLIBCUIMT=$(PTHREAD_LIBS) -lm -+STDLIBGUIST=-lX11 -lm - - # libraries for linking shared libraries --STDSHLGUIMT=-lXaw -lXt -lX11 -lXext $(PTHREAD_LIBS) -lm -+STDSHLGUIMT=-lX11 -lXext $(PTHREAD_LIBS) -lm - STDSHLCUIMT=$(PTHREAD_LIBS) -lm -+STDSHLGUIST=-lX11 -lXext -lm -+STDSHLCUIST=-lm - - LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive - --# STLport always needs pthread. --LIBSTLPORT=$(DYNAMIC) -lstlport_gcc $(STDLIBCPP) $(PTHREAD_LIBS) --LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) $(PTHREAD_LIBS) -+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc -lstdc++ -+LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) -+ -+#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC) - - # name of library manager - LIBMGR=ar - LIBFLAGS=-r --LIBEXT= .a - - # tool for generating import libraries - IMPLIB= -@@ -236,3 +230,4 @@ - DLLPOSTFIX=fi - DLLPRE=lib - DLLPOST=.so -+ diff --git a/editors/openoffice.org-1.1/files/patch-translation_limit_64k b/editors/openoffice.org-1.1/files/patch-translation_limit_64k deleted file mode 100644 index 612b19dfc575..000000000000 --- a/editors/openoffice.org-1.1/files/patch-translation_limit_64k +++ /dev/null @@ -1,124 +0,0 @@ -Issuetracker : #i33228#, #i34210# -CWS : N/A -Author : -Description : Kannada doesn't build since some resources are -limited to 64k. it won't fix for 1.1.x officially - -Index: inc/sc.hrc -=================================================================== -RCS file: /cvs/sc/sc/inc/sc.hrc,v -retrieving revision 1.35 -retrieving revision 1.35.288.2 -diff -u -r1.35 -r1.35.288.2 ---- sc/inc/sc.hrc 3 Dec 2002 15:26:06 -0000 1.35 -+++ sc/inc/sc.hrc 17 Sep 2004 14:25:38 -0000 1.35.288.2 -@@ -1141,8 +1141,12 @@ - #define RID_TBXCTL_INSOBJ (SC_RESOURCE_START+40) - #define RID_BMP_REFBTN1 (SC_RESOURCE_START+41) - #define RID_BMP_REFBTN2 (SC_RESOURCE_START+42) --#define RID_SC_FUNCTION_DESCRIPTIONS1 (SC_RESOURCE_START+43) --#define RID_SC_FUNCTION_DESCRIPTIONS2 (SC_RESOURCE_START+44) -+// #i34210# split function resources due to 64k limit, don't reuse old values -+// to have obviously empty function lists in case some localisation used the -+// old values for any reason. Don't even reuse the exact name because of the -+// translation database IDs. -+//#define RID_SC_FUNCTION_DESCRIPTIONS1 (SC_RESOURCE_START+43) -+//#define RID_SC_FUNCTION_DESCRIPTIONS2 (SC_RESOURCE_START+44) - #define RID_POPUP_CONTROL (SC_RESOURCE_START+45) - #define RID_POPUP_PAGEBREAK (SC_RESOURCE_START+46) - #define RID_OBJECTBAR_DRAWFORM (SC_RESOURCE_START+47) -@@ -1158,6 +1162,10 @@ - #define RID_IMAGELIST_H_NAVCONT (SC_RESOURCE_START+57) - #define RID_OUTLINEBITMAPS_H (SC_RESOURCE_START+58) - #define RID_OBJECTMENU_EDIT (SC_RESOURCE_START+59) -+#define RID_SC_FUNCTION_DESCRIPTIONS_1 (SC_RESOURCE_START+60) -+#define RID_SC_FUNCTION_DESCRIPTIONS_2 (SC_RESOURCE_START+61) -+#define RID_SC_FUNCTION_DESCRIPTIONS_3 (SC_RESOURCE_START+62) -+#define RID_SC_FUNCTION_DESCRIPTIONS_4 (SC_RESOURCE_START+63) - - #define STR_START (SC_RESOURCE_START+100) - #define STR_ROWHEIGHT (STR_START) -Index: source/core/data/global.cxx -=================================================================== -RCS file: /cvs/sc/sc/source/core/data/global.cxx,v -retrieving revision 1.31 -retrieving revision 1.31.166.2 -diff -u -r1.31 -r1.31.166.2 ---- sc/source/core/data/global.cxx 17 Apr 2003 09:54:45 -0000 1.31 -+++ sc/source/core/data/global.cxx 17 Sep 2004 14:25:38 -0000 1.31.166.2 -@@ -1475,10 +1475,12 @@ - USHORT i,j; - USHORT nDescBlock[] = - { -- RID_SC_FUNCTION_DESCRIPTIONS1, -- RID_SC_FUNCTION_DESCRIPTIONS2 -+ RID_SC_FUNCTION_DESCRIPTIONS_1, -+ RID_SC_FUNCTION_DESCRIPTIONS_2, -+ RID_SC_FUNCTION_DESCRIPTIONS_3, -+ RID_SC_FUNCTION_DESCRIPTIONS_4 - }; -- const USHORT nBlocks = sizeof(nDescBlock) / sizeof(USHORT); -+ const USHORT nBlocks = sizeof(nDescBlock) / sizeof(nDescBlock[0]); - - aFunctionList.Clear(); - -Index: source/ui/src/scfuncs.src -=================================================================== -RCS file: /cvs/sc/sc/source/ui/src/scfuncs.src,v -retrieving revision 1.76.22.8 -retrieving revision 1.76.22.8.4.2 -diff -u -r1.76.22.8 -r1.76.22.8.4.2 ---- sc/source/ui/src/scfuncs.src 10 Sep 2004 14:45:52 -0000 1.76.22.8 -+++ sc/source/ui/src/scfuncs.src 17 Sep 2004 14:25:39 -0000 1.76.22.8.4.2 -@@ -93,10 +93,16 @@ - // RID_SC_FUNCTION_DESCRIPTIONS1 - // RID_SC_FUNCTION_DESCRIPTIONS2 - -+ // #i34210# again splitted resources due to 64k limit -+ // RID_SC_FUNCTION_DESCRIPTIONS_1 -+ // RID_SC_FUNCTION_DESCRIPTIONS_2 -+ // RID_SC_FUNCTION_DESCRIPTIONS_3 -+ // RID_SC_FUNCTION_DESCRIPTIONS_4 -+ - #include "scfuncs.hrc" // ID_FUNCTION_GRP_XXX, HID_FUNC_XXX - #include "compiler.hrc" // SC_OPCODE_XXX - --Resource RID_SC_FUNCTION_DESCRIPTIONS1 -+Resource RID_SC_FUNCTION_DESCRIPTIONS_1 - { - // -=*# Resource for function DBANZAHL #*=- - Resource SC_OPCODE_DB_COUNT -@@ -15963,6 +15969,11 @@ - Text[ galician ] = "Valor 1; Valor 2;... son de 1 a 30 argumentos que representan os pagamentos e ingresos."; - }; - }; -+}; -+ -+ -+Resource RID_SC_FUNCTION_DESCRIPTIONS_2 -+{ - // -=*# Resource for function IKV #*=- - Resource SC_OPCODE_IKV - { -@@ -32174,7 +32185,8 @@ - }; - }; - --Resource RID_SC_FUNCTION_DESCRIPTIONS2 -+ -+Resource RID_SC_FUNCTION_DESCRIPTIONS_3 - { - // -=*# Resource for function DBANZAHL2 #*=- - // -=*# Resource for function HÄUFIGKEIT #*=- -@@ -49230,6 +49242,11 @@ - Text[ galician ] = "é o n—ãro de graos de liberdade."; - }; - }; -+}; -+ -+ -+Resource RID_SC_FUNCTION_DESCRIPTIONS_4 -+{ - // -=*# Resource for function STANDARDISIERUNG #*=- - Resource SC_OPCODE_STANDARD - { diff --git a/editors/openoffice.org-1.1/files/pkg-message.in b/editors/openoffice.org-1.1/files/pkg-message.in deleted file mode 100644 index 8b63380621c8..000000000000 --- a/editors/openoffice.org-1.1/files/pkg-message.in +++ /dev/null @@ -1,55 +0,0 @@ -OpenOffice.org Build %%RELEASE_NR%% Personal Install How-To - -Written by: Martin Blapp <mbr@freebsd.org> - and Maho Nakata <maho@FreeBSD.org> - -OpenOffice.org %%RELEASE_NR%% will soon been installed in -%%PREFIX%%/%%EXECBASE%% - -1 User installation -------------------- - -Just type "%%EXECBASE%%" after you have successfully -installed the package. If there is no installed -OO.org dir in your homedir, you'll be prompted to -install some files and choose a installed JDK. -The setup installs a "OpenOffice.org%%RELEASE_NR%%" folder -in your homedir. - -If the setup tells you there is already an installed -version, you may look at the file ".sversionrc" in -your homedir. In this file OpenOffice and StarOffice -have both a line for each version which is installed. -After removing the problematic line you should be able to -install again. - -2 Start OO.org --------------- - -There are some wrappers installed for fast startup. -Add "%%PREFIX%%/bin/" to your PATH and you will be able -to use them. - -%%PREFIX%%/bin/openoffice.org -%%PREFIX%%/bin/%%EXECBASE%% -%%PREFIX%%/bin/%%EXECBASE%%-sagenda -%%PREFIX%%/bin/%%EXECBASE%%-scalc -%%PREFIX%%/bin/%%EXECBASE%%-sdraw -%%PREFIX%%/bin/%%EXECBASE%%-setup -%%PREFIX%%/bin/%%EXECBASE%%-sfax -%%PREFIX%%/bin/%%EXECBASE%%-simpress -%%PREFIX%%/bin/%%EXECBASE%%-spadmin -%%PREFIX%%/bin/%%EXECBASE%%-sweb -%%PREFIX%%/bin/%%EXECBASE%%-swriter - -OO.org does need $LANG to be set to a suitable value. -If it is not already set, a default value is chosen. - -3 If you stuck into a trouble --------------------------------------------------- -Somehow you can stuck into a trouble. -To solve this issue, please remove the already installed -"OpenOffice.org%%RELEASE_NR%%" dir in your homedir and remove the -appropriate entry from ".sversionrc". After you have done -this, redo the user installation and the problem will -go away. diff --git a/editors/openoffice.org-1.1/pkg-descr b/editors/openoffice.org-1.1/pkg-descr deleted file mode 100644 index bc2ede1b8c2b..000000000000 --- a/editors/openoffice.org-1.1/pkg-descr +++ /dev/null @@ -1,17 +0,0 @@ -OpenOffice.org is an Open Source, community-developed, multi-platform office -productivity suite. It includes the key desktop applications, such as a -word processor, spreadsheet, presentation manager, and drawing program, -with a user interface and feature set similar to other office suites. - -Components include: - * A universal word processing application for creating business - letters, extensive text documents, professional layouts, and HTML - documents. - * A sophisticated application for performing advanced spreadsheet - functions, such as analyzing figures, creating lists, and viewing data. - * A tool for creating effective eye-catching presentations. - * A vector-oriented draw module that enables the creation of 3D - illustrations - -WWW: http://www.openoffice.org/ - http://porting.openoffice.org/freebsd/ diff --git a/editors/openoffice.org-1.1/pkg-plist b/editors/openoffice.org-1.1/pkg-plist deleted file mode 100644 index 28bd78453b52..000000000000 --- a/editors/openoffice.org-1.1/pkg-plist +++ /dev/null @@ -1 +0,0 @@ -# Dummy file, do not delete. Package list is generated automatically. |