diff options
author | Maho Nakata <maho@FreeBSD.org> | 2004-10-31 04:21:45 +0000 |
---|---|---|
committer | Maho Nakata <maho@FreeBSD.org> | 2004-10-31 04:21:45 +0000 |
commit | 4e9da3d5679b7388b010f16c20191f11cf778feb (patch) | |
tree | a1c9376b5a49d17e3638e012e638a464e74516c0 /editors/openoffice.org-1.1-devel | |
parent | 7399611cdbcd9697f53ac40a1d9e91794e6496be (diff) | |
download | ports-4e9da3d5679b7388b010f16c20191f11cf778feb.tar.gz ports-4e9da3d5679b7388b010f16c20191f11cf778feb.zip |
1) Change in Mozilla runtime build
#iZ 11424
#iZ 28398
checkout cws_srx645_mozooo of 2004/02/03 + moz/prj/build.lst
http://qa.openoffice.org/issues/show_bug.cgi?id=11424
http://qa.openoffice.org/issues/show_bug.cgi?id=28398
remove files/zipmoz.sh
remove Makefile.mozilla
2) remove optpatches (we have new version of freetype, need updated patches)
3) more clean ups
Notes
Notes:
svn path=/head/; revision=120509
Diffstat (limited to 'editors/openoffice.org-1.1-devel')
8 files changed, 191 insertions, 450 deletions
diff --git a/editors/openoffice.org-1.1-devel/Makefile b/editors/openoffice.org-1.1-devel/Makefile index b7752642744d..93bfb9ebc6fa 100644 --- a/editors/openoffice.org-1.1-devel/Makefile +++ b/editors/openoffice.org-1.1-devel/Makefile @@ -10,7 +10,8 @@ PORTVERSION= 1.1.4.${SNAPDATE} CATEGORIES+= editors MASTER_SITES+= ${MASTER_SITE_LOCAL} \ ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \ - http://people.freebsd.org/~mbr/ooo/:moz \ + http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/mozilla1.0/src/:moz \ + ${MASTER_SITE_LOCAL}: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 \ @@ -21,11 +22,13 @@ EXTRACT_ONLY= OOo_${PORTVERSION}_source.tar.bz2 MAINTAINER= openoffice@FreeBSD.org -SNAPDATE= 20041024 +SNAPDATE= 20041030 NO_LATEST_LINK= yes USE_GNOME= gtk20 +MOZILLA_PROJECT= cws_srx645_mozooo.20040203.tar.gz +MOZILLA_SOURCE= mozilla-source-1.0.tar.gz .if !defined(WITHOUT_MOZILLA) -DISTFILES+= patch-openoffice-mozilla101-2002-10-14:moz mozilla-vendor-1.0.2a.tgz:moz +DISTFILES+= ${MOZILLA_PROJECT}:moz ${MOZILLA_SOURCE}:moz USE_GNOME+= orbit gtk12 .endif @@ -163,19 +166,6 @@ pre-fetch: @${ECHO} "OOo debug support." @${ECHO} .endif -.if !defined(WITH_TTF_BYTECODE_ENABLED) - @${ECHO} - @${ECHO} "You may set WITH_TTF_BYTECODE_ENABLED=YES" - @${ECHO} "if you like to use the Freetype library to" - @${ECHO} "render TTF fonts. Normally the TTF lib is" - @${ECHO} "not used to render fonts." - @${ECHO} - @${ECHO} "If you have licensed the Apple patents" - @${ECHO} "US05155805 US05159668 and US05325479" - @${ECHO} "you can enable this option to get better" - @${ECHO} "quality of glyphs at small bitmap sizes." - @${ECHO} -.endif @${ECHO} @${ECHO} "NOTICE:" @${ECHO} @@ -188,7 +178,7 @@ pre-fetch: @${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 +# really tweak, extremely useful when you build all localized language versions # needed after when you build with ALL_LOCALIZED_LANGS. .if defined(TWEAK_L10N) @${RM} -f ${WRKDIR}/.PLIST* @@ -222,72 +212,44 @@ post-extract: ${CAT} ${DISTDIR}/${DIST_SUBDIR}/$$file | ${GZIP_CMD} -d | ${TAR} xf - ; \ done .endif +.if !defined(WITHOUT_MOZILLA) + @cd ${WRKSRC} ; ${MV} moz moz.old ; ${TAR} xfz ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_PROJECT} ; ${PATCH} < ${FILESDIR}/moz-patch + @${MKDIR} ${WRKSRC}/moz/download + @${CP} ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_SOURCE} ${WRKSRC}/moz/download + @cd ${WRKSRC} ; ${MV} moz moz.runtime ; ${MV} moz.old moz +.endif post-patch: @${REINPLACE_CMD} -e 's+%%PTHREAD_LIBS%%+${PTHREAD_LIBS}+g;' ${WRKSRC}/odk/settings/settings.mk @${REINPLACE_CMD} -e 's+%%PTHREAD_CFLAGS%%+${PTHREAD_CFLAGS}+g' ${WRKSRC}/odk/settings/settings.mk -.if defined(WITH_TTF_BYTECODE_ENABLED) - @if [ "`echo ${PATCHDIR}/optpatch-*`" != "${PATCHDIR}/optpatch-*" ]; then \ - ${ECHO_MSG} "===> Applying additional TTF bytecode patches for ${PKGNAME}" ; \ - if [ ${PATCH_DEBUG_TMP} = yes ]; then \ - ${ECHO_MSG} "===> Applying ${OPSYS} patch ${PATCHDIR}/optpatch-freetype::patch" ; \ - fi; \ - ${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/optpatch-freetype+patch ; \ - fi -.endif -.if !defined(WITHOUT_MOZILLA) && ( \ - !exists(${WRKSRC}/moz/zipped/FREEBSDGCCIruntime.zip) || \ - !exists(${WRKSRC}/moz/zipped/FREEBSDGCCIlib.zip) || \ - !exists(${WRKSRC}/moz/zipped/FREEBSDGCCIinc.zip) ) -.include <${FILESDIR}/Makefile.mozilla> -do-build: mozilla -.else do-build: + @cd ${WRKSRC} ; ./bootstrap +.if !defined(WITHOUT_MOZILLA) + @cd ${WRKSRC}/moz.runtime ; ${SETENV} "BUILD_MOZAB=TRUE" ${TCSH} -c 'source ../FreeBSDEnv.Set ; build.pl ; dmake zip' ; cp unxfbsd.pro/zipped/FREEBSD*.zip ../moz/zipped .endif -.if exists(${WRKDIR}/.Xvfb.pid) - @-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill - @${RM} -f ${WRKDIR}/.Xvfb.pid -.endif -.if !defined(DISPLAY) - # - # This is a UGLY hack to not have to specify a X-Display. - # - ${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) || 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}' - @-${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}' -.endif -do-install: -.if !defined(DISPLAY) # - # UGLY hack to not have to specify a X-Display. + # This is a UGLY hack to not have to specify a X-Display. # ${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid @sleep 5 - @cd ${WRKSRC}/instsetoo/*.pro/${LANG_EXT}/normal/ ; \ - SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} ./install --prefix=${PREFIX} + @cd ${WRKSRC} ; DISPLAY=${DISPLAYHACK} ; ${TCSH} -c 'source FreeBSDEnv.Set ; ${BUILD}' @-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill @${RM} -f ${WRKDIR}/.Xvfb.pid .else - @cd ${WRKSRC}/instsetoo/*.pro/${LANG_EXT}/normal/ ; \ - SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} ./install --prefix=${PREFIX} + @cd ${WRKSRC} ; DISPLAY=${DISPLAY} ; ${TCSH} -c 'source FreeBSDEnv.Set ; ${BUILD}' .endif +do-install: + @cd ${WRKSRC}/instsetoo/*.pro/${LANG_EXT}/normal/ ; TEMP=${WRKDIR} DISPLAY=${DISPLAY} ./install --prefix=${PREFIX} + install-user: - @SAL_IGNOREXERRORS=1 ${PREFIX}/${INSTALLATION_BASEDIR}/program/setup + @${PREFIX}/${INSTALLATION_BASEDIR}/program/setup post-install: @${ECHO_MSG} "===> Add wrapper scripts"; diff --git a/editors/openoffice.org-1.1-devel/distinfo b/editors/openoffice.org-1.1-devel/distinfo index 18f22f3404ab..8ec0d36a5f9c 100644 --- a/editors/openoffice.org-1.1-devel/distinfo +++ b/editors/openoffice.org-1.1-devel/distinfo @@ -1,11 +1,11 @@ -MD5 (openoffice1.1/OOo_1.1.4.20041024_source.tar.bz2) = 187eb8519e1c14866bc4cb3b8286387a -SIZE (openoffice1.1/OOo_1.1.4.20041024_source.tar.bz2) = 194266525 +MD5 (openoffice1.1/OOo_1.1.4.20041030_source.tar.bz2) = d51db6b6acbb14f707b3bb2360785666 +SIZE (openoffice1.1/OOo_1.1.4.20041030_source.tar.bz2) = 194262145 MD5 (openoffice1.1/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 SIZE (openoffice1.1/gpc231.tar.Z) = 27917 -MD5 (openoffice1.1/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a -SIZE (openoffice1.1/patch-openoffice-mozilla101-2002-10-14) = 29105 -MD5 (openoffice1.1/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468 -SIZE (openoffice1.1/mozilla-vendor-1.0.2a.tgz) = 7292 +MD5 (openoffice1.1/cws_srx645_mozooo.20040203.tar.gz) = 1239aad43c65d6808b6261ea9d60fb67 +SIZE (openoffice1.1/cws_srx645_mozooo.20040203.tar.gz) = 39708 +MD5 (openoffice1.1/mozilla-source-1.0.tar.gz) = 35a7524c2fbb773e23449179c5cb1f20 +SIZE (openoffice1.1/mozilla-source-1.0.tar.gz) = 39881558 MD5 (openoffice1.1/helpcontent_31_unix.tgz) = c7e618e2d9b8bd25cae12954ef2548c9 SIZE (openoffice1.1/helpcontent_31_unix.tgz) = 12073861 MD5 (openoffice1.1/helpcontent_33_unix.tgz) = 68d58bc30b485a77c0a0fba08af3aee3 diff --git a/editors/openoffice.org-1.1-devel/files/moz-patch b/editors/openoffice.org-1.1-devel/files/moz-patch new file mode 100644 index 000000000000..7341aed5cdd5 --- /dev/null +++ b/editors/openoffice.org-1.1-devel/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.org-1.1-devel/files/optpatch-freetype+patch b/editors/openoffice.org-1.1-devel/files/optpatch-freetype+patch deleted file mode 100644 index b426a8fb7fcc..000000000000 --- a/editors/openoffice.org-1.1-devel/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.org-1.1-devel/files/optpatch-vcl+util+makefile.pmk b/editors/openoffice.org-1.1-devel/files/optpatch-vcl+util+makefile.pmk deleted file mode 100644 index 41341ff0b4e8..000000000000 --- a/editors/openoffice.org-1.1-devel/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.org-1.1-devel/files/patch-translation_limit_64k b/editors/openoffice.org-1.1-devel/files/patch-translation_limit_64k new file mode 100644 index 000000000000..ce15548f052b --- /dev/null +++ b/editors/openoffice.org-1.1-devel/files/patch-translation_limit_64k @@ -0,0 +1,121 @@ +#iZ 33228# +#iZ 34210# + +Index: inc/sc.hrc +=================================================================== +RCS file: /cvs/sc/sc/inc/sc.hrc,v +retrieving revision 1.35 +retrieving revision 1.35.288.2 +diff -u -r1.35 -r1.35.288.2 +--- sc/inc/sc.hrc 3 Dec 2002 15:26:06 -0000 1.35 ++++ sc/inc/sc.hrc 17 Sep 2004 14:25:38 -0000 1.35.288.2 +@@ -1141,8 +1141,12 @@ + #define RID_TBXCTL_INSOBJ (SC_RESOURCE_START+40) + #define RID_BMP_REFBTN1 (SC_RESOURCE_START+41) + #define RID_BMP_REFBTN2 (SC_RESOURCE_START+42) +-#define RID_SC_FUNCTION_DESCRIPTIONS1 (SC_RESOURCE_START+43) +-#define RID_SC_FUNCTION_DESCRIPTIONS2 (SC_RESOURCE_START+44) ++// #i34210# split function resources due to 64k limit, don't reuse old values ++// to have obviously empty function lists in case some localisation used the ++// old values for any reason. Don't even reuse the exact name because of the ++// translation database IDs. ++//#define RID_SC_FUNCTION_DESCRIPTIONS1 (SC_RESOURCE_START+43) ++//#define RID_SC_FUNCTION_DESCRIPTIONS2 (SC_RESOURCE_START+44) + #define RID_POPUP_CONTROL (SC_RESOURCE_START+45) + #define RID_POPUP_PAGEBREAK (SC_RESOURCE_START+46) + #define RID_OBJECTBAR_DRAWFORM (SC_RESOURCE_START+47) +@@ -1158,6 +1162,10 @@ + #define RID_IMAGELIST_H_NAVCONT (SC_RESOURCE_START+57) + #define RID_OUTLINEBITMAPS_H (SC_RESOURCE_START+58) + #define RID_OBJECTMENU_EDIT (SC_RESOURCE_START+59) ++#define RID_SC_FUNCTION_DESCRIPTIONS_1 (SC_RESOURCE_START+60) ++#define RID_SC_FUNCTION_DESCRIPTIONS_2 (SC_RESOURCE_START+61) ++#define RID_SC_FUNCTION_DESCRIPTIONS_3 (SC_RESOURCE_START+62) ++#define RID_SC_FUNCTION_DESCRIPTIONS_4 (SC_RESOURCE_START+63) + + #define STR_START (SC_RESOURCE_START+100) + #define STR_ROWHEIGHT (STR_START) +Index: source/core/data/global.cxx +=================================================================== +RCS file: /cvs/sc/sc/source/core/data/global.cxx,v +retrieving revision 1.31 +retrieving revision 1.31.166.2 +diff -u -r1.31 -r1.31.166.2 +--- sc/source/core/data/global.cxx 17 Apr 2003 09:54:45 -0000 1.31 ++++ sc/source/core/data/global.cxx 17 Sep 2004 14:25:38 -0000 1.31.166.2 +@@ -1475,10 +1475,12 @@ + USHORT i,j; + USHORT nDescBlock[] = + { +- RID_SC_FUNCTION_DESCRIPTIONS1, +- RID_SC_FUNCTION_DESCRIPTIONS2 ++ RID_SC_FUNCTION_DESCRIPTIONS_1, ++ RID_SC_FUNCTION_DESCRIPTIONS_2, ++ RID_SC_FUNCTION_DESCRIPTIONS_3, ++ RID_SC_FUNCTION_DESCRIPTIONS_4 + }; +- const USHORT nBlocks = sizeof(nDescBlock) / sizeof(USHORT); ++ const USHORT nBlocks = sizeof(nDescBlock) / sizeof(nDescBlock[0]); + + aFunctionList.Clear(); + +Index: source/ui/src/scfuncs.src +=================================================================== +RCS file: /cvs/sc/sc/source/ui/src/scfuncs.src,v +retrieving revision 1.76.22.8 +retrieving revision 1.76.22.8.4.2 +diff -u -r1.76.22.8 -r1.76.22.8.4.2 +--- sc/source/ui/src/scfuncs.src 10 Sep 2004 14:45:52 -0000 1.76.22.8 ++++ sc/source/ui/src/scfuncs.src 17 Sep 2004 14:25:39 -0000 1.76.22.8.4.2 +@@ -93,10 +93,16 @@ + // RID_SC_FUNCTION_DESCRIPTIONS1 + // RID_SC_FUNCTION_DESCRIPTIONS2 + ++ // #i34210# again splitted resources due to 64k limit ++ // RID_SC_FUNCTION_DESCRIPTIONS_1 ++ // RID_SC_FUNCTION_DESCRIPTIONS_2 ++ // RID_SC_FUNCTION_DESCRIPTIONS_3 ++ // RID_SC_FUNCTION_DESCRIPTIONS_4 ++ + #include "scfuncs.hrc" // ID_FUNCTION_GRP_XXX, HID_FUNC_XXX + #include "compiler.hrc" // SC_OPCODE_XXX + +-Resource RID_SC_FUNCTION_DESCRIPTIONS1 ++Resource RID_SC_FUNCTION_DESCRIPTIONS_1 + { + // -=*# Resource for function DBANZAHL #*=- + Resource SC_OPCODE_DB_COUNT +@@ -15963,6 +15969,11 @@ + Text[ galician ] = "Valor 1; Valor 2;... son de 1 a 30 argumentos que representan os pagamentos e ingresos."; + }; + }; ++}; ++ ++ ++Resource RID_SC_FUNCTION_DESCRIPTIONS_2 ++{ + // -=*# Resource for function IKV #*=- + Resource SC_OPCODE_IKV + { +@@ -32174,7 +32185,8 @@ + }; + }; + +-Resource RID_SC_FUNCTION_DESCRIPTIONS2 ++ ++Resource RID_SC_FUNCTION_DESCRIPTIONS_3 + { + // -=*# Resource for function DBANZAHL2 #*=- + // -=*# Resource for function HÄUFIGKEIT #*=- +@@ -49230,6 +49242,11 @@ + Text[ galician ] = "é o n—ãro de graos de liberdade."; + }; + }; ++}; ++ ++ ++Resource RID_SC_FUNCTION_DESCRIPTIONS_4 ++{ + // -=*# Resource for function STANDARDISIERUNG #*=- + Resource SC_OPCODE_STANDARD + { diff --git a/editors/openoffice.org-1.1-devel/files/patch-ucbhelper+source+client+proxydeider.cxx b/editors/openoffice.org-1.1-devel/files/patch-ucbhelper+source+client+proxydeider.cxx new file mode 100644 index 000000000000..073390f79ab1 --- /dev/null +++ b/editors/openoffice.org-1.1-devel/files/patch-ucbhelper+source+client+proxydeider.cxx @@ -0,0 +1,22 @@ +#iz XXXXX +sys/socket.h is needed, there should be +appropreate place to give this definition, though. + +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 Oct 2004 23:08:26 -0000 +@@ -107,6 +107,10 @@ + using namespace com::sun::star; + using namespace ucbhelper; + ++#if defined (FREEBSD) ++#include <sys/socket.h> ++#endif ++ + #define CONFIG_ROOT_KEY "org.openoffice.Inet/Settings" + #define PROXY_TYPE_KEY "ooInetProxyType" + #define NO_PROXY_LIST_KEY "ooInetNoProxy" diff --git a/editors/openoffice.org-1.1-devel/files/zipmoz.sh b/editors/openoffice.org-1.1-devel/files/zipmoz.sh deleted file mode 100644 index 43a4591f3430..000000000000 --- a/editors/openoffice.org-1.1-devel/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 - |