mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-03 06:04:53 +00:00
1) update to 1.1.3; developer ver. cws_srx645_ooo113fix2,
checkout at 2004/7/29 16:00 JST) 2) remove GIF lzw disabling patches 3) change the method of localized build to reduce the amount of time, and/or make full use of ccache of 2nd and later builds. 4) Modification of OOo must be small as possible. No longer see LANG environment variable, CJK enhancements, etc.
This commit is contained in:
Maho Nakata
parent
af859b9149
commit
c52626ad10
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=115128
@ -6,107 +6,75 @@
|
||||
#
|
||||
|
||||
PORTNAME= openoffice
|
||||
PORTVERSION= 1.1.2.${SNAPDATE}
|
||||
PORTVERSION= 1.1.3
|
||||
CATEGORIES+= editors
|
||||
MASTER_SITES+= ${MASTER_SITE_LOCAL} \
|
||||
MASTER_SITES+= ${MASTER_SITE_LOCAL} \
|
||||
ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
|
||||
http://people.freebsd.org/~mbr/ooo/:moz \
|
||||
${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/contrib/helpcontent/&,}:help \
|
||||
ftp://ftp.kddlabs.co.jp/office/openoffice/contrib/helpcontent/:help \
|
||||
ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/contrib/helpcontent/:help \
|
||||
http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/:help \
|
||||
http://people.freebsd.org/~mbr/ooo/:moz
|
||||
http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/:help
|
||||
MASTER_SITE_SUBDIR= maho/openoffice.org
|
||||
LATEST_LINK= ${PORTNAME}-${PORTVERSION}-devel
|
||||
DISTFILES+= OOo_${PORTVERSION}_source.tar.bz2 gpc231.tar.Z:gpc \
|
||||
DISTFILES+= OOo_${PORTVERSION}.${SNAPDATE}_source.tar.bz2 gpc231.tar.Z:gpc \
|
||||
patch-openoffice-mozilla101-2002-10-14:moz mozilla-vendor-1.0.2a.tgz:moz
|
||||
.if defined(L10NHELP)
|
||||
DISTFILES+= ${L10NHELP:S/$/:help/}
|
||||
.endif
|
||||
EXTRACT_ONLY= OOo_${PORTVERSION}_source.tar.bz2
|
||||
|
||||
ZIP?= ${PREFIX}/bin/zip
|
||||
UNZIP?= ${PREFIX}/bin/unzip
|
||||
ANT?= ${LOCALBASE}/bin/ant
|
||||
TCSH?= /bin/tcsh
|
||||
EXTRACT_ONLY= OOo_${PORTVERSION}.${SNAPDATE}_source.tar.bz2
|
||||
|
||||
NO_LATEST_LINK= yes
|
||||
USE_GNOME= orbit gtk12 gtk20
|
||||
USE_PERL5= yes
|
||||
USE_BISON= yes
|
||||
USE_GMAKE= yes
|
||||
USE_REINPLACE= yes
|
||||
USE_BZIP2= yes
|
||||
SNAPDATE= 20040729
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
.include <${FILESDIR}/Makefile.localized>
|
||||
|
||||
.if defined(ALL_LOCALIZED_LANGS)
|
||||
DISTFILES+= helpcontent_31_unix.tgz:help helpcontent_33_unix.tgz:help \
|
||||
helpcontent_34_unix.tgz:help helpcontent_39_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_31_unix.tgz helpcontent_33_unix.tgz \
|
||||
helpcontent_34_unix.tgz helpcontent_39_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
|
||||
|
||||
.if ${OSVERSION} < 500000
|
||||
BROKEN= "Does not compile on 4.x (tries to link to libpthread)"
|
||||
.endif
|
||||
|
||||
MAINTAINER= openoffice@FreeBSD.org
|
||||
COMMENT?= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
|
||||
|
||||
BUILD_NR= 645
|
||||
RELEASE_NR= 1.1
|
||||
FRELEASE_NR= 1.1.2
|
||||
SNAPDATE= 20040518
|
||||
INSTALLATION_BASEDIR= OpenOffice.org${FRELEASE_NR}
|
||||
RELEASE_NR= ${PORTVERSION}
|
||||
INSTALLATION_BASEDIR= OpenOffice.org${RELEASE_NR}
|
||||
DIST_SUBDIR= openoffice1.1
|
||||
DICT_DIR= ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
|
||||
SIMPLEOSVER!= ${UNAME} -r | sed -e 's/\.//' | sed -e 's/\..*//'
|
||||
|
||||
#
|
||||
# configuration for language specific slave ports
|
||||
#
|
||||
.if !defined(LANG_EXT)
|
||||
LANG_EXT=01
|
||||
.else
|
||||
#
|
||||
# Add pkg-descr and pkg-message if available
|
||||
#
|
||||
.if exists(${.CURDIR}/pkg-descr)
|
||||
DESCR= ${.CURDIR}/pkg-descr
|
||||
.endif
|
||||
.if exists(${.CURDIR}/pkg-message)
|
||||
PKGMESSAGE= ${.CURDIR}/pkg-message
|
||||
.endif
|
||||
#
|
||||
# Set prefix and suffix
|
||||
#
|
||||
SIMPLEOSVER!= ${UNAME} -r | ${SED} -e 's/\.//' | ${SED} -e 's/\..*//'
|
||||
.if defined(LANG_PKGNAME)
|
||||
PKGNAMEPREFIX= ${LANG_PKGNAME}-
|
||||
PKGNAMEPREFIX= ${LANG_PKGNAME}-
|
||||
.endif
|
||||
.if defined(LANG_SUFFIX)
|
||||
PKGNAMESUFFIX= -${LANG_SUFFIX}
|
||||
PKGNAMESUFFIX?= -${LANG_SUFFIX}
|
||||
.endif
|
||||
.endif # if defined(LANG_PKGNAME)
|
||||
#
|
||||
# LANG_CONFIGURE_ARG is missing for the german port
|
||||
#
|
||||
.if defined(LANG_EXT)
|
||||
CONFIGURE_ARGS+= --with-lang=${LANG_CONFIGURE_ARG},ENUS
|
||||
.endif
|
||||
.endif
|
||||
|
||||
.if !defined (LANG) && !defined(USE_LANG)
|
||||
USE_LANG= en_US.ISO8859-15
|
||||
LANG_LIST= en_US.ISO8859-15 en_US.ISO8859-1 US-ASCII
|
||||
.else
|
||||
.if !defined(USE_LANG)
|
||||
USE_LANG= ${LANG}
|
||||
.endif
|
||||
.endif
|
||||
|
||||
LANG_SORTED=`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
|
||||
|
||||
# OOo requires gcc 3.2 (currently 3.3 is not supported)
|
||||
BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
|
||||
USE_GCC=3.2
|
||||
# XXX dirty
|
||||
.if defined(WITH_CCACHE)
|
||||
BUILD_DEPENDS+= ccache:${PORTSDIR}/devel/ccache
|
||||
CC= ccache gcc32
|
||||
CXX= ccache g++32
|
||||
.else
|
||||
CC= gcc32
|
||||
CXX= g++32
|
||||
|
||||
MAINTAINER= openoffice@FreeBSD.org
|
||||
.if !defined(COMMENT)
|
||||
COMMENT= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
|
||||
.endif
|
||||
|
||||
#
|
||||
# The JDK dependency needs to be at the first place, so all
|
||||
# following dependencies use the same JDK.
|
||||
#
|
||||
BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14 \
|
||||
BUILD_DEPENDS+= ${JDKDIR}/bin/java:${PORTSDIR}/java/jdk14 \
|
||||
zip:${PORTSDIR}/archivers/zip \
|
||||
unzip:${PORTSDIR}/archivers/unzip \
|
||||
gcp:${PORTSDIR}/sysutils/coreutils \
|
||||
@ -115,39 +83,21 @@ BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14 \
|
||||
.if !defined(DISPLAY)
|
||||
BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT}
|
||||
.endif
|
||||
|
||||
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
|
||||
png.5:${PORTSDIR}/graphics/png \
|
||||
mng.1:${PORTSDIR}/graphics/libmng \
|
||||
freetype.9:${PORTSDIR}/print/freetype2
|
||||
|
||||
USE_PERL5= yes
|
||||
USE_BZIP2= yes
|
||||
USE_BISON= yes
|
||||
USE_GMAKE= yes
|
||||
|
||||
EXTRACT_BEFORE_ARGS_R= -dc
|
||||
EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
|
||||
EXTRACT_CMD_R= ${GZIP_CMD}
|
||||
EXTRACT_REST= gpc231.tar.Z
|
||||
|
||||
JDKDIR?= ${LOCALBASE}/jdk1.4.2
|
||||
JAVAVM= ${JDKDIR}/bin/java
|
||||
|
||||
GNU_CONFIGURE= yes
|
||||
USE_AUTOCONF_VER= 253
|
||||
USE_AUTOCONF_VER= 253
|
||||
WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work
|
||||
WRKSRC= ${WRKDIR}/oo_${FRELEASE_NR}_src/config_office
|
||||
.if defined(WITH_DEBUG)
|
||||
CFLAGS+= -g
|
||||
.if ${WITH_DEBUG} == 2
|
||||
BUILD= dmake debug="true"
|
||||
.else
|
||||
WRKSRC= ${WRKDIR}/oo_${RELEASE_NR}_src/config_office
|
||||
ANT?= ${LOCALBASE}/bin/ant
|
||||
TCSH?= /bin/tcsh
|
||||
ZIP?= ${PREFIX}/bin/zip
|
||||
UNZIP?= ${PREFIX}/bin/unzip
|
||||
BUILD= dmake
|
||||
.endif
|
||||
.else
|
||||
BUILD= dmake strip="true"
|
||||
.endif
|
||||
|
||||
.if !defined(DISPLAY)
|
||||
DISPLAYHACK=localhost:1001
|
||||
@ -157,44 +107,33 @@ CONFIGURE_ENV= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
|
||||
PTHREAD_LIBS=${PTHREAD_LIBS}
|
||||
CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-jdk-home=${JDKDIR}
|
||||
|
||||
.if defined(LANG_EXT)
|
||||
CONFIGURE_ARGS+= --with-lang=${LANG_CONFIGURE_ARG},ENUS
|
||||
.else
|
||||
LANG_EXT= 01
|
||||
.endif
|
||||
|
||||
.if defined(ALL_LOCALIZED_LANGS)
|
||||
CONFIGURE_ARGS+= --with-lang=ALL
|
||||
.endif
|
||||
|
||||
.if defined(WITH_DEBUG)
|
||||
.if ${WITH_DEBUG} == 2
|
||||
CONFIGURE_ARGS+= --enable-debug
|
||||
.else
|
||||
CONFIGURE_ARGS+= --enable-symbols
|
||||
.endif
|
||||
.endif
|
||||
|
||||
pre-fetch:
|
||||
@${ECHO}
|
||||
.if !defined(LANG)
|
||||
@${ECHO} "REQUIREMENTS:"
|
||||
@${ECHO}
|
||||
@${ECHO} "OO requires that the ENV variable LANG"
|
||||
@${ECHO} "is set to a proper value. Dependent on"
|
||||
@${ECHO} "which language port you use, OO does"
|
||||
@${ECHO} "automatically set LANG to a suitable"
|
||||
@${ECHO} "value. You can change this with:"
|
||||
@${ECHO}
|
||||
@${ECHO} "USE_LANG=\"preferred language\""
|
||||
@${ECHO}
|
||||
@${ECHO} "and set a different language"
|
||||
@${ECHO} "like:"
|
||||
@${ECHO}
|
||||
@${ECHO} "${LANG_SORTED}"
|
||||
@${ECHO}
|
||||
@${ECHO} "Your current setting is:"
|
||||
@${ECHO}
|
||||
@${ECHO} "USE_LANG=${USE_LANG}"
|
||||
@${ECHO}
|
||||
@${ECHO}
|
||||
.endif
|
||||
@${ECHO} "OPTIONS:"
|
||||
.if !defined(WITH_DEBUG)
|
||||
@${ECHO}
|
||||
@${ECHO} "You can compile OO with debug symbols"
|
||||
@${ECHO} "You can compile OOo 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} "OOo debug support."
|
||||
@${ECHO}
|
||||
.endif
|
||||
.if !defined(WITH_TTF_BYTECODE_ENABLED)
|
||||
@ -209,30 +148,6 @@ pre-fetch:
|
||||
@${ECHO} "you can enable this option to get better"
|
||||
@${ECHO} "quality of glyphs at small bitmap sizes."
|
||||
@${ECHO}
|
||||
.endif
|
||||
.if !defined(WITH_GIF_LZW_COMPRESSION)
|
||||
@${ECHO}
|
||||
@${ECHO} "You may set WITH_GIF_LZW_COMPRESSION=YES"
|
||||
@${ECHO} "If you want to make compressed gif images"
|
||||
@${ECHO}
|
||||
@${ECHO} "If must have license from the Unisys and IBM patents"
|
||||
@${ECHO} "to enable this option to get compressed GIF images."
|
||||
@${ECHO} "According to http://www.unisys.com/about__unisys/lzw"
|
||||
@${ECHO} "Patent expires:"
|
||||
@${ECHO} "June 20, 2003 : U.S."
|
||||
@${ECHO} "June 18, 2004 : U.K., France, Germany and Italy"
|
||||
@${ECHO} "June 20, 2004 : Japan"
|
||||
@${ECHO} "July 7, 2004 : Canada"
|
||||
@${ECHO}
|
||||
.endif
|
||||
.if ${OSVERSION} < 450002
|
||||
@${ECHO}
|
||||
@${ECHO} "OS-VERSION ${OSVERSION} too low"
|
||||
@${ECHO}
|
||||
@${ECHO} "OO need some important libc_r and"
|
||||
@${ECHO} "gcc fixes to build. Please upgrade to 4.6"
|
||||
@${ECHO} "RELEASE or 4.6 STABLE."
|
||||
@${FALSE}
|
||||
.endif
|
||||
@${ECHO}
|
||||
@${ECHO} "NOTICE:"
|
||||
@ -242,90 +157,47 @@ pre-fetch:
|
||||
@${ECHO} "of free diskspace (~ 8GB)."
|
||||
.else
|
||||
@${ECHO} "of free diskspace (~ 4GB)."
|
||||
.endif
|
||||
@${ECHO}
|
||||
.if (defined(USE_GCC) && ${USE_GCC} == 2.95) || \
|
||||
(${OSVERSION} < 500000 && !defined(USE_GCC))
|
||||
@${ECHO} "KERNEL CONFIGURATION:"
|
||||
@${ECHO}
|
||||
@${ECHO} "Openoffice needs a larger stack- and"
|
||||
@${ECHO} "datasize to build. Check your limit"
|
||||
@${ECHO} "settings and and put this in /boot/loader.conf"
|
||||
@${ECHO} "if neccessary:"
|
||||
@${ECHO}
|
||||
@${ECHO} "kern.maxdsiz=\"1073741824\""
|
||||
@${ECHO} "kern.maxssiz=\"268435456\""
|
||||
.endif
|
||||
@${ECHO}
|
||||
.if ${OSVERSION} < 460002
|
||||
@${ECHO} "REQUIRED SYSTEM PATCHES:"
|
||||
@${ECHO}
|
||||
.endif
|
||||
.if ${OSVERSION} < 490100
|
||||
@${ECHO} "OO.org can crash if you enter a non existing path"
|
||||
@${ECHO} "or URL in the location bar. To fix these crashes"
|
||||
@${ECHO} "you need a uncommitted system patch for rtld:"
|
||||
@${ECHO}
|
||||
@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-symlookup.diff"
|
||||
@${ECHO}
|
||||
.endif
|
||||
.if ${OSVERSION} < 460001
|
||||
@${ECHO}
|
||||
@${ECHO} "OO setup is broken on STABLE < 4.6"
|
||||
@${ECHO} "including 4.6 RELEASE."
|
||||
@${ECHO} "You'll need a system patch to solve"
|
||||
@${ECHO} "this problem:"
|
||||
@${ECHO}
|
||||
@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-alloca.diff"
|
||||
@${ECHO}
|
||||
.endif
|
||||
.if ${OSVERSION} < 460002
|
||||
@${ECHO}
|
||||
@${ECHO} "OO.org soffice binary can deadlock. You can work around"
|
||||
@${ECHO} "this problem with this patch:"
|
||||
@${ECHO}
|
||||
@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-deadlock.diff"
|
||||
@${ECHO}
|
||||
.endif
|
||||
.if ${OSVERSION} < 490100
|
||||
@${ECHO}
|
||||
@${ECHO} "OO.org build can deadlock in regmerge. You can work around"
|
||||
@${ECHO} "this problem with this patch:"
|
||||
@${ECHO}
|
||||
@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-builddeadlock.diff"
|
||||
@${ECHO}
|
||||
.endif
|
||||
.if !exists(/usr/include/langinfo.h)
|
||||
@${ECHO}
|
||||
@${ECHO} "langinfo.h is missing !"
|
||||
@${ECHO}
|
||||
@${ECHO} "Please upgrade to 4.6 RELEASE or"
|
||||
@${ECHO} "4.6 STABLE."
|
||||
@${ECHO}
|
||||
@${FALSE}
|
||||
.endif
|
||||
@${ECHO} "If you want SDK and/or solver, please type make sdk and/or make solver"
|
||||
|
||||
pre-everything::
|
||||
# really tewak, 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:
|
||||
@for file in ${EXTRACT_REST}; do \
|
||||
if ! (cd ${WRKDIR} && ${EXTRACT_CMD_R} \
|
||||
${EXTRACT_BEFORE_ARGS_R} \
|
||||
${_DISTDIR}/$$file ${EXTRACT_AFTER_ARGS_R}) ; \
|
||||
then \
|
||||
exit 1; \
|
||||
fi \
|
||||
done
|
||||
@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/
|
||||
@${MAKE} extract-mozilla
|
||||
@-${RM} -f ${WRKSRC}/../moz/zipped/*.zip
|
||||
@${RM} -f ${WRKSRC}/../moz/zipped/*.zip
|
||||
@${CHMOD} +x ${WRKSRC}/../solenv/bin/zipdep.pl
|
||||
.if defined(L10NHELP)
|
||||
@${ECHO_MSG} "===> Extracting L10NHELP sub project"
|
||||
@${MKDIR} ${WRKDIR}/L10NHELP
|
||||
@cd ${WRKDIR}/L10NHELP && \
|
||||
@cd ${WRKDIR}/L10NHELP ; \
|
||||
${CAT} ${DISTDIR}/${DIST_SUBDIR}/${L10NHELP} | ${GZIP_CMD} -d | ${TAR} xf -
|
||||
.endif
|
||||
.if defined(ALL_LOCALIZED_LANGS)
|
||||
@${ECHO_MSG} "===> Extracting All available L10NHELPs"
|
||||
@${MKDIR} ${WRKDIR}/L10NHELP
|
||||
@cd ${WRKDIR}/L10NHELP ; \
|
||||
for file in ${L10NHELPS}; do \
|
||||
${CAT} ${DISTDIR}/${DIST_SUBDIR}/$$file | ${GZIP_CMD} -d | ${TAR} xf - ; \
|
||||
done
|
||||
.endif
|
||||
|
||||
post-patch:
|
||||
@${REINPLACE_CMD} -e 's+%%PTHREAD_LIBS%%+${PTHREAD_LIBS}+g;' ${WRKSRC}/../odk/settings/settings.mk
|
||||
@ -340,110 +212,13 @@ post-patch:
|
||||
${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/optpatch-freetype+patch ; \
|
||||
fi
|
||||
.endif
|
||||
.if !defined(WITH_GIF_LZW_COMPRESSION)
|
||||
@if [ "`echo ${PATCHDIR}/gifpatch-*`" != "${PATCHDIR}/gifpatch-*" ]; then \
|
||||
${ECHO_MSG} "===> Removing GIF LZW compression for ${PKGNAME}" ; \
|
||||
if [ ${PATCH_DEBUG_TMP} = yes ]; then \
|
||||
${ECHO_MSG} "===> Applying GIF LZW compression ${OPSYS} patch" ; \
|
||||
fi; \
|
||||
${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx ; \
|
||||
${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx ; \
|
||||
${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/gifpatch-goodies+source+filter.vcl+egif+makefile.mk ; \
|
||||
fi
|
||||
.endif
|
||||
.if defined(WITH_DEBUG)
|
||||
@if [ "`echo ${PATCHDIR}/debugpatch-*`" != "${PATCHDIR}/debugpatch-*" ]; then \
|
||||
${ECHO_MSG} "===> Applying additional debug ${OPSYS} patches for ${PKGNAME}" ; \
|
||||
PATCHES_APPLIED="" ; \
|
||||
for i in ${PATCHDIR}/debugpatch-*; do \
|
||||
case $$i in \
|
||||
*.orig|*.rej|*~) \
|
||||
${ECHO_MSG} "===> Ignoring patchfile $$i" ; \
|
||||
;; \
|
||||
*) \
|
||||
if [ ${PATCH_DEBUG_TMP} = yes ]; then \
|
||||
${ECHO_MSG} "===> Applying ${OPSYS} patch $$i" ; \
|
||||
fi; \
|
||||
if ${PATCH} ${PATCH_ARGS} < $$i ; then \
|
||||
PATCHES_APPLIED="$$PATCHES_APPLIED $$i" ; \
|
||||
else \
|
||||
${ECHO_MSG} `${ECHO_CMD} ">> Patch $$i failed to apply cleanly." | ${SED} "s|${PATCHDIR}/||"` ; \
|
||||
if [ x"$$PATCHES_APPLIED" != x"" ]; then \
|
||||
${ECHO_MSG} `${ECHO_CMD} ">> Patch(es) $$PATCHES_APPLIED applied cleanly." | ${SED} "s|${PATCHDIR}/||g"` ; \
|
||||
fi; \
|
||||
${FALSE} ; \
|
||||
fi; \
|
||||
;; \
|
||||
esac; \
|
||||
done; \
|
||||
fi;
|
||||
.endif
|
||||
|
||||
extract-mozilla:
|
||||
.if ! exists(${WRKDIR}/mozilla/Makefile)
|
||||
@${ECHO_MSG} "===> Extracting mozilla sub project"
|
||||
@cd ${WRKDIR} && tar -xzf ${DISTDIR}/${DIST_SUBDIR}/mozilla-vendor-1.0.2a.tgz
|
||||
.endif
|
||||
@cd ${WRKDIR}/mozilla && ${MAKE} extract WRKDIRPREFIX=""
|
||||
|
||||
patch-mozilla:
|
||||
@${CP} ${DISTDIR}/${DIST_SUBDIR}/patch-openoffice-mozilla101-2002-10-14 \
|
||||
${WRKDIR}/mozilla/files/
|
||||
@cd ${WRKDIR}/mozilla && ${MAKE} patch WRKDIRPREFIX=""
|
||||
|
||||
build-mozilla:
|
||||
.if ! exists(${WRKDIR}/FREEBSDGCCIruntime.zip)
|
||||
@${ECHO_MSG} "===> Building mozilla sub project"
|
||||
.if defined(WITH_DEBUG)
|
||||
@${CP} ${WRKDIR}/mozilla/Makefile ${WRKDIR}/mozilla/Makefile.new
|
||||
@${SED} -e 's|--disable-debug||' \
|
||||
-e 's|--disable-cpp-rtti||' \
|
||||
-e 's|--enable-strip||' \
|
||||
< ${WRKDIR}/mozilla/Makefile.new > ${WRKDIR}/mozilla/Makefile
|
||||
.endif
|
||||
.if defined(USE_GCC)
|
||||
@cd ${WRKDIR}/mozilla && ${MAKE} CXX="${CXX}" CC="${CC}" CFLAGS="${CFLAGS}" USE_GCC=${USE_GCC} build WRKDIRPREFIX=""
|
||||
.else
|
||||
@cd ${WRKDIR}/mozilla && ${MAKE} CXX="${CXX}" CC="${CC}" CFLAGS="${CFLAGS}" build WRKDIRPREFIX=""
|
||||
.endif
|
||||
@${CP} ${FILESDIR}/zipmoz.sh ${WRKDIR}
|
||||
@${CHMOD} 755 ${WRKDIR}/zipmoz.sh
|
||||
@${WRKDIR}/zipmoz.sh ${WRKDIR}/mozilla/work/mozilla/dist FREEBSDGCCI ${WRKDIR}
|
||||
.endif
|
||||
|
||||
install-mozilla:
|
||||
@${CP} ${WRKDIR}/FREEBSDGCCIinc.zip ${WRKSRC}/../moz/zipped/
|
||||
@${CP} ${WRKDIR}/FREEBSDGCCIlib.zip ${WRKSRC}/../moz/zipped/
|
||||
@${CP} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKSRC}/../moz/zipped/
|
||||
|
||||
register-mozilla:
|
||||
.if exists(${WRKDIR}/mozilla-runtime)
|
||||
@${RM} -rf ${WRKDIR}/mozilla-runtime
|
||||
.endif
|
||||
@${MKDIR} ${WRKDIR}/mozilla-runtime
|
||||
@cd ${WRKDIR}/mozilla-runtime && ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIruntime.zip
|
||||
@cd ${WRKDIR}/mozilla-runtime && ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIlib.zip
|
||||
@${CP} ${WRKDIR}/mozilla/work/mozilla/dist/bin/regxpcom ${WRKDIR}/mozilla-runtime/
|
||||
@-${RM} ${WRKDIR}/mozilla-runtime/components/component.reg
|
||||
@cd ${WRKDIR}/mozilla-runtime && export MOZILLA_FIVE_HOME=. \
|
||||
&& export LD_LIBRARY_PATH=.:./lib && ./regxpcom
|
||||
@${CP} ${WRKDIR}/mozilla-runtime/components/xpti.dat \
|
||||
${WRKDIR}/mozilla-runtime/components/xptitemp.dat
|
||||
@${RM} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKDIR}/mozilla-runtime/regxpcom
|
||||
@cd ${WRKDIR}/mozilla-runtime && ${FIND} . -type f \
|
||||
| ${ZIP} ${WRKDIR}/FREEBSDGCCIruntime.zip -@
|
||||
|
||||
mozilla:
|
||||
@${MAKE} extract-mozilla
|
||||
@${MAKE} patch-mozilla
|
||||
@${MAKE} build-mozilla
|
||||
@${MAKE} register-mozilla
|
||||
@${MAKE} install-mozilla
|
||||
.include <${FILESDIR}/Makefile.mozilla>
|
||||
|
||||
do-build:
|
||||
.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIruntime.zip)
|
||||
.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIlib.zip)
|
||||
.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIinc.zip)
|
||||
.if !exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIruntime.zip)
|
||||
.if !exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIlib.zip)
|
||||
.if !exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIinc.zip)
|
||||
@${MAKE} mozilla
|
||||
.endif
|
||||
.endif
|
||||
@ -459,28 +234,25 @@ do-build:
|
||||
${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
|
||||
@sleep 5
|
||||
.endif
|
||||
@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ./bootstrap
|
||||
.if defined(L10NHELP)
|
||||
@cd ${WRKSRC}/.. ; PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ./bootstrap
|
||||
.if defined(L10NHELP) || defined(ALL_LOCALIZED_LANGS)
|
||||
@${MKDIR} ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck
|
||||
@${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck
|
||||
.endif
|
||||
.if !defined(DISPLAY)
|
||||
@cd ${WRKSRC}/.. && DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
|
||||
${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}'
|
||||
@cd ${WRKSRC}/.. ; DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ; \
|
||||
${TCSH} -c 'source FreeBSDEnv.Set ; unsetenv TOP ; ${BUILD}'
|
||||
@-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
|
||||
@${RM} -f ${WRKDIR}/.Xvfb.pid
|
||||
.else
|
||||
@cd ${WRKSRC}/.. && DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
|
||||
${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}'
|
||||
@cd ${WRKSRC}/.. ; DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ; \
|
||||
${TCSH} -c 'source FreeBSDEnv.Set ; unsetenv TOP ; ${BUILD}'
|
||||
.endif
|
||||
.if defined(LANG_PKGNAME)
|
||||
@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
|
||||
${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && cd instsetoo/util && ${BUILD} LANGEXT=${LANG_EXT}'
|
||||
@cd ${WRKSRC}/.. ; PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ; \
|
||||
${TCSH} -c 'source FreeBSDEnv.Set ; unsetenv TOP ; cd instsetoo/util ; ${BUILD} LANGEXT=${LANG_EXT}'
|
||||
.endif
|
||||
|
||||
pre-install:
|
||||
@${MKDIR} ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/bin/${LANG_EXT}/osl/
|
||||
|
||||
do-install:
|
||||
.if !defined(DISPLAY)
|
||||
#
|
||||
@ -504,11 +276,10 @@ post-install:
|
||||
@${ECHO_MSG} "===> Add wrapper scripts";
|
||||
@${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/
|
||||
@${CP} ${FILESDIR}/freebsd-local.sh ${WRKDIR}/
|
||||
@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \
|
||||
@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
|
||||
-e 's#%%LANG%%#${USE_LANG}#g' \
|
||||
-e 's#%%BUILD_NR%%#${BUILD_NR}#g' \
|
||||
-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
|
||||
-e 's#%%FRELEASE_NR%%#${FRELEASE_NR}#g' \
|
||||
${WRKDIR}/openoffice-wrapper \
|
||||
${WRKDIR}/freebsd-local.sh
|
||||
@${INSTALL_SCRIPT} ${WRKDIR}/openoffice-wrapper \
|
||||
@ -525,15 +296,15 @@ post-install:
|
||||
@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-spadmin
|
||||
@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sweb
|
||||
@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-swriter
|
||||
@cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice-${RELEASE_NR} > ${TMPPLIST}
|
||||
@cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice-${RELEASE_NR} >> ${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
|
||||
@cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} openoffice-${RELEASE_NR} > ${TMPPLIST}
|
||||
@cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} openoffice-${RELEASE_NR} >> ${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}
|
||||
|
||||
package-rename:
|
||||
@${ECHO_MSG} "===> Rename package for OO.org mirror upload";
|
||||
@${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}
|
||||
@ -546,29 +317,20 @@ package-rename:
|
||||
.endif
|
||||
|
||||
sdk:
|
||||
@${ECHO_MSG} "===> Make SDK of OpenOffice.org"
|
||||
@${ECHO_MSG} "===> Make SDK of OOo"
|
||||
.if !defined(DISPLAY)
|
||||
@cd ${WRKSRC}/.. && DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
|
||||
${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && cd sdk_oo && build.pl && deliver.pl'
|
||||
@cd ${WRKSRC}/.. ; DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ; \
|
||||
${TCSH} -c 'source FreeBSDEnv.Set ; unsetenv TOP ; cd sdk_oo ; build.pl ; deliver.pl'
|
||||
@-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
|
||||
@${RM} -f ${WRKDIR}/.Xvfb.pid
|
||||
.else
|
||||
@cd ${WRKSRC}/.. && DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
|
||||
${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && cd sdk_oo && build.pl && deliver.pl'
|
||||
@cd ${WRKSRC}/.. ; DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ; \
|
||||
${TCSH} -c 'source FreeBSDEnv.Set ; unsetenv TOP ; cd sdk_oo ; build.pl ; deliver.pl'
|
||||
.endif
|
||||
${MV} ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/bin/OpenOffice.org${FRELEASE_NR}_SDK.tar.gz ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel_sdk.tar.gz
|
||||
@${MV} ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/bin/OpenOffice.org${RELEASE_NR}_SDK.tar.gz ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel_sdk.tar.gz
|
||||
|
||||
solver:
|
||||
@${ECHO_MSG} "===> Make Solver of OpenOffice.org"
|
||||
@${ECHO_MSG} "===> Make Solver of OOo"
|
||||
@cd ${WRKSRC}/.. ; ${TAR} cfz ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel_solver.tar.gz solver
|
||||
|
||||
update:
|
||||
@${MAKE} fetch
|
||||
@${MAKE} extract
|
||||
@cd ${WRKSRC}/.. && for dir in *; do \
|
||||
if [ -d $$dir ]; then \
|
||||
cd $$dir; cvs update -d; cd ..; \
|
||||
fi \
|
||||
done
|
||||
|
||||
.include <bsd.port.post.mk>
|
||||
|
||||
@ -2,11 +2,6 @@
|
||||
#
|
||||
# $FreeBSD $
|
||||
|
||||
if [ -e $HOME/.sversionrc ]; then
|
||||
OOHOME=`grep %%FRELEASE_NR%% $HOME/.sversionrc \
|
||||
| sed -e 's/.*file:\/\///'`
|
||||
fi
|
||||
|
||||
save_common_xcu() {
|
||||
sed 's/^X//' > $OOHOME/tmp/Common.xcu << 'END-of-Common.xcu'
|
||||
X<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
@ -1,45 +0,0 @@
|
||||
--- /dev/null 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ ../goodies/source/filter.vcl/egif/giflzwc_disabled.cxx 2002-08-15 15:09:47.000000000 +0200
|
||||
@@ -0,0 +1,42 @@
|
||||
+/**********************************
|
||||
+ * This code is copied from giflzwc.cxx, with the patented LZW compression code removed.
|
||||
+ **********************************/
|
||||
+
|
||||
+//#include <tools/stream.hxx>
|
||||
+#include "giflzwc.hxx"
|
||||
+
|
||||
+// --------------------
|
||||
+// - GIFLZWCompressor -
|
||||
+// --------------------
|
||||
+
|
||||
+GIFLZWCompressor::GIFLZWCompressor()
|
||||
+{
|
||||
+ pIDOS=NULL;
|
||||
+}
|
||||
+
|
||||
+// ------------------------------------------------------------------------
|
||||
+
|
||||
+GIFLZWCompressor::~GIFLZWCompressor()
|
||||
+{
|
||||
+}
|
||||
+
|
||||
+// ------------------------------------------------------------------------
|
||||
+
|
||||
+void GIFLZWCompressor::StartCompression( SvStream& rGIF, USHORT nPixelSize )
|
||||
+{
|
||||
+ /********************** DISABLED *************************/
|
||||
+}
|
||||
+
|
||||
+// ------------------------------------------------------------------------
|
||||
+
|
||||
+void GIFLZWCompressor::Compress( HPBYTE pSrc, ULONG nSize )
|
||||
+{
|
||||
+ /********************** DISABLED *************************/
|
||||
+}
|
||||
+
|
||||
+// ------------------------------------------------------------------------
|
||||
+
|
||||
+void GIFLZWCompressor::EndCompression()
|
||||
+{
|
||||
+ /********************** DISABLED *************************/
|
||||
+}
|
||||
@ -1,11 +0,0 @@
|
||||
--- ../goodies/source/filter.vcl/egif/makefile.mk.orig Tue Aug 14 23:22:54 2001
|
||||
+++ ../goodies/source/filter.vcl/egif/makefile.mk Mon Apr 14 06:04:55 2003
|
||||
@@ -89,7 +89,7 @@
|
||||
|
||||
SLOFILES= $(SLO)$/egif.obj \
|
||||
$(SLO)$/dlgegif.obj \
|
||||
- $(SLO)$/giflzwc.obj
|
||||
+ $(SLO)$/giflzwc_disabled.obj
|
||||
|
||||
|
||||
# ==========================================================================
|
||||
@ -1,8 +1,8 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-1.1-devel/files/Attic/openoffice-wrapper,v 1.12 2003-09-25 22:43:58 mbr Exp $
|
||||
# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-1.1-devel/files/Attic/openoffice-wrapper,v 1.13 2004-07-31 04:06:32 maho Exp $
|
||||
|
||||
oopath=%%PREFIX%%/OpenOffice.org%%FRELEASE_NR%%/program/
|
||||
oopath=%%PREFIX%%/OpenOffice.org%%RELEASE_NR%%/program/
|
||||
program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%-||'`
|
||||
|
||||
case $program in
|
||||
|
||||
@ -1,214 +0,0 @@
|
||||
--- ../svx/source/svrtf/rtfitem.cxx 24 Jun 2003 07:48:56 -0000 1.18
|
||||
+++ ../svx/source/svrtf/rtfitem.cxx 25 Jul 2003 22:54:24 -0000
|
||||
@@ -285,11 +285,20 @@
|
||||
}
|
||||
else
|
||||
{
|
||||
- if( LOW_CHARTYPE == eType || HIGH_CHARTYPE == eType )
|
||||
+// if( LOW_CHARTYPE == eType || HIGH_CHARTYPE == eType ) //Takashi Ono for CJK
|
||||
+ if( LOW_CHARTYPE == eType )
|
||||
{
|
||||
if( *pNormal )
|
||||
{
|
||||
rItem.SetWhich( *pNormal );
|
||||
+ rSet.Put( rItem );
|
||||
+ }
|
||||
+ }
|
||||
+ else if( HIGH_CHARTYPE == eType )
|
||||
+ {
|
||||
+ if( *pCTL )
|
||||
+ {
|
||||
+ rItem.SetWhich( *pCTL );
|
||||
rSet.Put( rItem );
|
||||
}
|
||||
}
|
||||
--- ../svx/source/svrtf/svxrtf.cxx 19 May 2003 12:30:59 -0000 1.15
|
||||
+++ ../svx/source/svrtf/svxrtf.cxx 25 Jul 2003 22:54:29 -0000
|
||||
@@ -583,8 +583,14 @@
|
||||
|
||||
case RTF_FCHARSET:
|
||||
if( -1 != nTokenValue )
|
||||
- pFont->SetCharSet( rtl_getTextEncodingFromWindowsCharset(
|
||||
- (BYTE)nTokenValue ) );
|
||||
+ {
|
||||
+// pFont->SetCharSet( rtl_getTextEncodingFromWindowsCharset(
|
||||
+// (BYTE)nTokenValue ) );
|
||||
+ CharSet nCharSet =
|
||||
+ rtl_getTextEncodingFromWindowsCharset( (BYTE)nTokenValue );
|
||||
+ pFont->SetCharSet( nCharSet );
|
||||
+ SetEncoding( nCharSet ); //Takashi Ono
|
||||
+ }
|
||||
break;
|
||||
|
||||
case RTF_FPRQ:
|
||||
--- ../sw/source/filter/rtf/swparrtf.cxx 4 Jun 2003 10:19:09 -0000 1.28
|
||||
+++ ../sw/source/filter/rtf/swparrtf.cxx 25 Jul 2003 22:54:37 -0000
|
||||
@@ -3231,10 +3231,156 @@
|
||||
SetSwgValues( rCollSet );
|
||||
}
|
||||
|
||||
+//Takashi Ono for CJK
|
||||
+String SwRTFParser::XlateFmtColName( const String &rName )
|
||||
+{
|
||||
+#define RES_NONE RES_POOLCOLL_DOC_END
|
||||
+
|
||||
+ static const RES_POOL_COLLFMT_TYPE aArr[]={
|
||||
+ RES_POOLCOLL_STANDARD, RES_POOLCOLL_HEADLINE1, RES_POOLCOLL_HEADLINE2,
|
||||
+ RES_POOLCOLL_HEADLINE3, RES_POOLCOLL_HEADLINE4, RES_POOLCOLL_HEADLINE5,
|
||||
+ RES_POOLCOLL_HEADLINE6, RES_POOLCOLL_HEADLINE7, RES_POOLCOLL_HEADLINE8,
|
||||
+ RES_POOLCOLL_HEADLINE9,
|
||||
+
|
||||
+ RES_POOLCOLL_TOX_IDX1, RES_POOLCOLL_TOX_IDX2, RES_POOLCOLL_TOX_IDX3,
|
||||
+ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE,
|
||||
+ RES_POOLCOLL_TOX_CNTNT1,
|
||||
+
|
||||
+ RES_POOLCOLL_TOX_CNTNT2, RES_POOLCOLL_TOX_CNTNT3, RES_POOLCOLL_TOX_CNTNT4,
|
||||
+ RES_POOLCOLL_TOX_CNTNT5, RES_POOLCOLL_TOX_CNTNT6, RES_POOLCOLL_TOX_CNTNT7,
|
||||
+ RES_POOLCOLL_TOX_CNTNT8, RES_POOLCOLL_TOX_CNTNT9,
|
||||
+ RES_NONE, RES_POOLCOLL_FOOTNOTE,
|
||||
+
|
||||
+ RES_NONE, RES_POOLCOLL_HEADER, RES_POOLCOLL_FOOTER, RES_POOLCOLL_TOX_IDXH,
|
||||
+ RES_NONE, RES_NONE, RES_POOLCOLL_JAKETADRESS, RES_POOLCOLL_SENDADRESS,
|
||||
+ RES_NONE, RES_NONE,
|
||||
+
|
||||
+ RES_NONE, RES_NONE, RES_NONE, RES_POOLCOLL_ENDNOTE, RES_NONE, RES_NONE, RES_NONE,
|
||||
+ RES_POOLCOLL_LISTS_BEGIN, RES_NONE, RES_NONE,
|
||||
+
|
||||
+ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE,
|
||||
+ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE,
|
||||
+
|
||||
+ RES_NONE,RES_NONE, RES_POOLCOLL_DOC_TITEL, RES_NONE, RES_POOLCOLL_SIGNATURE, RES_NONE,
|
||||
+ RES_POOLCOLL_TEXT, RES_POOLCOLL_TEXT_MOVE, RES_NONE, RES_NONE,
|
||||
+
|
||||
+ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_POOLCOLL_DOC_SUBTITEL };
|
||||
+ static const sal_Char *stiName[] = {
|
||||
+ "Normal",
|
||||
+ "heading 1",
|
||||
+ "heading 2",
|
||||
+ "heading 3",
|
||||
+ "heading 4",
|
||||
+ "heading 5",
|
||||
+ "heading 6",
|
||||
+ "heading 7",
|
||||
+ "heading 8",
|
||||
+ "heading 9",
|
||||
+ "index 1",
|
||||
+ "index 2",
|
||||
+ "index 3",
|
||||
+ "index 4",
|
||||
+ "index 5",
|
||||
+ "index 6",
|
||||
+ "index 7",
|
||||
+ "index 8",
|
||||
+ "index 9",
|
||||
+ "toc 1",
|
||||
+ "toc 2",
|
||||
+ "toc 3",
|
||||
+ "toc 4",
|
||||
+ "toc 5",
|
||||
+ "toc 6",
|
||||
+ "toc 7",
|
||||
+ "toc 8",
|
||||
+ "toc 9",
|
||||
+ "Normal Indent",
|
||||
+ "footnote text",
|
||||
+ "annotation text",
|
||||
+ "header",
|
||||
+ "footer",
|
||||
+ "index heading",
|
||||
+ "caption",
|
||||
+ "table of figures",
|
||||
+ "envelope address",
|
||||
+ "envelope return",
|
||||
+ "footnote reference",
|
||||
+ "annotation reference",
|
||||
+ "line number",
|
||||
+ "page number",
|
||||
+ "endnote reference",
|
||||
+ "endnote text",
|
||||
+ "table of authorities",
|
||||
+ "macro",
|
||||
+ "toa heading",
|
||||
+ "List",
|
||||
+ "List Bullet",
|
||||
+ "List Number",
|
||||
+ "List 2",
|
||||
+ "List 3",
|
||||
+ "List 4",
|
||||
+ "List 5",
|
||||
+ "List Bullet 2",
|
||||
+ "List Bullet 3",
|
||||
+ "List Bullet 4",
|
||||
+ "List Bullet 5",
|
||||
+ "List Number 2",
|
||||
+ "List Number 3",
|
||||
+ "List Number 4",
|
||||
+ "List Number 5",
|
||||
+ "Title",
|
||||
+ "Closing",
|
||||
+ "Signature",
|
||||
+ "Default Paragraph Font",
|
||||
+ "Body Text",
|
||||
+ "Body Text Indent",
|
||||
+ "List Continue",
|
||||
+ "List Continue 2",
|
||||
+ "List Continue 3",
|
||||
+ "List Continue 4",
|
||||
+ "List Continue 5",
|
||||
+ "Message Header",
|
||||
+ "Subtitle",
|
||||
+ };
|
||||
+
|
||||
+
|
||||
+ ASSERT( ( sizeof( aArr ) / sizeof( RES_POOL_COLLFMT_TYPE ) == 75 ),
|
||||
+ "Style-UEbersetzungstabelle hat falsche Groesse" );
|
||||
+ ASSERT( ( sizeof( stiName ) / sizeof( *stiName ) == 75 ),
|
||||
+ "Style-UEbersetzungstabelle hat falsche Groesse" );
|
||||
+
|
||||
+ RES_POOL_COLLFMT_TYPE nId = RES_NONE;
|
||||
+
|
||||
+ for (int i = 0; i < sizeof( stiName ) / sizeof( *stiName ); i++)
|
||||
+ {
|
||||
+ if ( rName == String( stiName[i], RTL_TEXTENCODING_MS_1252 ) )
|
||||
+ {
|
||||
+ nId = aArr[i];
|
||||
+ break;
|
||||
+ }
|
||||
+ }
|
||||
+ USHORT nResId;
|
||||
+ if( RES_POOLCOLL_TEXT_BEGIN <= nId && nId < RES_POOLCOLL_TEXT_END )
|
||||
+ nResId = RC_POOLCOLL_TEXT_BEGIN - RES_POOLCOLL_TEXT_BEGIN;
|
||||
+ else if (RES_POOLCOLL_LISTS_BEGIN <= nId && nId < RES_POOLCOLL_LISTS_END)
|
||||
+ nResId = RC_POOLCOLL_LISTS_BEGIN - RES_POOLCOLL_LISTS_BEGIN;
|
||||
+ else if (RES_POOLCOLL_EXTRA_BEGIN <= nId && nId < RES_POOLCOLL_EXTRA_END)
|
||||
+ nResId = RC_POOLCOLL_EXTRA_BEGIN - RES_POOLCOLL_EXTRA_BEGIN;
|
||||
+ else if (RES_POOLCOLL_REGISTER_BEGIN <= nId && nId < RES_POOLCOLL_REGISTER_END)
|
||||
+ nResId = RC_POOLCOLL_REGISTER_BEGIN - RES_POOLCOLL_REGISTER_BEGIN;
|
||||
+ else if (RES_POOLCOLL_DOC_BEGIN <= nId && nId < RES_POOLCOLL_DOC_END)
|
||||
+ nResId = RC_POOLCOLL_DOC_BEGIN - RES_POOLCOLL_DOC_BEGIN;
|
||||
+ else if (RES_POOLCOLL_HTML_BEGIN <= nId && nId < RES_POOLCOLL_HTML_END)
|
||||
+ nResId = RC_POOLCOLL_HTML_BEGIN - RES_POOLCOLL_HTML_BEGIN;
|
||||
+ return String( ResId( nResId + nId, pSwResMgr ) );
|
||||
+}
|
||||
+
|
||||
SwTxtFmtColl* SwRTFParser::MakeStyle( USHORT nNo, const SvxRTFStyleType& rStyle )
|
||||
{
|
||||
- int bCollExist;
|
||||
- SwTxtFmtColl* pColl = MakeColl( rStyle.sName, USHORT(nNo),
|
||||
+ int bCollExist;
|
||||
+// SwTxtFmtColl* pColl = MakeColl( rStyle.sName, USHORT(nNo), //Takashi Ono for CJK
|
||||
+ SwTxtFmtColl* pColl = MakeColl( XlateFmtColName( rStyle.sName ),
|
||||
+ USHORT(nNo),
|
||||
rStyle.nOutlineNo, bCollExist );
|
||||
aTxtCollTbl.Insert( nNo, pColl );
|
||||
|
||||
--- ../sw/source/filter/rtf/swparrtf.hxx 19 May 2003 12:25:34 -0000 1.10
|
||||
+++ ../sw/source/filter/rtf/swparrtf.hxx 25 Jul 2003 22:54:44 -0000
|
||||
@@ -364,6 +364,7 @@
|
||||
void SetStyleAttr( SfxItemSet& rCollSet,
|
||||
const SfxItemSet& rStyleSet,
|
||||
const SfxItemSet& rDerivedSet );
|
||||
+ String XlateFmtColName( const String &rName ); //Takashi Ono for CJK
|
||||
SwTxtFmtColl* MakeStyle( USHORT nNo, const SvxRTFStyleType& rStyle );
|
||||
SwCharFmt* MakeCharStyle( USHORT nNo, const SvxRTFStyleType& rStyle );
|
||||
void MakeStyleTab();
|
||||
@ -1,13 +0,0 @@
|
||||
--- ../sal/textenc/tencinfo.c.orig Fri Apr 11 16:25:01 2003
|
||||
+++ ../sal/textenc/tencinfo.c Sat May 31 23:33:43 2003
|
||||
@@ -668,6 +668,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 },
|
||||
@ -1,11 +0,0 @@
|
||||
http://www.openoffice.org/issues/show_bug.cgi?id=29286
|
||||
--- ../solenv/bin/deliver.pl.old Mon May 10 18:46:11 2004
|
||||
+++ ../solenv/bin/deliver.pl Tue May 18 09:10:47 2004
|
||||
@@ -138,6 +138,7 @@
|
||||
};
|
||||
$strip = '/usr/ccs/bin/strip' if ( $^O eq 'solaris' );
|
||||
$strip = 'strip' if ( $^O eq "darwin" );
|
||||
+$strip = 'strip' if ( $^O eq "freebsd" );
|
||||
$upd = $ENV{'UPD'};
|
||||
($gui = lc($ENV{GUI})) || die "can't determine GUI";
|
||||
|
||||
@ -1,21 +0,0 @@
|
||||
--- ../sw/source/filter/ww8/ww8par.cxx 9 Jul 2003 11:06:44 -0000 1.114
|
||||
+++ ../sw/source/filter/ww8/ww8par.cxx 25 Jul 2003 22:55:23 -0000
|
||||
@@ -2015,7 +2015,7 @@
|
||||
bool bStartAttr = pPlcxMan->Get(&aRes); // hole Attribut-Pos
|
||||
aRes.nAktCp = rTxtPos; // Akt. Cp-Pos
|
||||
|
||||
- if ((aRes.nFlags & MAN_MASK_NEW_SEP) && !bIgnoreText) // neue Section
|
||||
+ if ((aRes.nFlags & MAN_MASK_NEW_SEP) || maSectionManager.empty()) // neue Section
|
||||
{
|
||||
ASSERT(pPaM->GetNode()->GetTxtNode(), "Missing txtnode");
|
||||
// PageDesc erzeugen und fuellen
|
||||
--- ../sw/source/filter/ww8/ww8par.hxx 30 Jun 2003 15:54:37 -0000 1.115
|
||||
+++ ../sw/source/filter/ww8/ww8par.hxx 25 Jul 2003 22:55:28 -0000
|
||||
@@ -720,6 +720,7 @@
|
||||
short GetPageLeft() const;
|
||||
short GetPageRight() const;
|
||||
short GetPageWidth() const;
|
||||
+ bool empty() const { return maSegments.empty(); }
|
||||
};
|
||||
|
||||
class wwFrameNamer
|
||||
@ -1,53 +0,0 @@
|
||||
--- ../sw/source/filter/ww8/ww8par.cxx 9 Jul 2003 11:06:44 -0000 1.114
|
||||
+++ ../sw/source/filter/ww8/ww8par.cxx 25 Jul 2003 22:54:52 -0000
|
||||
@@ -1774,11 +1774,20 @@
|
||||
if (nUCode >= 0x3000) //0x8000 ?
|
||||
{
|
||||
sal_Char aTest[2];
|
||||
- aTest[0] = (nUCode & 0xFF00) >> 8;
|
||||
- aTest[1] = (nUCode & 0x00FF);
|
||||
- String aTemp(aTest, 2, eSrcCharSet);
|
||||
- ASSERT(aTemp.Len() == 1, "so much for that theory");
|
||||
- *pWork = aTemp.GetChar(0);
|
||||
+ if (nUCode >= 0x3000)
|
||||
+ {
|
||||
+ aTest[0] = (nUCode & 0xFF00) >> 8;
|
||||
+ aTest[1] = (nUCode & 0x00FF);
|
||||
+ String aTemp(aTest, 2, eSrcCharSet);
|
||||
+ ASSERT(aTemp.Len() == 1, "so much for that theory");
|
||||
+ *pWork = aTemp.GetChar(0);
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ aTest[0] = (nUCode & 0x00FF);
|
||||
+ String aTemp(aTest, 1, eSrcCharSet);
|
||||
+ *pWork = aTemp.GetChar(0);
|
||||
+ }
|
||||
}
|
||||
else
|
||||
{
|
||||
--- ../sw/source/filter/ww8/ww8par6.cxx 20 Jun 2003 09:38:07 -0000 1.138
|
||||
+++ ../sw/source/filter/ww8/ww8par6.cxx 25 Jul 2003 22:55:05 -0000
|
||||
@@ -3373,9 +3373,11 @@
|
||||
nId = RES_CHRATR_CTL_FONT;
|
||||
break;
|
||||
case 93:
|
||||
+ case 111:
|
||||
case 0x4a4f:
|
||||
nId = RES_CHRATR_FONT;
|
||||
break;
|
||||
+ case 112:
|
||||
case 0x4a50:
|
||||
nId = RES_CHRATR_CJK_FONT;
|
||||
break;
|
||||
@@ -5104,8 +5106,8 @@
|
||||
//percentage to grow hps short
|
||||
{110, (FNReadRecord)0}, //"sprmCCondHyhen", chp.ysri
|
||||
//ysri short
|
||||
- {111, &SwWW8ImplReader::Read_BoldBiDiUsw}, //"111 bidi bold ?",
|
||||
- {112, &SwWW8ImplReader::Read_BoldBiDiUsw}, //"112 bidi italic ?",
|
||||
+ {111, &SwWW8ImplReader::Read_FontCode}, //ww7 font
|
||||
+ {112, &SwWW8ImplReader::Read_FontCode}, //ww7 CJK font
|
||||
{113, &SwWW8ImplReader::Read_FontCode}, //ww7 rtl font
|
||||
{114, (FNReadRecord)0}, //"??114",
|
||||
{115, &SwWW8ImplReader::Read_TxtColor}, //ww7 rtl colour ?
|
||||
@ -1,312 +0,0 @@
|
||||
--- ../svtools/source/svrtf/rtfout.cxx.orig 2000-10-16 18:13:46.000000000 +0900
|
||||
+++ ../svtools/source/svrtf/rtfout.cxx 2003-09-23 12:41:00.000000000 +0900
|
||||
@@ -124,8 +124,9 @@
|
||||
default:
|
||||
{
|
||||
sal_Unicode cCh = c;
|
||||
- c = (BYTE)ByteString::ConvertFromUnicode( c, eDestEnc, FALSE );
|
||||
- if( !c )
|
||||
+ rtl::OString buff( &c, 1, eDestEnc, RTL_UNICODETOTEXT_FLAGS_UNDEFINED_IGNORE|RTL_UNICODETOTEXT_FLAGS_INVALID_IGNORE );
|
||||
+// c = (BYTE)ByteString::ConvertFromUnicode( c, eDestEnc, FALSE );
|
||||
+ if( !buff.getLength() )
|
||||
{
|
||||
// then write as unicode - character
|
||||
if( 0xFF < cCh )
|
||||
@@ -141,8 +142,8 @@
|
||||
break;
|
||||
}
|
||||
|
||||
- if( !bWriteHelpFile )
|
||||
- switch( c )
|
||||
+ if( !bWriteHelpFile && buff.getLength() == 1 )
|
||||
+ switch( BYTE(buff[0]) )
|
||||
{
|
||||
#ifdef MAC
|
||||
case 0xa5: pStr = sRTF_BULLET; break;
|
||||
@@ -164,6 +165,9 @@
|
||||
// MAC
|
||||
}
|
||||
if( !pStr )
|
||||
+ for (int i = 0; i < buff.getLength(); ++i)
|
||||
+ {
|
||||
+ c = BYTE(buff[i]);
|
||||
switch ( c )
|
||||
{
|
||||
case '\\':
|
||||
@@ -186,6 +190,7 @@
|
||||
}
|
||||
break;
|
||||
}
|
||||
+ }
|
||||
}
|
||||
break;
|
||||
}
|
||||
--- ../sw/source/filter/rtf/wrtrtf.cxx.orig 2003-04-18 00:00:28.000000000 +0900
|
||||
+++ ../sw/source/filter/rtf/wrtrtf.cxx 2003-09-23 23:33:08.000000000 +0900
|
||||
@@ -184,6 +184,12 @@
|
||||
#ifndef _CHARFMT_HXX
|
||||
#include <charfmt.hxx>
|
||||
#endif
|
||||
+#ifndef _POOLFMT_HXX
|
||||
+#include <poolfmt.hxx>
|
||||
+#endif
|
||||
+#ifndef _SWSTYLENAMEMAPPER_HXX
|
||||
+#include <SwStyleNameMapper.hxx>
|
||||
+#endif
|
||||
#ifndef _SECTION_HXX //autogen
|
||||
#include <section.hxx>
|
||||
#endif
|
||||
@@ -215,7 +221,7 @@
|
||||
SV_IMPL_VARARR( RTFColorTbl, Color )
|
||||
|
||||
|
||||
-SwRTFWriter::SwRTFWriter( const String& rFltName )
|
||||
+SwRTFWriter::SwRTFWriter( const String& rFltName ) : eCurrentCharSet(DEF_ENCODING)
|
||||
{
|
||||
// schreibe Win-RTF-HelpFileFmt
|
||||
bWriteHelpFmt = 'W' == rFltName.GetChar( 0 );
|
||||
@@ -893,14 +899,14 @@
|
||||
// as alternative name. Because WinWord can't match each
|
||||
// font to a UniCode font. So the CJK texts are shown as
|
||||
// empty rectangles ;-(.
|
||||
- RTFOutFuncs::Out_String( rWrt.Strm(), sFntNm, DEF_ENCODING,
|
||||
+ RTFOutFuncs::Out_String( rWrt.Strm(), sFntNm, eChrSet,
|
||||
rWrt.bWriteHelpFmt );
|
||||
OutComment( rWrt, sRTF_FALT) << ' ';
|
||||
- RTFOutFuncs::Out_String( rWrt.Strm(), sAltNm, DEF_ENCODING,
|
||||
+ RTFOutFuncs::Out_String( rWrt.Strm(), sAltNm, eChrSet,
|
||||
rWrt.bWriteHelpFmt ) << '}';
|
||||
}
|
||||
else
|
||||
- RTFOutFuncs::Out_String( rWrt.Strm(), sFntNm, DEF_ENCODING,
|
||||
+ RTFOutFuncs::Out_String( rWrt.Strm(), sFntNm, eChrSet,
|
||||
rWrt.bWriteHelpFmt );
|
||||
rWrt.Strm() << ";}";
|
||||
}
|
||||
@@ -932,6 +938,139 @@
|
||||
|
||||
|
||||
|
||||
+//Takashi Ono for CJK
|
||||
+const rtl::OUString SwRTFWriter::XlateFmtName( const rtl::OUString &rName, SwGetPoolIdFromName eFlags )
|
||||
+{
|
||||
+#define RES_NONE RES_POOLCOLL_DOC_END
|
||||
+
|
||||
+ static const RES_POOL_COLLFMT_TYPE aArr[]={
|
||||
+ RES_POOLCOLL_STANDARD, RES_POOLCOLL_HEADLINE1, RES_POOLCOLL_HEADLINE2,
|
||||
+ RES_POOLCOLL_HEADLINE3, RES_POOLCOLL_HEADLINE4, RES_POOLCOLL_HEADLINE5,
|
||||
+ RES_POOLCOLL_HEADLINE6, RES_POOLCOLL_HEADLINE7, RES_POOLCOLL_HEADLINE8,
|
||||
+ RES_POOLCOLL_HEADLINE9,
|
||||
+
|
||||
+ RES_POOLCOLL_TOX_IDX1, RES_POOLCOLL_TOX_IDX2, RES_POOLCOLL_TOX_IDX3,
|
||||
+ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE,
|
||||
+ RES_POOLCOLL_TOX_CNTNT1,
|
||||
+
|
||||
+ RES_POOLCOLL_TOX_CNTNT2, RES_POOLCOLL_TOX_CNTNT3, RES_POOLCOLL_TOX_CNTNT4,
|
||||
+ RES_POOLCOLL_TOX_CNTNT5, RES_POOLCOLL_TOX_CNTNT6, RES_POOLCOLL_TOX_CNTNT7,
|
||||
+ RES_POOLCOLL_TOX_CNTNT8, RES_POOLCOLL_TOX_CNTNT9,
|
||||
+ RES_POOLCOLL_TEXT_IDENT, RES_POOLCOLL_FOOTNOTE,
|
||||
+
|
||||
+ RES_NONE, RES_POOLCOLL_HEADER, RES_POOLCOLL_FOOTER, RES_POOLCOLL_TOX_IDXH,
|
||||
+ RES_POOLCOLL_LABEL, RES_POOLCOLL_TOX_ILLUSH, RES_POOLCOLL_JAKETADRESS, RES_POOLCOLL_SENDADRESS,
|
||||
+ RES_NONE, RES_NONE,
|
||||
+
|
||||
+ RES_NONE, RES_NONE, RES_NONE, RES_POOLCOLL_ENDNOTE, RES_POOLCOLL_TOX_AUTHORITIESH, RES_NONE, RES_NONE,
|
||||
+ RES_POOLCOLL_BUL_LEVEL1, RES_POOLCOLL_BUL_LEVEL1, RES_POOLCOLL_NUM_LEVEL1,
|
||||
+
|
||||
+ RES_POOLCOLL_BUL_LEVEL2, RES_POOLCOLL_BUL_LEVEL3, RES_POOLCOLL_BUL_LEVEL4, RES_POOLCOLL_BUL_LEVEL5,
|
||||
+ RES_POOLCOLL_BUL_LEVEL2, RES_POOLCOLL_BUL_LEVEL3, RES_POOLCOLL_BUL_LEVEL4, RES_POOLCOLL_BUL_LEVEL5,
|
||||
+ RES_POOLCOLL_NUM_LEVEL2, RES_POOLCOLL_NUM_LEVEL3, RES_POOLCOLL_NUM_LEVEL4, RES_POOLCOLL_NUM_LEVEL5,
|
||||
+
|
||||
+ RES_POOLCOLL_DOC_TITEL, RES_NONE, RES_POOLCOLL_SIGNATURE, RES_NONE,
|
||||
+ RES_POOLCOLL_TEXT, RES_POOLCOLL_TEXT_MOVE, RES_NONE, RES_NONE,
|
||||
+
|
||||
+ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_POOLCOLL_DOC_SUBTITEL };
|
||||
+ static const sal_Char *stiName[] = {
|
||||
+ "Normal",
|
||||
+ "heading 1",
|
||||
+ "heading 2",
|
||||
+ "heading 3",
|
||||
+ "heading 4",
|
||||
+ "heading 5",
|
||||
+ "heading 6",
|
||||
+ "heading 7",
|
||||
+ "heading 8",
|
||||
+ "heading 9",
|
||||
+ "index 1",
|
||||
+ "index 2",
|
||||
+ "index 3",
|
||||
+ "index 4",
|
||||
+ "index 5",
|
||||
+ "index 6",
|
||||
+ "index 7",
|
||||
+ "index 8",
|
||||
+ "index 9",
|
||||
+ "toc 1",
|
||||
+ "toc 2",
|
||||
+ "toc 3",
|
||||
+ "toc 4",
|
||||
+ "toc 5",
|
||||
+ "toc 6",
|
||||
+ "toc 7",
|
||||
+ "toc 8",
|
||||
+ "toc 9",
|
||||
+ "Normal Indent",
|
||||
+ "footnote text",
|
||||
+ "annotation text",
|
||||
+ "header",
|
||||
+ "footer",
|
||||
+ "index heading",
|
||||
+ "caption",
|
||||
+ "table of figures",
|
||||
+ "envelope address",
|
||||
+ "envelope return",
|
||||
+ "footnote reference",
|
||||
+ "annotation reference",
|
||||
+ "line number",
|
||||
+ "page number",
|
||||
+ "endnote reference",
|
||||
+ "endnote text",
|
||||
+ "table of authorities",
|
||||
+ "macro",
|
||||
+ "toa heading",
|
||||
+ "List",
|
||||
+ "List Bullet",
|
||||
+ "List Number",
|
||||
+ "List 2",
|
||||
+ "List 3",
|
||||
+ "List 4",
|
||||
+ "List 5",
|
||||
+ "List Bullet 2",
|
||||
+ "List Bullet 3",
|
||||
+ "List Bullet 4",
|
||||
+ "List Bullet 5",
|
||||
+ "List Number 2",
|
||||
+ "List Number 3",
|
||||
+ "List Number 4",
|
||||
+ "List Number 5",
|
||||
+ "Title",
|
||||
+ "Closing",
|
||||
+ "Signature",
|
||||
+ "Default Paragraph Font",
|
||||
+ "Body Text",
|
||||
+ "Body Text Indent",
|
||||
+ "List Continue",
|
||||
+ "List Continue 2",
|
||||
+ "List Continue 3",
|
||||
+ "List Continue 4",
|
||||
+ "List Continue 5",
|
||||
+ "Message Header",
|
||||
+ "Subtitle",
|
||||
+ };
|
||||
+
|
||||
+
|
||||
+ ASSERT( ( sizeof( aArr ) / sizeof( RES_POOL_COLLFMT_TYPE ) == 75 ),
|
||||
+ "Style-UEbersetzungstabelle hat falsche Groesse" );
|
||||
+ ASSERT( ( sizeof( stiName ) / sizeof( *stiName ) == 75 ),
|
||||
+ "Style-UEbersetzungstabelle hat falsche Groesse" );
|
||||
+
|
||||
+ sal_uInt16 idcol = ::SwStyleNameMapper::GetPoolIdFromUIName( rName, eFlags );
|
||||
+
|
||||
+ for (int i = 0; i < sizeof( aArr ) / sizeof( *aArr ); i++)
|
||||
+ {
|
||||
+ if ( idcol == aArr[i] )
|
||||
+ {
|
||||
+ return rtl::OUString::createFromAscii(stiName[i]);
|
||||
+ }
|
||||
+ }
|
||||
+ return ::SwStyleNameMapper::GetProgName( idcol, String() );
|
||||
+}
|
||||
+
|
||||
+
|
||||
+
|
||||
void SwRTFWriter::OutRTFStyleTab()
|
||||
{
|
||||
// das 0-Style ist das Default, wird nie ausgegeben !!
|
||||
@@ -988,7 +1127,7 @@
|
||||
}
|
||||
|
||||
Strm() << ' ';
|
||||
- RTFOutFuncs::Out_String( Strm(), pColl->GetName(), DEF_ENCODING,
|
||||
+ RTFOutFuncs::Out_String( Strm(), XlateFmtName( pColl->GetName(), GET_POOLID_TXTCOLL ), DEF_ENCODING,
|
||||
bWriteHelpFmt ) << ";}" << SwRTFWriter::sNewLine;
|
||||
}
|
||||
|
||||
@@ -1015,8 +1154,8 @@
|
||||
}
|
||||
|
||||
Strm() << ' ';
|
||||
- RTFOutFuncs::Out_String( Strm(), pFmt->GetName(), DEF_ENCODING,
|
||||
- bWriteHelpFmt ) << ";}" << SwRTFWriter::sNewLine;
|
||||
+ RTFOutFuncs::Out_String( Strm(), XlateFmtName( pFmt->GetName(), GET_POOLID_CHRFMT ), DEF_ENCODING,
|
||||
+ bWriteHelpFmt ) << ";}" << SwRTFWriter::sNewLine;
|
||||
}
|
||||
|
||||
Strm() << '}';
|
||||
@@ -1217,8 +1356,8 @@
|
||||
break;
|
||||
Strm() << sRTF_PGDSCNXT;
|
||||
OutULong( i ) << ' ';
|
||||
- RTFOutFuncs::Out_String( Strm(), rPageDesc.GetName(),
|
||||
- DEF_ENCODING, bWriteHelpFmt ) << ";}";
|
||||
+ RTFOutFuncs::Out_String( Strm(), XlateFmtName( rPageDesc.GetName(), GET_POOLID_PAGEDESC ), DEF_ENCODING,
|
||||
+ bWriteHelpFmt ) << ";}";
|
||||
}
|
||||
Strm() << '}' << SwRTFWriter::sNewLine;
|
||||
bOutPageDesc = bOutPageDescTbl = FALSE;
|
||||
--- ../sw/source/filter/rtf/wrtrtf.hxx.orig 2002-07-31 19:18:50.000000000 +0900
|
||||
+++ ../sw/source/filter/rtf/wrtrtf.hxx 2003-09-23 23:37:50.000000000 +0900
|
||||
@@ -117,6 +117,7 @@
|
||||
USHORT nAktFlyPos; // Index auf das naechste "FlyFrmFmt"
|
||||
void OutRTFColorTab();
|
||||
void OutRTFFontTab();
|
||||
+ const rtl::OUString XlateFmtName( const rtl::OUString &rName, SwGetPoolIdFromName eFlags );
|
||||
void OutRTFStyleTab();
|
||||
void OutRTFListTab();
|
||||
|
||||
@@ -136,6 +137,8 @@
|
||||
USHORT nBkmkTabPos; // akt. Position in der Bookmark-Tabelle
|
||||
USHORT nCurScript; // actual scripttype
|
||||
|
||||
+ rtl_TextEncoding eCurrentCharSet;
|
||||
+
|
||||
#if defined(MAC) || defined(UNX)
|
||||
static const sal_Char sNewLine; // nur \012 oder \015
|
||||
#else
|
||||
--- ../sw/source/filter/rtf/rtfatr.cxx.orig 2003-05-19 21:24:46.000000000 +0900
|
||||
+++ ../sw/source/filter/rtf/rtfatr.cxx 2003-09-23 23:45:52.000000000 +0900
|
||||
@@ -1319,7 +1319,7 @@
|
||||
sURL = aTmp.GetFull();
|
||||
}
|
||||
*/ rWrt.Strm() << '\"';
|
||||
- RTFOutFuncs::Out_String( rWrt.Strm(), sURL, DEF_ENCODING,
|
||||
+ RTFOutFuncs::Out_String( rWrt.Strm(), sURL, rRTFWrt.eCurrentCharSet,
|
||||
rRTFWrt.bWriteHelpFmt ) << "\" ";
|
||||
sURL = aTmp.GetMark();
|
||||
}
|
||||
@@ -1328,7 +1328,7 @@
|
||||
{
|
||||
rWrt.Strm() << "\\\\l \"";
|
||||
sURL.Erase( 0, 1 );
|
||||
- RTFOutFuncs::Out_String( rWrt.Strm(), sURL, DEF_ENCODING,
|
||||
+ RTFOutFuncs::Out_String( rWrt.Strm(), sURL, rRTFWrt.eCurrentCharSet,
|
||||
rRTFWrt.bWriteHelpFmt ) << "\" ";
|
||||
}
|
||||
|
||||
@@ -1609,7 +1609,7 @@
|
||||
|
||||
if( nStrPos != nEnde )
|
||||
RTFOutFuncs::Out_Char( rWrt.Strm(), rStr.GetChar( nStrPos ),
|
||||
- DEF_ENCODING, rRTFWrt.bWriteHelpFmt );
|
||||
+ rRTFWrt.eCurrentCharSet, rRTFWrt.bWriteHelpFmt );
|
||||
}
|
||||
|
||||
// noch eine schliesende Klammer da ??
|
||||
@@ -2188,6 +2188,7 @@
|
||||
const sal_Char* pCmd = bAssoc ? sRTF_AF : sRTF_F;
|
||||
rWrt.Strm() << pCmd;
|
||||
rWrt.OutULong(rRTFWrt.GetId(rFont));
|
||||
+ rRTFWrt.eCurrentCharSet = rFont.GetCharSet();
|
||||
}
|
||||
return rWrt;
|
||||
}
|
||||
89
editors/openoffice-1.1-devel/files/pkg-message.de
Normal file
89
editors/openoffice-1.1-devel/files/pkg-message.de
Normal file
@ -0,0 +1,89 @@
|
||||
OpenOffice.org Version 1.1.2 Installationsanleitung
|
||||
|
||||
Geschrieben von: Martin Blapp <mbr@freebsd.org>
|
||||
|
||||
OpenOffice.org ist bald im Verzeichnis
|
||||
${PREFIX}/OpenOffice.org1.1.2/ installiert.
|
||||
|
||||
1 Benutzerinstallation
|
||||
----------------------
|
||||
|
||||
Nachdem der Port oder das Package installiert ist
|
||||
kann OO.org mit "openoffice" gestartet werden. Beim
|
||||
ersten Mal wird das OO.org Setup aufgerufen und in
|
||||
Ihrem Benutzerverzeichnis das Verzeichnis
|
||||
"OpenOffice.org1.1.2" angelegt. Ebenfalls werden
|
||||
Sie während des Setups nach einem installierten
|
||||
Java JDK gefragt.
|
||||
|
||||
Falls das Setup mit der Fehlermeldung abbricht, dass
|
||||
schon eine Version installiert sei (von einem vorherigen
|
||||
Installationsversuch), kann ein Blick in die Datei
|
||||
".sversionrc" helfen. In dieser Datei speichern Openoffice
|
||||
wie auch alle Staroffice Versionen Informationen ’…r die
|
||||
Installation ab. L šáhen Sie die problematische Zeile
|
||||
und die Installation wird nun funktionieren.
|
||||
|
||||
2 Start von OO.org
|
||||
------------------
|
||||
|
||||
Die FreeBSD-Version von OO.org installiert nun ein Skript
|
||||
zum schnellen Aufruf. Bitte fӋn Sie "${PREFIX}/bin/"
|
||||
zu Ihrer ENV-Variable PATH hinzu und sie werden OO.org
|
||||
einfacher aufrufen k ˜Žen:
|
||||
|
||||
${PREFIX}/bin/openoffice
|
||||
${PREFIX}/bin/openoffice-sagenda
|
||||
${PREFIX}/bin/openoffice-scalc
|
||||
${PREFIX}/bin/openoffice-sdraw
|
||||
${PREFIX}/bin/openoffice-setup
|
||||
${PREFIX}/bin/openoffice-sfax
|
||||
${PREFIX}/bin/openoffice-simpress
|
||||
${PREFIX}/bin/openoffice-spadmin
|
||||
${PREFIX}/bin/openoffice-sweb
|
||||
${PREFIX}/bin/openoffice-swriter
|
||||
|
||||
OO.org verlangt dass die ENV-Variable LANG auf einen
|
||||
brauchbaren Wert gesetzt ist. Wenn LANG nicht definiert
|
||||
ist, so verwendet das Startup-Skript eine Standard-Einstellung,
|
||||
Momentan wird "de_DE.ISO_8859-15" verwendet. Sie k ˜Žen diese
|
||||
Einstellung auch im Startup-Skript ändern.
|
||||
|
||||
Wenn Sie einen älteren X-Server vor der XFree86 Version 4.2
|
||||
verwenden, k ˜Žen Warnungen auftreten. Ignorieren Sie diese
|
||||
oder verwenden Sie eine neuere Version.
|
||||
|
||||
Falls US-ASCII verwendet wird, k ˜Žen Sie Dokumente mit
|
||||
Umlauten und Sonderzeichen im Dateinamen nicht mehr speichern
|
||||
und laden, und natšŒich werden Sie auch im OO.org keine
|
||||
dieser Zeichen mehr tippen k ˜Žen.
|
||||
|
||||
3 Setup Probleme (nur FreeBSD < 4.7-RELEASE)
|
||||
--------------------------------------------
|
||||
|
||||
Falls sich das Setup ’…r eine fehlende Datei mit Namen
|
||||
"setup.ins" beklagt, so ist es an der Zeit Ihr System auf
|
||||
die neueste FreeBSD-Version zu aktualisieren. FreeBSD
|
||||
4.7-RELEASE und neuer hat dieses Problem nicht.
|
||||
|
||||
4 Abstšše bei der URL-Leiste (nur FreeBSD < 4.7-RELEASE)
|
||||
---------------------------------------------------------
|
||||
|
||||
Bei älteren FreeBSD-Version als 4.7-RELEASE kann OO.org
|
||||
bei Eingaben in der URL-Leiste abstššen, falls ein nicht
|
||||
existierender Dateiname eingegeben wird. Der folgende
|
||||
Systempatch schafft Abhilfe:
|
||||
|
||||
http://people.freebsd.org/~mbr/ooo/rtld-symlookup.diff
|
||||
|
||||
5 Absturz nach dem Wechseln zu einer anderen Sprachversion
|
||||
----------------------------------------------------------
|
||||
|
||||
Falls Sie zuerst die englische Version von OO.org installiert
|
||||
haben und nachträglich auf eine andere Sprachversion gewechselt
|
||||
haben, so kann dies OO.org zum Absturz bringen.
|
||||
|
||||
Abhilfe schafft in diesem Fall nur das L šáhen des bestehenden
|
||||
OpenOffice.org1.1.2 Verzeichnisses und des entsprechenden
|
||||
Eintrags aus der Datei ".sversionrc" mit anschliessender neuer
|
||||
Benutzer-Installation.
|
||||
@ -1,4 +1,4 @@
|
||||
OpenOffice.org Build 1.1.1 Personal Install How-To
|
||||
OpenOffice.org Build 1.1.2 Personal Install How-To
|
||||
|
||||
Written by: Martin Blapp <mbr@freebsd.org>
|
||||
|
||||
@ -9,7 +9,7 @@ Just type "openoffice" after you have successfully
|
||||
installed the package. If there is no installed
|
||||
OO.org dir in hour homedir, you'll be prompted to
|
||||
install some files and choose a installed JDK.
|
||||
The setup installs a "OpenOffice.org1.1.0" folder
|
||||
The setup installs a "OpenOffice.org1.1.2" folder
|
||||
in your homedir.
|
||||
|
||||
If the setup tells you there is already an installed
|
||||
@ -26,16 +26,16 @@ 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-1.1
|
||||
${PREFIX}/bin/openoffice-1.1-sagenda
|
||||
${PREFIX}/bin/openoffice-1.1-scalc
|
||||
${PREFIX}/bin/openoffice-1.1-sdraw
|
||||
${PREFIX}/bin/openoffice-1.1-setup
|
||||
${PREFIX}/bin/openoffice-1.1-sfax
|
||||
${PREFIX}/bin/openoffice-1.1-simpress
|
||||
${PREFIX}/bin/openoffice-1.1-spadmin
|
||||
${PREFIX}/bin/openoffice-1.1-sweb
|
||||
${PREFIX}/bin/openoffice-1.1-swriter
|
||||
${PREFIX}/bin/openoffice-1.1.2
|
||||
${PREFIX}/bin/openoffice-1.1.2-sagenda
|
||||
${PREFIX}/bin/openoffice-1.1.2-scalc
|
||||
${PREFIX}/bin/openoffice-1.1.2-sdraw
|
||||
${PREFIX}/bin/openoffice-1.1.2-setup
|
||||
${PREFIX}/bin/openoffice-1.1.2-sfax
|
||||
${PREFIX}/bin/openoffice-1.1.2-simpress
|
||||
${PREFIX}/bin/openoffice-1.1.2-spadmin
|
||||
${PREFIX}/bin/openoffice-1.1.2-sweb
|
||||
${PREFIX}/bin/openoffice-1.1.2-swriter
|
||||
|
||||
OO.org does need $LANG to be set to a suitable value.
|
||||
If it is not already set, a default value is chosen.
|
||||
|
||||
@ -6,107 +6,75 @@
|
||||
#
|
||||
|
||||
PORTNAME= openoffice
|
||||
PORTVERSION= 1.1.2.${SNAPDATE}
|
||||
PORTVERSION= 1.1.3
|
||||
CATEGORIES+= editors
|
||||
MASTER_SITES+= ${MASTER_SITE_LOCAL} \
|
||||
MASTER_SITES+= ${MASTER_SITE_LOCAL} \
|
||||
ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
|
||||
http://people.freebsd.org/~mbr/ooo/:moz \
|
||||
${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/contrib/helpcontent/&,}:help \
|
||||
ftp://ftp.kddlabs.co.jp/office/openoffice/contrib/helpcontent/:help \
|
||||
ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/contrib/helpcontent/:help \
|
||||
http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/:help \
|
||||
http://people.freebsd.org/~mbr/ooo/:moz
|
||||
http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/:help
|
||||
MASTER_SITE_SUBDIR= maho/openoffice.org
|
||||
LATEST_LINK= ${PORTNAME}-${PORTVERSION}-devel
|
||||
DISTFILES+= OOo_${PORTVERSION}_source.tar.bz2 gpc231.tar.Z:gpc \
|
||||
DISTFILES+= OOo_${PORTVERSION}.${SNAPDATE}_source.tar.bz2 gpc231.tar.Z:gpc \
|
||||
patch-openoffice-mozilla101-2002-10-14:moz mozilla-vendor-1.0.2a.tgz:moz
|
||||
.if defined(L10NHELP)
|
||||
DISTFILES+= ${L10NHELP:S/$/:help/}
|
||||
.endif
|
||||
EXTRACT_ONLY= OOo_${PORTVERSION}_source.tar.bz2
|
||||
|
||||
ZIP?= ${PREFIX}/bin/zip
|
||||
UNZIP?= ${PREFIX}/bin/unzip
|
||||
ANT?= ${LOCALBASE}/bin/ant
|
||||
TCSH?= /bin/tcsh
|
||||
EXTRACT_ONLY= OOo_${PORTVERSION}.${SNAPDATE}_source.tar.bz2
|
||||
|
||||
NO_LATEST_LINK= yes
|
||||
USE_GNOME= orbit gtk12 gtk20
|
||||
USE_PERL5= yes
|
||||
USE_BISON= yes
|
||||
USE_GMAKE= yes
|
||||
USE_REINPLACE= yes
|
||||
USE_BZIP2= yes
|
||||
SNAPDATE= 20040729
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
.include <${FILESDIR}/Makefile.localized>
|
||||
|
||||
.if defined(ALL_LOCALIZED_LANGS)
|
||||
DISTFILES+= helpcontent_31_unix.tgz:help helpcontent_33_unix.tgz:help \
|
||||
helpcontent_34_unix.tgz:help helpcontent_39_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_31_unix.tgz helpcontent_33_unix.tgz \
|
||||
helpcontent_34_unix.tgz helpcontent_39_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
|
||||
|
||||
.if ${OSVERSION} < 500000
|
||||
BROKEN= "Does not compile on 4.x (tries to link to libpthread)"
|
||||
.endif
|
||||
|
||||
MAINTAINER= openoffice@FreeBSD.org
|
||||
COMMENT?= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
|
||||
|
||||
BUILD_NR= 645
|
||||
RELEASE_NR= 1.1
|
||||
FRELEASE_NR= 1.1.2
|
||||
SNAPDATE= 20040518
|
||||
INSTALLATION_BASEDIR= OpenOffice.org${FRELEASE_NR}
|
||||
RELEASE_NR= ${PORTVERSION}
|
||||
INSTALLATION_BASEDIR= OpenOffice.org${RELEASE_NR}
|
||||
DIST_SUBDIR= openoffice1.1
|
||||
DICT_DIR= ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
|
||||
SIMPLEOSVER!= ${UNAME} -r | sed -e 's/\.//' | sed -e 's/\..*//'
|
||||
|
||||
#
|
||||
# configuration for language specific slave ports
|
||||
#
|
||||
.if !defined(LANG_EXT)
|
||||
LANG_EXT=01
|
||||
.else
|
||||
#
|
||||
# Add pkg-descr and pkg-message if available
|
||||
#
|
||||
.if exists(${.CURDIR}/pkg-descr)
|
||||
DESCR= ${.CURDIR}/pkg-descr
|
||||
.endif
|
||||
.if exists(${.CURDIR}/pkg-message)
|
||||
PKGMESSAGE= ${.CURDIR}/pkg-message
|
||||
.endif
|
||||
#
|
||||
# Set prefix and suffix
|
||||
#
|
||||
SIMPLEOSVER!= ${UNAME} -r | ${SED} -e 's/\.//' | ${SED} -e 's/\..*//'
|
||||
.if defined(LANG_PKGNAME)
|
||||
PKGNAMEPREFIX= ${LANG_PKGNAME}-
|
||||
PKGNAMEPREFIX= ${LANG_PKGNAME}-
|
||||
.endif
|
||||
.if defined(LANG_SUFFIX)
|
||||
PKGNAMESUFFIX= -${LANG_SUFFIX}
|
||||
PKGNAMESUFFIX?= -${LANG_SUFFIX}
|
||||
.endif
|
||||
.endif # if defined(LANG_PKGNAME)
|
||||
#
|
||||
# LANG_CONFIGURE_ARG is missing for the german port
|
||||
#
|
||||
.if defined(LANG_EXT)
|
||||
CONFIGURE_ARGS+= --with-lang=${LANG_CONFIGURE_ARG},ENUS
|
||||
.endif
|
||||
.endif
|
||||
|
||||
.if !defined (LANG) && !defined(USE_LANG)
|
||||
USE_LANG= en_US.ISO8859-15
|
||||
LANG_LIST= en_US.ISO8859-15 en_US.ISO8859-1 US-ASCII
|
||||
.else
|
||||
.if !defined(USE_LANG)
|
||||
USE_LANG= ${LANG}
|
||||
.endif
|
||||
.endif
|
||||
|
||||
LANG_SORTED=`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
|
||||
|
||||
# OOo requires gcc 3.2 (currently 3.3 is not supported)
|
||||
BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
|
||||
USE_GCC=3.2
|
||||
# XXX dirty
|
||||
.if defined(WITH_CCACHE)
|
||||
BUILD_DEPENDS+= ccache:${PORTSDIR}/devel/ccache
|
||||
CC= ccache gcc32
|
||||
CXX= ccache g++32
|
||||
.else
|
||||
CC= gcc32
|
||||
CXX= g++32
|
||||
|
||||
MAINTAINER= openoffice@FreeBSD.org
|
||||
.if !defined(COMMENT)
|
||||
COMMENT= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
|
||||
.endif
|
||||
|
||||
#
|
||||
# The JDK dependency needs to be at the first place, so all
|
||||
# following dependencies use the same JDK.
|
||||
#
|
||||
BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14 \
|
||||
BUILD_DEPENDS+= ${JDKDIR}/bin/java:${PORTSDIR}/java/jdk14 \
|
||||
zip:${PORTSDIR}/archivers/zip \
|
||||
unzip:${PORTSDIR}/archivers/unzip \
|
||||
gcp:${PORTSDIR}/sysutils/coreutils \
|
||||
@ -115,39 +83,21 @@ BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14 \
|
||||
.if !defined(DISPLAY)
|
||||
BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT}
|
||||
.endif
|
||||
|
||||
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
|
||||
png.5:${PORTSDIR}/graphics/png \
|
||||
mng.1:${PORTSDIR}/graphics/libmng \
|
||||
freetype.9:${PORTSDIR}/print/freetype2
|
||||
|
||||
USE_PERL5= yes
|
||||
USE_BZIP2= yes
|
||||
USE_BISON= yes
|
||||
USE_GMAKE= yes
|
||||
|
||||
EXTRACT_BEFORE_ARGS_R= -dc
|
||||
EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
|
||||
EXTRACT_CMD_R= ${GZIP_CMD}
|
||||
EXTRACT_REST= gpc231.tar.Z
|
||||
|
||||
JDKDIR?= ${LOCALBASE}/jdk1.4.2
|
||||
JAVAVM= ${JDKDIR}/bin/java
|
||||
|
||||
GNU_CONFIGURE= yes
|
||||
USE_AUTOCONF_VER= 253
|
||||
USE_AUTOCONF_VER= 253
|
||||
WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work
|
||||
WRKSRC= ${WRKDIR}/oo_${FRELEASE_NR}_src/config_office
|
||||
.if defined(WITH_DEBUG)
|
||||
CFLAGS+= -g
|
||||
.if ${WITH_DEBUG} == 2
|
||||
BUILD= dmake debug="true"
|
||||
.else
|
||||
WRKSRC= ${WRKDIR}/oo_${RELEASE_NR}_src/config_office
|
||||
ANT?= ${LOCALBASE}/bin/ant
|
||||
TCSH?= /bin/tcsh
|
||||
ZIP?= ${PREFIX}/bin/zip
|
||||
UNZIP?= ${PREFIX}/bin/unzip
|
||||
BUILD= dmake
|
||||
.endif
|
||||
.else
|
||||
BUILD= dmake strip="true"
|
||||
.endif
|
||||
|
||||
.if !defined(DISPLAY)
|
||||
DISPLAYHACK=localhost:1001
|
||||
@ -157,44 +107,33 @@ CONFIGURE_ENV= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
|
||||
PTHREAD_LIBS=${PTHREAD_LIBS}
|
||||
CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-jdk-home=${JDKDIR}
|
||||
|
||||
.if defined(LANG_EXT)
|
||||
CONFIGURE_ARGS+= --with-lang=${LANG_CONFIGURE_ARG},ENUS
|
||||
.else
|
||||
LANG_EXT= 01
|
||||
.endif
|
||||
|
||||
.if defined(ALL_LOCALIZED_LANGS)
|
||||
CONFIGURE_ARGS+= --with-lang=ALL
|
||||
.endif
|
||||
|
||||
.if defined(WITH_DEBUG)
|
||||
.if ${WITH_DEBUG} == 2
|
||||
CONFIGURE_ARGS+= --enable-debug
|
||||
.else
|
||||
CONFIGURE_ARGS+= --enable-symbols
|
||||
.endif
|
||||
.endif
|
||||
|
||||
pre-fetch:
|
||||
@${ECHO}
|
||||
.if !defined(LANG)
|
||||
@${ECHO} "REQUIREMENTS:"
|
||||
@${ECHO}
|
||||
@${ECHO} "OO requires that the ENV variable LANG"
|
||||
@${ECHO} "is set to a proper value. Dependent on"
|
||||
@${ECHO} "which language port you use, OO does"
|
||||
@${ECHO} "automatically set LANG to a suitable"
|
||||
@${ECHO} "value. You can change this with:"
|
||||
@${ECHO}
|
||||
@${ECHO} "USE_LANG=\"preferred language\""
|
||||
@${ECHO}
|
||||
@${ECHO} "and set a different language"
|
||||
@${ECHO} "like:"
|
||||
@${ECHO}
|
||||
@${ECHO} "${LANG_SORTED}"
|
||||
@${ECHO}
|
||||
@${ECHO} "Your current setting is:"
|
||||
@${ECHO}
|
||||
@${ECHO} "USE_LANG=${USE_LANG}"
|
||||
@${ECHO}
|
||||
@${ECHO}
|
||||
.endif
|
||||
@${ECHO} "OPTIONS:"
|
||||
.if !defined(WITH_DEBUG)
|
||||
@${ECHO}
|
||||
@${ECHO} "You can compile OO with debug symbols"
|
||||
@${ECHO} "You can compile OOo 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} "OOo debug support."
|
||||
@${ECHO}
|
||||
.endif
|
||||
.if !defined(WITH_TTF_BYTECODE_ENABLED)
|
||||
@ -209,30 +148,6 @@ pre-fetch:
|
||||
@${ECHO} "you can enable this option to get better"
|
||||
@${ECHO} "quality of glyphs at small bitmap sizes."
|
||||
@${ECHO}
|
||||
.endif
|
||||
.if !defined(WITH_GIF_LZW_COMPRESSION)
|
||||
@${ECHO}
|
||||
@${ECHO} "You may set WITH_GIF_LZW_COMPRESSION=YES"
|
||||
@${ECHO} "If you want to make compressed gif images"
|
||||
@${ECHO}
|
||||
@${ECHO} "If must have license from the Unisys and IBM patents"
|
||||
@${ECHO} "to enable this option to get compressed GIF images."
|
||||
@${ECHO} "According to http://www.unisys.com/about__unisys/lzw"
|
||||
@${ECHO} "Patent expires:"
|
||||
@${ECHO} "June 20, 2003 : U.S."
|
||||
@${ECHO} "June 18, 2004 : U.K., France, Germany and Italy"
|
||||
@${ECHO} "June 20, 2004 : Japan"
|
||||
@${ECHO} "July 7, 2004 : Canada"
|
||||
@${ECHO}
|
||||
.endif
|
||||
.if ${OSVERSION} < 450002
|
||||
@${ECHO}
|
||||
@${ECHO} "OS-VERSION ${OSVERSION} too low"
|
||||
@${ECHO}
|
||||
@${ECHO} "OO need some important libc_r and"
|
||||
@${ECHO} "gcc fixes to build. Please upgrade to 4.6"
|
||||
@${ECHO} "RELEASE or 4.6 STABLE."
|
||||
@${FALSE}
|
||||
.endif
|
||||
@${ECHO}
|
||||
@${ECHO} "NOTICE:"
|
||||
@ -242,90 +157,47 @@ pre-fetch:
|
||||
@${ECHO} "of free diskspace (~ 8GB)."
|
||||
.else
|
||||
@${ECHO} "of free diskspace (~ 4GB)."
|
||||
.endif
|
||||
@${ECHO}
|
||||
.if (defined(USE_GCC) && ${USE_GCC} == 2.95) || \
|
||||
(${OSVERSION} < 500000 && !defined(USE_GCC))
|
||||
@${ECHO} "KERNEL CONFIGURATION:"
|
||||
@${ECHO}
|
||||
@${ECHO} "Openoffice needs a larger stack- and"
|
||||
@${ECHO} "datasize to build. Check your limit"
|
||||
@${ECHO} "settings and and put this in /boot/loader.conf"
|
||||
@${ECHO} "if neccessary:"
|
||||
@${ECHO}
|
||||
@${ECHO} "kern.maxdsiz=\"1073741824\""
|
||||
@${ECHO} "kern.maxssiz=\"268435456\""
|
||||
.endif
|
||||
@${ECHO}
|
||||
.if ${OSVERSION} < 460002
|
||||
@${ECHO} "REQUIRED SYSTEM PATCHES:"
|
||||
@${ECHO}
|
||||
.endif
|
||||
.if ${OSVERSION} < 490100
|
||||
@${ECHO} "OO.org can crash if you enter a non existing path"
|
||||
@${ECHO} "or URL in the location bar. To fix these crashes"
|
||||
@${ECHO} "you need a uncommitted system patch for rtld:"
|
||||
@${ECHO}
|
||||
@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-symlookup.diff"
|
||||
@${ECHO}
|
||||
.endif
|
||||
.if ${OSVERSION} < 460001
|
||||
@${ECHO}
|
||||
@${ECHO} "OO setup is broken on STABLE < 4.6"
|
||||
@${ECHO} "including 4.6 RELEASE."
|
||||
@${ECHO} "You'll need a system patch to solve"
|
||||
@${ECHO} "this problem:"
|
||||
@${ECHO}
|
||||
@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-alloca.diff"
|
||||
@${ECHO}
|
||||
.endif
|
||||
.if ${OSVERSION} < 460002
|
||||
@${ECHO}
|
||||
@${ECHO} "OO.org soffice binary can deadlock. You can work around"
|
||||
@${ECHO} "this problem with this patch:"
|
||||
@${ECHO}
|
||||
@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-deadlock.diff"
|
||||
@${ECHO}
|
||||
.endif
|
||||
.if ${OSVERSION} < 490100
|
||||
@${ECHO}
|
||||
@${ECHO} "OO.org build can deadlock in regmerge. You can work around"
|
||||
@${ECHO} "this problem with this patch:"
|
||||
@${ECHO}
|
||||
@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-builddeadlock.diff"
|
||||
@${ECHO}
|
||||
.endif
|
||||
.if !exists(/usr/include/langinfo.h)
|
||||
@${ECHO}
|
||||
@${ECHO} "langinfo.h is missing !"
|
||||
@${ECHO}
|
||||
@${ECHO} "Please upgrade to 4.6 RELEASE or"
|
||||
@${ECHO} "4.6 STABLE."
|
||||
@${ECHO}
|
||||
@${FALSE}
|
||||
.endif
|
||||
@${ECHO} "If you want SDK and/or solver, please type make sdk and/or make solver"
|
||||
|
||||
pre-everything::
|
||||
# really tewak, 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:
|
||||
@for file in ${EXTRACT_REST}; do \
|
||||
if ! (cd ${WRKDIR} && ${EXTRACT_CMD_R} \
|
||||
${EXTRACT_BEFORE_ARGS_R} \
|
||||
${_DISTDIR}/$$file ${EXTRACT_AFTER_ARGS_R}) ; \
|
||||
then \
|
||||
exit 1; \
|
||||
fi \
|
||||
done
|
||||
@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/
|
||||
@${MAKE} extract-mozilla
|
||||
@-${RM} -f ${WRKSRC}/../moz/zipped/*.zip
|
||||
@${RM} -f ${WRKSRC}/../moz/zipped/*.zip
|
||||
@${CHMOD} +x ${WRKSRC}/../solenv/bin/zipdep.pl
|
||||
.if defined(L10NHELP)
|
||||
@${ECHO_MSG} "===> Extracting L10NHELP sub project"
|
||||
@${MKDIR} ${WRKDIR}/L10NHELP
|
||||
@cd ${WRKDIR}/L10NHELP && \
|
||||
@cd ${WRKDIR}/L10NHELP ; \
|
||||
${CAT} ${DISTDIR}/${DIST_SUBDIR}/${L10NHELP} | ${GZIP_CMD} -d | ${TAR} xf -
|
||||
.endif
|
||||
.if defined(ALL_LOCALIZED_LANGS)
|
||||
@${ECHO_MSG} "===> Extracting All available L10NHELPs"
|
||||
@${MKDIR} ${WRKDIR}/L10NHELP
|
||||
@cd ${WRKDIR}/L10NHELP ; \
|
||||
for file in ${L10NHELPS}; do \
|
||||
${CAT} ${DISTDIR}/${DIST_SUBDIR}/$$file | ${GZIP_CMD} -d | ${TAR} xf - ; \
|
||||
done
|
||||
.endif
|
||||
|
||||
post-patch:
|
||||
@${REINPLACE_CMD} -e 's+%%PTHREAD_LIBS%%+${PTHREAD_LIBS}+g;' ${WRKSRC}/../odk/settings/settings.mk
|
||||
@ -340,110 +212,13 @@ post-patch:
|
||||
${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/optpatch-freetype+patch ; \
|
||||
fi
|
||||
.endif
|
||||
.if !defined(WITH_GIF_LZW_COMPRESSION)
|
||||
@if [ "`echo ${PATCHDIR}/gifpatch-*`" != "${PATCHDIR}/gifpatch-*" ]; then \
|
||||
${ECHO_MSG} "===> Removing GIF LZW compression for ${PKGNAME}" ; \
|
||||
if [ ${PATCH_DEBUG_TMP} = yes ]; then \
|
||||
${ECHO_MSG} "===> Applying GIF LZW compression ${OPSYS} patch" ; \
|
||||
fi; \
|
||||
${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx ; \
|
||||
${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx ; \
|
||||
${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/gifpatch-goodies+source+filter.vcl+egif+makefile.mk ; \
|
||||
fi
|
||||
.endif
|
||||
.if defined(WITH_DEBUG)
|
||||
@if [ "`echo ${PATCHDIR}/debugpatch-*`" != "${PATCHDIR}/debugpatch-*" ]; then \
|
||||
${ECHO_MSG} "===> Applying additional debug ${OPSYS} patches for ${PKGNAME}" ; \
|
||||
PATCHES_APPLIED="" ; \
|
||||
for i in ${PATCHDIR}/debugpatch-*; do \
|
||||
case $$i in \
|
||||
*.orig|*.rej|*~) \
|
||||
${ECHO_MSG} "===> Ignoring patchfile $$i" ; \
|
||||
;; \
|
||||
*) \
|
||||
if [ ${PATCH_DEBUG_TMP} = yes ]; then \
|
||||
${ECHO_MSG} "===> Applying ${OPSYS} patch $$i" ; \
|
||||
fi; \
|
||||
if ${PATCH} ${PATCH_ARGS} < $$i ; then \
|
||||
PATCHES_APPLIED="$$PATCHES_APPLIED $$i" ; \
|
||||
else \
|
||||
${ECHO_MSG} `${ECHO_CMD} ">> Patch $$i failed to apply cleanly." | ${SED} "s|${PATCHDIR}/||"` ; \
|
||||
if [ x"$$PATCHES_APPLIED" != x"" ]; then \
|
||||
${ECHO_MSG} `${ECHO_CMD} ">> Patch(es) $$PATCHES_APPLIED applied cleanly." | ${SED} "s|${PATCHDIR}/||g"` ; \
|
||||
fi; \
|
||||
${FALSE} ; \
|
||||
fi; \
|
||||
;; \
|
||||
esac; \
|
||||
done; \
|
||||
fi;
|
||||
.endif
|
||||
|
||||
extract-mozilla:
|
||||
.if ! exists(${WRKDIR}/mozilla/Makefile)
|
||||
@${ECHO_MSG} "===> Extracting mozilla sub project"
|
||||
@cd ${WRKDIR} && tar -xzf ${DISTDIR}/${DIST_SUBDIR}/mozilla-vendor-1.0.2a.tgz
|
||||
.endif
|
||||
@cd ${WRKDIR}/mozilla && ${MAKE} extract WRKDIRPREFIX=""
|
||||
|
||||
patch-mozilla:
|
||||
@${CP} ${DISTDIR}/${DIST_SUBDIR}/patch-openoffice-mozilla101-2002-10-14 \
|
||||
${WRKDIR}/mozilla/files/
|
||||
@cd ${WRKDIR}/mozilla && ${MAKE} patch WRKDIRPREFIX=""
|
||||
|
||||
build-mozilla:
|
||||
.if ! exists(${WRKDIR}/FREEBSDGCCIruntime.zip)
|
||||
@${ECHO_MSG} "===> Building mozilla sub project"
|
||||
.if defined(WITH_DEBUG)
|
||||
@${CP} ${WRKDIR}/mozilla/Makefile ${WRKDIR}/mozilla/Makefile.new
|
||||
@${SED} -e 's|--disable-debug||' \
|
||||
-e 's|--disable-cpp-rtti||' \
|
||||
-e 's|--enable-strip||' \
|
||||
< ${WRKDIR}/mozilla/Makefile.new > ${WRKDIR}/mozilla/Makefile
|
||||
.endif
|
||||
.if defined(USE_GCC)
|
||||
@cd ${WRKDIR}/mozilla && ${MAKE} CXX="${CXX}" CC="${CC}" CFLAGS="${CFLAGS}" USE_GCC=${USE_GCC} build WRKDIRPREFIX=""
|
||||
.else
|
||||
@cd ${WRKDIR}/mozilla && ${MAKE} CXX="${CXX}" CC="${CC}" CFLAGS="${CFLAGS}" build WRKDIRPREFIX=""
|
||||
.endif
|
||||
@${CP} ${FILESDIR}/zipmoz.sh ${WRKDIR}
|
||||
@${CHMOD} 755 ${WRKDIR}/zipmoz.sh
|
||||
@${WRKDIR}/zipmoz.sh ${WRKDIR}/mozilla/work/mozilla/dist FREEBSDGCCI ${WRKDIR}
|
||||
.endif
|
||||
|
||||
install-mozilla:
|
||||
@${CP} ${WRKDIR}/FREEBSDGCCIinc.zip ${WRKSRC}/../moz/zipped/
|
||||
@${CP} ${WRKDIR}/FREEBSDGCCIlib.zip ${WRKSRC}/../moz/zipped/
|
||||
@${CP} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKSRC}/../moz/zipped/
|
||||
|
||||
register-mozilla:
|
||||
.if exists(${WRKDIR}/mozilla-runtime)
|
||||
@${RM} -rf ${WRKDIR}/mozilla-runtime
|
||||
.endif
|
||||
@${MKDIR} ${WRKDIR}/mozilla-runtime
|
||||
@cd ${WRKDIR}/mozilla-runtime && ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIruntime.zip
|
||||
@cd ${WRKDIR}/mozilla-runtime && ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIlib.zip
|
||||
@${CP} ${WRKDIR}/mozilla/work/mozilla/dist/bin/regxpcom ${WRKDIR}/mozilla-runtime/
|
||||
@-${RM} ${WRKDIR}/mozilla-runtime/components/component.reg
|
||||
@cd ${WRKDIR}/mozilla-runtime && export MOZILLA_FIVE_HOME=. \
|
||||
&& export LD_LIBRARY_PATH=.:./lib && ./regxpcom
|
||||
@${CP} ${WRKDIR}/mozilla-runtime/components/xpti.dat \
|
||||
${WRKDIR}/mozilla-runtime/components/xptitemp.dat
|
||||
@${RM} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKDIR}/mozilla-runtime/regxpcom
|
||||
@cd ${WRKDIR}/mozilla-runtime && ${FIND} . -type f \
|
||||
| ${ZIP} ${WRKDIR}/FREEBSDGCCIruntime.zip -@
|
||||
|
||||
mozilla:
|
||||
@${MAKE} extract-mozilla
|
||||
@${MAKE} patch-mozilla
|
||||
@${MAKE} build-mozilla
|
||||
@${MAKE} register-mozilla
|
||||
@${MAKE} install-mozilla
|
||||
.include <${FILESDIR}/Makefile.mozilla>
|
||||
|
||||
do-build:
|
||||
.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIruntime.zip)
|
||||
.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIlib.zip)
|
||||
.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIinc.zip)
|
||||
.if !exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIruntime.zip)
|
||||
.if !exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIlib.zip)
|
||||
.if !exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIinc.zip)
|
||||
@${MAKE} mozilla
|
||||
.endif
|
||||
.endif
|
||||
@ -459,28 +234,25 @@ do-build:
|
||||
${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
|
||||
@sleep 5
|
||||
.endif
|
||||
@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ./bootstrap
|
||||
.if defined(L10NHELP)
|
||||
@cd ${WRKSRC}/.. ; PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ./bootstrap
|
||||
.if defined(L10NHELP) || defined(ALL_LOCALIZED_LANGS)
|
||||
@${MKDIR} ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck
|
||||
@${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck
|
||||
.endif
|
||||
.if !defined(DISPLAY)
|
||||
@cd ${WRKSRC}/.. && DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
|
||||
${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}'
|
||||
@cd ${WRKSRC}/.. ; DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ; \
|
||||
${TCSH} -c 'source FreeBSDEnv.Set ; unsetenv TOP ; ${BUILD}'
|
||||
@-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
|
||||
@${RM} -f ${WRKDIR}/.Xvfb.pid
|
||||
.else
|
||||
@cd ${WRKSRC}/.. && DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
|
||||
${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}'
|
||||
@cd ${WRKSRC}/.. ; DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ; \
|
||||
${TCSH} -c 'source FreeBSDEnv.Set ; unsetenv TOP ; ${BUILD}'
|
||||
.endif
|
||||
.if defined(LANG_PKGNAME)
|
||||
@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
|
||||
${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && cd instsetoo/util && ${BUILD} LANGEXT=${LANG_EXT}'
|
||||
@cd ${WRKSRC}/.. ; PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ; \
|
||||
${TCSH} -c 'source FreeBSDEnv.Set ; unsetenv TOP ; cd instsetoo/util ; ${BUILD} LANGEXT=${LANG_EXT}'
|
||||
.endif
|
||||
|
||||
pre-install:
|
||||
@${MKDIR} ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/bin/${LANG_EXT}/osl/
|
||||
|
||||
do-install:
|
||||
.if !defined(DISPLAY)
|
||||
#
|
||||
@ -504,11 +276,10 @@ post-install:
|
||||
@${ECHO_MSG} "===> Add wrapper scripts";
|
||||
@${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/
|
||||
@${CP} ${FILESDIR}/freebsd-local.sh ${WRKDIR}/
|
||||
@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \
|
||||
@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
|
||||
-e 's#%%LANG%%#${USE_LANG}#g' \
|
||||
-e 's#%%BUILD_NR%%#${BUILD_NR}#g' \
|
||||
-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
|
||||
-e 's#%%FRELEASE_NR%%#${FRELEASE_NR}#g' \
|
||||
${WRKDIR}/openoffice-wrapper \
|
||||
${WRKDIR}/freebsd-local.sh
|
||||
@${INSTALL_SCRIPT} ${WRKDIR}/openoffice-wrapper \
|
||||
@ -525,15 +296,15 @@ post-install:
|
||||
@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-spadmin
|
||||
@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sweb
|
||||
@${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-swriter
|
||||
@cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice-${RELEASE_NR} > ${TMPPLIST}
|
||||
@cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice-${RELEASE_NR} >> ${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
|
||||
@cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} openoffice-${RELEASE_NR} > ${TMPPLIST}
|
||||
@cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} openoffice-${RELEASE_NR} >> ${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}
|
||||
|
||||
package-rename:
|
||||
@${ECHO_MSG} "===> Rename package for OO.org mirror upload";
|
||||
@${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}
|
||||
@ -546,29 +317,20 @@ package-rename:
|
||||
.endif
|
||||
|
||||
sdk:
|
||||
@${ECHO_MSG} "===> Make SDK of OpenOffice.org"
|
||||
@${ECHO_MSG} "===> Make SDK of OOo"
|
||||
.if !defined(DISPLAY)
|
||||
@cd ${WRKSRC}/.. && DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
|
||||
${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && cd sdk_oo && build.pl && deliver.pl'
|
||||
@cd ${WRKSRC}/.. ; DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ; \
|
||||
${TCSH} -c 'source FreeBSDEnv.Set ; unsetenv TOP ; cd sdk_oo ; build.pl ; deliver.pl'
|
||||
@-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
|
||||
@${RM} -f ${WRKDIR}/.Xvfb.pid
|
||||
.else
|
||||
@cd ${WRKSRC}/.. && DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
|
||||
${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && cd sdk_oo && build.pl && deliver.pl'
|
||||
@cd ${WRKSRC}/.. ; DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ; \
|
||||
${TCSH} -c 'source FreeBSDEnv.Set ; unsetenv TOP ; cd sdk_oo ; build.pl ; deliver.pl'
|
||||
.endif
|
||||
${MV} ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/bin/OpenOffice.org${FRELEASE_NR}_SDK.tar.gz ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel_sdk.tar.gz
|
||||
@${MV} ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/bin/OpenOffice.org${RELEASE_NR}_SDK.tar.gz ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel_sdk.tar.gz
|
||||
|
||||
solver:
|
||||
@${ECHO_MSG} "===> Make Solver of OpenOffice.org"
|
||||
@${ECHO_MSG} "===> Make Solver of OOo"
|
||||
@cd ${WRKSRC}/.. ; ${TAR} cfz ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel_solver.tar.gz solver
|
||||
|
||||
update:
|
||||
@${MAKE} fetch
|
||||
@${MAKE} extract
|
||||
@cd ${WRKSRC}/.. && for dir in *; do \
|
||||
if [ -d $$dir ]; then \
|
||||
cd $$dir; cvs update -d; cd ..; \
|
||||
fi \
|
||||
done
|
||||
|
||||
.include <bsd.port.post.mk>
|
||||
|
||||
@ -2,11 +2,6 @@
|
||||
#
|
||||
# $FreeBSD $
|
||||
|
||||
if [ -e $HOME/.sversionrc ]; then
|
||||
OOHOME=`grep %%FRELEASE_NR%% $HOME/.sversionrc \
|
||||
| sed -e 's/.*file:\/\///'`
|
||||
fi
|
||||
|
||||
save_common_xcu() {
|
||||
sed 's/^X//' > $OOHOME/tmp/Common.xcu << 'END-of-Common.xcu'
|
||||
X<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
@ -1,45 +0,0 @@
|
||||
--- /dev/null 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ ../goodies/source/filter.vcl/egif/giflzwc_disabled.cxx 2002-08-15 15:09:47.000000000 +0200
|
||||
@@ -0,0 +1,42 @@
|
||||
+/**********************************
|
||||
+ * This code is copied from giflzwc.cxx, with the patented LZW compression code removed.
|
||||
+ **********************************/
|
||||
+
|
||||
+//#include <tools/stream.hxx>
|
||||
+#include "giflzwc.hxx"
|
||||
+
|
||||
+// --------------------
|
||||
+// - GIFLZWCompressor -
|
||||
+// --------------------
|
||||
+
|
||||
+GIFLZWCompressor::GIFLZWCompressor()
|
||||
+{
|
||||
+ pIDOS=NULL;
|
||||
+}
|
||||
+
|
||||
+// ------------------------------------------------------------------------
|
||||
+
|
||||
+GIFLZWCompressor::~GIFLZWCompressor()
|
||||
+{
|
||||
+}
|
||||
+
|
||||
+// ------------------------------------------------------------------------
|
||||
+
|
||||
+void GIFLZWCompressor::StartCompression( SvStream& rGIF, USHORT nPixelSize )
|
||||
+{
|
||||
+ /********************** DISABLED *************************/
|
||||
+}
|
||||
+
|
||||
+// ------------------------------------------------------------------------
|
||||
+
|
||||
+void GIFLZWCompressor::Compress( HPBYTE pSrc, ULONG nSize )
|
||||
+{
|
||||
+ /********************** DISABLED *************************/
|
||||
+}
|
||||
+
|
||||
+// ------------------------------------------------------------------------
|
||||
+
|
||||
+void GIFLZWCompressor::EndCompression()
|
||||
+{
|
||||
+ /********************** DISABLED *************************/
|
||||
+}
|
||||
@ -1,11 +0,0 @@
|
||||
--- ../goodies/source/filter.vcl/egif/makefile.mk.orig Tue Aug 14 23:22:54 2001
|
||||
+++ ../goodies/source/filter.vcl/egif/makefile.mk Mon Apr 14 06:04:55 2003
|
||||
@@ -89,7 +89,7 @@
|
||||
|
||||
SLOFILES= $(SLO)$/egif.obj \
|
||||
$(SLO)$/dlgegif.obj \
|
||||
- $(SLO)$/giflzwc.obj
|
||||
+ $(SLO)$/giflzwc_disabled.obj
|
||||
|
||||
|
||||
# ==========================================================================
|
||||
@ -1,8 +1,8 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-1.1-devel/files/Attic/openoffice-wrapper,v 1.12 2003-09-25 22:43:58 mbr Exp $
|
||||
# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-1.1-devel/files/Attic/openoffice-wrapper,v 1.13 2004-07-31 04:06:32 maho Exp $
|
||||
|
||||
oopath=%%PREFIX%%/OpenOffice.org%%FRELEASE_NR%%/program/
|
||||
oopath=%%PREFIX%%/OpenOffice.org%%RELEASE_NR%%/program/
|
||||
program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%-||'`
|
||||
|
||||
case $program in
|
||||
|
||||
@ -1,214 +0,0 @@
|
||||
--- ../svx/source/svrtf/rtfitem.cxx 24 Jun 2003 07:48:56 -0000 1.18
|
||||
+++ ../svx/source/svrtf/rtfitem.cxx 25 Jul 2003 22:54:24 -0000
|
||||
@@ -285,11 +285,20 @@
|
||||
}
|
||||
else
|
||||
{
|
||||
- if( LOW_CHARTYPE == eType || HIGH_CHARTYPE == eType )
|
||||
+// if( LOW_CHARTYPE == eType || HIGH_CHARTYPE == eType ) //Takashi Ono for CJK
|
||||
+ if( LOW_CHARTYPE == eType )
|
||||
{
|
||||
if( *pNormal )
|
||||
{
|
||||
rItem.SetWhich( *pNormal );
|
||||
+ rSet.Put( rItem );
|
||||
+ }
|
||||
+ }
|
||||
+ else if( HIGH_CHARTYPE == eType )
|
||||
+ {
|
||||
+ if( *pCTL )
|
||||
+ {
|
||||
+ rItem.SetWhich( *pCTL );
|
||||
rSet.Put( rItem );
|
||||
}
|
||||
}
|
||||
--- ../svx/source/svrtf/svxrtf.cxx 19 May 2003 12:30:59 -0000 1.15
|
||||
+++ ../svx/source/svrtf/svxrtf.cxx 25 Jul 2003 22:54:29 -0000
|
||||
@@ -583,8 +583,14 @@
|
||||
|
||||
case RTF_FCHARSET:
|
||||
if( -1 != nTokenValue )
|
||||
- pFont->SetCharSet( rtl_getTextEncodingFromWindowsCharset(
|
||||
- (BYTE)nTokenValue ) );
|
||||
+ {
|
||||
+// pFont->SetCharSet( rtl_getTextEncodingFromWindowsCharset(
|
||||
+// (BYTE)nTokenValue ) );
|
||||
+ CharSet nCharSet =
|
||||
+ rtl_getTextEncodingFromWindowsCharset( (BYTE)nTokenValue );
|
||||
+ pFont->SetCharSet( nCharSet );
|
||||
+ SetEncoding( nCharSet ); //Takashi Ono
|
||||
+ }
|
||||
break;
|
||||
|
||||
case RTF_FPRQ:
|
||||
--- ../sw/source/filter/rtf/swparrtf.cxx 4 Jun 2003 10:19:09 -0000 1.28
|
||||
+++ ../sw/source/filter/rtf/swparrtf.cxx 25 Jul 2003 22:54:37 -0000
|
||||
@@ -3231,10 +3231,156 @@
|
||||
SetSwgValues( rCollSet );
|
||||
}
|
||||
|
||||
+//Takashi Ono for CJK
|
||||
+String SwRTFParser::XlateFmtColName( const String &rName )
|
||||
+{
|
||||
+#define RES_NONE RES_POOLCOLL_DOC_END
|
||||
+
|
||||
+ static const RES_POOL_COLLFMT_TYPE aArr[]={
|
||||
+ RES_POOLCOLL_STANDARD, RES_POOLCOLL_HEADLINE1, RES_POOLCOLL_HEADLINE2,
|
||||
+ RES_POOLCOLL_HEADLINE3, RES_POOLCOLL_HEADLINE4, RES_POOLCOLL_HEADLINE5,
|
||||
+ RES_POOLCOLL_HEADLINE6, RES_POOLCOLL_HEADLINE7, RES_POOLCOLL_HEADLINE8,
|
||||
+ RES_POOLCOLL_HEADLINE9,
|
||||
+
|
||||
+ RES_POOLCOLL_TOX_IDX1, RES_POOLCOLL_TOX_IDX2, RES_POOLCOLL_TOX_IDX3,
|
||||
+ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE,
|
||||
+ RES_POOLCOLL_TOX_CNTNT1,
|
||||
+
|
||||
+ RES_POOLCOLL_TOX_CNTNT2, RES_POOLCOLL_TOX_CNTNT3, RES_POOLCOLL_TOX_CNTNT4,
|
||||
+ RES_POOLCOLL_TOX_CNTNT5, RES_POOLCOLL_TOX_CNTNT6, RES_POOLCOLL_TOX_CNTNT7,
|
||||
+ RES_POOLCOLL_TOX_CNTNT8, RES_POOLCOLL_TOX_CNTNT9,
|
||||
+ RES_NONE, RES_POOLCOLL_FOOTNOTE,
|
||||
+
|
||||
+ RES_NONE, RES_POOLCOLL_HEADER, RES_POOLCOLL_FOOTER, RES_POOLCOLL_TOX_IDXH,
|
||||
+ RES_NONE, RES_NONE, RES_POOLCOLL_JAKETADRESS, RES_POOLCOLL_SENDADRESS,
|
||||
+ RES_NONE, RES_NONE,
|
||||
+
|
||||
+ RES_NONE, RES_NONE, RES_NONE, RES_POOLCOLL_ENDNOTE, RES_NONE, RES_NONE, RES_NONE,
|
||||
+ RES_POOLCOLL_LISTS_BEGIN, RES_NONE, RES_NONE,
|
||||
+
|
||||
+ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE,
|
||||
+ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE,
|
||||
+
|
||||
+ RES_NONE,RES_NONE, RES_POOLCOLL_DOC_TITEL, RES_NONE, RES_POOLCOLL_SIGNATURE, RES_NONE,
|
||||
+ RES_POOLCOLL_TEXT, RES_POOLCOLL_TEXT_MOVE, RES_NONE, RES_NONE,
|
||||
+
|
||||
+ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_POOLCOLL_DOC_SUBTITEL };
|
||||
+ static const sal_Char *stiName[] = {
|
||||
+ "Normal",
|
||||
+ "heading 1",
|
||||
+ "heading 2",
|
||||
+ "heading 3",
|
||||
+ "heading 4",
|
||||
+ "heading 5",
|
||||
+ "heading 6",
|
||||
+ "heading 7",
|
||||
+ "heading 8",
|
||||
+ "heading 9",
|
||||
+ "index 1",
|
||||
+ "index 2",
|
||||
+ "index 3",
|
||||
+ "index 4",
|
||||
+ "index 5",
|
||||
+ "index 6",
|
||||
+ "index 7",
|
||||
+ "index 8",
|
||||
+ "index 9",
|
||||
+ "toc 1",
|
||||
+ "toc 2",
|
||||
+ "toc 3",
|
||||
+ "toc 4",
|
||||
+ "toc 5",
|
||||
+ "toc 6",
|
||||
+ "toc 7",
|
||||
+ "toc 8",
|
||||
+ "toc 9",
|
||||
+ "Normal Indent",
|
||||
+ "footnote text",
|
||||
+ "annotation text",
|
||||
+ "header",
|
||||
+ "footer",
|
||||
+ "index heading",
|
||||
+ "caption",
|
||||
+ "table of figures",
|
||||
+ "envelope address",
|
||||
+ "envelope return",
|
||||
+ "footnote reference",
|
||||
+ "annotation reference",
|
||||
+ "line number",
|
||||
+ "page number",
|
||||
+ "endnote reference",
|
||||
+ "endnote text",
|
||||
+ "table of authorities",
|
||||
+ "macro",
|
||||
+ "toa heading",
|
||||
+ "List",
|
||||
+ "List Bullet",
|
||||
+ "List Number",
|
||||
+ "List 2",
|
||||
+ "List 3",
|
||||
+ "List 4",
|
||||
+ "List 5",
|
||||
+ "List Bullet 2",
|
||||
+ "List Bullet 3",
|
||||
+ "List Bullet 4",
|
||||
+ "List Bullet 5",
|
||||
+ "List Number 2",
|
||||
+ "List Number 3",
|
||||
+ "List Number 4",
|
||||
+ "List Number 5",
|
||||
+ "Title",
|
||||
+ "Closing",
|
||||
+ "Signature",
|
||||
+ "Default Paragraph Font",
|
||||
+ "Body Text",
|
||||
+ "Body Text Indent",
|
||||
+ "List Continue",
|
||||
+ "List Continue 2",
|
||||
+ "List Continue 3",
|
||||
+ "List Continue 4",
|
||||
+ "List Continue 5",
|
||||
+ "Message Header",
|
||||
+ "Subtitle",
|
||||
+ };
|
||||
+
|
||||
+
|
||||
+ ASSERT( ( sizeof( aArr ) / sizeof( RES_POOL_COLLFMT_TYPE ) == 75 ),
|
||||
+ "Style-UEbersetzungstabelle hat falsche Groesse" );
|
||||
+ ASSERT( ( sizeof( stiName ) / sizeof( *stiName ) == 75 ),
|
||||
+ "Style-UEbersetzungstabelle hat falsche Groesse" );
|
||||
+
|
||||
+ RES_POOL_COLLFMT_TYPE nId = RES_NONE;
|
||||
+
|
||||
+ for (int i = 0; i < sizeof( stiName ) / sizeof( *stiName ); i++)
|
||||
+ {
|
||||
+ if ( rName == String( stiName[i], RTL_TEXTENCODING_MS_1252 ) )
|
||||
+ {
|
||||
+ nId = aArr[i];
|
||||
+ break;
|
||||
+ }
|
||||
+ }
|
||||
+ USHORT nResId;
|
||||
+ if( RES_POOLCOLL_TEXT_BEGIN <= nId && nId < RES_POOLCOLL_TEXT_END )
|
||||
+ nResId = RC_POOLCOLL_TEXT_BEGIN - RES_POOLCOLL_TEXT_BEGIN;
|
||||
+ else if (RES_POOLCOLL_LISTS_BEGIN <= nId && nId < RES_POOLCOLL_LISTS_END)
|
||||
+ nResId = RC_POOLCOLL_LISTS_BEGIN - RES_POOLCOLL_LISTS_BEGIN;
|
||||
+ else if (RES_POOLCOLL_EXTRA_BEGIN <= nId && nId < RES_POOLCOLL_EXTRA_END)
|
||||
+ nResId = RC_POOLCOLL_EXTRA_BEGIN - RES_POOLCOLL_EXTRA_BEGIN;
|
||||
+ else if (RES_POOLCOLL_REGISTER_BEGIN <= nId && nId < RES_POOLCOLL_REGISTER_END)
|
||||
+ nResId = RC_POOLCOLL_REGISTER_BEGIN - RES_POOLCOLL_REGISTER_BEGIN;
|
||||
+ else if (RES_POOLCOLL_DOC_BEGIN <= nId && nId < RES_POOLCOLL_DOC_END)
|
||||
+ nResId = RC_POOLCOLL_DOC_BEGIN - RES_POOLCOLL_DOC_BEGIN;
|
||||
+ else if (RES_POOLCOLL_HTML_BEGIN <= nId && nId < RES_POOLCOLL_HTML_END)
|
||||
+ nResId = RC_POOLCOLL_HTML_BEGIN - RES_POOLCOLL_HTML_BEGIN;
|
||||
+ return String( ResId( nResId + nId, pSwResMgr ) );
|
||||
+}
|
||||
+
|
||||
SwTxtFmtColl* SwRTFParser::MakeStyle( USHORT nNo, const SvxRTFStyleType& rStyle )
|
||||
{
|
||||
- int bCollExist;
|
||||
- SwTxtFmtColl* pColl = MakeColl( rStyle.sName, USHORT(nNo),
|
||||
+ int bCollExist;
|
||||
+// SwTxtFmtColl* pColl = MakeColl( rStyle.sName, USHORT(nNo), //Takashi Ono for CJK
|
||||
+ SwTxtFmtColl* pColl = MakeColl( XlateFmtColName( rStyle.sName ),
|
||||
+ USHORT(nNo),
|
||||
rStyle.nOutlineNo, bCollExist );
|
||||
aTxtCollTbl.Insert( nNo, pColl );
|
||||
|
||||
--- ../sw/source/filter/rtf/swparrtf.hxx 19 May 2003 12:25:34 -0000 1.10
|
||||
+++ ../sw/source/filter/rtf/swparrtf.hxx 25 Jul 2003 22:54:44 -0000
|
||||
@@ -364,6 +364,7 @@
|
||||
void SetStyleAttr( SfxItemSet& rCollSet,
|
||||
const SfxItemSet& rStyleSet,
|
||||
const SfxItemSet& rDerivedSet );
|
||||
+ String XlateFmtColName( const String &rName ); //Takashi Ono for CJK
|
||||
SwTxtFmtColl* MakeStyle( USHORT nNo, const SvxRTFStyleType& rStyle );
|
||||
SwCharFmt* MakeCharStyle( USHORT nNo, const SvxRTFStyleType& rStyle );
|
||||
void MakeStyleTab();
|
||||
@ -1,13 +0,0 @@
|
||||
--- ../sal/textenc/tencinfo.c.orig Fri Apr 11 16:25:01 2003
|
||||
+++ ../sal/textenc/tencinfo.c Sat May 31 23:33:43 2003
|
||||
@@ -668,6 +668,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 },
|
||||
@ -1,11 +0,0 @@
|
||||
http://www.openoffice.org/issues/show_bug.cgi?id=29286
|
||||
--- ../solenv/bin/deliver.pl.old Mon May 10 18:46:11 2004
|
||||
+++ ../solenv/bin/deliver.pl Tue May 18 09:10:47 2004
|
||||
@@ -138,6 +138,7 @@
|
||||
};
|
||||
$strip = '/usr/ccs/bin/strip' if ( $^O eq 'solaris' );
|
||||
$strip = 'strip' if ( $^O eq "darwin" );
|
||||
+$strip = 'strip' if ( $^O eq "freebsd" );
|
||||
$upd = $ENV{'UPD'};
|
||||
($gui = lc($ENV{GUI})) || die "can't determine GUI";
|
||||
|
||||
@ -1,21 +0,0 @@
|
||||
--- ../sw/source/filter/ww8/ww8par.cxx 9 Jul 2003 11:06:44 -0000 1.114
|
||||
+++ ../sw/source/filter/ww8/ww8par.cxx 25 Jul 2003 22:55:23 -0000
|
||||
@@ -2015,7 +2015,7 @@
|
||||
bool bStartAttr = pPlcxMan->Get(&aRes); // hole Attribut-Pos
|
||||
aRes.nAktCp = rTxtPos; // Akt. Cp-Pos
|
||||
|
||||
- if ((aRes.nFlags & MAN_MASK_NEW_SEP) && !bIgnoreText) // neue Section
|
||||
+ if ((aRes.nFlags & MAN_MASK_NEW_SEP) || maSectionManager.empty()) // neue Section
|
||||
{
|
||||
ASSERT(pPaM->GetNode()->GetTxtNode(), "Missing txtnode");
|
||||
// PageDesc erzeugen und fuellen
|
||||
--- ../sw/source/filter/ww8/ww8par.hxx 30 Jun 2003 15:54:37 -0000 1.115
|
||||
+++ ../sw/source/filter/ww8/ww8par.hxx 25 Jul 2003 22:55:28 -0000
|
||||
@@ -720,6 +720,7 @@
|
||||
short GetPageLeft() const;
|
||||
short GetPageRight() const;
|
||||
short GetPageWidth() const;
|
||||
+ bool empty() const { return maSegments.empty(); }
|
||||
};
|
||||
|
||||
class wwFrameNamer
|
||||
@ -1,53 +0,0 @@
|
||||
--- ../sw/source/filter/ww8/ww8par.cxx 9 Jul 2003 11:06:44 -0000 1.114
|
||||
+++ ../sw/source/filter/ww8/ww8par.cxx 25 Jul 2003 22:54:52 -0000
|
||||
@@ -1774,11 +1774,20 @@
|
||||
if (nUCode >= 0x3000) //0x8000 ?
|
||||
{
|
||||
sal_Char aTest[2];
|
||||
- aTest[0] = (nUCode & 0xFF00) >> 8;
|
||||
- aTest[1] = (nUCode & 0x00FF);
|
||||
- String aTemp(aTest, 2, eSrcCharSet);
|
||||
- ASSERT(aTemp.Len() == 1, "so much for that theory");
|
||||
- *pWork = aTemp.GetChar(0);
|
||||
+ if (nUCode >= 0x3000)
|
||||
+ {
|
||||
+ aTest[0] = (nUCode & 0xFF00) >> 8;
|
||||
+ aTest[1] = (nUCode & 0x00FF);
|
||||
+ String aTemp(aTest, 2, eSrcCharSet);
|
||||
+ ASSERT(aTemp.Len() == 1, "so much for that theory");
|
||||
+ *pWork = aTemp.GetChar(0);
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ aTest[0] = (nUCode & 0x00FF);
|
||||
+ String aTemp(aTest, 1, eSrcCharSet);
|
||||
+ *pWork = aTemp.GetChar(0);
|
||||
+ }
|
||||
}
|
||||
else
|
||||
{
|
||||
--- ../sw/source/filter/ww8/ww8par6.cxx 20 Jun 2003 09:38:07 -0000 1.138
|
||||
+++ ../sw/source/filter/ww8/ww8par6.cxx 25 Jul 2003 22:55:05 -0000
|
||||
@@ -3373,9 +3373,11 @@
|
||||
nId = RES_CHRATR_CTL_FONT;
|
||||
break;
|
||||
case 93:
|
||||
+ case 111:
|
||||
case 0x4a4f:
|
||||
nId = RES_CHRATR_FONT;
|
||||
break;
|
||||
+ case 112:
|
||||
case 0x4a50:
|
||||
nId = RES_CHRATR_CJK_FONT;
|
||||
break;
|
||||
@@ -5104,8 +5106,8 @@
|
||||
//percentage to grow hps short
|
||||
{110, (FNReadRecord)0}, //"sprmCCondHyhen", chp.ysri
|
||||
//ysri short
|
||||
- {111, &SwWW8ImplReader::Read_BoldBiDiUsw}, //"111 bidi bold ?",
|
||||
- {112, &SwWW8ImplReader::Read_BoldBiDiUsw}, //"112 bidi italic ?",
|
||||
+ {111, &SwWW8ImplReader::Read_FontCode}, //ww7 font
|
||||
+ {112, &SwWW8ImplReader::Read_FontCode}, //ww7 CJK font
|
||||
{113, &SwWW8ImplReader::Read_FontCode}, //ww7 rtl font
|
||||
{114, (FNReadRecord)0}, //"??114",
|
||||
{115, &SwWW8ImplReader::Read_TxtColor}, //ww7 rtl colour ?
|
||||
@ -1,312 +0,0 @@
|
||||
--- ../svtools/source/svrtf/rtfout.cxx.orig 2000-10-16 18:13:46.000000000 +0900
|
||||
+++ ../svtools/source/svrtf/rtfout.cxx 2003-09-23 12:41:00.000000000 +0900
|
||||
@@ -124,8 +124,9 @@
|
||||
default:
|
||||
{
|
||||
sal_Unicode cCh = c;
|
||||
- c = (BYTE)ByteString::ConvertFromUnicode( c, eDestEnc, FALSE );
|
||||
- if( !c )
|
||||
+ rtl::OString buff( &c, 1, eDestEnc, RTL_UNICODETOTEXT_FLAGS_UNDEFINED_IGNORE|RTL_UNICODETOTEXT_FLAGS_INVALID_IGNORE );
|
||||
+// c = (BYTE)ByteString::ConvertFromUnicode( c, eDestEnc, FALSE );
|
||||
+ if( !buff.getLength() )
|
||||
{
|
||||
// then write as unicode - character
|
||||
if( 0xFF < cCh )
|
||||
@@ -141,8 +142,8 @@
|
||||
break;
|
||||
}
|
||||
|
||||
- if( !bWriteHelpFile )
|
||||
- switch( c )
|
||||
+ if( !bWriteHelpFile && buff.getLength() == 1 )
|
||||
+ switch( BYTE(buff[0]) )
|
||||
{
|
||||
#ifdef MAC
|
||||
case 0xa5: pStr = sRTF_BULLET; break;
|
||||
@@ -164,6 +165,9 @@
|
||||
// MAC
|
||||
}
|
||||
if( !pStr )
|
||||
+ for (int i = 0; i < buff.getLength(); ++i)
|
||||
+ {
|
||||
+ c = BYTE(buff[i]);
|
||||
switch ( c )
|
||||
{
|
||||
case '\\':
|
||||
@@ -186,6 +190,7 @@
|
||||
}
|
||||
break;
|
||||
}
|
||||
+ }
|
||||
}
|
||||
break;
|
||||
}
|
||||
--- ../sw/source/filter/rtf/wrtrtf.cxx.orig 2003-04-18 00:00:28.000000000 +0900
|
||||
+++ ../sw/source/filter/rtf/wrtrtf.cxx 2003-09-23 23:33:08.000000000 +0900
|
||||
@@ -184,6 +184,12 @@
|
||||
#ifndef _CHARFMT_HXX
|
||||
#include <charfmt.hxx>
|
||||
#endif
|
||||
+#ifndef _POOLFMT_HXX
|
||||
+#include <poolfmt.hxx>
|
||||
+#endif
|
||||
+#ifndef _SWSTYLENAMEMAPPER_HXX
|
||||
+#include <SwStyleNameMapper.hxx>
|
||||
+#endif
|
||||
#ifndef _SECTION_HXX //autogen
|
||||
#include <section.hxx>
|
||||
#endif
|
||||
@@ -215,7 +221,7 @@
|
||||
SV_IMPL_VARARR( RTFColorTbl, Color )
|
||||
|
||||
|
||||
-SwRTFWriter::SwRTFWriter( const String& rFltName )
|
||||
+SwRTFWriter::SwRTFWriter( const String& rFltName ) : eCurrentCharSet(DEF_ENCODING)
|
||||
{
|
||||
// schreibe Win-RTF-HelpFileFmt
|
||||
bWriteHelpFmt = 'W' == rFltName.GetChar( 0 );
|
||||
@@ -893,14 +899,14 @@
|
||||
// as alternative name. Because WinWord can't match each
|
||||
// font to a UniCode font. So the CJK texts are shown as
|
||||
// empty rectangles ;-(.
|
||||
- RTFOutFuncs::Out_String( rWrt.Strm(), sFntNm, DEF_ENCODING,
|
||||
+ RTFOutFuncs::Out_String( rWrt.Strm(), sFntNm, eChrSet,
|
||||
rWrt.bWriteHelpFmt );
|
||||
OutComment( rWrt, sRTF_FALT) << ' ';
|
||||
- RTFOutFuncs::Out_String( rWrt.Strm(), sAltNm, DEF_ENCODING,
|
||||
+ RTFOutFuncs::Out_String( rWrt.Strm(), sAltNm, eChrSet,
|
||||
rWrt.bWriteHelpFmt ) << '}';
|
||||
}
|
||||
else
|
||||
- RTFOutFuncs::Out_String( rWrt.Strm(), sFntNm, DEF_ENCODING,
|
||||
+ RTFOutFuncs::Out_String( rWrt.Strm(), sFntNm, eChrSet,
|
||||
rWrt.bWriteHelpFmt );
|
||||
rWrt.Strm() << ";}";
|
||||
}
|
||||
@@ -932,6 +938,139 @@
|
||||
|
||||
|
||||
|
||||
+//Takashi Ono for CJK
|
||||
+const rtl::OUString SwRTFWriter::XlateFmtName( const rtl::OUString &rName, SwGetPoolIdFromName eFlags )
|
||||
+{
|
||||
+#define RES_NONE RES_POOLCOLL_DOC_END
|
||||
+
|
||||
+ static const RES_POOL_COLLFMT_TYPE aArr[]={
|
||||
+ RES_POOLCOLL_STANDARD, RES_POOLCOLL_HEADLINE1, RES_POOLCOLL_HEADLINE2,
|
||||
+ RES_POOLCOLL_HEADLINE3, RES_POOLCOLL_HEADLINE4, RES_POOLCOLL_HEADLINE5,
|
||||
+ RES_POOLCOLL_HEADLINE6, RES_POOLCOLL_HEADLINE7, RES_POOLCOLL_HEADLINE8,
|
||||
+ RES_POOLCOLL_HEADLINE9,
|
||||
+
|
||||
+ RES_POOLCOLL_TOX_IDX1, RES_POOLCOLL_TOX_IDX2, RES_POOLCOLL_TOX_IDX3,
|
||||
+ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE,
|
||||
+ RES_POOLCOLL_TOX_CNTNT1,
|
||||
+
|
||||
+ RES_POOLCOLL_TOX_CNTNT2, RES_POOLCOLL_TOX_CNTNT3, RES_POOLCOLL_TOX_CNTNT4,
|
||||
+ RES_POOLCOLL_TOX_CNTNT5, RES_POOLCOLL_TOX_CNTNT6, RES_POOLCOLL_TOX_CNTNT7,
|
||||
+ RES_POOLCOLL_TOX_CNTNT8, RES_POOLCOLL_TOX_CNTNT9,
|
||||
+ RES_POOLCOLL_TEXT_IDENT, RES_POOLCOLL_FOOTNOTE,
|
||||
+
|
||||
+ RES_NONE, RES_POOLCOLL_HEADER, RES_POOLCOLL_FOOTER, RES_POOLCOLL_TOX_IDXH,
|
||||
+ RES_POOLCOLL_LABEL, RES_POOLCOLL_TOX_ILLUSH, RES_POOLCOLL_JAKETADRESS, RES_POOLCOLL_SENDADRESS,
|
||||
+ RES_NONE, RES_NONE,
|
||||
+
|
||||
+ RES_NONE, RES_NONE, RES_NONE, RES_POOLCOLL_ENDNOTE, RES_POOLCOLL_TOX_AUTHORITIESH, RES_NONE, RES_NONE,
|
||||
+ RES_POOLCOLL_BUL_LEVEL1, RES_POOLCOLL_BUL_LEVEL1, RES_POOLCOLL_NUM_LEVEL1,
|
||||
+
|
||||
+ RES_POOLCOLL_BUL_LEVEL2, RES_POOLCOLL_BUL_LEVEL3, RES_POOLCOLL_BUL_LEVEL4, RES_POOLCOLL_BUL_LEVEL5,
|
||||
+ RES_POOLCOLL_BUL_LEVEL2, RES_POOLCOLL_BUL_LEVEL3, RES_POOLCOLL_BUL_LEVEL4, RES_POOLCOLL_BUL_LEVEL5,
|
||||
+ RES_POOLCOLL_NUM_LEVEL2, RES_POOLCOLL_NUM_LEVEL3, RES_POOLCOLL_NUM_LEVEL4, RES_POOLCOLL_NUM_LEVEL5,
|
||||
+
|
||||
+ RES_POOLCOLL_DOC_TITEL, RES_NONE, RES_POOLCOLL_SIGNATURE, RES_NONE,
|
||||
+ RES_POOLCOLL_TEXT, RES_POOLCOLL_TEXT_MOVE, RES_NONE, RES_NONE,
|
||||
+
|
||||
+ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_POOLCOLL_DOC_SUBTITEL };
|
||||
+ static const sal_Char *stiName[] = {
|
||||
+ "Normal",
|
||||
+ "heading 1",
|
||||
+ "heading 2",
|
||||
+ "heading 3",
|
||||
+ "heading 4",
|
||||
+ "heading 5",
|
||||
+ "heading 6",
|
||||
+ "heading 7",
|
||||
+ "heading 8",
|
||||
+ "heading 9",
|
||||
+ "index 1",
|
||||
+ "index 2",
|
||||
+ "index 3",
|
||||
+ "index 4",
|
||||
+ "index 5",
|
||||
+ "index 6",
|
||||
+ "index 7",
|
||||
+ "index 8",
|
||||
+ "index 9",
|
||||
+ "toc 1",
|
||||
+ "toc 2",
|
||||
+ "toc 3",
|
||||
+ "toc 4",
|
||||
+ "toc 5",
|
||||
+ "toc 6",
|
||||
+ "toc 7",
|
||||
+ "toc 8",
|
||||
+ "toc 9",
|
||||
+ "Normal Indent",
|
||||
+ "footnote text",
|
||||
+ "annotation text",
|
||||
+ "header",
|
||||
+ "footer",
|
||||
+ "index heading",
|
||||
+ "caption",
|
||||
+ "table of figures",
|
||||
+ "envelope address",
|
||||
+ "envelope return",
|
||||
+ "footnote reference",
|
||||
+ "annotation reference",
|
||||
+ "line number",
|
||||
+ "page number",
|
||||
+ "endnote reference",
|
||||
+ "endnote text",
|
||||
+ "table of authorities",
|
||||
+ "macro",
|
||||
+ "toa heading",
|
||||
+ "List",
|
||||
+ "List Bullet",
|
||||
+ "List Number",
|
||||
+ "List 2",
|
||||
+ "List 3",
|
||||
+ "List 4",
|
||||
+ "List 5",
|
||||
+ "List Bullet 2",
|
||||
+ "List Bullet 3",
|
||||
+ "List Bullet 4",
|
||||
+ "List Bullet 5",
|
||||
+ "List Number 2",
|
||||
+ "List Number 3",
|
||||
+ "List Number 4",
|
||||
+ "List Number 5",
|
||||
+ "Title",
|
||||
+ "Closing",
|
||||
+ "Signature",
|
||||
+ "Default Paragraph Font",
|
||||
+ "Body Text",
|
||||
+ "Body Text Indent",
|
||||
+ "List Continue",
|
||||
+ "List Continue 2",
|
||||
+ "List Continue 3",
|
||||
+ "List Continue 4",
|
||||
+ "List Continue 5",
|
||||
+ "Message Header",
|
||||
+ "Subtitle",
|
||||
+ };
|
||||
+
|
||||
+
|
||||
+ ASSERT( ( sizeof( aArr ) / sizeof( RES_POOL_COLLFMT_TYPE ) == 75 ),
|
||||
+ "Style-UEbersetzungstabelle hat falsche Groesse" );
|
||||
+ ASSERT( ( sizeof( stiName ) / sizeof( *stiName ) == 75 ),
|
||||
+ "Style-UEbersetzungstabelle hat falsche Groesse" );
|
||||
+
|
||||
+ sal_uInt16 idcol = ::SwStyleNameMapper::GetPoolIdFromUIName( rName, eFlags );
|
||||
+
|
||||
+ for (int i = 0; i < sizeof( aArr ) / sizeof( *aArr ); i++)
|
||||
+ {
|
||||
+ if ( idcol == aArr[i] )
|
||||
+ {
|
||||
+ return rtl::OUString::createFromAscii(stiName[i]);
|
||||
+ }
|
||||
+ }
|
||||
+ return ::SwStyleNameMapper::GetProgName( idcol, String() );
|
||||
+}
|
||||
+
|
||||
+
|
||||
+
|
||||
void SwRTFWriter::OutRTFStyleTab()
|
||||
{
|
||||
// das 0-Style ist das Default, wird nie ausgegeben !!
|
||||
@@ -988,7 +1127,7 @@
|
||||
}
|
||||
|
||||
Strm() << ' ';
|
||||
- RTFOutFuncs::Out_String( Strm(), pColl->GetName(), DEF_ENCODING,
|
||||
+ RTFOutFuncs::Out_String( Strm(), XlateFmtName( pColl->GetName(), GET_POOLID_TXTCOLL ), DEF_ENCODING,
|
||||
bWriteHelpFmt ) << ";}" << SwRTFWriter::sNewLine;
|
||||
}
|
||||
|
||||
@@ -1015,8 +1154,8 @@
|
||||
}
|
||||
|
||||
Strm() << ' ';
|
||||
- RTFOutFuncs::Out_String( Strm(), pFmt->GetName(), DEF_ENCODING,
|
||||
- bWriteHelpFmt ) << ";}" << SwRTFWriter::sNewLine;
|
||||
+ RTFOutFuncs::Out_String( Strm(), XlateFmtName( pFmt->GetName(), GET_POOLID_CHRFMT ), DEF_ENCODING,
|
||||
+ bWriteHelpFmt ) << ";}" << SwRTFWriter::sNewLine;
|
||||
}
|
||||
|
||||
Strm() << '}';
|
||||
@@ -1217,8 +1356,8 @@
|
||||
break;
|
||||
Strm() << sRTF_PGDSCNXT;
|
||||
OutULong( i ) << ' ';
|
||||
- RTFOutFuncs::Out_String( Strm(), rPageDesc.GetName(),
|
||||
- DEF_ENCODING, bWriteHelpFmt ) << ";}";
|
||||
+ RTFOutFuncs::Out_String( Strm(), XlateFmtName( rPageDesc.GetName(), GET_POOLID_PAGEDESC ), DEF_ENCODING,
|
||||
+ bWriteHelpFmt ) << ";}";
|
||||
}
|
||||
Strm() << '}' << SwRTFWriter::sNewLine;
|
||||
bOutPageDesc = bOutPageDescTbl = FALSE;
|
||||
--- ../sw/source/filter/rtf/wrtrtf.hxx.orig 2002-07-31 19:18:50.000000000 +0900
|
||||
+++ ../sw/source/filter/rtf/wrtrtf.hxx 2003-09-23 23:37:50.000000000 +0900
|
||||
@@ -117,6 +117,7 @@
|
||||
USHORT nAktFlyPos; // Index auf das naechste "FlyFrmFmt"
|
||||
void OutRTFColorTab();
|
||||
void OutRTFFontTab();
|
||||
+ const rtl::OUString XlateFmtName( const rtl::OUString &rName, SwGetPoolIdFromName eFlags );
|
||||
void OutRTFStyleTab();
|
||||
void OutRTFListTab();
|
||||
|
||||
@@ -136,6 +137,8 @@
|
||||
USHORT nBkmkTabPos; // akt. Position in der Bookmark-Tabelle
|
||||
USHORT nCurScript; // actual scripttype
|
||||
|
||||
+ rtl_TextEncoding eCurrentCharSet;
|
||||
+
|
||||
#if defined(MAC) || defined(UNX)
|
||||
static const sal_Char sNewLine; // nur \012 oder \015
|
||||
#else
|
||||
--- ../sw/source/filter/rtf/rtfatr.cxx.orig 2003-05-19 21:24:46.000000000 +0900
|
||||
+++ ../sw/source/filter/rtf/rtfatr.cxx 2003-09-23 23:45:52.000000000 +0900
|
||||
@@ -1319,7 +1319,7 @@
|
||||
sURL = aTmp.GetFull();
|
||||
}
|
||||
*/ rWrt.Strm() << '\"';
|
||||
- RTFOutFuncs::Out_String( rWrt.Strm(), sURL, DEF_ENCODING,
|
||||
+ RTFOutFuncs::Out_String( rWrt.Strm(), sURL, rRTFWrt.eCurrentCharSet,
|
||||
rRTFWrt.bWriteHelpFmt ) << "\" ";
|
||||
sURL = aTmp.GetMark();
|
||||
}
|
||||
@@ -1328,7 +1328,7 @@
|
||||
{
|
||||
rWrt.Strm() << "\\\\l \"";
|
||||
sURL.Erase( 0, 1 );
|
||||
- RTFOutFuncs::Out_String( rWrt.Strm(), sURL, DEF_ENCODING,
|
||||
+ RTFOutFuncs::Out_String( rWrt.Strm(), sURL, rRTFWrt.eCurrentCharSet,
|
||||
rRTFWrt.bWriteHelpFmt ) << "\" ";
|
||||
}
|
||||
|
||||
@@ -1609,7 +1609,7 @@
|
||||
|
||||
if( nStrPos != nEnde )
|
||||
RTFOutFuncs::Out_Char( rWrt.Strm(), rStr.GetChar( nStrPos ),
|
||||
- DEF_ENCODING, rRTFWrt.bWriteHelpFmt );
|
||||
+ rRTFWrt.eCurrentCharSet, rRTFWrt.bWriteHelpFmt );
|
||||
}
|
||||
|
||||
// noch eine schliesende Klammer da ??
|
||||
@@ -2188,6 +2188,7 @@
|
||||
const sal_Char* pCmd = bAssoc ? sRTF_AF : sRTF_F;
|
||||
rWrt.Strm() << pCmd;
|
||||
rWrt.OutULong(rRTFWrt.GetId(rFont));
|
||||
+ rRTFWrt.eCurrentCharSet = rFont.GetCharSet();
|
||||
}
|
||||
return rWrt;
|
||||
}
|
||||
89
editors/openoffice.org-1.1-devel/files/pkg-message.de
Normal file
89
editors/openoffice.org-1.1-devel/files/pkg-message.de
Normal file
@ -0,0 +1,89 @@
|
||||
OpenOffice.org Version 1.1.2 Installationsanleitung
|
||||
|
||||
Geschrieben von: Martin Blapp <mbr@freebsd.org>
|
||||
|
||||
OpenOffice.org ist bald im Verzeichnis
|
||||
${PREFIX}/OpenOffice.org1.1.2/ installiert.
|
||||
|
||||
1 Benutzerinstallation
|
||||
----------------------
|
||||
|
||||
Nachdem der Port oder das Package installiert ist
|
||||
kann OO.org mit "openoffice" gestartet werden. Beim
|
||||
ersten Mal wird das OO.org Setup aufgerufen und in
|
||||
Ihrem Benutzerverzeichnis das Verzeichnis
|
||||
"OpenOffice.org1.1.2" angelegt. Ebenfalls werden
|
||||
Sie während des Setups nach einem installierten
|
||||
Java JDK gefragt.
|
||||
|
||||
Falls das Setup mit der Fehlermeldung abbricht, dass
|
||||
schon eine Version installiert sei (von einem vorherigen
|
||||
Installationsversuch), kann ein Blick in die Datei
|
||||
".sversionrc" helfen. In dieser Datei speichern Openoffice
|
||||
wie auch alle Staroffice Versionen Informationen ’…r die
|
||||
Installation ab. L šáhen Sie die problematische Zeile
|
||||
und die Installation wird nun funktionieren.
|
||||
|
||||
2 Start von OO.org
|
||||
------------------
|
||||
|
||||
Die FreeBSD-Version von OO.org installiert nun ein Skript
|
||||
zum schnellen Aufruf. Bitte fӋn Sie "${PREFIX}/bin/"
|
||||
zu Ihrer ENV-Variable PATH hinzu und sie werden OO.org
|
||||
einfacher aufrufen k ˜Žen:
|
||||
|
||||
${PREFIX}/bin/openoffice
|
||||
${PREFIX}/bin/openoffice-sagenda
|
||||
${PREFIX}/bin/openoffice-scalc
|
||||
${PREFIX}/bin/openoffice-sdraw
|
||||
${PREFIX}/bin/openoffice-setup
|
||||
${PREFIX}/bin/openoffice-sfax
|
||||
${PREFIX}/bin/openoffice-simpress
|
||||
${PREFIX}/bin/openoffice-spadmin
|
||||
${PREFIX}/bin/openoffice-sweb
|
||||
${PREFIX}/bin/openoffice-swriter
|
||||
|
||||
OO.org verlangt dass die ENV-Variable LANG auf einen
|
||||
brauchbaren Wert gesetzt ist. Wenn LANG nicht definiert
|
||||
ist, so verwendet das Startup-Skript eine Standard-Einstellung,
|
||||
Momentan wird "de_DE.ISO_8859-15" verwendet. Sie k ˜Žen diese
|
||||
Einstellung auch im Startup-Skript ändern.
|
||||
|
||||
Wenn Sie einen älteren X-Server vor der XFree86 Version 4.2
|
||||
verwenden, k ˜Žen Warnungen auftreten. Ignorieren Sie diese
|
||||
oder verwenden Sie eine neuere Version.
|
||||
|
||||
Falls US-ASCII verwendet wird, k ˜Žen Sie Dokumente mit
|
||||
Umlauten und Sonderzeichen im Dateinamen nicht mehr speichern
|
||||
und laden, und natšŒich werden Sie auch im OO.org keine
|
||||
dieser Zeichen mehr tippen k ˜Žen.
|
||||
|
||||
3 Setup Probleme (nur FreeBSD < 4.7-RELEASE)
|
||||
--------------------------------------------
|
||||
|
||||
Falls sich das Setup ’…r eine fehlende Datei mit Namen
|
||||
"setup.ins" beklagt, so ist es an der Zeit Ihr System auf
|
||||
die neueste FreeBSD-Version zu aktualisieren. FreeBSD
|
||||
4.7-RELEASE und neuer hat dieses Problem nicht.
|
||||
|
||||
4 Abstšše bei der URL-Leiste (nur FreeBSD < 4.7-RELEASE)
|
||||
---------------------------------------------------------
|
||||
|
||||
Bei älteren FreeBSD-Version als 4.7-RELEASE kann OO.org
|
||||
bei Eingaben in der URL-Leiste abstššen, falls ein nicht
|
||||
existierender Dateiname eingegeben wird. Der folgende
|
||||
Systempatch schafft Abhilfe:
|
||||
|
||||
http://people.freebsd.org/~mbr/ooo/rtld-symlookup.diff
|
||||
|
||||
5 Absturz nach dem Wechseln zu einer anderen Sprachversion
|
||||
----------------------------------------------------------
|
||||
|
||||
Falls Sie zuerst die englische Version von OO.org installiert
|
||||
haben und nachträglich auf eine andere Sprachversion gewechselt
|
||||
haben, so kann dies OO.org zum Absturz bringen.
|
||||
|
||||
Abhilfe schafft in diesem Fall nur das L šáhen des bestehenden
|
||||
OpenOffice.org1.1.2 Verzeichnisses und des entsprechenden
|
||||
Eintrags aus der Datei ".sversionrc" mit anschliessender neuer
|
||||
Benutzer-Installation.
|
||||
@ -1,4 +1,4 @@
|
||||
OpenOffice.org Build 1.1.1 Personal Install How-To
|
||||
OpenOffice.org Build 1.1.2 Personal Install How-To
|
||||
|
||||
Written by: Martin Blapp <mbr@freebsd.org>
|
||||
|
||||
@ -9,7 +9,7 @@ Just type "openoffice" after you have successfully
|
||||
installed the package. If there is no installed
|
||||
OO.org dir in hour homedir, you'll be prompted to
|
||||
install some files and choose a installed JDK.
|
||||
The setup installs a "OpenOffice.org1.1.0" folder
|
||||
The setup installs a "OpenOffice.org1.1.2" folder
|
||||
in your homedir.
|
||||
|
||||
If the setup tells you there is already an installed
|
||||
@ -26,16 +26,16 @@ 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-1.1
|
||||
${PREFIX}/bin/openoffice-1.1-sagenda
|
||||
${PREFIX}/bin/openoffice-1.1-scalc
|
||||
${PREFIX}/bin/openoffice-1.1-sdraw
|
||||
${PREFIX}/bin/openoffice-1.1-setup
|
||||
${PREFIX}/bin/openoffice-1.1-sfax
|
||||
${PREFIX}/bin/openoffice-1.1-simpress
|
||||
${PREFIX}/bin/openoffice-1.1-spadmin
|
||||
${PREFIX}/bin/openoffice-1.1-sweb
|
||||
${PREFIX}/bin/openoffice-1.1-swriter
|
||||
${PREFIX}/bin/openoffice-1.1.2
|
||||
${PREFIX}/bin/openoffice-1.1.2-sagenda
|
||||
${PREFIX}/bin/openoffice-1.1.2-scalc
|
||||
${PREFIX}/bin/openoffice-1.1.2-sdraw
|
||||
${PREFIX}/bin/openoffice-1.1.2-setup
|
||||
${PREFIX}/bin/openoffice-1.1.2-sfax
|
||||
${PREFIX}/bin/openoffice-1.1.2-simpress
|
||||
${PREFIX}/bin/openoffice-1.1.2-spadmin
|
||||
${PREFIX}/bin/openoffice-1.1.2-sweb
|
||||
${PREFIX}/bin/openoffice-1.1.2-swriter
|
||||
|
||||
OO.org does need $LANG to be set to a suitable value.
|
||||
If it is not already set, a default value is chosen.
|
||||
|
||||
Loading…
Reference in New Issue
Block a user