diff options
author | Maho Nakata <maho@FreeBSD.org> | 2005-01-11 23:17:42 +0000 |
---|---|---|
committer | Maho Nakata <maho@FreeBSD.org> | 2005-01-11 23:17:42 +0000 |
commit | 5d2011a85ef96d78f192aa85bc072f9876a9353f (patch) | |
tree | efc5b0c888d28ba52eb56b4debd6573beb011eaa /editors/openoffice-1.1/files | |
parent | Upgrade to 050110 snapshot. (diff) |
Update to 1.1.4
Many thanks to: Pavel Janik, Kris Kennaway
and SUN Microsystems, Inc (esp. Hamburg team).
Additional contributors: daichi, kan, lofi, nork, obrien
Notes
Notes:
svn path=/head/; revision=126170
Diffstat (limited to 'editors/openoffice-1.1/files')
18 files changed, 179 insertions, 710 deletions
diff --git a/editors/openoffice-1.1/files/Makefile.knobs b/editors/openoffice-1.1/files/Makefile.knobs new file mode 100644 index 000000000000..09dce7f71bdc --- /dev/null +++ b/editors/openoffice-1.1/files/Makefile.knobs @@ -0,0 +1,68 @@ +# Makefile for knobs +# Whom: Maho Nakata <maho@FreeBSD.org> +# $FreeBSD$ + +.if defined(WITHOUT_JAVA) +CONFIGURE_ARGS+= --disable-java +.else +CONFIGURE_ARGS+= --with-jdk-home="${JAVA_HOME}" +.endif + +.if defined(WITHOUT_MOZILLA) +CONFIGURE_ARGS+= --disable-mozilla +.endif + +.if defined(ALL_LOCALIZED_LANGS) +CONFIGURE_ARGS+= --with-lang=ALL +.else +CONFIGURE_ARGS+= --with-lang=${LANG_CONFIGURE_ARG} +.endif + +.if defined(WITH_DEBUG) +.if ${WITH_DEBUG} == 2 +CONFIGURE_ARGS+= --enable-debug +.else +CONFIGURE_ARGS+= --enable-symbols +.endif +.endif + +pre-fetch: +.if (${OSVERSION} < 503001 && ${OSVERSION} >= 500000) || (${OSVERSION} < 492000) + @${ECHO} + @${ECHO} "WARNING" + @${ECHO} "Your rtld seems to be old." + @${ECHO} "Please remake your rtld by:" + @${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c" + @${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c" + @${ECHO} "# make ; make depend ; make install" + @${ECHO} "AT YOUR OWN RISK!" +.endif + @${ECHO} "OPTIONS:" +.if !defined(WITH_DEBUG) + @${ECHO} + @${ECHO} "You can compile OOo with debug symbols with WITH_DEBUG=1" + @${ECHO} + @${ECHO} "If you set WITH_DEBUG=2, you add internal" + @${ECHO} "OOo debug support." +.endif +.if !defined(WITHOUT_MOZILLA) + @${ECHO} + @${ECHO} "You can compile OOo without Mozilla connectivity by" + @${ECHO} "make -DWITHOUT_MOZILLA" +.endif +.if !defined(WITHOUT_JAVA) + @${ECHO} + @${ECHO} "You can compile OOo without Java support by" + @${ECHO} "make -DWITHOUT_JAVA" +.endif + @${ECHO} + @${ECHO} "NOTICE:" + @${ECHO} + @${ECHO} "To build Openoffice, you should have a lot" +.if defined(WITH_DEBUG) + @${ECHO} "of free diskspace (~ 8GB)." +.else + @${ECHO} "of free diskspace (~ 4GB)." +.endif + @${ECHO} "If you want SDK and/or solver, please type make sdk and/or make solver" + diff --git a/editors/openoffice-1.1/files/Makefile.localized b/editors/openoffice-1.1/files/Makefile.localized index d01203363382..aacbb4a7f2b9 100644 --- a/editors/openoffice-1.1/files/Makefile.localized +++ b/editors/openoffice-1.1/files/Makefile.localized @@ -102,7 +102,6 @@ LANG_EXT= 49 L10NHELP= helpcontent_${LANG_EXT}_unix.tgz LANG_CONFIGURE_ARG= GER COMMENT= Office-Suite mit Textverarbeitung, Tabellenkalkulation, Datenbank und Praesentationsprogramm -PKGMESSAGE= ${FILESDIR}/pkg-message.de .endif ################################################################ .if ${LOCALIZED_LANG} == "el" diff --git a/editors/openoffice-1.1/files/Makefile.mozilla b/editors/openoffice-1.1/files/Makefile.mozilla deleted file mode 100644 index 9593c16dba89..000000000000 --- a/editors/openoffice-1.1/files/Makefile.mozilla +++ /dev/null @@ -1,56 +0,0 @@ -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 - @${REINPLACE_CMD} -e 's|--disable-debug||' \ - -e 's|--disable-cpp-rtti||' \ - -e 's|--enable-strip||' \ - < ${WRKDIR}/mozilla/Makefile.new > ${WRKDIR}/mozilla/Makefile -.endif -#XXX FIXME! we shuold add CFLAGS="${CLFAGS}" to honor CFLAGS!! -.if defined(USE_GCC) - @cd ${WRKDIR}/mozilla ; ${MAKE} CXX="${CXX}" CC="${CC}" USE_GCC=${USE_GCC} build WRKDIRPREFIX="" -.else - @cd ${WRKDIR}/mozilla ; ${MAKE} CXX="${CXX}" CC="${CC}" 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: extract-mozilla patch-mozilla build-mozilla register-mozilla install-mozilla diff --git a/editors/openoffice-1.1/files/moz-patch b/editors/openoffice-1.1/files/moz-patch new file mode 100644 index 000000000000..7341aed5cdd5 --- /dev/null +++ b/editors/openoffice-1.1/files/moz-patch @@ -0,0 +1,19 @@ +#iZ 28398 +#iZ 11424 + +http://qa.openoffice.org/issues/show_bug.cgi?id=28398 +http://qa.openoffice.org/issues/show_bug.cgi?id=11424 + +--- moz/extractfiles.mk.org Sat Oct 30 22:01:49 2004 ++++ moz/extractfiles.mk Sat Oct 30 22:00:21 2004 +@@ -269,8 +269,8 @@ + +$(COPY) /QSZ $(INCLUDE_PATH)* $(INCLUDE_DIR) + +$(COPY) /QSZ $(PUBLIC_PATH)* $(INCLUDE_DIR) + .ELSE +- +$(GNUCOPY) -pr $(INCLUDE_PATH)* $(INCLUDE_DIR) +- +$(GNUCOPY) -pr $(PUBLIC_PATH)* $(INCLUDE_DIR) ++ +$(GNUCOPY) -Lr $(INCLUDE_PATH)* $(INCLUDE_DIR) ++ +$(GNUCOPY) -Lr $(PUBLIC_PATH)* $(INCLUDE_DIR) + .ENDIF + + .IF "$(GUI)"=="UNX" diff --git a/editors/openoffice-1.1/files/openoffice-wrapper b/editors/openoffice-1.1/files/openoffice-wrapper index 9265261affa7..3e0c2171e1d9 100644 --- a/editors/openoffice-1.1/files/openoffice-wrapper +++ b/editors/openoffice-1.1/files/openoffice-wrapper @@ -1,8 +1,8 @@ #!/bin/sh # -# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-1.1/files/Attic/openoffice-wrapper,v 1.14 2004-08-07 08:39:51 maho Exp $ +# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-1.1/files/Attic/openoffice-wrapper,v 1.15 2005-01-11 23:17:42 maho Exp $ -oopath=%%PREFIX%%/OpenOffice.org%%RELEASE_NR%%/program/ +oopath=%%PREFIX%%/%%INSTALLATION_BASEDIR%%/program/ program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%-||'` case $program in diff --git a/editors/openoffice-1.1/files/optpatch-freetype+patch b/editors/openoffice-1.1/files/optpatch-freetype+patch deleted file mode 100644 index b426a8fb7fcc..000000000000 --- a/editors/openoffice-1.1/files/optpatch-freetype+patch +++ /dev/null @@ -1,208 +0,0 @@ -Index: files/patch-freetype::patch -=================================================================== -RCS file: files/patch-freetype::patch -diff -N files/patch-freetype::patch ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ files/patch-freetype::patch 4 Aug 2002 15:27:42 -0000 -@@ -0,0 +1,201 @@ -+diff -ur ../freetype/freetype-2.0.5.patch oo641d_patched/freetype/freetype-2.0.5.patch -+--- ../freetype/freetype-2.0.5.patch Fri Apr 5 21:07:34 2002 -++++ ../freetype/freetype-2.0.5.patch Sat Mar 9 18:04:17 2002 -+@@ -1,118 +1,79 @@ -+-*** misc/freetype-2.0.5/builds/compiler/visualc.mk Thu Dec 14 00:44:33 2000 -+---- misc/build/freetype-2.0.5/builds/compiler/visualc.mk Wed Nov 7 16:11:47 2001 -+-*************** -+-*** 63,69 **** -+- # ANSI compliance. -+- # -+- ifndef CFLAGS -+-! CFLAGS := /nologo /c /Ox /G5 /W3 /WX -+- endif -+- -+- # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant. -+---- 63,69 ---- -+- # ANSI compliance. -+- # -+- ifndef CFLAGS -+-! CFLAGS := /nologo /c /Ox /G5 /W3 /WX /MT /Gd -D_CTYPE_DISABLE_MACROS -+- endif -+- -+- # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant. -+-*** misc/freetype-2.0.5/builds/unix/ltmain.sh Thu Jun 7 19:36:17 2001 -+---- misc/build/freetype-2.0.5/builds/unix/ltmain.sh Wed Nov 7 16:11:47 2001 -+-*************** -+-*** 631,637 **** -+- if test "$build_old_libs" = yes; then -+- if test "$pic_mode" != yes; then -+- # Don't build PIC code -+-! command="$base_compile $srcfile" -+- else -+- # All platforms use -DPIC, to notify preprocessed assembler code. -+- command="$base_compile $srcfile $pic_flag -DPIC" -+---- 631,637 ---- -+- if test "$build_old_libs" = yes; then -+- if test "$pic_mode" != yes; then -+- # Don't build PIC code -+-! command="$base_compile $srcfile -DPIC $pic_flag" -+- else -+- # All platforms use -DPIC, to notify preprocessed assembler code. -+- command="$base_compile $srcfile $pic_flag -DPIC" -+-*** misc/freetype-2.0.5/include/freetype/config/ftmodule.h Mon Jan 1 18:25:21 2001 -+---- misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h Wed Nov 7 16:11:47 2001 -+-*************** -+-*** 1,7 **** -+---- 1,9 ---- -+- FT_USE_MODULE(autohint_module_class) -+- FT_USE_MODULE(cff_driver_class) -+- FT_USE_MODULE(t1cid_driver_class) -+-+ /* -+- FT_USE_MODULE(pcf_driver_class) -+-+ */ -+- FT_USE_MODULE(psaux_module_class) -+- FT_USE_MODULE(psnames_module_class) -+- FT_USE_MODULE(ft_raster1_renderer_class) -+-*************** -+-*** 9,12 **** -+---- 11,16 ---- -+- FT_USE_MODULE(ft_smooth_renderer_class) -+- FT_USE_MODULE(tt_driver_class) -+- FT_USE_MODULE(t1_driver_class) -+-+ /* -+- FT_USE_MODULE(winfnt_driver_class) -+-+ */ -+-*** misc/freetype-2.0.5/include/freetype/config/ftoption.h Tue Aug 21 10:50:45 2001 -+---- misc/build/freetype-2.0.5/include/freetype/config/ftoption.h Wed Nov 7 16:11:47 2001 -+-*************** -+-*** 70,76 **** -+---- 70,79 ---- -+- /* All convenience functions are declared as such in their */ -+- /* documentation. */ -+- /* */ -+-+ /* -+- #undef FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS -+-+ */ -+-+ #define FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS -+- -+- -+- /*************************************************************************/ -+-*************** -+-*** 108,116 **** -+- /* use a vector `plotter' format that isn't supported when this */ -+- /* macro is undefined. */ -+- /* */ -+- #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS -+- -+-- -+- /*************************************************************************/ -+- /* */ -+- /* Glyph Postscript Names handling */ -+---- 111,121 ---- -+- /* use a vector `plotter' format that isn't supported when this */ -+- /* macro is undefined. */ -+- /* */ -+-+ /* -+- #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS -+-+ */ -+-+ #undef FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS -+- -+- /*************************************************************************/ -+- /* */ -+- /* Glyph Postscript Names handling */ -+-*** misc/build/freetype-2.0.5/builds/unix/ltmain.sh.orig Mon Jan 7 14:21:35 2002 -+---- misc/build/freetype-2.0.5/builds/unix/ltmain.sh Mon Jan 7 14:21:40 2002 -+-*************** -+-*** 2251,2257 **** -+- ;; -+- -+- irix) -+-! major=`expr $current - $age + 1` -+- verstring="sgi$major.$revision" -+- -+- # Add in all the interfaces that we are compatible with. -+---- 2251,2257 ---- -+- ;; -+- -+- irix) -+-! major=`expr $current - $age` -+- verstring="sgi$major.$revision" -+- -+- # Add in all the interfaces that we are compatible with. -++diff -ur misc/freetype-2.0.5/builds/compiler/visualc.mk misc/build/freetype-2.0.5/builds/compiler/visualc.mk -++--- misc/freetype-2.0.5/builds/compiler/visualc.mk Thu Dec 27 14:47:57 2001 -+++++ misc/build/freetype-2.0.5/builds/compiler/visualc.mk Thu Dec 27 14:49:17 2001 -++@@ -63,7 +63,7 @@ -++ # ANSI compliance. -++ # -++ ifndef CFLAGS -++- CFLAGS := /nologo /c /Ox /G5 /W3 /WX -+++ CFLAGS := /nologo /c /Ox /G5 /W3 /WX /MT /Gd -D_CTYPE_DISABLE_MACROS -++ endif -++ -++ # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant. -++diff -ur misc/freetype-2.0.5/builds/unix/ltmain.sh misc/build/freetype-2.0.5/builds/unix/ltmain.sh -++--- misc/freetype-2.0.5/builds/unix/ltmain.sh Thu Dec 27 14:47:56 2001 -+++++ misc/build/freetype-2.0.5/builds/unix/ltmain.sh Thu Dec 27 14:49:17 2001 -++@@ -631,7 +631,7 @@ -++ if test "$build_old_libs" = yes; then -++ if test "$pic_mode" != yes; then -++ # Don't build PIC code -++- command="$base_compile $srcfile" -+++ command="$base_compile $srcfile -DPIC $pic_flag" -++ else -++ # All platforms use -DPIC, to notify preprocessed assembler code. -++ command="$base_compile $srcfile $pic_flag -DPIC" -++diff -ur misc/freetype-2.0.5/include/freetype/config/ftmodule.h misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h -++--- misc/freetype-2.0.5/include/freetype/config/ftmodule.h Thu Dec 27 14:47:57 2001 -+++++ misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h Thu Dec 27 14:49:17 2001 -++@@ -1,7 +1,9 @@ -++ FT_USE_MODULE(autohint_module_class) -++ FT_USE_MODULE(cff_driver_class) -++ FT_USE_MODULE(t1cid_driver_class) -+++/* -++ FT_USE_MODULE(pcf_driver_class) -+++*/ -++ FT_USE_MODULE(psaux_module_class) -++ FT_USE_MODULE(psnames_module_class) -++ FT_USE_MODULE(ft_raster1_renderer_class) -++@@ -9,4 +11,6 @@ -++ FT_USE_MODULE(ft_smooth_renderer_class) -++ FT_USE_MODULE(tt_driver_class) -++ FT_USE_MODULE(t1_driver_class) -+++/* -++ FT_USE_MODULE(winfnt_driver_class) -+++*/ -++diff -ur misc/freetype-2.0.5/include/freetype/config/ftoption.h misc/build/freetype-2.0.5/include/freetype/config/ftoption.h -++--- misc/freetype-2.0.5/include/freetype/config/ftoption.h Thu Dec 27 14:47:57 2001 -+++++ misc/build/freetype-2.0.5/include/freetype/config/ftoption.h Thu Dec 27 14:51:15 2001 -++@@ -70,7 +70,10 @@ -++ /* All convenience functions are declared as such in their */ -++ /* documentation. */ -++ /* */ -+++/* -++ #undef FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS -+++*/ -+++#define FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS -++ -++ -++ /*************************************************************************/ -++@@ -108,8 +111,10 @@ -++ /* use a vector `plotter' format that isn't supported when this */ -++ /* macro is undefined. */ -++ /* */ -+++/* -++ #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS -++- -+++*/ -+++#undef FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS -++ -++ /*************************************************************************/ -++ /* */ -++@@ -338,7 +343,7 @@ -++ /* By undefining this, you will only compile the code necessary to load */ -++ /* TrueType glyphs without hinting. */ -++ /* */ -++-#undef TT_CONFIG_OPTION_BYTECODE_INTERPRETER -+++#define TT_CONFIG_OPTION_BYTECODE_INTERPRETER -++ -++ -++ /*************************************************************************/ diff --git a/editors/openoffice-1.1/files/optpatch-vcl+util+makefile.pmk b/editors/openoffice-1.1/files/optpatch-vcl+util+makefile.pmk deleted file mode 100644 index 41341ff0b4e8..000000000000 --- a/editors/openoffice-1.1/files/optpatch-vcl+util+makefile.pmk +++ /dev/null @@ -1,11 +0,0 @@ ---- ../vcl/util/makefile.pmk.orig Mon Aug 5 01:39:41 2002 -+++ ../vcl/util/makefile.pmk Mon Aug 5 01:40:03 2002 -@@ -64,7 +64,7 @@ - PROJECTPCHSOURCE=$(PRJ)$/util$/vclpch - PDBTARGET=vcl - --.IF "$(OS)" != "MACOSX" -+.IF "$(OS)" != "MACOSX" && "$(OS)" != "FREEBSD" - .IF "$(remote)" != "" - USE_BUILTIN_RASTERIZER=true - .ENDIF diff --git a/editors/openoffice-1.1/files/patch-config_office+configure.in b/editors/openoffice-1.1/files/patch-config_office+configure.in index 5a73be9d0bbe..76cb40db51e6 100644 --- a/editors/openoffice-1.1/files/patch-config_office+configure.in +++ b/editors/openoffice-1.1/files/patch-config_office+configure.in @@ -1,3 +1,5 @@ +http://www.openoffice.org/issues/show_bug.cgi?id=40189 + Index: config_office/configure.in =================================================================== RCS file: /cvs/tools/config_office/configure.in,v diff --git a/editors/openoffice-1.1/files/patch-cppuhelper+source+gcc3_linux_intel.map b/editors/openoffice-1.1/files/patch-cppuhelper+source+gcc3_linux_intel.map deleted file mode 100644 index bbbfeab36816..000000000000 --- a/editors/openoffice-1.1/files/patch-cppuhelper+source+gcc3_linux_intel.map +++ /dev/null @@ -1,10 +0,0 @@ ---- cppuhelper/source/gcc3_linux_intel.map.orig Sat Sep 13 22:15:22 2003 -+++ cppuhelper/source/gcc3_linux_intel.map Sat Sep 13 22:16:01 2003 -@@ -299,6 +299,7 @@ - _ZNK4cppu6UnoUrl11getProtocolEv; - _ZNK4cppu6UnoUrl13getConnectionEv; - _ZNK4cppu6UnoUrl13getObjectNameEv; -+_end; - - local: - *; diff --git a/editors/openoffice-1.1/files/patch-sch_setLogicRectHack b/editors/openoffice-1.1/files/patch-sch_setLogicRectHack deleted file mode 100644 index 44de26bd9cfd..000000000000 --- a/editors/openoffice-1.1/files/patch-sch_setLogicRectHack +++ /dev/null @@ -1,69 +0,0 @@ -#iZ 9462 - ---- sch/source/ui/unoidl/ChXChartObject.cxx.orig 7 Aug 2002 16:01:42 -0000 1.34 -+++ sch/source/ui/unoidl/ChXChartObject.cxx 20 Feb 2004 00:43:10 -0000 -@@ -161,9 +161,11 @@ - // XShape - - // the following 'Hack' methods are copied from svx/unodraw/unoshape.cxx --// they are needed as long as the drawing layer requires this -+// they are needed as long as the drawing layer requires this. Must -+// prefix these with 'sch' to make sure the symbols don't conflict with -+// those in svx and cause Bad Things To Happen (TM) #i9462# - --sal_Bool needLogicRectHack( SdrObject* pObj ) -+static sal_Bool sch_needLogicRectHack( SdrObject* pObj ) - { - if( pObj->GetObjInventor() == SdrInventor) - { -@@ -189,9 +191,9 @@ - return sal_False; - } - --Rectangle getLogicRectHack( SdrObject* pObj ) -+static Rectangle sch_getLogicRectHack( SdrObject* pObj ) - { -- if(needLogicRectHack(pObj)) -+ if(sch_needLogicRectHack(pObj)) - { - return pObj->GetSnapRect(); - } -@@ -201,9 +203,9 @@ - } - } - --void setLogicRectHack( SdrObject* pObj, const Rectangle& rRect ) -+static void sch_setLogicRectHack( SdrObject* pObj, const Rectangle& rRect ) - { -- if(needLogicRectHack(pObj)) -+ if(sch_needLogicRectHack(pObj)) - { - pObj->SetSnapRect( rRect ); - } -@@ -244,7 +246,7 @@ - SdrObject* pObj = GetCurrentSdrObject(); - if( pObj ) - { -- Rectangle aRect( getLogicRectHack( pObj )); -+ Rectangle aRect( sch_getLogicRectHack( pObj )); - Point aPt( aRect.Left(), aRect.Top() ); - - // Position is relative to anchor - calculate absoulte position -@@ -277,7 +279,7 @@ - SdrObject* pObj = GetCurrentSdrObject(); - if( pObj ) - { -- Rectangle aRect( getLogicRectHack( pObj ) ); -+ Rectangle aRect( sch_getLogicRectHack( pObj ) ); - Point aLocalPos( aPosition.X, aPosition.Y ); - - // Position is absolute - position relative to anchor is required -@@ -309,7 +311,7 @@ - SdrObject* pObj = GetCurrentSdrObject(); - if( pObj ) - { -- Rectangle aRect( getLogicRectHack( pObj )); -+ Rectangle aRect( sch_getLogicRectHack( pObj )); - Size aObjSize( aRect.GetWidth(), aRect.GetHeight() ); - return awt::Size( aObjSize.getWidth(), aObjSize.getHeight() ); - } diff --git a/editors/openoffice-1.1/files/patch-sfx2+source+config+cfgmgr.cxx b/editors/openoffice-1.1/files/patch-sfx2+source+config+cfgmgr.cxx deleted file mode 100644 index 420c61cc7b7b..000000000000 --- a/editors/openoffice-1.1/files/patch-sfx2+source+config+cfgmgr.cxx +++ /dev/null @@ -1,16 +0,0 @@ -Weird bug? -http://qa.openoffice.org/issues/show_bug.cgi?id=22253 - ---- sfx2/source/config/cfgmgr.cxx.org Fri Nov 7 19:11:25 2003 -+++ sfx2/source/config/cfgmgr.cxx Fri Nov 7 19:30:26 2003 -@@ -118,6 +118,10 @@ - catch(com::sun::star::ucb::InteractiveAugmentedIOException&) - { - } -+ // PJ: This is a workaround for weird error on FreeBSD (#i22253#) -+ catch(com::sun::star::uno::Exception&) -+ { -+ } - sal_Bool bIsDocument; - if ( (aAny >>= bIsDocument) && bIsDocument ) - return new SotStorage( TRUE, rName, nMode, STORAGE_TRANSACTED ); diff --git a/editors/openoffice-1.1/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx b/editors/openoffice-1.1/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx index 196084c1657b..6cf440329e06 100644 --- a/editors/openoffice-1.1/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx +++ b/editors/openoffice-1.1/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx @@ -1,3 +1,13 @@ +In solver/645/unxfbsd.pro/inc/rtl/string.hxx, +even though there is a descrioptin like +static OString valueOf( sal_Int32 i, sal_Int16 radix = 10 ) SAL_THROW(()) +and In /usr/include/machine/_types.h, +typedef int __int32_t; +typedef __int32_t __time_t; /* time()... */ +and +/usr/include/time.h:typedef __time_t time_t; +this cast seems to be mandatory. Why?? + --- shell/source/unix/sysshell/recently_used_file_handler.cxx.orig Tue Jan 13 00:56:37 2004 +++ shell/source/unix/sysshell/recently_used_file_handler.cxx Tue Jan 13 00:57:26 2004 @@ -188,9 +188,12 @@ diff --git a/editors/openoffice-1.1/files/patch-svx_setLogicRectHack b/editors/openoffice-1.1/files/patch-svx_setLogicRectHack deleted file mode 100644 index e8c2725e58ab..000000000000 --- a/editors/openoffice-1.1/files/patch-svx_setLogicRectHack +++ /dev/null @@ -1,84 +0,0 @@ -#i9462# ---- svx/source/unodraw/unoshape.cxx.orig 4 Feb 2004 13:21:23 -0000 1.109 -+++ svx/source/unodraw/unoshape.cxx 20 Feb 2004 00:43:50 -0000 -@@ -1067,8 +1067,10 @@ - // XShape - - //---------------------------------------------------------------------- -+// This code also existed in sch, and those duplicate symbols -+// cause Bad Things To Happen (TM) #i9462#. Prefixing with 'svx'. - --sal_Bool needLogicRectHack( SdrObject* pObj ) -+static sal_Bool svx_needLogicRectHack( SdrObject* pObj ) - { - if( pObj->GetObjInventor() == SdrInventor) - { -@@ -1096,9 +1098,9 @@ - - //---------------------------------------------------------------------- - --Rectangle getLogicRectHack( SdrObject* pObj ) -+static Rectangle svx_getLogicRectHack( SdrObject* pObj ) - { -- if(needLogicRectHack(pObj)) -+ if(svx_needLogicRectHack(pObj)) - { - return pObj->GetSnapRect(); - } -@@ -1110,9 +1112,9 @@ - - //---------------------------------------------------------------------- - --void setLogicRectHack( SdrObject* pObj, const Rectangle& rRect ) -+static void svx_setLogicRectHack( SdrObject* pObj, const Rectangle& rRect ) - { -- if(needLogicRectHack(pObj)) -+ if(svx_needLogicRectHack(pObj)) - { - pObj->SetSnapRect( rRect ); - } -@@ -1130,7 +1132,7 @@ - - if( pObj && pModel) - { -- Rectangle aRect( getLogicRectHack(pObj) ); -+ Rectangle aRect( svx_getLogicRectHack(pObj) ); - Point aPt( aRect.Left(), aRect.Top() ); - - // Position is relativ to anchor, so recalc to absolut position -@@ -1157,7 +1159,7 @@ - // transformation matrix - if(!pObj->ISA(E3dCompoundObject)) - { -- Rectangle aRect( getLogicRectHack(pObj) ); -+ Rectangle aRect( svx_getLogicRectHack(pObj) ); - Point aLocalPos( Position.X, Position.Y ); - ForceMetricToItemPoolMetric(aLocalPos); - -@@ -1183,7 +1185,7 @@ - - if( pObj && pModel) - { -- Rectangle aRect( getLogicRectHack(pObj) ); -+ Rectangle aRect( svx_getLogicRectHack(pObj) ); - Size aObjSize( aRect.GetWidth(), aRect.GetHeight() ); - ForceMetricTo100th_mm(aObjSize); - return ::com::sun::star::awt::Size( aObjSize.getWidth(), aObjSize.getHeight() ); -@@ -1200,7 +1202,7 @@ - - if( pObj && pModel) - { -- Rectangle aRect( getLogicRectHack(pObj) ); -+ Rectangle aRect( svx_getLogicRectHack(pObj) ); - Size aLocalSize( rSize.Width, rSize.Height ); - ForceMetricToItemPoolMetric(aLocalSize); - if(pObj->GetObjInventor() == SdrInventor && pObj->GetObjIdentifier() == OBJ_MEASURE ) -@@ -1213,7 +1215,7 @@ - else - { - aRect.SetSize(aLocalSize); -- setLogicRectHack( pObj, aRect ); -+ svx_setLogicRectHack( pObj, aRect ); - } - - pModel->SetChanged(); diff --git a/editors/openoffice-1.1/files/patch-translation_limit_64k b/editors/openoffice-1.1/files/patch-translation_limit_64k index ce15548f052b..109833162541 100644 --- a/editors/openoffice-1.1/files/patch-translation_limit_64k +++ b/editors/openoffice-1.1/files/patch-translation_limit_64k @@ -1,5 +1,7 @@ #iZ 33228# #iZ 34210# +Kannada doesn't build since some resources are limited to 64k. +it won't fix for 1.1.x Index: inc/sc.hrc =================================================================== diff --git a/editors/openoffice-1.1/files/patch-ucbhelper+source+client+proxydeider.cxx b/editors/openoffice-1.1/files/patch-ucbhelper+source+client+proxydeider.cxx new file mode 100644 index 000000000000..88225ffe8308 --- /dev/null +++ b/editors/openoffice-1.1/files/patch-ucbhelper+source+client+proxydeider.cxx @@ -0,0 +1,22 @@ +http://www.openoffice.org/issues/show_bug.cgi?id=40191 + +sys/socket.h is needed for FreeBSD + +Index: ucbhelper/source/client/proxydecider.cxx +=================================================================== +RCS file: /cvs/ucb/ucbhelper/source/client/proxydecider.cxx,v +retrieving revision 1.3.16.1 +diff -u -r1.3.16.1 proxydecider.cxx +--- ucbhelper/source/client/proxydecider.cxx 20 Oct 2004 12:04:36 -0000 1.3.16.1 ++++ ucbhelper/source/client/proxydecider.cxx 30 Dec 2004 04:12:01 -0000 +@@ -127,6 +127,10 @@ + #include <unistd.h> + #endif + ++#if defined (FREEBSD) ++#include <sys/socket.h> ++#endif ++ + #ifdef SOLARIS + + extern "C" diff --git a/editors/openoffice-1.1/files/pkg-message.de b/editors/openoffice-1.1/files/pkg-message.de deleted file mode 100644 index 4466bdb7bee5..000000000000 --- a/editors/openoffice-1.1/files/pkg-message.de +++ /dev/null @@ -1,89 +0,0 @@ -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. diff --git a/editors/openoffice-1.1/files/pkg-message.in b/editors/openoffice-1.1/files/pkg-message.in new file mode 100644 index 000000000000..5d97699bd0f0 --- /dev/null +++ b/editors/openoffice-1.1/files/pkg-message.in @@ -0,0 +1,54 @@ +OpenOffice.org Build %%RELEASE_NR%% Personal Install How-To + +Written by: Martin Blapp <mbr@freebsd.org> + and Maho Nakata <maho@FreeBSD.org> + +OpenOffice.org %%RELEASE_NR%% will soon been installed in +%%PREFIX%%/%%EXECBASE%% + +1 User installation +------------------- + +Just type "%%EXECBASE%%" after you have successfully +installed the package. If there is no installed +OO.org dir in your homedir, you'll be prompted to +install some files and choose a installed JDK. +The setup installs a "OpenOffice.org%%RELEASE_NR%%" folder +in your homedir. + +If the setup tells you there is already an installed +version, you may look at the file ".sversionrc" in +your homedir. In this file OpenOffice and StarOffice +have both a line for each version which is installed. +After removing the problematic line you should be able to +install again. + +2 Start OO.org +-------------- + +There are some wrappers installed for fast startup. +Add "%%PREFIX%%/bin/" to your PATH and you will be able +to use them. + +%%PREFIX%%/bin/%%EXECBASE%% +%%PREFIX%%/bin/%%EXECBASE%%-sagenda +%%PREFIX%%/bin/%%EXECBASE%%-scalc +%%PREFIX%%/bin/%%EXECBASE%%-sdraw +%%PREFIX%%/bin/%%EXECBASE%%-setup +%%PREFIX%%/bin/%%EXECBASE%%-sfax +%%PREFIX%%/bin/%%EXECBASE%%-simpress +%%PREFIX%%/bin/%%EXECBASE%%-spadmin +%%PREFIX%%/bin/%%EXECBASE%%-sweb +%%PREFIX%%/bin/%%EXECBASE%%-swriter + +OO.org does need $LANG to be set to a suitable value. +If it is not already set, a default value is chosen. + +3 If you stuck into a trouble +-------------------------------------------------- +Somehow you can stuck into a trouble. +To solve this issue, please remove the already installed +"OpenOffice.org%%RELEASE_NR%%" dir in your homedir and remove the +appropriate entry from ".sversionrc". After you have done +this, redo the user installation and the problem will +go away. diff --git a/editors/openoffice-1.1/files/zipmoz.sh b/editors/openoffice-1.1/files/zipmoz.sh deleted file mode 100644 index 43a4591f3430..000000000000 --- a/editors/openoffice-1.1/files/zipmoz.sh +++ /dev/null @@ -1,164 +0,0 @@ -#!/bin/sh -f - -RUNTIME_FILES=" components/libabsyncsvc.so components/libaddrbook.so \ - components/libmork.so components/libmozldap.so \ - components/libnecko.so components/libprofile.so \ - components/librdf.so components/libstrres.so \ - components/libunicharutil.so components/libuconv.so \ - components/libucvcn.so components/libucvibm.so \ - components/libucvja.so components/libucvko.so \ - components/libucvlatin.so components/libucvtw.so \ - components/libucvtw2.so components/liburiloader.so \ - components/libvcard.so components/libxpconnect.so \ - components/libpref.so components/libchrome.so libmozjs.so \ - libmsgbaseutil.so libldap50.so libnspr4.so libplc4.so \ - libplds4.so libxpcom.so libmozz.so component.reg \ - components/necko_dns.xpt components/xpcom_xpti.xpt \ - components/xpcom_threads.xpt components/xpcom_io.xpt \ - components/xpcom_ds.xpt components/xpcom_components.xpt \ - components/xpcom_base.xpt components/xpti.dat \ - defaults/pref/all.js defaults/pref/config.js \ - defaults/pref/editor.js defaults/pref/initpref.js \ - defaults/pref/inspector.js defaults/pref/mailnews.js \ - defaults/pref/security-prefs.js defaults/pref/unix.js \ - defaults/pref/xpinstall.js" - -LIB_FILES=" lib/libembed_base_s.a lib/libmozreg_s.a \ - lib/libnspr4.so lib/libxpcom.so lib/libprldap50.so" - -INC_FILES="include/" -INC_FILES2="public/" - -if [ $# -lt 2 -o $# -gt 3 ] ; then - echo - echo usage: $0 mozilla_dist target [target_dir] - echo - echo where: - echo - echo "mozilla_dist points to the mozilla distribution" - echo "target concatenates OS, compiler and CPU (e.g. FREEBSDGCCI etc)" - echo "target_dir is the directory to place the zips" - exit 1 -fi - -MOZ_DIST=$1 -TARGET=$2 -if [ "w$3" != "w" ]; then - TARGET_DIR=$3 -else - if [ "w$TARGET_DIR" == "w" ]; then - TARGET_DIR= - fi -fi - -ZIP_TARGET=$TARGET_DIR -if [ -z "$ZIP_TARGET" ] ; then - ZIP_TARGET=../ -fi - -# just to remember the current working directory -STARTING_DIR=`pwd` - -echo -echo --- creating zips for $TARGET, using mozilla distribution in $MOZ_DIST - -# Create the directories -[ ! -d $TARGET_DIR/$TARGET/runtime ] && mkdir -p $TARGET_DIR/$TARGET/runtime -[ ! -d $TARGET_DIR/$TARGET/runtime/components ] && mkdir -p $TARGET_DIR/$TARGET/runtime/components -[ ! -d $TARGET_DIR/$TARGET/runtime/defaults ] && mkdir -p $TARGET_DIR/$TARGET/runtime/defaults -[ ! -d $TARGET_DIR/$TARGET/runtime/defaults/pref ] && mkdir -p $TARGET_DIR/$TARGET/runtime/defaults/pref -[ ! -d $TARGET_DIR/$TARGET/lib ] && mkdir -p $TARGET_DIR/$TARGET/lib -[ ! -d $TARGET_DIR/$TARGET/inc ] && mkdir -p $TARGET_DIR/$TARGET/inc -[ ! -d $TARGET_DIR/$TARGET/inc/nspr ] && mkdir -p $TARGET_DIR/$TARGET/inc/nspr -[ ! -d $TARGET_DIR/$TARGET/inc/obsolete ] && mkdir -p $TARGET_DIR/$TARGET/inc/obsolete - -# Copy the files -echo -echo --- copying files -echo - -for i in $RUNTIME_FILES; do - if [ ! -f $MOZ_DIST/bin/$i ]; then - echo $MOZ_DIST/bin/$i does not exist, check your distribution - else - if [ `echo $i | grep component` ]; then - cp $MOZ_DIST/bin/$i $TARGET_DIR/$TARGET/runtime/components/ - elif [ `echo $i | grep defaults` ]; then - cp $MOZ_DIST/bin/$i $TARGET_DIR/$TARGET/runtime/defaults/pref/ - else - cp $MOZ_DIST/bin/$i $TARGET_DIR/$TARGET/runtime/ - fi - fi -done - -for i in $LIB_FILES; do - if [ ! -f $MOZ_DIST/$i ]; then - echo $MOZ_DIST/$i does not exist, check your distribution - else - cp -R -L $MOZ_DIST/$i $TARGET_DIR/$TARGET/lib/ - fi -done - -for i in `ls -1 $MOZ_DIST/$INC_FILES`; do - if [ ! -d $i ]; then - cp -R -L $MOZ_DIST/include/$i $TARGET_DIR/$TARGET/inc/ - fi -done - -for i in `ls -1 $MOZ_DIST/$INC_FILES2`; do - if [ ! -d $i ]; then - cp -R -L $MOZ_DIST/public/$i $TARGET_DIR/$TARGET/inc - fi -done - -for i in `ls -1 $MOZ_DIST/$INC_FILES/nspr`; do - if [ ! -d $i ]; then - cp -R -L $MOZ_DIST/include/nspr/$i $TARGET_DIR/$TARGET/inc/nspr - fi -done - -for i in `ls -1 $MOZ_DIST/$INC_FILES/nspr/obsolete`; do - if [ ! -d $i ]; then - cp -R -L $MOZ_DIST/include/nspr/obsolete/$i $TARGET_DIR/$TARGET/inc/obsolete - fi -done - -# delete old zips - -[ -f $TARGET_DIR/$TARGET/runtime.zip ] && rm -f $TARGET_DIR/$TARGET/runtime.zip -[ -f $TARGET_DIR/$TARGET/lib.zip ] && rm -f $TARGET_DIR/$TARGET/lib.zip -[ -f $TARGET_DIR/$TARGET/inc.zip ] && rm -f $TARGET_DIR/$TARGET/inc.zip - -# zip the runtime files - -echo -echo --- creating ${TARGET}runtime.zip -echo - -cd $TARGET_DIR/$TARGET/runtime -find . -type f | zip $ZIP_TARGET/${TARGET}runtime.zip -@ - -# zip the lib files -echo -echo --- creating ${TARGET}lib.zip -echo - -cd $TARGET_DIR/$TARGET/lib -find . -type f | zip $ZIP_TARGET/${TARGET}lib.zip -@ - -# zip the inc files -echo -echo --- creating ${TARGET}inc.zip -echo - -cd $TARGET_DIR/$TARGET/inc -find . -type f | zip $ZIP_TARGET/${TARGET}inc.zip -@ - -# remove dirs -cd $STARTING_DIR -rm -rf $TARGET_DIR/$TARGET - -echo -echo --- done -echo - |