diff options
| author | maho <maho@FreeBSD.org> | 2004-06-11 18:57:50 +0800 |
|---|---|---|
| committer | maho <maho@FreeBSD.org> | 2004-06-11 18:57:50 +0800 |
| commit | 72cf48f5e8a3e7f07fdd494af05a675b00dc1399 (patch) | |
| tree | d1e355b0dd63829dd6e53bb5332ac297f39de6e3 /editors | |
| parent | cc7e5b2e47558baa31d8f76daca9ea63afc47ce3 (diff) | |
| download | freebsd-ports-gnome-72cf48f5e8a3e7f07fdd494af05a675b00dc1399.tar.gz freebsd-ports-gnome-72cf48f5e8a3e7f07fdd494af05a675b00dc1399.tar.zst freebsd-ports-gnome-72cf48f5e8a3e7f07fdd494af05a675b00dc1399.zip | |
update to cws_src680_ooo20040620, checkedout at 2004/06/11
Still marked as ignore, but manual installtion works.
Diffstat (limited to 'editors')
264 files changed, 924 insertions, 4908 deletions
diff --git a/editors/openoffice-2.0-devel/Makefile b/editors/openoffice-2.0-devel/Makefile index d47c500c2e52..6c660a7b6fb8 100644 --- a/editors/openoffice-2.0-devel/Makefile +++ b/editors/openoffice-2.0-devel/Makefile @@ -24,7 +24,7 @@ MAINTAINER= openoffice@FreeBSD.org COMMENT= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser .endif -IGNORE= "Does not work yet, installation problems" +IGNORE= "Installation is not complete, manual installation works" NO_LATEST_LINK= yes UNZIP?= ${LOCALBASE}/bin/unzip @@ -33,13 +33,13 @@ ANT?= ${LOCALBASE}/bin/ant TCSH?= /bin/tcsh DIST_SUBDIR= openoffice2.0 BUILD_NR= 680 -MILESTONE= m30 +MILESTONE= m41 RELEASE_NR= 2.0 FRELEASE_NR= 2.0 -SNAPDATE= 20040402 +SNAPDATE= 20040611 INSTALLATION_BASEDIR= OpenOffice.org${RELEASE_NR} EXTRACT_ONLY= OOo_${BUILD_NR}${MILESTONE}_${SNAPDATE}_source.tar.bz2 -USE_GNOME= orbit gtk12 +USE_GNOME= orbit gtk12 gtk20 USE_REINPLACE= yes USE_PERL5= yes USE_BZIP2= yes @@ -48,7 +48,7 @@ USE_GMAKE= yes LANG_EXT?= 01 LANG_CONFIGURE_ARG?= ENUS WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work -WRKSRC= ${WRKDIR}/oo_${BUILD_NR}${MILESTONE}_src/config_office +WRKSRC= ${WRKDIR}/oo_${RELEASE_NR}_src/config_office #XXX dirty BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32 @@ -58,9 +58,11 @@ CXX= g++32 BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14 BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip BUILD_DEPENDS+= unzip:${PORTSDIR}/archivers/unzip -BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/apache-ant -BUILD_DEPENDS+= ${X11BASE}/lib/libgdk-x11-2.0.so:${PORTSDIR}/x11-toolkits/gtk20 +BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/apache-ant +BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries BUILD_DEPENDS+= ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft +BUILD_DEPENDS+= ${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip + .if !defined(DISPLAY) BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer .endif @@ -111,7 +113,7 @@ JDKDIR?= ${LOCALBASE}/jdk1.4.2 JAVAVM= ${JDKDIR}/bin/java GNU_CONFIGURE= yes -USE_AUTOCONF_VER= 253 +USE_AUTOCONF_VER= 259 .if defined(WITH_DEBUG) CFLAGS+= -g .if ${WITH_DEBUG} == 2 @@ -130,7 +132,7 @@ DISPLAYHACK=localhost:1001 CONFIGURE_ENV= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \ PTHREAD_LIBS=${PTHREAD_LIBS} CONFIGURE_ARGS+= --with-lang=${LANG_CONFIGURE_ARG} -CONFIGURE_ARGS+= --with-jdk-home=${JDKDIR} --with-ant-home=${LOCALBASE}/ant --with-gnu-cp=${LOCALBASE}/bin/gcp --enable-mozilla=no +CONFIGURE_ARGS+= --with-jdk-home=${JDKDIR} --with-ant-home=${LOCALBASE}/ant --with-gnu-cp=${LOCALBASE}/bin/gcp --enable-mozilla=yes .if defined(WITH_DEBUG) .if ${WITH_DEBUG} == 2 diff --git a/editors/openoffice-2.0-devel/distinfo b/editors/openoffice-2.0-devel/distinfo index 74de717eb2de..23f567c61dd8 100644 --- a/editors/openoffice-2.0-devel/distinfo +++ b/editors/openoffice-2.0-devel/distinfo @@ -1,5 +1,5 @@ -MD5 (openoffice2.0/OOo_680m30_20040402_source.tar.bz2) = 768b3d8246a12eff6bf83f098093fbee -SIZE (openoffice2.0/OOo_680m30_20040402_source.tar.bz2) = 195378119 +MD5 (openoffice2.0/OOo_680m41_20040611_source.tar.bz2) = 7b8a6d87b80022f85093a67c01064883 +SIZE (openoffice2.0/OOo_680m41_20040611_source.tar.bz2) = 221136281 MD5 (openoffice2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 SIZE (openoffice2.0/gpc231.tar.Z) = 27917 MD5 (openoffice2.0/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a diff --git a/editors/openoffice-2.0-devel/files/patch-config_office+configure.in b/editors/openoffice-2.0-devel/files/patch-config_office+configure.in deleted file mode 100644 index 8bd6e0668f6b..000000000000 --- a/editors/openoffice-2.0-devel/files/patch-config_office+configure.in +++ /dev/null @@ -1,50 +0,0 @@ -#i27028 and #i27028 -http://qa.openoffice.org/issues/show_bug.cgi?id=27021 (Xaw) -http://qa.openoffice.org/issues/show_bug.cgi?id=27028 (ant) - ---- ../config_office/configure.in.org Sat Mar 27 17:54:16 2004 -+++ ../config_office/configure.in Sun Mar 28 22:17:37 2004 -@@ -1478,7 +1478,7 @@ - elif test "$_os" != "WINNT" ; then - AC_PATH_X - AC_PATH_XTRA -- AC_CHECK_HEADERS(X11/Xaw/Label.h,[AC_MSG_RESULT([Ok])],[AC_MSG_ERROR([Xaw include headers not found])]) -+dnl AC_CHECK_HEADERS(X11/Xaw/Label.h,[AC_MSG_RESULT([Ok])],[AC_MSG_ERROR([Xaw include headers not found])]) - - if test "x$x_includes" = "x"; then - x_includes="/usr/include" -@@ -1830,10 +1830,12 @@ - - if test "$enable_java" != "no"; then - ANT_HOME=; export ANT_HOME -+WITH_ANT_HOME=; export WITH_ANT_HOME - if test -z "$with_ant_home"; then - AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat]) - else -- AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat],,$with_ant_home/bin) -+ AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat],,$with_ant_home/bin:$PATH) -+ WITH_ANT_HOME=$with_ant_home - fi - - -@@ -1873,7 +1875,11 @@ - AC_TRY_EVAL(ant_cmd) - if test $? = 0 && test -f ./conftest.class ; then - AC_MSG_RESULT([Ant works]) -- ANT_HOME=`echo $ANT | $SED -n "s/\/bin\/ant.*\$//p"` -+ if test -z "$WITH_ANT_HOME"; then -+ ANT_HOME=`echo $ANT | $SED -n "s/\/bin\/ant.*\$//p"` -+ else -+ ANT_HOME="$WITH_ANT_HOME" -+ fi - else - echo "configure: Ant test failed" >&5 - cat conftest.java >&5 -@@ -1885,6 +1891,7 @@ - - rm -f conftest* core core.* *.core - fi -+ - if test -z "$ANT_HOME"; then - ANT_HOME="NO_ANT_HOME" - fi diff --git a/editors/openoffice-2.0-devel/files/patch-config_office+set_soenv.in b/editors/openoffice-2.0-devel/files/patch-config_office+set_soenv.in deleted file mode 100644 index dbb4c3506e1e..000000000000 --- a/editors/openoffice-2.0-devel/files/patch-config_office+set_soenv.in +++ /dev/null @@ -1,13 +0,0 @@ -#i27028 -http://qa.openoffice.org/issues/show_bug.cgi?id=27028 - ---- ../config_office/set_soenv.in.old Tue Mar 9 21:31:38 2004 -+++ ../config_office/set_soenv.in Sun Mar 28 09:56:03 2004 -@@ -1419,6 +1419,7 @@ - ToFile( "XSLTPROC", "@XSLTPROC@", "e" ); - ToFile( "ANT_HOME", "@ANT_HOME@", "e" ); - ToFile( "ANT_LIB", "@ANT_LIB@", "e" ); -+ToFile( "ANT", "@ANT@", "e" ); - ToFile( "JDKLIB", $JAVA_LIB, "e" ); - ToFile( "STLPORT4", $STLPORT4, "e" ); - ToFile( "ASM_PATH", $ASM_PATH, "e" ); diff --git a/editors/openoffice-2.0-devel/files/patch-cppuhelper+source+gcc3_linux_intel.map b/editors/openoffice-2.0-devel/files/patch-cppuhelper+source+gcc3_linux_intel.map deleted file mode 100644 index cdb61b141eba..000000000000 --- a/editors/openoffice-2.0-devel/files/patch-cppuhelper+source+gcc3_linux_intel.map +++ /dev/null @@ -1,13 +0,0 @@ -Mysterious :) - -http://qa.openoffice.org/issues/show_bug.cgi?id=23917 ---- ../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-2.0-devel/files/patch-hwpfilter+source+hwpreader.hxx b/editors/openoffice-2.0-devel/files/patch-hwpfilter+source+hwpreader.hxx deleted file mode 100644 index 8d65e6a3ee83..000000000000 --- a/editors/openoffice-2.0-devel/files/patch-hwpfilter+source+hwpreader.hxx +++ /dev/null @@ -1,14 +0,0 @@ -http://qa.openoffice.org/issues/show_bug.cgi?id=27033 ---- ../hwpfilter/source/hwpreader.hxx~ Wed Oct 15 23:37:24 2003 -+++ ../hwpfilter/source/hwpreader.hxx Sun Mar 28 22:46:18 2004 -@@ -68,7 +68,9 @@ - #include <string.h> - #ifdef WIN32 - #include <malloc.h> --#else -+#endif -+ -+#if !defined(FREEBSD) - #include <alloca.h> - #endif - diff --git a/editors/openoffice-2.0-devel/files/patch-libxml2+prj+build.lst b/editors/openoffice-2.0-devel/files/patch-libxml2+prj+build.lst new file mode 100644 index 000000000000..f0d7b8f05fc8 --- /dev/null +++ b/editors/openoffice-2.0-devel/files/patch-libxml2+prj+build.lst @@ -0,0 +1,12 @@ +Index: libxml2/prj/build.lst +=================================================================== +RCS file: /cvs/external/libxml2/prj/build.lst,v +retrieving revision 1.1 +diff -u -r1.1 build.lst +--- ../libxml2/prj/build.lst 6 Feb 2004 10:15:09 -0000 1.1 ++++ ../libxml2/prj/build.lst 4 May 2004 20:20:20 -0000 +@@ -1,3 +1,3 @@ +-lx libxml2 : soltools NULL
++lx libxml2 : soltools xml2cmp NULL
+ lx libxml2 usr1 - all lx_mkout NULL
+ lx libxml2 nmake - all lx_libxml2 NULL
diff --git a/editors/openoffice-2.0-devel/files/patch-odk+setsdkenv_unix.in b/editors/openoffice-2.0-devel/files/patch-odk+setsdkenv_unix.in deleted file mode 100644 index e5551f883231..000000000000 --- a/editors/openoffice-2.0-devel/files/patch-odk+setsdkenv_unix.in +++ /dev/null @@ -1,27 +0,0 @@ -http://qa.openoffice.org/issues/show_bug.cgi?id=24142 ---- ../odk/setsdkenv_unix.in Sun Jan 25 18:41:01 2004 -+++ ../odk/setsdkenv_unix.in Sun Jan 25 18:42:00 2004 -@@ -2,7 +2,8 @@ - - # This script starts a new shell and sets all enviroment variables, which - # are necessary for building the examples of the Office Development Kit. --# The Script was developed for the operating systems Solaris and Linux. -+# The script was developed for the operating systems Solaris, Linux, MacOS X -+# and FreeBSD. - - # Installation directory of the Software Development Kit. - # Example: OO_SDK_HOME=/work/StarOffice_SDK -@@ -76,6 +77,13 @@ - LD_LIBRARY_PATH=$OO_SDK_HOME/$directoryname/lib:$OO_SDK_HOME/$exampleout/lib:$OFFICE_PROGRAM_PATH:.:$LD_LIBRARY_PATH - export LD_LIBRARY_PATH - ;; -+ -+ FreeBSD) -+ directoryname=freebsd -+ exampleout=FREEBSDexample.out -+ LD_LIBRARY_PATH=$OO_SDK_HOME/$directoryname/lib:$OO_SDK_HOME/$exampleout/lib:$OFFICE_PROGRAM_PATH:.:$LD_LIBRARY_PATH -+ export LD_LIBRARY_PATH -+ ;; - esac - - # Add directory of the SDK tools to the path. diff --git a/editors/openoffice-2.0-devel/files/patch-odk+settings+settings.mk b/editors/openoffice-2.0-devel/files/patch-odk+settings+settings.mk deleted file mode 100644 index 8c3942d12f16..000000000000 --- a/editors/openoffice-2.0-devel/files/patch-odk+settings+settings.mk +++ /dev/null @@ -1,90 +0,0 @@ -http://qa.openoffice.org/issues/show_bug.cgi?id=24142 - ---- ../odk/settings/settings.mk Sun Jan 25 18:41:02 2004 -+++ ../odk/settings/settings.mk Sun Jan 25 18:45:09 2004 -@@ -368,3 +368,85 @@ - - endif - -+ifeq "$(PLATFORM)" "FreeBSD" -+# Settings for FreeBSD using gcc compiler -+ -+PROCTYPE := $(shell uname -m) -+ -+ -+# Default is freebsd on a intel machine -+PLATFORM=FreeBSD -+PACKAGE_LIB_DIR=freebsd_x86.plt -+JAVA_PROC_TYPE=i386 -+ -+OS=FREEBSD -+PS=/ -+CC=gcc -+LINK=gcc -+LIB=gcc -+ECHO=@echo -+MKDIR=mkdir -p -+CAT=cat -+OBJ_EXT=o -+SHAREDLIB_EXT=so -+SHAREDLIB_PRE=lib -+SHAREDLIB_OUT=$(OUT_LIB) -+ -+GCC_VERSION=$(shell $(CC) -dumpversion) -+ -+ifeq "$(shell echo $(GCC_VERSION) | cut -c 1)" "3" -+COMID=gcc3 -+CPPU_ENV=gcc3 -+else -+COMID=GCC -+CPPU_ENV=gcc2 -+endif -+ -+OSEP=\< -+CSEP=\> -+QUOTE=$(subst S,\,S) -+QM=\" -+ -+DEL=rm -f -+DELRECURSIVE=rm -rf -+COPY=cp -+URLPREFIX=file:// -+ -+# Include UDK version numbers -+include $(PRJ)/include/udkversion.mk -+ -+SALLIB=-lsal -+CPPULIB=-lcppu -+CPPUHELPERLIB=-lcppuhelper$(COMID) -+SALHELPERLIB=-lsalhelper$(COMID) -+STLPORTLIB=-lstlport_gcc -+ -+EMPTYSTRING= -+PATH_SEPARATOR=: -+ -+# -O is necessary for inlining (see gcc documentation) -+ifeq "$(DEBUG)" "yes" -+CC_FLAGS=-c -g -fpic -DPIC -fno-rtti %%PTHREAD_CFLAGS%% -+else -+CC_FLAGS=-c -O -fpic -DPIC -fno-rtti %%PTHREAD_CFLAGS%% -+endif -+ -+SDK_JAVA_INCLUDES = -I$(OO_SDK_JAVA_HOME)/include -I$(OO_SDK_JAVA_HOME)/include/freebsd -+CC_INCLUDES=-I. -I/usr/include -I$(OUT)/inc/examples -I$(PRJ)/include -+STL_INCLUDES=-I$(OO_SDK_HOME)/include/stl -+CC_DEFINES=-DUNX -DGCC -DFREEBSD -DCPPU_ENV=$(CPPU_ENV) -+ -+# define for used compiler necessary for UNO -+#-DCPPU_ENV=gcc2 -- gcc 2.91/2.95 -+#-DCPPU_ENV=gcc3 -- gcc3 3.0 -+ -+CC_OUTPUT_SWITCH=-o -+ -+LIBRARY_LINK_FLAGS=-shared '-Wl,-rpath,$$ORIGIN' -+ -+EXE_LINK_FLAGS=-Wl -+LINK_LIBS=-L$(OUT)/lib -L$(PRJ)/$(PLATFORM)/lib -L$(OFFICE_PROGRAM_PATH) %%PTHREAD_LIBS%% -+LINK_JAVA_LIBS=-L$(OO_SDK_JAVA_HOME)/jre/lib/$(JAVA_PROC_TYPE) -+ -+endif -+ diff --git a/editors/openoffice-2.0-devel/files/patch-psprint+source+helper+strhelper.cxx b/editors/openoffice-2.0-devel/files/patch-psprint+source+helper+strhelper.cxx new file mode 100644 index 000000000000..52530e403ac0 --- /dev/null +++ b/editors/openoffice-2.0-devel/files/patch-psprint+source+helper+strhelper.cxx @@ -0,0 +1,21 @@ +http://www.openoffice.org/issues/show_bug.cgi?id=27753 +The isnan() macro is a new feature of C99 and not yet part of C++. + +Index: source/helper/strhelper.cxx +=================================================================== +RCS file: /cvs/gsl/psprint/source/helper/strhelper.cxx,v +retrieving revision 1.6 +diff -u -r1.6 strhelper.cxx +--- ../psprint/source/helper/strhelper.cxx 30 Mar 2004 13:48:06 -0000 1.6 ++++ ../psprint/source/helper/strhelper.cxx 13 Apr 2004 22:26:11 -0000 +@@ -67,6 +67,10 @@ + #include <cmath> // for isnan + #include <cstring> + ++#if defined (FREEBSD) ++using namespace __gnu_cxx; //for isnan ++#endif ++ + namespace psp { + + inline int isSpace( char cChar ) diff --git a/editors/openoffice-2.0-devel/files/patch-setup2+mow+source+loader+makefile.mk b/editors/openoffice-2.0-devel/files/patch-setup2+mow+source+loader+makefile.mk deleted file mode 100644 index 7b25ff2635df..000000000000 --- a/editors/openoffice-2.0-devel/files/patch-setup2+mow+source+loader+makefile.mk +++ /dev/null @@ -1,17 +0,0 @@ -do not need -ldl - -http://qa.openoffice.org/issues/show_bug.cgi?id=27043 ---- ../setup2/mow/source/loader/makefile.mk~ Tue Mar 9 21:04:35 2004 -+++ ../setup2/mow/source/loader/makefile.mk Mon Mar 29 11:10:50 2004 -@@ -92,7 +92,11 @@ - LINK=gcc - LINKFLAGS= - LINKFLAGSAPP= -+.IF "$(OS)"=="FREEBSD" -+STDLIB= -lX11 -lc -lm -+.ELSE - STDLIB= -lX11 -ldl -lc -lm -+.ENDIF # "$(OS)"=="FREEBSD" - .ENDIF # "$(OS)$(COMID)"=="GCC" - - OBJFILES= $(OBJ)$/loader.obj diff --git a/editors/openoffice-2.0-devel/files/patch-sfx2+source+config+cfgmgr.cxx b/editors/openoffice-2.0-devel/files/patch-sfx2+source+config+cfgmgr.cxx deleted file mode 100644 index be38de290a51..000000000000 --- a/editors/openoffice-2.0-devel/files/patch-sfx2+source+config+cfgmgr.cxx +++ /dev/null @@ -1,16 +0,0 @@ -Wired 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-2.0-devel/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx b/editors/openoffice-2.0-devel/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx deleted file mode 100644 index 10c3f3c1f6e8..000000000000 --- a/editors/openoffice-2.0-devel/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx +++ /dev/null @@ -1,34 +0,0 @@ -http://qa.openoffice.org/issues/show_bug.cgi?id=24315 - -For FreeBSD, time_t is defined as -at /usr/include/machine/_types.h -49th typedef int __int32_t; -90th typedef __int32_t __time_t; /* time()... */ -and -/usr/include/pwd.h:typedef __time_t time_t; -/usr/include/time.h:typedef __time_t time_t; -/usr/include/timeconv.h:typedef __time_t time_t; -/usr/include/utime.h:typedef __time_t time_t; -so time_t is equal to 32 bit integer - -For LinuxPPC (Yellowdog 3.0.1) - - ---- ../shell/source/unix/sysshell/recently_used_file_handler.cxx.orig Tue Jan 13 00:56:37 2004 -+++ ../shell/source/unix/sysshell/recently_used_file_handler.cxx Tue Jan 13 00:57:26 2004 -@@ -188,9 +188,12 @@ - write_xml_start_tag(TAG_RECENT_ITEM, file, true); - write_xml_tag(TAG_URI, uri_, file); - write_xml_tag(TAG_MIME_TYPE, mime_type_, file); -- -- rtl::OString ts = rtl::OString::valueOf(timestamp_); -- write_xml_tag(TAG_TIMESTAMP, ts.getStr(), file); -+#if defined FREEBSD -+ rtl::OString ts = rtl::OString::valueOf((sal_Int32)timestamp_); -+#else -+ rtl::OString ts = rtl::OString::valueOf(timestamp_); -+#endif -+ write_xml_tag(TAG_TIMESTAMP, ts.getStr(), file); - - if (is_private_) - write_xml_tag(TAG_PRIVATE, file); diff --git a/editors/openoffice-2.0-devel/files/patch-solenv+inc+ant.mk b/editors/openoffice-2.0-devel/files/patch-solenv+inc+ant.mk deleted file mode 100644 index e050b85d41e9..000000000000 --- a/editors/openoffice-2.0-devel/files/patch-solenv+inc+ant.mk +++ /dev/null @@ -1,13 +0,0 @@ -http://qa.openoffice.org/issues/show_bug.cgi?id=27028 - ---- ../solenv/inc/ant.mk~ Wed Feb 4 21:37:16 2004 -+++ ../solenv/inc/ant.mk Fri Apr 2 23:59:27 2004 -@@ -100,7 +100,7 @@ - .ENDIF - .ENDIF - --ANT=$(WRAPCMD) java -classpath $(CLASSPATH) -Xmx128m org.apache.tools.ant.Main -Djava.home=$(JAVA_HOME) -Dant.home=$(ANT_HOME) -+#ANT=$(WRAPCMD) java -classpath $(CLASSPATH) -Xmx128m org.apache.tools.ant.Main -Djava.home=$(JAVA_HOME) -Dant.home=$(ANT_HOME) - #ANT=java -version - - .IF "$(ANT_BUILDFILE)"=="" diff --git a/editors/openoffice-2.0-devel/files/patch-solenv+inc+settings.mk b/editors/openoffice-2.0-devel/files/patch-solenv+inc+settings.mk deleted file mode 100644 index f93ee2ad6bf2..000000000000 --- a/editors/openoffice-2.0-devel/files/patch-solenv+inc+settings.mk +++ /dev/null @@ -1,15 +0,0 @@ -http://www.openoffice.org/issues/show_bug.cgi?id=25579 -We should set locale as UTF-8 when compiling -but this was due to violation of OOo coding style - ---- ../solenv/inc/settings.mk.old Tue Mar 9 21:19:28 2004 -+++ ../solenv/inc/settings.mk Mon Mar 29 13:23:31 2004 -@@ -172,7 +172,7 @@ - JAVAI=gij - JAVACPS=--classpath - .ELSE --JAVAC=javac -+JAVAC=javac -encoding UTF-8 - JAVAI=java - JAVACPS=-classpath - .ENDIF diff --git a/editors/openoffice-2.0-devel/files/patch-vcl+source+gdi+outdev3.cxx b/editors/openoffice-2.0-devel/files/patch-vcl+source+gdi+outdev3.cxx deleted file mode 100644 index 22ef6f26f45f..000000000000 --- a/editors/openoffice-2.0-devel/files/patch-vcl+source+gdi+outdev3.cxx +++ /dev/null @@ -1,14 +0,0 @@ -do not need <malloc.h> including stdlib.h is enough -http://qa.openoffice.org/issues/show_bug.cgi?id=27041 - ---- ../vcl/source/gdi/outdev3.cxx.old Mon Mar 29 09:42:28 2004 -+++ ../vcl/source/gdi/outdev3.cxx Mon Mar 29 09:42:59 2004 -@@ -176,7 +176,7 @@ - #if defined(SOLARIS) || defined(IRIX) - #include <alloca.h> - #else --#ifndef MACOSX -+#if !(defined(MACOSX) || defined(FREEBSD)) - #include <malloc.h> - #endif - #endif diff --git a/editors/openoffice-2.0-devel/files/patch-vcl+source+gdi+sallayout.cxx b/editors/openoffice-2.0-devel/files/patch-vcl+source+gdi+sallayout.cxx deleted file mode 100644 index 5cbc59bf7db7..000000000000 --- a/editors/openoffice-2.0-devel/files/patch-vcl+source+gdi+sallayout.cxx +++ /dev/null @@ -1,14 +0,0 @@ -malloc.h is deprecated -http://qa.openoffice.org/issues/show_bug.cgi?id=27041 - ---- ../vcl/source/gdi/sallayout.cxx.org Mon Mar 29 10:02:17 2004 -+++ ../vcl/source/gdi/sallayout.cxx Mon Mar 29 10:02:43 2004 -@@ -67,7 +67,7 @@ - #if defined(SOLARIS) || defined(IRIX) - #include <alloca.h> - #else --#ifndef MACOSX -+#if !(defined(MACOSX) || defined(FREEBSD)) - #include <malloc.h> - #endif - #endif diff --git a/editors/openoffice-2.0-devel/files/patch-vcl+source+glyphs+gcache_layout.cxx b/editors/openoffice-2.0-devel/files/patch-vcl+source+glyphs+gcache_layout.cxx deleted file mode 100644 index 53c7a909faf7..000000000000 --- a/editors/openoffice-2.0-devel/files/patch-vcl+source+glyphs+gcache_layout.cxx +++ /dev/null @@ -1,14 +0,0 @@ -malloc.h is deprecated -http://qa.openoffice.org/issues/show_bug.cgi?id=27041 - ---- ../vcl/source/glyphs/gcach_layout.cxx~ Tue Mar 9 21:15:32 2004 -+++ ../vcl/source/glyphs/gcach_layout.cxx Mon Mar 29 09:44:52 2004 -@@ -74,7 +74,7 @@ - #if defined(SOLARIS) || defined(IRIX) - #include <alloca.h> - #else --#ifndef MACOSX -+#if !(defined(MACOSX) || defined(FREEBSD)) - #include <malloc.h> - #endif - #endif diff --git a/editors/openoffice-2.0-devel/files/patch-vcl+unx+source+plugadapt+salmain.cxx b/editors/openoffice-2.0-devel/files/patch-vcl+unx+source+plugadapt+salmain.cxx deleted file mode 100644 index f5bd54364036..000000000000 --- a/editors/openoffice-2.0-devel/files/patch-vcl+unx+source+plugadapt+salmain.cxx +++ /dev/null @@ -1,24 +0,0 @@ -http://qa.openoffice.org/issues/show_bug.cgi?id=27042 - -include <sys/types.h> -Note: --- -* $RCSfile: salmain.cxx,v $ -* -* $Revision: 1.8.12.2 $ -* -* last change: $Author: hr $ $Date: 2004/01/09 18:14:00 $ --- -includes this patch - ---- ../vcl/unx/source/plugadapt/salmain.cxx~ Mon Mar 29 09:50:50 2004 -+++ ../vcl/unx/source/plugadapt/salmain.cxx Mon Mar 29 10:08:28 2004 -@@ -59,7 +59,7 @@ - * - ************************************************************************/ - --#ifdef MACOSX -+#if defined(MACOSX) || defined(FREEBSD) - // rlimit needs sys/types.h - #include <sys/types.h> - #include <sys/time.h> diff --git a/editors/openoffice-2.0-devel/files/patch-vcl+util+makefile.mk b/editors/openoffice-2.0-devel/files/patch-vcl+util+makefile.mk deleted file mode 100644 index 5d133486e032..000000000000 --- a/editors/openoffice-2.0-devel/files/patch-vcl+util+makefile.mk +++ /dev/null @@ -1,30 +0,0 @@ -FreeBSD doesn't require/need/have -ldl -http://qa.openoffice.org/issues/show_bug.cgi?id=27043 - ---- ../vcl/util/makefile.mk~ Mon Mar 29 09:50:51 2004 -+++ ../vcl/util/makefile.mk Mon Mar 29 10:19:04 2004 -@@ -208,7 +208,9 @@ - .IF "$(GUI)"!="UNX" - SHL1OBJS= $(SLO)$/salshl.obj - .ELSE --SHL1STDLIBS+=-ldl -+ .IF "$(OS)"!="FREEBSD" -+ SHL1STDLIBS+=-ldl -+ .ENDIF - .ENDIF - - .IF "$(GUI)" != "MAC" -@@ -351,8 +353,11 @@ - # libs for gtk plugin - SHL4STDLIBS=`pkg-config --libs gtk+-2.0 gthread-2.0` - SHL4STDLIBS+=-l$(SHL2TARGET) --SHL4STDLIBS+=$(SHL3STDLIBS) -lX11 -ldl -- -+ .IF "$(OS)"!="FREEBSD" -+ SHL4STDLIBS+=$(SHL3STDLIBS) -lX11 -ldl -+ .ELSE -+ SHL4STDLIBS+=$(SHL3STDLIBS) -lX11 -+ .ENDIF # FREEBSD - .ENDIF # UNX - - # --- Allgemein ---------------------------------------------------------- diff --git a/editors/openoffice-2.0-devel/files/patch-wizards+prj+build.lst b/editors/openoffice-2.0-devel/files/patch-wizards+prj+build.lst new file mode 100644 index 000000000000..5d5abb75a07e --- /dev/null +++ b/editors/openoffice-2.0-devel/files/patch-wizards+prj+build.lst @@ -0,0 +1,15 @@ +http://www.openoffice.org/issues/show_bug.cgi?id=29656 + +Index: wizards/prj/build.lst +=================================================================== +RCS file: /cvs/installation/wizards/prj/build.lst,v +retrieving revision 1.23 +diff -u -r1.23 build.lst +--- ../wizards/prj/build.lst 19 May 2004 16:35:11 -0000 1.23 ++++ ../wizards/prj/build.lst 8 Jun 2004 22:43:04 -0000 +@@ -1,4 +1,4 @@ +-wz wizards : rsc javaunohelper jut unoil NULL ++wz wizards : rsc qadevOOo javaunohelper jut unoil NULL + wz wizards\util nmake - all wz_util NULL + wz wizards\source\config nmake - all wz_config NULL + wz wizards\source\euro nmake - all wz_eurowiz NULL diff --git a/editors/openoffice-2.0-devel/files/patch-wizards+prj+d.lst b/editors/openoffice-2.0-devel/files/patch-wizards+prj+d.lst new file mode 100644 index 000000000000..d1b4255cca46 --- /dev/null +++ b/editors/openoffice-2.0-devel/files/patch-wizards+prj+d.lst @@ -0,0 +1,16 @@ +http://www.openoffice.org/issues/show_bug.cgi?id=29666 + +Index: wizards/prj/d.lst +=================================================================== +RCS file: /cvs/installation/wizards/prj/d.lst,v +retrieving revision 1.13 +diff -u -r1.13 d.lst +--- ../wizards/prj/d.lst 2 Feb 2004 19:16:11 -0000 1.13 ++++ ../wizards/prj/d.lst 9 Jun 2004 08:25:50 -0000 +@@ -1,5 +1,6 @@ + mkdir: %COMMON_DEST%\bin%_EXT%\hid + mkdir: %_DEST%\pck%_EXT% ++mkdir: %_DEST%\pck%_EXT%\img + ..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid + ..\%__SRC%\bin\*.zip %_DEST%\pck%_EXT%\*.zip + ..\%__SRC%\bin\iwz*.res %_DEST%\bin%_EXT%\iwz*.res diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile index d47c500c2e52..6c660a7b6fb8 100644 --- a/editors/openoffice-3-devel/Makefile +++ b/editors/openoffice-3-devel/Makefile @@ -24,7 +24,7 @@ MAINTAINER= openoffice@FreeBSD.org COMMENT= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser .endif -IGNORE= "Does not work yet, installation problems" +IGNORE= "Installation is not complete, manual installation works" NO_LATEST_LINK= yes UNZIP?= ${LOCALBASE}/bin/unzip @@ -33,13 +33,13 @@ ANT?= ${LOCALBASE}/bin/ant TCSH?= /bin/tcsh DIST_SUBDIR= openoffice2.0 BUILD_NR= 680 -MILESTONE= m30 +MILESTONE= m41 RELEASE_NR= 2.0 FRELEASE_NR= 2.0 -SNAPDATE= 20040402 +SNAPDATE= 20040611 INSTALLATION_BASEDIR= OpenOffice.org${RELEASE_NR} EXTRACT_ONLY= OOo_${BUILD_NR}${MILESTONE}_${SNAPDATE}_source.tar.bz2 -USE_GNOME= orbit gtk12 +USE_GNOME= orbit gtk12 gtk20 USE_REINPLACE= yes USE_PERL5= yes USE_BZIP2= yes @@ -48,7 +48,7 @@ USE_GMAKE= yes LANG_EXT?= 01 LANG_CONFIGURE_ARG?= ENUS WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work -WRKSRC= ${WRKDIR}/oo_${BUILD_NR}${MILESTONE}_src/config_office +WRKSRC= ${WRKDIR}/oo_${RELEASE_NR}_src/config_office #XXX dirty BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32 @@ -58,9 +58,11 @@ CXX= g++32 BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14 BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip BUILD_DEPENDS+= unzip:${PORTSDIR}/archivers/unzip -BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/apache-ant -BUILD_DEPENDS+= ${X11BASE}/lib/libgdk-x11-2.0.so:${PORTSDIR}/x11-toolkits/gtk20 +BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/apache-ant +BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries BUILD_DEPENDS+= ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft +BUILD_DEPENDS+= ${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip + .if !defined(DISPLAY) BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer .endif @@ -111,7 +113,7 @@ JDKDIR?= ${LOCALBASE}/jdk1.4.2 JAVAVM= ${JDKDIR}/bin/java GNU_CONFIGURE= yes -USE_AUTOCONF_VER= 253 +USE_AUTOCONF_VER= 259 .if defined(WITH_DEBUG) CFLAGS+= -g .if ${WITH_DEBUG} == 2 @@ -130,7 +132,7 @@ DISPLAYHACK=localhost:1001 CONFIGURE_ENV= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \ PTHREAD_LIBS=${PTHREAD_LIBS} CONFIGURE_ARGS+= --with-lang=${LANG_CONFIGURE_ARG} -CONFIGURE_ARGS+= --with-jdk-home=${JDKDIR} --with-ant-home=${LOCALBASE}/ant --with-gnu-cp=${LOCALBASE}/bin/gcp --enable-mozilla=no +CONFIGURE_ARGS+= --with-jdk-home=${JDKDIR} --with-ant-home=${LOCALBASE}/ant --with-gnu-cp=${LOCALBASE}/bin/gcp --enable-mozilla=yes .if defined(WITH_DEBUG) .if ${WITH_DEBUG} == 2 diff --git a/editors/openoffice-3-devel/distinfo b/editors/openoffice-3-devel/distinfo index 74de717eb2de..23f567c61dd8 100644 --- a/editors/openoffice-3-devel/distinfo +++ b/editors/openoffice-3-devel/distinfo @@ -1,5 +1,5 @@ -MD5 (openoffice2.0/OOo_680m30_20040402_source.tar.bz2) = 768b3d8246a12eff6bf83f098093fbee -SIZE (openoffice2.0/OOo_680m30_20040402_source.tar.bz2) = 195378119 +MD5 (openoffice2.0/OOo_680m41_20040611_source.tar.bz2) = 7b8a6d87b80022f85093a67c01064883 +SIZE (openoffice2.0/OOo_680m41_20040611_source.tar.bz2) = 221136281 MD5 (openoffice2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 SIZE (openoffice2.0/gpc231.tar.Z) = 27917 MD5 (openoffice2.0/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a diff --git a/editors/openoffice-3-devel/files/patch-config_office+configure.in b/editors/openoffice-3-devel/files/patch-config_office+configure.in deleted file mode 100644 index 8bd6e0668f6b..000000000000 --- a/editors/openoffice-3-devel/files/patch-config_office+configure.in +++ /dev/null @@ -1,50 +0,0 @@ -#i27028 and #i27028 -http://qa.openoffice.org/issues/show_bug.cgi?id=27021 (Xaw) -http://qa.openoffice.org/issues/show_bug.cgi?id=27028 (ant) - ---- ../config_office/configure.in.org Sat Mar 27 17:54:16 2004 -+++ ../config_office/configure.in Sun Mar 28 22:17:37 2004 -@@ -1478,7 +1478,7 @@ - elif test "$_os" != "WINNT" ; then - AC_PATH_X - AC_PATH_XTRA -- AC_CHECK_HEADERS(X11/Xaw/Label.h,[AC_MSG_RESULT([Ok])],[AC_MSG_ERROR([Xaw include headers not found])]) -+dnl AC_CHECK_HEADERS(X11/Xaw/Label.h,[AC_MSG_RESULT([Ok])],[AC_MSG_ERROR([Xaw include headers not found])]) - - if test "x$x_includes" = "x"; then - x_includes="/usr/include" -@@ -1830,10 +1830,12 @@ - - if test "$enable_java" != "no"; then - ANT_HOME=; export ANT_HOME -+WITH_ANT_HOME=; export WITH_ANT_HOME - if test -z "$with_ant_home"; then - AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat]) - else -- AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat],,$with_ant_home/bin) -+ AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat],,$with_ant_home/bin:$PATH) -+ WITH_ANT_HOME=$with_ant_home - fi - - -@@ -1873,7 +1875,11 @@ - AC_TRY_EVAL(ant_cmd) - if test $? = 0 && test -f ./conftest.class ; then - AC_MSG_RESULT([Ant works]) -- ANT_HOME=`echo $ANT | $SED -n "s/\/bin\/ant.*\$//p"` -+ if test -z "$WITH_ANT_HOME"; then -+ ANT_HOME=`echo $ANT | $SED -n "s/\/bin\/ant.*\$//p"` -+ else -+ ANT_HOME="$WITH_ANT_HOME" -+ fi - else - echo "configure: Ant test failed" >&5 - cat conftest.java >&5 -@@ -1885,6 +1891,7 @@ - - rm -f conftest* core core.* *.core - fi -+ - if test -z "$ANT_HOME"; then - ANT_HOME="NO_ANT_HOME" - fi diff --git a/editors/openoffice-3-devel/files/patch-config_office+set_soenv.in b/editors/openoffice-3-devel/files/patch-config_office+set_soenv.in deleted file mode 100644 index dbb4c3506e1e..000000000000 --- a/editors/openoffice-3-devel/files/patch-config_office+set_soenv.in +++ /dev/null @@ -1,13 +0,0 @@ -#i27028 -http://qa.openoffice.org/issues/show_bug.cgi?id=27028 - ---- ../config_office/set_soenv.in.old Tue Mar 9 21:31:38 2004 -+++ ../config_office/set_soenv.in Sun Mar 28 09:56:03 2004 -@@ -1419,6 +1419,7 @@ - ToFile( "XSLTPROC", "@XSLTPROC@", "e" ); - ToFile( "ANT_HOME", "@ANT_HOME@", "e" ); - ToFile( "ANT_LIB", "@ANT_LIB@", "e" ); -+ToFile( "ANT", "@ANT@", "e" ); - ToFile( "JDKLIB", $JAVA_LIB, "e" ); - ToFile( "STLPORT4", $STLPORT4, "e" ); - ToFile( "ASM_PATH", $ASM_PATH, "e" ); diff --git a/editors/openoffice-3-devel/files/patch-cppuhelper+source+gcc3_linux_intel.map b/editors/openoffice-3-devel/files/patch-cppuhelper+source+gcc3_linux_intel.map deleted file mode 100644 index cdb61b141eba..000000000000 --- a/editors/openoffice-3-devel/files/patch-cppuhelper+source+gcc3_linux_intel.map +++ /dev/null @@ -1,13 +0,0 @@ -Mysterious :) - -http://qa.openoffice.org/issues/show_bug.cgi?id=23917 ---- ../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-3-devel/files/patch-hwpfilter+source+hwpreader.hxx b/editors/openoffice-3-devel/files/patch-hwpfilter+source+hwpreader.hxx deleted file mode 100644 index 8d65e6a3ee83..000000000000 --- a/editors/openoffice-3-devel/files/patch-hwpfilter+source+hwpreader.hxx +++ /dev/null @@ -1,14 +0,0 @@ -http://qa.openoffice.org/issues/show_bug.cgi?id=27033 ---- ../hwpfilter/source/hwpreader.hxx~ Wed Oct 15 23:37:24 2003 -+++ ../hwpfilter/source/hwpreader.hxx Sun Mar 28 22:46:18 2004 -@@ -68,7 +68,9 @@ - #include <string.h> - #ifdef WIN32 - #include <malloc.h> --#else -+#endif -+ -+#if !defined(FREEBSD) - #include <alloca.h> - #endif - diff --git a/editors/openoffice-3-devel/files/patch-libxml2+prj+build.lst b/editors/openoffice-3-devel/files/patch-libxml2+prj+build.lst new file mode 100644 index 000000000000..f0d7b8f05fc8 --- /dev/null +++ b/editors/openoffice-3-devel/files/patch-libxml2+prj+build.lst @@ -0,0 +1,12 @@ +Index: libxml2/prj/build.lst +=================================================================== +RCS file: /cvs/external/libxml2/prj/build.lst,v +retrieving revision 1.1 +diff -u -r1.1 build.lst +--- ../libxml2/prj/build.lst 6 Feb 2004 10:15:09 -0000 1.1 ++++ ../libxml2/prj/build.lst 4 May 2004 20:20:20 -0000 +@@ -1,3 +1,3 @@ +-lx libxml2 : soltools NULL
++lx libxml2 : soltools xml2cmp NULL
+ lx libxml2 usr1 - all lx_mkout NULL
+ lx libxml2 nmake - all lx_libxml2 NULL
diff --git a/editors/openoffice-3-devel/files/patch-odk+setsdkenv_unix.in b/editors/openoffice-3-devel/files/patch-odk+setsdkenv_unix.in deleted file mode 100644 index e5551f883231..000000000000 --- a/editors/openoffice-3-devel/files/patch-odk+setsdkenv_unix.in +++ /dev/null @@ -1,27 +0,0 @@ -http://qa.openoffice.org/issues/show_bug.cgi?id=24142 ---- ../odk/setsdkenv_unix.in Sun Jan 25 18:41:01 2004 -+++ ../odk/setsdkenv_unix.in Sun Jan 25 18:42:00 2004 -@@ -2,7 +2,8 @@ - - # This script starts a new shell and sets all enviroment variables, which - # are necessary for building the examples of the Office Development Kit. --# The Script was developed for the operating systems Solaris and Linux. -+# The script was developed for the operating systems Solaris, Linux, MacOS X -+# and FreeBSD. - - # Installation directory of the Software Development Kit. - # Example: OO_SDK_HOME=/work/StarOffice_SDK -@@ -76,6 +77,13 @@ - LD_LIBRARY_PATH=$OO_SDK_HOME/$directoryname/lib:$OO_SDK_HOME/$exampleout/lib:$OFFICE_PROGRAM_PATH:.:$LD_LIBRARY_PATH - export LD_LIBRARY_PATH - ;; -+ -+ FreeBSD) -+ directoryname=freebsd -+ exampleout=FREEBSDexample.out -+ LD_LIBRARY_PATH=$OO_SDK_HOME/$directoryname/lib:$OO_SDK_HOME/$exampleout/lib:$OFFICE_PROGRAM_PATH:.:$LD_LIBRARY_PATH -+ export LD_LIBRARY_PATH -+ ;; - esac - - # Add directory of the SDK tools to the path. diff --git a/editors/openoffice-3-devel/files/patch-odk+settings+settings.mk b/editors/openoffice-3-devel/files/patch-odk+settings+settings.mk deleted file mode 100644 index 8c3942d12f16..000000000000 --- a/editors/openoffice-3-devel/files/patch-odk+settings+settings.mk +++ /dev/null @@ -1,90 +0,0 @@ -http://qa.openoffice.org/issues/show_bug.cgi?id=24142 - ---- ../odk/settings/settings.mk Sun Jan 25 18:41:02 2004 -+++ ../odk/settings/settings.mk Sun Jan 25 18:45:09 2004 -@@ -368,3 +368,85 @@ - - endif - -+ifeq "$(PLATFORM)" "FreeBSD" -+# Settings for FreeBSD using gcc compiler -+ -+PROCTYPE := $(shell uname -m) -+ -+ -+# Default is freebsd on a intel machine -+PLATFORM=FreeBSD -+PACKAGE_LIB_DIR=freebsd_x86.plt -+JAVA_PROC_TYPE=i386 -+ -+OS=FREEBSD -+PS=/ -+CC=gcc -+LINK=gcc -+LIB=gcc -+ECHO=@echo -+MKDIR=mkdir -p -+CAT=cat -+OBJ_EXT=o -+SHAREDLIB_EXT=so -+SHAREDLIB_PRE=lib -+SHAREDLIB_OUT=$(OUT_LIB) -+ -+GCC_VERSION=$(shell $(CC) -dumpversion) -+ -+ifeq "$(shell echo $(GCC_VERSION) | cut -c 1)" "3" -+COMID=gcc3 -+CPPU_ENV=gcc3 -+else -+COMID=GCC -+CPPU_ENV=gcc2 -+endif -+ -+OSEP=\< -+CSEP=\> -+QUOTE=$(subst S,\,S) -+QM=\" -+ -+DEL=rm -f -+DELRECURSIVE=rm -rf -+COPY=cp -+URLPREFIX=file:// -+ -+# Include UDK version numbers -+include $(PRJ)/include/udkversion.mk -+ -+SALLIB=-lsal -+CPPULIB=-lcppu -+CPPUHELPERLIB=-lcppuhelper$(COMID) -+SALHELPERLIB=-lsalhelper$(COMID) -+STLPORTLIB=-lstlport_gcc -+ -+EMPTYSTRING= -+PATH_SEPARATOR=: -+ -+# -O is necessary for inlining (see gcc documentation) -+ifeq "$(DEBUG)" "yes" -+CC_FLAGS=-c -g -fpic -DPIC -fno-rtti %%PTHREAD_CFLAGS%% -+else -+CC_FLAGS=-c -O -fpic -DPIC -fno-rtti %%PTHREAD_CFLAGS%% -+endif -+ -+SDK_JAVA_INCLUDES = -I$(OO_SDK_JAVA_HOME)/include -I$(OO_SDK_JAVA_HOME)/include/freebsd -+CC_INCLUDES=-I. -I/usr/include -I$(OUT)/inc/examples -I$(PRJ)/include -+STL_INCLUDES=-I$(OO_SDK_HOME)/include/stl -+CC_DEFINES=-DUNX -DGCC -DFREEBSD -DCPPU_ENV=$(CPPU_ENV) -+ -+# define for used compiler necessary for UNO -+#-DCPPU_ENV=gcc2 -- gcc 2.91/2.95 -+#-DCPPU_ENV=gcc3 -- gcc3 3.0 -+ -+CC_OUTPUT_SWITCH=-o -+ -+LIBRARY_LINK_FLAGS=-shared '-Wl,-rpath,$$ORIGIN' -+ -+EXE_LINK_FLAGS=-Wl -+LINK_LIBS=-L$(OUT)/lib -L$(PRJ)/$(PLATFORM)/lib -L$(OFFICE_PROGRAM_PATH) %%PTHREAD_LIBS%% -+LINK_JAVA_LIBS=-L$(OO_SDK_JAVA_HOME)/jre/lib/$(JAVA_PROC_TYPE) -+ -+endif -+ diff --git a/editors/openoffice-3-devel/files/patch-psprint+source+helper+strhelper.cxx b/editors/openoffice-3-devel/files/patch-psprint+source+helper+strhelper.cxx new file mode 100644 index 000000000000..52530e403ac0 --- /dev/null +++ b/editors/openoffice-3-devel/files/patch-psprint+source+helper+strhelper.cxx @@ -0,0 +1,21 @@ +http://www.openoffice.org/issues/show_bug.cgi?id=27753 +The isnan() macro is a new feature of C99 and not yet part of C++. + +Index: source/helper/strhelper.cxx +=================================================================== +RCS file: /cvs/gsl/psprint/source/helper/strhelper.cxx,v +retrieving revision 1.6 +diff -u -r1.6 strhelper.cxx +--- ../psprint/source/helper/strhelper.cxx 30 Mar 2004 13:48:06 -0000 1.6 ++++ ../psprint/source/helper/strhelper.cxx 13 Apr 2004 22:26:11 -0000 +@@ -67,6 +67,10 @@ + #include <cmath> // for isnan + #include <cstring> + ++#if defined (FREEBSD) ++using namespace __gnu_cxx; //for isnan ++#endif ++ + namespace psp { + + inline int isSpace( char cChar ) diff --git a/editors/openoffice-3-devel/files/patch-setup2+mow+source+loader+makefile.mk b/editors/openoffice-3-devel/files/patch-setup2+mow+source+loader+makefile.mk deleted file mode 100644 index 7b25ff2635df..000000000000 --- a/editors/openoffice-3-devel/files/patch-setup2+mow+source+loader+makefile.mk +++ /dev/null @@ -1,17 +0,0 @@ -do not need -ldl - -http://qa.openoffice.org/issues/show_bug.cgi?id=27043 ---- ../setup2/mow/source/loader/makefile.mk~ Tue Mar 9 21:04:35 2004 -+++ ../setup2/mow/source/loader/makefile.mk Mon Mar 29 11:10:50 2004 -@@ -92,7 +92,11 @@ - LINK=gcc - LINKFLAGS= - LINKFLAGSAPP= -+.IF "$(OS)"=="FREEBSD" -+STDLIB= -lX11 -lc -lm -+.ELSE - STDLIB= -lX11 -ldl -lc -lm -+.ENDIF # "$(OS)"=="FREEBSD" - .ENDIF # "$(OS)$(COMID)"=="GCC" - - OBJFILES= $(OBJ)$/loader.obj diff --git a/editors/openoffice-3-devel/files/patch-sfx2+source+config+cfgmgr.cxx b/editors/openoffice-3-devel/files/patch-sfx2+source+config+cfgmgr.cxx deleted file mode 100644 index be38de290a51..000000000000 --- a/editors/openoffice-3-devel/files/patch-sfx2+source+config+cfgmgr.cxx +++ /dev/null @@ -1,16 +0,0 @@ -Wired 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-3-devel/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx b/editors/openoffice-3-devel/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx deleted file mode 100644 index 10c3f3c1f6e8..000000000000 --- a/editors/openoffice-3-devel/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx +++ /dev/null @@ -1,34 +0,0 @@ -http://qa.openoffice.org/issues/show_bug.cgi?id=24315 - -For FreeBSD, time_t is defined as -at /usr/include/machine/_types.h -49th typedef int __int32_t; -90th typedef __int32_t __time_t; /* time()... */ -and -/usr/include/pwd.h:typedef __time_t time_t; -/usr/include/time.h:typedef __time_t time_t; -/usr/include/timeconv.h:typedef __time_t time_t; -/usr/include/utime.h:typedef __time_t time_t; -so time_t is equal to 32 bit integer - -For LinuxPPC (Yellowdog 3.0.1) - - ---- ../shell/source/unix/sysshell/recently_used_file_handler.cxx.orig Tue Jan 13 00:56:37 2004 -+++ ../shell/source/unix/sysshell/recently_used_file_handler.cxx Tue Jan 13 00:57:26 2004 -@@ -188,9 +188,12 @@ - write_xml_start_tag(TAG_RECENT_ITEM, file, true); - write_xml_tag(TAG_URI, uri_, file); - write_xml_tag(TAG_MIME_TYPE, mime_type_, file); -- -- rtl::OString ts = rtl::OString::valueOf(timestamp_); -- write_xml_tag(TAG_TIMESTAMP, ts.getStr(), file); -+#if defined FREEBSD -+ rtl::OString ts = rtl::OString::valueOf((sal_Int32)timestamp_); -+#else -+ rtl::OString ts = rtl::OString::valueOf(timestamp_); -+#endif -+ write_xml_tag(TAG_TIMESTAMP, ts.getStr(), file); - - if (is_private_) - write_xml_tag(TAG_PRIVATE, file); diff --git a/editors/openoffice-3-devel/files/patch-solenv+inc+ant.mk b/editors/openoffice-3-devel/files/patch-solenv+inc+ant.mk deleted file mode 100644 index e050b85d41e9..000000000000 --- a/editors/openoffice-3-devel/files/patch-solenv+inc+ant.mk +++ /dev/null @@ -1,13 +0,0 @@ -http://qa.openoffice.org/issues/show_bug.cgi?id=27028 - ---- ../solenv/inc/ant.mk~ Wed Feb 4 21:37:16 2004 -+++ ../solenv/inc/ant.mk Fri Apr 2 23:59:27 2004 -@@ -100,7 +100,7 @@ - .ENDIF - .ENDIF - --ANT=$(WRAPCMD) java -classpath $(CLASSPATH) -Xmx128m org.apache.tools.ant.Main -Djava.home=$(JAVA_HOME) -Dant.home=$(ANT_HOME) -+#ANT=$(WRAPCMD) java -classpath $(CLASSPATH) -Xmx128m org.apache.tools.ant.Main -Djava.home=$(JAVA_HOME) -Dant.home=$(ANT_HOME) - #ANT=java -version - - .IF "$(ANT_BUILDFILE)"=="" diff --git a/editors/openoffice-3-devel/files/patch-solenv+inc+settings.mk b/editors/openoffice-3-devel/files/patch-solenv+inc+settings.mk deleted file mode 100644 index f93ee2ad6bf2..000000000000 --- a/editors/openoffice-3-devel/files/patch-solenv+inc+settings.mk +++ /dev/null @@ -1,15 +0,0 @@ -http://www.openoffice.org/issues/show_bug.cgi?id=25579 -We should set locale as UTF-8 when compiling -but this was due to violation of OOo coding style - ---- ../solenv/inc/settings.mk.old Tue Mar 9 21:19:28 2004 -+++ ../solenv/inc/settings.mk Mon Mar 29 13:23:31 2004 -@@ -172,7 +172,7 @@ - JAVAI=gij - JAVACPS=--classpath - .ELSE --JAVAC=javac -+JAVAC=javac -encoding UTF-8 - JAVAI=java - JAVACPS=-classpath - .ENDIF diff --git a/editors/openoffice-3-devel/files/patch-vcl+source+gdi+outdev3.cxx b/editors/openoffice-3-devel/files/patch-vcl+source+gdi+outdev3.cxx deleted file mode 100644 index 22ef6f26f45f..000000000000 --- a/editors/openoffice-3-devel/files/patch-vcl+source+gdi+outdev3.cxx +++ /dev/null @@ -1,14 +0,0 @@ -do not need <malloc.h> including stdlib.h is enough -http://qa.openoffice.org/issues/show_bug.cgi?id=27041 - ---- ../vcl/source/gdi/outdev3.cxx.old Mon Mar 29 09:42:28 2004 -+++ ../vcl/source/gdi/outdev3.cxx Mon Mar 29 09:42:59 2004 -@@ -176,7 +176,7 @@ - #if defined(SOLARIS) || defined(IRIX) - #include <alloca.h> - #else --#ifndef MACOSX -+#if !(defined(MACOSX) || defined(FREEBSD)) - #include <malloc.h> - #endif - #endif diff --git a/editors/openoffice-3-devel/files/patch-vcl+source+gdi+sallayout.cxx b/editors/openoffice-3-devel/files/patch-vcl+source+gdi+sallayout.cxx deleted file mode 100644 index 5cbc59bf7db7..000000000000 --- a/editors/openoffice-3-devel/files/patch-vcl+source+gdi+sallayout.cxx +++ /dev/null @@ -1,14 +0,0 @@ -malloc.h is deprecated -http://qa.openoffice.org/issues/show_bug.cgi?id=27041 - ---- ../vcl/source/gdi/sallayout.cxx.org Mon Mar 29 10:02:17 2004 -+++ ../vcl/source/gdi/sallayout.cxx Mon Mar 29 10:02:43 2004 -@@ -67,7 +67,7 @@ - #if defined(SOLARIS) || defined(IRIX) - #include <alloca.h> - #else --#ifndef MACOSX -+#if !(defined(MACOSX) || defined(FREEBSD)) - #include <malloc.h> - #endif - #endif diff --git a/editors/openoffice-3-devel/files/patch-vcl+source+glyphs+gcache_layout.cxx b/editors/openoffice-3-devel/files/patch-vcl+source+glyphs+gcache_layout.cxx deleted file mode 100644 index 53c7a909faf7..000000000000 --- a/editors/openoffice-3-devel/files/patch-vcl+source+glyphs+gcache_layout.cxx +++ /dev/null @@ -1,14 +0,0 @@ -malloc.h is deprecated -http://qa.openoffice.org/issues/show_bug.cgi?id=27041 - ---- ../vcl/source/glyphs/gcach_layout.cxx~ Tue Mar 9 21:15:32 2004 -+++ ../vcl/source/glyphs/gcach_layout.cxx Mon Mar 29 09:44:52 2004 -@@ -74,7 +74,7 @@ - #if defined(SOLARIS) || defined(IRIX) - #include <alloca.h> - #else --#ifndef MACOSX -+#if !(defined(MACOSX) || defined(FREEBSD)) - #include <malloc.h> - #endif - #endif diff --git a/editors/openoffice-3-devel/files/patch-vcl+unx+source+plugadapt+salmain.cxx b/editors/openoffice-3-devel/files/patch-vcl+unx+source+plugadapt+salmain.cxx deleted file mode 100644 index f5bd54364036..000000000000 --- a/editors/openoffice-3-devel/files/patch-vcl+unx+source+plugadapt+salmain.cxx +++ /dev/null @@ -1,24 +0,0 @@ -http://qa.openoffice.org/issues/show_bug.cgi?id=27042 - -include <sys/types.h> -Note: --- -* $RCSfile: salmain.cxx,v $ -* -* $Revision: 1.8.12.2 $ -* -* last change: $Author: hr $ $Date: 2004/01/09 18:14:00 $ --- -includes this patch - ---- ../vcl/unx/source/plugadapt/salmain.cxx~ Mon Mar 29 09:50:50 2004 -+++ ../vcl/unx/source/plugadapt/salmain.cxx Mon Mar 29 10:08:28 2004 -@@ -59,7 +59,7 @@ - * - ************************************************************************/ - --#ifdef MACOSX -+#if defined(MACOSX) || defined(FREEBSD) - // rlimit needs sys/types.h - #include <sys/types.h> - #include <sys/time.h> diff --git a/editors/openoffice-3-devel/files/patch-vcl+util+makefile.mk b/editors/openoffice-3-devel/files/patch-vcl+util+makefile.mk deleted file mode 100644 index 5d133486e032..000000000000 --- a/editors/openoffice-3-devel/files/patch-vcl+util+makefile.mk +++ /dev/null @@ -1,30 +0,0 @@ -FreeBSD doesn't require/need/have -ldl -http://qa.openoffice.org/issues/show_bug.cgi?id=27043 - ---- ../vcl/util/makefile.mk~ Mon Mar 29 09:50:51 2004 -+++ ../vcl/util/makefile.mk Mon Mar 29 10:19:04 2004 -@@ -208,7 +208,9 @@ - .IF "$(GUI)"!="UNX" - SHL1OBJS= $(SLO)$/salshl.obj - .ELSE --SHL1STDLIBS+=-ldl -+ .IF "$(OS)"!="FREEBSD" -+ SHL1STDLIBS+=-ldl -+ .ENDIF - .ENDIF - - .IF "$(GUI)" != "MAC" -@@ -351,8 +353,11 @@ - # libs for gtk plugin - SHL4STDLIBS=`pkg-config --libs gtk+-2.0 gthread-2.0` - SHL4STDLIBS+=-l$(SHL2TARGET) --SHL4STDLIBS+=$(SHL3STDLIBS) -lX11 -ldl -- -+ .IF "$(OS)"!="FREEBSD" -+ SHL4STDLIBS+=$(SHL3STDLIBS) -lX11 -ldl -+ .ELSE -+ SHL4STDLIBS+=$(SHL3STDLIBS) -lX11 -+ .ENDIF # FREEBSD - .ENDIF # UNX - - # --- Allgemein ---------------------------------------------------------- diff --git a/editors/openoffice-3-devel/files/patch-wizards+prj+build.lst b/editors/openoffice-3-devel/files/patch-wizards+prj+build.lst new file mode 100644 index 000000000000..5d5abb75a07e --- /dev/null +++ b/editors/openoffice-3-devel/files/patch-wizards+prj+build.lst @@ -0,0 +1,15 @@ +http://www.openoffice.org/issues/show_bug.cgi?id=29656 + +Index: wizards/prj/build.lst +=================================================================== +RCS file: /cvs/installation/wizards/prj/build.lst,v +retrieving revision 1.23 +diff -u -r1.23 build.lst +--- ../wizards/prj/build.lst 19 May 2004 16:35:11 -0000 1.23 ++++ ../wizards/prj/build.lst 8 Jun 2004 22:43:04 -0000 +@@ -1,4 +1,4 @@ +-wz wizards : rsc javaunohelper jut unoil NULL ++wz wizards : rsc qadevOOo javaunohelper jut unoil NULL + wz wizards\util nmake - all wz_util NULL + wz wizards\source\config nmake - all wz_config NULL + wz wizards\source\euro nmake - all wz_eurowiz NULL diff --git a/editors/openoffice-3-devel/files/patch-wizards+prj+d.lst b/editors/openoffice-3-devel/files/patch-wizards+prj+d.lst new file mode 100644 index 000000000000..d1b4255cca46 --- /dev/null +++ b/editors/openoffice-3-devel/files/patch-wizards+prj+d.lst @@ -0,0 +1,16 @@ +http://www.openoffice.org/issues/show_bug.cgi?id=29666 + +Index: wizards/prj/d.lst +=================================================================== +RCS file: /cvs/installation/wizards/prj/d.lst,v +retrieving revision 1.13 +diff -u -r1.13 d.lst +--- ../wizards/prj/d.lst 2 Feb 2004 19:16:11 -0000 1.13 ++++ ../wizards/prj/d.lst 9 Jun 2004 08:25:50 -0000 +@@ -1,5 +1,6 @@ + mkdir: %COMMON_DEST%\bin%_EXT%\hid + mkdir: %_DEST%\pck%_EXT% ++mkdir: %_DEST%\pck%_EXT%\img + ..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid + ..\%__SRC%\bin\*.zip %_DEST%\pck%_EXT%\*.zip + ..\%__SRC%\bin\iwz*.res %_DEST%\bin%_EXT%\iwz*.res diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile index d47c500c2e52..6c660a7b6fb8 100644 --- a/editors/openoffice-3/Makefile +++ b/editors/openoffice-3/Makefile @@ -24,7 +24,7 @@ MAINTAINER= openoffice@FreeBSD.org COMMENT= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser .endif -IGNORE= "Does not work yet, installation problems" +IGNORE= "Installation is not complete, manual installation works" NO_LATEST_LINK= yes UNZIP?= ${LOCALBASE}/bin/unzip @@ -33,13 +33,13 @@ ANT?= ${LOCALBASE}/bin/ant TCSH?= /bin/tcsh DIST_SUBDIR= openoffice2.0 BUILD_NR= 680 -MILESTONE= m30 +MILESTONE= m41 RELEASE_NR= 2.0 FRELEASE_NR= 2.0 -SNAPDATE= 20040402 +SNAPDATE= 20040611 INSTALLATION_BASEDIR= OpenOffice.org${RELEASE_NR} EXTRACT_ONLY= OOo_${BUILD_NR}${MILESTONE}_${SNAPDATE}_source.tar.bz2 -USE_GNOME= orbit gtk12 +USE_GNOME= orbit gtk12 gtk20 USE_REINPLACE= yes USE_PERL5= yes USE_BZIP2= yes @@ -48,7 +48,7 @@ USE_GMAKE= yes LANG_EXT?= 01 LANG_CONFIGURE_ARG?= ENUS WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work -WRKSRC= ${WRKDIR}/oo_${BUILD_NR}${MILESTONE}_src/config_office +WRKSRC= ${WRKDIR}/oo_${RELEASE_NR}_src/config_office #XXX dirty BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32 @@ -58,9 +58,11 @@ CXX= g++32 BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14 BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip BUILD_DEPENDS+= unzip:${PORTSDIR}/archivers/unzip -BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/apache-ant -BUILD_DEPENDS+= ${X11BASE}/lib/libgdk-x11-2.0.so:${PORTSDIR}/x11-toolkits/gtk20 +BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/apache-ant +BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries BUILD_DEPENDS+= ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft +BUILD_DEPENDS+= ${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip + .if !defined(DISPLAY) BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer .endif @@ -111,7 +113,7 @@ JDKDIR?= ${LOCALBASE}/jdk1.4.2 JAVAVM= ${JDKDIR}/bin/java GNU_CONFIGURE= yes -USE_AUTOCONF_VER= 253 +USE_AUTOCONF_VER= 259 .if defined(WITH_DEBUG) CFLAGS+= -g .if ${WITH_DEBUG} == 2 @@ -130,7 +132,7 @@ DISPLAYHACK=localhost:1001 CONFIGURE_ENV= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \ PTHREAD_LIBS=${PTHREAD_LIBS} CONFIGURE_ARGS+= --with-lang=${LANG_CONFIGURE_ARG} -CONFIGURE_ARGS+= --with-jdk-home=${JDKDIR} --with-ant-home=${LOCALBASE}/ant --with-gnu-cp=${LOCALBASE}/bin/gcp --enable-mozilla=no +CONFIGURE_ARGS+= --with-jdk-home=${JDKDIR} --with-ant-home=${LOCALBASE}/ant --with-gnu-cp=${LOCALBASE}/bin/gcp --enable-mozilla=yes .if defined(WITH_DEBUG) .if ${WITH_DEBUG} == 2 diff --git a/editors/openoffice-3/distinfo b/editors/openoffice-3/distinfo index 74de717eb2de..23f567c61dd8 100644 --- a/editors/openoffice-3/distinfo +++ b/editors/openoffice-3/distinfo @@ -1,5 +1,5 @@ -MD5 (openoffice2.0/OOo_680m30_20040402_source.tar.bz2) = 768b3d8246a12eff6bf83f098093fbee -SIZE (openoffice2.0/OOo_680m30_20040402_source.tar.bz2) = 195378119 +MD5 (openoffice2.0/OOo_680m41_20040611_source.tar.bz2) = 7b8a6d87b80022f85093a67c01064883 +SIZE (openoffice2.0/OOo_680m41_20040611_source.tar.bz2) = 221136281 MD5 (openoffice2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 SIZE (openoffice2.0/gpc231.tar.Z) = 27917 MD5 (openoffice2.0/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a diff --git a/editors/openoffice-3/files/patch-config_office+configure.in b/editors/openoffice-3/files/patch-config_office+configure.in deleted file mode 100644 index 8bd6e0668f6b..000000000000 --- a/editors/openoffice-3/files/patch-config_office+configure.in +++ /dev/null @@ -1,50 +0,0 @@ -#i27028 and #i27028 -http://qa.openoffice.org/issues/show_bug.cgi?id=27021 (Xaw) -http://qa.openoffice.org/issues/show_bug.cgi?id=27028 (ant) - ---- ../config_office/configure.in.org Sat Mar 27 17:54:16 2004 -+++ ../config_office/configure.in Sun Mar 28 22:17:37 2004 -@@ -1478,7 +1478,7 @@ - elif test "$_os" != "WINNT" ; then - AC_PATH_X - AC_PATH_XTRA -- AC_CHECK_HEADERS(X11/Xaw/Label.h,[AC_MSG_RESULT([Ok])],[AC_MSG_ERROR([Xaw include headers not found])]) -+dnl AC_CHECK_HEADERS(X11/Xaw/Label.h,[AC_MSG_RESULT([Ok])],[AC_MSG_ERROR([Xaw include headers not found])]) - - if test "x$x_includes" = "x"; then - x_includes="/usr/include" -@@ -1830,10 +1830,12 @@ - - if test "$enable_java" != "no"; then - ANT_HOME=; export ANT_HOME -+WITH_ANT_HOME=; export WITH_ANT_HOME - if test -z "$with_ant_home"; then - AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat]) - else -- AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat],,$with_ant_home/bin) -+ AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat],,$with_ant_home/bin:$PATH) -+ WITH_ANT_HOME=$with_ant_home - fi - - -@@ -1873,7 +1875,11 @@ - AC_TRY_EVAL(ant_cmd) - if test $? = 0 && test -f ./conftest.class ; then - AC_MSG_RESULT([Ant works]) -- ANT_HOME=`echo $ANT | $SED -n "s/\/bin\/ant.*\$//p"` -+ if test -z "$WITH_ANT_HOME"; then -+ ANT_HOME=`echo $ANT | $SED -n "s/\/bin\/ant.*\$//p"` -+ else -+ ANT_HOME="$WITH_ANT_HOME" -+ fi - else - echo "configure: Ant test failed" >&5 - cat conftest.java >&5 -@@ -1885,6 +1891,7 @@ - - rm -f conftest* core core.* *.core - fi -+ - if test -z "$ANT_HOME"; then - ANT_HOME="NO_ANT_HOME" - fi diff --git a/editors/openoffice-3/files/patch-config_office+set_soenv.in b/editors/openoffice-3/files/patch-config_office+set_soenv.in deleted file mode 100644 index dbb4c3506e1e..000000000000 --- a/editors/openoffice-3/files/patch-config_office+set_soenv.in +++ /dev/null @@ -1,13 +0,0 @@ -#i27028 -http://qa.openoffice.org/issues/show_bug.cgi?id=27028 - ---- ../config_office/set_soenv.in.old Tue Mar 9 21:31:38 2004 -+++ ../config_office/set_soenv.in Sun Mar 28 09:56:03 2004 -@@ -1419,6 +1419,7 @@ - ToFile( "XSLTPROC", "@XSLTPROC@", "e" ); - ToFile( "ANT_HOME", "@ANT_HOME@", "e" ); - ToFile( "ANT_LIB", "@ANT_LIB@", "e" ); -+ToFile( "ANT", "@ANT@", "e" ); - ToFile( "JDKLIB", $JAVA_LIB, "e" ); - ToFile( "STLPORT4", $STLPORT4, "e" ); - ToFile( "ASM_PATH", $ASM_PATH, "e" ); diff --git a/editors/openoffice-3/files/patch-cppuhelper+source+gcc3_linux_intel.map b/editors/openoffice-3/files/patch-cppuhelper+source+gcc3_linux_intel.map deleted file mode 100644 index cdb61b141eba..000000000000 --- a/editors/openoffice-3/files/patch-cppuhelper+source+gcc3_linux_intel.map +++ /dev/null @@ -1,13 +0,0 @@ -Mysterious :) - -http://qa.openoffice.org/issues/show_bug.cgi?id=23917 ---- ../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-3/files/patch-hwpfilter+source+hwpreader.hxx b/editors/openoffice-3/files/patch-hwpfilter+source+hwpreader.hxx deleted file mode 100644 index 8d65e6a3ee83..000000000000 --- a/editors/openoffice-3/files/patch-hwpfilter+source+hwpreader.hxx +++ /dev/null @@ -1,14 +0,0 @@ -http://qa.openoffice.org/issues/show_bug.cgi?id=27033 ---- ../hwpfilter/source/hwpreader.hxx~ Wed Oct 15 23:37:24 2003 -+++ ../hwpfilter/source/hwpreader.hxx Sun Mar 28 22:46:18 2004 -@@ -68,7 +68,9 @@ - #include <string.h> - #ifdef WIN32 - #include <malloc.h> --#else -+#endif -+ -+#if !defined(FREEBSD) - #include <alloca.h> - #endif - diff --git a/editors/openoffice-3/files/patch-libxml2+prj+build.lst b/editors/openoffice-3/files/patch-libxml2+prj+build.lst new file mode 100644 index 000000000000..f0d7b8f05fc8 --- /dev/null +++ b/editors/openoffice-3/files/patch-libxml2+prj+build.lst @@ -0,0 +1,12 @@ +Index: libxml2/prj/build.lst +=================================================================== +RCS file: /cvs/external/libxml2/prj/build.lst,v +retrieving revision 1.1 +diff -u -r1.1 build.lst +--- ../libxml2/prj/build.lst 6 Feb 2004 10:15:09 -0000 1.1 ++++ ../libxml2/prj/build.lst 4 May 2004 20:20:20 -0000 +@@ -1,3 +1,3 @@ +-lx libxml2 : soltools NULL
++lx libxml2 : soltools xml2cmp NULL
+ lx libxml2 usr1 - all lx_mkout NULL
+ lx libxml2 nmake - all lx_libxml2 NULL
diff --git a/editors/openoffice-3/files/patch-odk+setsdkenv_unix.in b/editors/openoffice-3/files/patch-odk+setsdkenv_unix.in deleted file mode 100644 index e5551f883231..000000000000 --- a/editors/openoffice-3/files/patch-odk+setsdkenv_unix.in +++ /dev/null @@ -1,27 +0,0 @@ -http://qa.openoffice.org/issues/show_bug.cgi?id=24142 ---- ../odk/setsdkenv_unix.in Sun Jan 25 18:41:01 2004 -+++ ../odk/setsdkenv_unix.in Sun Jan 25 18:42:00 2004 -@@ -2,7 +2,8 @@ - - # This script starts a new shell and sets all enviroment variables, which - # are necessary for building the examples of the Office Development Kit. --# The Script was developed for the operating systems Solaris and Linux. -+# The script was developed for the operating systems Solaris, Linux, MacOS X -+# and FreeBSD. - - # Installation directory of the Software Development Kit. - # Example: OO_SDK_HOME=/work/StarOffice_SDK -@@ -76,6 +77,13 @@ - LD_LIBRARY_PATH=$OO_SDK_HOME/$directoryname/lib:$OO_SDK_HOME/$exampleout/lib:$OFFICE_PROGRAM_PATH:.:$LD_LIBRARY_PATH - export LD_LIBRARY_PATH - ;; -+ -+ FreeBSD) -+ directoryname=freebsd -+ exampleout=FREEBSDexample.out -+ LD_LIBRARY_PATH=$OO_SDK_HOME/$directoryname/lib:$OO_SDK_HOME/$exampleout/lib:$OFFICE_PROGRAM_PATH:.:$LD_LIBRARY_PATH -+ export LD_LIBRARY_PATH -+ ;; - esac - - # Add directory of the SDK tools to the path. diff --git a/editors/openoffice-3/files/patch-odk+settings+settings.mk b/editors/openoffice-3/files/patch-odk+settings+settings.mk deleted file mode 100644 index 8c3942d12f16..000000000000 --- a/editors/openoffice-3/files/patch-odk+settings+settings.mk +++ /dev/null @@ -1,90 +0,0 @@ -http://qa.openoffice.org/issues/show_bug.cgi?id=24142 - ---- ../odk/settings/settings.mk Sun Jan 25 18:41:02 2004 -+++ ../odk/settings/settings.mk Sun Jan 25 18:45:09 2004 -@@ -368,3 +368,85 @@ - - endif - -+ifeq "$(PLATFORM)" "FreeBSD" -+# Settings for FreeBSD using gcc compiler -+ -+PROCTYPE := $(shell uname -m) -+ -+ -+# Default is freebsd on a intel machine -+PLATFORM=FreeBSD -+PACKAGE_LIB_DIR=freebsd_x86.plt -+JAVA_PROC_TYPE=i386 -+ -+OS=FREEBSD -+PS=/ -+CC=gcc -+LINK=gcc -+LIB=gcc -+ECHO=@echo -+MKDIR=mkdir -p -+CAT=cat -+OBJ_EXT=o -+SHAREDLIB_EXT=so -+SHAREDLIB_PRE=lib -+SHAREDLIB_OUT=$(OUT_LIB) -+ -+GCC_VERSION=$(shell $(CC) -dumpversion) -+ -+ifeq "$(shell echo $(GCC_VERSION) | cut -c 1)" "3" -+COMID=gcc3 -+CPPU_ENV=gcc3 -+else -+COMID=GCC -+CPPU_ENV=gcc2 -+endif -+ -+OSEP=\< -+CSEP=\> -+QUOTE=$(subst S,\,S) -+QM=\" -+ -+DEL=rm -f -+DELRECURSIVE=rm -rf -+COPY=cp -+URLPREFIX=file:// -+ -+# Include UDK version numbers -+include $(PRJ)/include/udkversion.mk -+ -+SALLIB=-lsal -+CPPULIB=-lcppu -+CPPUHELPERLIB=-lcppuhelper$(COMID) -+SALHELPERLIB=-lsalhelper$(COMID) -+STLPORTLIB=-lstlport_gcc -+ -+EMPTYSTRING= -+PATH_SEPARATOR=: -+ -+# -O is necessary for inlining (see gcc documentation) -+ifeq "$(DEBUG)" "yes" -+CC_FLAGS=-c -g -fpic -DPIC -fno-rtti %%PTHREAD_CFLAGS%% -+else -+CC_FLAGS=-c -O -fpic -DPIC -fno-rtti %%PTHREAD_CFLAGS%% -+endif -+ -+SDK_JAVA_INCLUDES = -I$(OO_SDK_JAVA_HOME)/include -I$(OO_SDK_JAVA_HOME)/include/freebsd -+CC_INCLUDES=-I. -I/usr/include -I$(OUT)/inc/examples -I$(PRJ)/include -+STL_INCLUDES=-I$(OO_SDK_HOME)/include/stl -+CC_DEFINES=-DUNX -DGCC -DFREEBSD -DCPPU_ENV=$(CPPU_ENV) -+ -+# define for used compiler necessary for UNO -+#-DCPPU_ENV=gcc2 -- gcc 2.91/2.95 -+#-DCPPU_ENV=gcc3 -- gcc3 3.0 -+ -+CC_OUTPUT_SWITCH=-o -+ -+LIBRARY_LINK_FLAGS=-shared '-Wl,-rpath,$$ORIGIN' -+ -+EXE_LINK_FLAGS=-Wl -+LINK_LIBS=-L$(OUT)/lib -L$(PRJ)/$(PLATFORM)/lib -L$(OFFICE_PROGRAM_PATH) %%PTHREAD_LIBS%% -+LINK_JAVA_LIBS=-L$(OO_SDK_JAVA_HOME)/jre/lib/$(JAVA_PROC_TYPE) -+ -+endif -+ diff --git a/editors/openoffice-3/files/patch-psprint+source+helper+strhelper.cxx b/editors/openoffice-3/files/patch-psprint+source+helper+strhelper.cxx new file mode 100644 index 000000000000..52530e403ac0 --- /dev/null +++ b/editors/openoffice-3/files/patch-psprint+source+helper+strhelper.cxx @@ -0,0 +1,21 @@ +http://www.openoffice.org/issues/show_bug.cgi?id=27753 +The isnan() macro is a new feature of C99 and not yet part of C++. + +Index: source/helper/strhelper.cxx +=================================================================== +RCS file: /cvs/gsl/psprint/source/helper/strhelper.cxx,v +retrieving revision 1.6 +diff -u -r1.6 strhelper.cxx +--- ../psprint/source/helper/strhelper.cxx 30 Mar 2004 13:48:06 -0000 1.6 ++++ ../psprint/source/helper/strhelper.cxx 13 Apr 2004 22:26:11 -0000 +@@ -67,6 +67,10 @@ + #include <cmath> // for isnan + #include <cstring> + ++#if defined (FREEBSD) ++using namespace __gnu_cxx; //for isnan ++#endif ++ + namespace psp { + + inline int isSpace( char cChar ) diff --git a/editors/openoffice-3/files/patch-setup2+mow+source+loader+makefile.mk b/editors/openoffice-3/files/patch-setup2+mow+source+loader+makefile.mk deleted file mode 100644 index 7b25ff2635df..000000000000 --- a/editors/openoffice-3/files/patch-setup2+mow+source+loader+makefile.mk +++ /dev/null @@ -1,17 +0,0 @@ -do not need -ldl - -http://qa.openoffice.org/issues/show_bug.cgi?id=27043 ---- ../setup2/mow/source/loader/makefile.mk~ Tue Mar 9 21:04:35 2004 -+++ ../setup2/mow/source/loader/makefile.mk Mon Mar 29 11:10:50 2004 -@@ -92,7 +92,11 @@ - LINK=gcc - LINKFLAGS= - LINKFLAGSAPP= -+.IF "$(OS)"=="FREEBSD" -+STDLIB= -lX11 -lc -lm -+.ELSE - STDLIB= -lX11 -ldl -lc -lm -+.ENDIF # "$(OS)"=="FREEBSD" - .ENDIF # "$(OS)$(COMID)"=="GCC" - - OBJFILES= $(OBJ)$/loader.obj diff --git a/editors/openoffice-3/files/patch-sfx2+source+config+cfgmgr.cxx b/editors/openoffice-3/files/patch-sfx2+source+config+cfgmgr.cxx deleted file mode 100644 index be38de290a51..000000000000 --- a/editors/openoffice-3/files/patch-sfx2+source+config+cfgmgr.cxx +++ /dev/null @@ -1,16 +0,0 @@ -Wired 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-3/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx b/editors/openoffice-3/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx deleted file mode 100644 index 10c3f3c1f6e8..000000000000 --- a/editors/openoffice-3/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx +++ /dev/null @@ -1,34 +0,0 @@ -http://qa.openoffice.org/issues/show_bug.cgi?id=24315 - -For FreeBSD, time_t is defined as -at /usr/include/machine/_types.h -49th typedef int __int32_t; -90th typedef __int32_t __time_t; /* time()... */ -and -/usr/include/pwd.h:typedef __time_t time_t; -/usr/include/time.h:typedef __time_t time_t; -/usr/include/timeconv.h:typedef __time_t time_t; -/usr/include/utime.h:typedef __time_t time_t; -so time_t is equal to 32 bit integer - -For LinuxPPC (Yellowdog 3.0.1) - - ---- ../shell/source/unix/sysshell/recently_used_file_handler.cxx.orig Tue Jan 13 00:56:37 2004 -+++ ../shell/source/unix/sysshell/recently_used_file_handler.cxx Tue Jan 13 00:57:26 2004 -@@ -188,9 +188,12 @@ - write_xml_start_tag(TAG_RECENT_ITEM, file, true); - write_xml_tag(TAG_URI, uri_, file); - write_xml_tag(TAG_MIME_TYPE, mime_type_, file); -- -- rtl::OString ts = rtl::OString::valueOf(timestamp_); -- write_xml_tag(TAG_TIMESTAMP, ts.getStr(), file); -+#if defined FREEBSD -+ rtl::OString ts = rtl::OString::valueOf((sal_Int32)timestamp_); -+#else -+ rtl::OString ts = rtl::OString::valueOf(timestamp_); -+#endif -+ write_xml_tag(TAG_TIMESTAMP, ts.getStr(), file); - - if (is_private_) - write_xml_tag(TAG_PRIVATE, file); diff --git a/editors/openoffice-3/files/patch-solenv+inc+ant.mk b/editors/openoffice-3/files/patch-solenv+inc+ant.mk deleted file mode 100644 index e050b85d41e9..000000000000 --- a/editors/openoffice-3/files/patch-solenv+inc+ant.mk +++ /dev/null @@ -1,13 +0,0 @@ -http://qa.openoffice.org/issues/show_bug.cgi?id=27028 - ---- ../solenv/inc/ant.mk~ Wed Feb 4 21:37:16 2004 -+++ ../solenv/inc/ant.mk Fri Apr 2 23:59:27 2004 -@@ -100,7 +100,7 @@ - .ENDIF - .ENDIF - --ANT=$(WRAPCMD) java -classpath $(CLASSPATH) -Xmx128m org.apache.tools.ant.Main -Djava.home=$(JAVA_HOME) -Dant.home=$(ANT_HOME) -+#ANT=$(WRAPCMD) java -classpath $(CLASSPATH) -Xmx128m org.apache.tools.ant.Main -Djava.home=$(JAVA_HOME) -Dant.home=$(ANT_HOME) - #ANT=java -version - - .IF "$(ANT_BUILDFILE)"=="" diff --git a/editors/openoffice-3/files/patch-solenv+inc+settings.mk b/editors/openoffice-3/files/patch-solenv+inc+settings.mk deleted file mode 100644 index f93ee2ad6bf2..000000000000 --- a/editors/openoffice-3/files/patch-solenv+inc+settings.mk +++ /dev/null @@ -1,15 +0,0 @@ -http://www.openoffice.org/issues/show_bug.cgi?id=25579 -We should set locale as UTF-8 when compiling -but this was due to violation of OOo coding style - ---- ../solenv/inc/settings.mk.old Tue Mar 9 21:19:28 2004 -+++ ../solenv/inc/settings.mk Mon Mar 29 13:23:31 2004 -@@ -172,7 +172,7 @@ - JAVAI=gij - JAVACPS=--classpath - .ELSE --JAVAC=javac -+JAVAC=javac -encoding UTF-8 - JAVAI=java - JAVACPS=-classpath - .ENDIF diff --git a/editors/openoffice-3/files/patch-vcl+source+gdi+outdev3.cxx b/editors/openoffice-3/files/patch-vcl+source+gdi+outdev3.cxx deleted file mode 100644 index 22ef6f26f45f..000000000000 --- a/editors/openoffice-3/files/patch-vcl+source+gdi+outdev3.cxx +++ /dev/null @@ -1,14 +0,0 @@ -do not need <malloc.h> including stdlib.h is enough -http://qa.openoffice.org/issues/show_bug.cgi?id=27041 - ---- ../vcl/source/gdi/outdev3.cxx.old Mon Mar 29 09:42:28 2004 -+++ ../vcl/source/gdi/outdev3.cxx Mon Mar 29 09:42:59 2004 -@@ -176,7 +176,7 @@ - #if defined(SOLARIS) || defined(IRIX) - #include <alloca.h> - #else --#ifndef MACOSX -+#if !(defined(MACOSX) || defined(FREEBSD)) - #include <malloc.h> - #endif - #endif diff --git a/editors/openoffice-3/files/patch-vcl+source+gdi+sallayout.cxx b/editors/openoffice-3/files/patch-vcl+source+gdi+sallayout.cxx deleted file mode 100644 index 5cbc59bf7db7..000000000000 --- a/editors/openoffice-3/files/patch-vcl+source+gdi+sallayout.cxx +++ /dev/null @@ -1,14 +0,0 @@ -malloc.h is deprecated -http://qa.openoffice.org/issues/show_bug.cgi?id=27041 - ---- ../vcl/source/gdi/sallayout.cxx.org Mon Mar 29 10:02:17 2004 -+++ ../vcl/source/gdi/sallayout.cxx Mon Mar 29 10:02:43 2004 -@@ -67,7 +67,7 @@ - #if defined(SOLARIS) || defined(IRIX) - #include <alloca.h> - #else --#ifndef MACOSX -+#if !(defined(MACOSX) || defined(FREEBSD)) - #include <malloc.h> - #endif - #endif diff --git a/editors/openoffice-3/files/patch-vcl+source+glyphs+gcache_layout.cxx b/editors/openoffice-3/files/patch-vcl+source+glyphs+gcache_layout.cxx deleted file mode 100644 index 53c7a909faf7..000000000000 --- a/editors/openoffice-3/files/patch-vcl+source+glyphs+gcache_layout.cxx +++ /dev/null @@ -1,14 +0,0 @@ -malloc.h is deprecated -http://qa.openoffice.org/issues/show_bug.cgi?id=27041 - ---- ../vcl/source/glyphs/gcach_layout.cxx~ Tue Mar 9 21:15:32 2004 -+++ ../vcl/source/glyphs/gcach_layout.cxx Mon Mar 29 09:44:52 2004 -@@ -74,7 +74,7 @@ - #if defined(SOLARIS) || defined(IRIX) - #include <alloca.h> - #else --#ifndef MACOSX -+#if !(defined(MACOSX) || defined(FREEBSD)) - #include <malloc.h> - #endif - #endif diff --git a/editors/openoffice-3/files/patch-vcl+unx+source+plugadapt+salmain.cxx b/editors/openoffice-3/files/patch-vcl+unx+source+plugadapt+salmain.cxx deleted file mode 100644 index f5bd54364036..000000000000 --- a/editors/openoffice-3/files/patch-vcl+unx+source+plugadapt+salmain.cxx +++ /dev/null @@ -1,24 +0,0 @@ -http://qa.openoffice.org/issues/show_bug.cgi?id=27042 - -include <sys/types.h> -Note: --- -* $RCSfile: salmain.cxx,v $ -* -* $Revision: 1.8.12.2 $ -* -* last change: $Author: hr $ $Date: 2004/01/09 18:14:00 $ --- -includes this patch - ---- ../vcl/unx/source/plugadapt/salmain.cxx~ Mon Mar 29 09:50:50 2004 -+++ ../vcl/unx/source/plugadapt/salmain.cxx Mon Mar 29 10:08:28 2004 -@@ -59,7 +59,7 @@ - * - ************************************************************************/ - --#ifdef MACOSX -+#if defined(MACOSX) || defined(FREEBSD) - // rlimit needs sys/types.h - #include <sys/types.h> - #include <sys/time.h> diff --git a/editors/openoffice-3/files/patch-vcl+util+makefile.mk b/editors/openoffice-3/files/patch-vcl+util+makefile.mk deleted file mode 100644 index 5d133486e032..000000000000 --- a/editors/openoffice-3/files/patch-vcl+util+makefile.mk +++ /dev/null @@ -1,30 +0,0 @@ -FreeBSD doesn't require/need/have -ldl -http://qa.openoffice.org/issues/show_bug.cgi?id=27043 - ---- ../vcl/util/makefile.mk~ Mon Mar 29 09:50:51 2004 -+++ ../vcl/util/makefile.mk Mon Mar 29 10:19:04 2004 -@@ -208,7 +208,9 @@ - .IF "$(GUI)"!="UNX" - SHL1OBJS= $(SLO)$/salshl.obj - .ELSE --SHL1STDLIBS+=-ldl -+ .IF "$(OS)"!="FREEBSD" -+ SHL1STDLIBS+=-ldl -+ .ENDIF - .ENDIF - - .IF "$(GUI)" != "MAC" -@@ -351,8 +353,11 @@ - # libs for gtk plugin - SHL4STDLIBS=`pkg-config --libs gtk+-2.0 gthread-2.0` - SHL4STDLIBS+=-l$(SHL2TARGET) --SHL4STDLIBS+=$(SHL3STDLIBS) -lX11 -ldl -- -+ .IF "$(OS)"!="FREEBSD" -+ SHL4STDLIBS+=$(SHL3STDLIBS) -lX11 -ldl -+ .ELSE -+ SHL4STDLIBS+=$(SHL3STDLIBS) -lX11 -+ .ENDIF # FREEBSD - .ENDIF # UNX - - # --- Allgemein ---------------------------------------------------------- diff --git a/editors/openoffice-3/files/patch-wizards+prj+build.lst b/editors/openoffice-3/files/patch-wizards+prj+build.lst new file mode 100644 index 000000000000..5d5abb75a07e --- /dev/null +++ b/editors/openoffice-3/files/patch-wizards+prj+build.lst @@ -0,0 +1,15 @@ +http://www.openoffice.org/issues/show_bug.cgi?id=29656 + +Index: wizards/prj/build.lst +=================================================================== +RCS file: /cvs/installation/wizards/prj/build.lst,v +retrieving revision 1.23 +diff -u -r1.23 build.lst +--- ../wizards/prj/build.lst 19 May 2004 16:35:11 -0000 1.23 ++++ ../wizards/prj/build.lst 8 Jun 2004 22:43:04 -0000 +@@ -1,4 +1,4 @@ +-wz wizards : rsc javaunohelper jut unoil NULL ++wz wizards : rsc qadevOOo javaunohelper jut unoil NULL + wz wizards\util nmake - all wz_util NULL + wz wizards\source\config nmake - all wz_config NULL + wz wizards\source\euro nmake - all wz_eurowiz NULL diff --git a/editors/openoffice-3/files/patch-wizards+prj+d.lst b/editors/openoffice-3/files/patch-wizards+prj+d.lst new file mode 100644 index 000000000000..d1b4255cca46 --- /dev/null +++ b/editors/openoffice-3/files/patch-wizards+prj+d.lst @@ -0,0 +1,16 @@ +http://www.openoffice.org/issues/show_bug.cgi?id=29666 + +Index: wizards/prj/d.lst +=================================================================== +RCS file: /cvs/installation/wizards/prj/d.lst,v +retrieving revision 1.13 +diff -u -r1.13 d.lst +--- ../wizards/prj/d.lst 2 Feb 2004 19:16:11 -0000 1.13 ++++ ../wizards/prj/d.lst 9 Jun 2004 08:25:50 -0000 +@@ -1,5 +1,6 @@ + mkdir: %COMMON_DEST%\bin%_EXT%\hid + mkdir: %_DEST%\pck%_EXT% ++mkdir: %_DEST%\pck%_EXT%\img + ..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid + ..\%__SRC%\bin\*.zip %_DEST%\pck%_EXT%\*.zip + ..\%__SRC%\bin\iwz*.res %_DEST%\bin%_EXT%\iwz*.res diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile index d47c500c2e52..6c660a7b6fb8 100644 --- a/editors/openoffice.org-2-RC/Makefile +++ b/editors/openoffice.org-2-RC/Makefile @@ -24,7 +24,7 @@ MAINTAINER= openoffice@FreeBSD.org COMMENT= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser .endif -IGNORE= "Does not work yet, installation problems" +IGNORE= "Installation is not complete, manual installation works" NO_LATEST_LINK= yes UNZIP?= ${LOCALBASE}/bin/unzip @@ -33,13 +33,13 @@ ANT?= ${LOCALBASE}/bin/ant TCSH?= /bin/tcsh DIST_SUBDIR= openoffice2.0 BUILD_NR= 680 -MILESTONE= m30 +MILESTONE= m41 RELEASE_NR= 2.0 FRELEASE_NR= 2.0 -SNAPDATE= 20040402 +SNAPDATE= 20040611 INSTALLATION_BASEDIR= OpenOffice.org${RELEASE_NR} EXTRACT_ONLY= OOo_${BUILD_NR}${MILESTONE}_${SNAPDATE}_source.tar.bz2 -USE_GNOME= orbit gtk12 +USE_GNOME= orbit gtk12 gtk20 USE_REINPLACE= yes USE_PERL5= yes USE_BZIP2= yes @@ -48,7 +48,7 @@ USE_GMAKE= yes LANG_EXT?= 01 LANG_CONFIGURE_ARG?= ENUS WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work -WRKSRC= ${WRKDIR}/oo_${BUILD_NR}${MILESTONE}_src/config_office +WRKSRC= ${WRKDIR}/oo_${RELEASE_NR}_src/config_office #XXX dirty BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32 @@ -58,9 +58,11 @@ CXX= g++32 BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14 BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip BUILD_DEPENDS+= unzip:${PORTSDIR}/archivers/unzip -BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/apache-ant -BUILD_DEPENDS+= ${X11BASE}/lib/libgdk-x11-2.0.so:${PORTSDIR}/x11-toolkits/gtk20 +BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/apache-ant +BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries BUILD_DEPENDS+= ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft +BUILD_DEPENDS+= ${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip + .if !defined(DISPLAY) BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer .endif @@ -111,7 +113,7 @@ JDKDIR?= ${LOCALBASE}/jdk1.4.2 JAVAVM= ${JDKDIR}/bin/java GNU_CONFIGURE= yes -USE_AUTOCONF_VER= 253 +USE_AUTOCONF_VER= 259 .if defined(WITH_DEBUG) CFLAGS+= -g .if ${WITH_DEBUG} == 2 @@ -130,7 +132,7 @@ DISPLAYHACK=localhost:1001 CONFIGURE_ENV= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \ PTHREAD_LIBS=${PTHREAD_LIBS} CONFIGURE_ARGS+= --with-lang=${LANG_CONFIGURE_ARG} -CONFIGURE_ARGS+= --with-jdk-home=${JDKDIR} --with-ant-home=${LOCALBASE}/ant --with-gnu-cp=${LOCALBASE}/bin/gcp --enable-mozilla=no +CONFIGURE_ARGS+= --with-jdk-home=${JDKDIR} --with-ant-home=${LOCALBASE}/ant --with-gnu-cp=${LOCALBASE}/bin/gcp --enable-mozilla=yes .if defined(WITH_DEBUG) .if ${WITH_DEBUG} == 2 diff --git a/editors/openoffice.org-2-RC/distinfo b/editors/openoffice.org-2-RC/distinfo index 74de717eb2de..23f567c61dd8 100644 --- a/editors/openoffice.org-2-RC/distinfo +++ b/editors/openoffice.org-2-RC/distinfo @@ -1,5 +1,5 @@ -MD5 (openoffice2.0/OOo_680m30_20040402_source.tar.bz2) = 768b3d8246a12eff6bf83f098093fbee -SIZE (openoffice2.0/OOo_680m30_20040402_source.tar.bz2) = 195378119 +MD5 (openoffice2.0/OOo_680m41_20040611_source.tar.bz2) = 7b8a6d87b80022f85093a67c01064883 +SIZE (openoffice2.0/OOo_680m41_20040611_source.tar.bz2) = 221136281 MD5 (openoffice2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 SIZE (openoffice2.0/gpc231.tar.Z) = 27917 MD5 (openoffice2.0/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a diff --git a/editors/openoffice.org-2-RC/files/patch-config_office+configure.in b/editors/openoffice.org-2-RC/files/patch-config_office+configure.in deleted file mode 100644 index 8bd6e0668f6b..000000000000 --- a/editors/openoffice.org-2-RC/files/patch-config_office+configure.in +++ /dev/null @@ -1,50 +0,0 @@ -#i27028 and #i27028 -http://qa.openoffice.org/issues/show_bug.cgi?id=27021 (Xaw) -http://qa.openoffice.org/issues/show_bug.cgi?id=27028 (ant) - ---- ../config_office/configure.in.org Sat Mar 27 17:54:16 2004 -+++ ../config_office/configure.in Sun Mar 28 22:17:37 2004 -@@ -1478,7 +1478,7 @@ - elif test "$_os" != "WINNT" ; then - AC_PATH_X - AC_PATH_XTRA -- AC_CHECK_HEADERS(X11/Xaw/Label.h,[AC_MSG_RESULT([Ok])],[AC_MSG_ERROR([Xaw include headers not found])]) -+dnl AC_CHECK_HEADERS(X11/Xaw/Label.h,[AC_MSG_RESULT([Ok])],[AC_MSG_ERROR([Xaw include headers not found])]) - - if test "x$x_includes" = "x"; then - x_includes="/usr/include" -@@ -1830,10 +1830,12 @@ - - if test "$enable_java" != "no"; then - ANT_HOME=; export ANT_HOME -+WITH_ANT_HOME=; export WITH_ANT_HOME - if test -z "$with_ant_home"; then - AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat]) - else -- AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat],,$with_ant_home/bin) -+ AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat],,$with_ant_home/bin:$PATH) -+ WITH_ANT_HOME=$with_ant_home - fi - - -@@ -1873,7 +1875,11 @@ - AC_TRY_EVAL(ant_cmd) - if test $? = 0 && test -f ./conftest.class ; then - AC_MSG_RESULT([Ant works]) -- ANT_HOME=`echo $ANT | $SED -n "s/\/bin\/ant.*\$//p"` -+ if test -z "$WITH_ANT_HOME"; then -+ ANT_HOME=`echo $ANT | $SED -n "s/\/bin\/ant.*\$//p"` -+ else -+ ANT_HOME="$WITH_ANT_HOME" -+ fi - else - echo "configure: Ant test failed" >&5 - cat conftest.java >&5 -@@ -1885,6 +1891,7 @@ - - rm -f conftest* core core.* *.core - fi -+ - if test -z "$ANT_HOME"; then - ANT_HOME="NO_ANT_HOME" - fi diff --git a/editors/openoffice.org-2-RC/files/patch-config_office+set_soenv.in b/editors/openoffice.org-2-RC/files/patch-config_office+set_soenv.in deleted file mode 100644 index dbb4c3506e1e..000000000000 --- a/editors/openoffice.org-2-RC/files/patch-config_office+set_soenv.in +++ /dev/null @@ -1,13 +0,0 @@ -#i27028 -http://qa.openoffice.org/issues/show_bug.cgi?id=27028 - ---- ../config_office/set_soenv.in.old Tue Mar 9 21:31:38 2004 -+++ ../config_office/set_soenv.in Sun Mar 28 09:56:03 2004 -@@ -1419,6 +1419,7 @@ - ToFile( "XSLTPROC", "@XSLTPROC@", "e" ); - ToFile( "ANT_HOME", "@ANT_HOME@", "e" ); - ToFile( "ANT_LIB", "@ANT_LIB@", "e" ); -+ToFile( "ANT", "@ANT@", "e" ); - ToFile( "JDKLIB", $JAVA_LIB, "e" ); - ToFile( "STLPORT4", $STLPORT4, "e" ); - ToFile( "ASM_PATH", $ASM_PATH, "e" ); diff --git a/editors/openoffice.org-2-RC/files/patch-cppuhelper+source+gcc3_linux_intel.map b/editors/openoffice.org-2-RC/files/patch-cppuhelper+source+gcc3_linux_intel.map deleted file mode 100644 index cdb61b141eba..000000000000 --- a/editors/openoffice.org-2-RC/files/patch-cppuhelper+source+gcc3_linux_intel.map +++ /dev/null @@ -1,13 +0,0 @@ -Mysterious :) - -http://qa.openoffice.org/issues/show_bug.cgi?id=23917 ---- ../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.org-2-RC/files/patch-hwpfilter+source+hwpreader.hxx b/editors/openoffice.org-2-RC/files/patch-hwpfilter+source+hwpreader.hxx deleted file mode 100644 index 8d65e6a3ee83..000000000000 --- a/editors/openoffice.org-2-RC/files/patch-hwpfilter+source+hwpreader.hxx +++ /dev/null @@ -1,14 +0,0 @@ -http://qa.openoffice.org/issues/show_bug.cgi?id=27033 ---- ../hwpfilter/source/hwpreader.hxx~ Wed Oct 15 23:37:24 2003 -+++ ../hwpfilter/source/hwpreader.hxx Sun Mar 28 22:46:18 2004 -@@ -68,7 +68,9 @@ - #include <string.h> - #ifdef WIN32 - #include <malloc.h> --#else -+#endif -+ -+#if !defined(FREEBSD) - #include <alloca.h> - #endif - diff --git a/editors/openoffice.org-2-RC/files/patch-libxml2+prj+build.lst b/editors/openoffice.org-2-RC/files/patch-libxml2+prj+build.lst new file mode 100644 index 000000000000..f0d7b8f05fc8 --- /dev/null +++ b/editors/openoffice.org-2-RC/files/patch-libxml2+prj+build.lst @@ -0,0 +1,12 @@ +Index: libxml2/prj/build.lst +=================================================================== +RCS file: /cvs/external/libxml2/prj/build.lst,v +retrieving revision 1.1 +diff -u -r1.1 build.lst +--- ../libxml2/prj/build.lst 6 Feb 2004 10:15:09 -0000 1.1 ++++ ../libxml2/prj/build.lst 4 May 2004 20:20:20 -0000 +@@ -1,3 +1,3 @@ +-lx libxml2 : soltools NULL
++lx libxml2 : soltools xml2cmp NULL
+ lx libxml2 usr1 - all lx_mkout NULL
+ lx libxml2 nmake - all lx_libxml2 NULL
diff --git a/editors/openoffice.org-2-RC/files/patch-odk+setsdkenv_unix.in b/editors/openoffice.org-2-RC/files/patch-odk+setsdkenv_unix.in deleted file mode 100644 index e5551f883231..000000000000 --- a/editors/openoffice.org-2-RC/files/patch-odk+setsdkenv_unix.in +++ /dev/null @@ -1,27 +0,0 @@ -http://qa.openoffice.org/issues/show_bug.cgi?id=24142 ---- ../odk/setsdkenv_unix.in Sun Jan 25 18:41:01 2004 -+++ ../odk/setsdkenv_unix.in Sun Jan 25 18:42:00 2004 -@@ -2,7 +2,8 @@ - - # This script starts a new shell and sets all enviroment variables, which - # are necessary for building the examples of the Office Development Kit. --# The Script was developed for the operating systems Solaris and Linux. -+# The script was developed for the operating systems Solaris, Linux, MacOS X -+# and FreeBSD. - - # Installation directory of the Software Development Kit. - # Example: OO_SDK_HOME=/work/StarOffice_SDK -@@ -76,6 +77,13 @@ - LD_LIBRARY_PATH=$OO_SDK_HOME/$directoryname/lib:$OO_SDK_HOME/$exampleout/lib:$OFFICE_PROGRAM_PATH:.:$LD_LIBRARY_PATH - export LD_LIBRARY_PATH - ;; -+ -+ FreeBSD) -+ directoryname=freebsd -+ exampleout=FREEBSDexample.out -+ LD_LIBRARY_PATH=$OO_SDK_HOME/$directoryname/lib:$OO_SDK_HOME/$exampleout/lib:$OFFICE_PROGRAM_PATH:.:$LD_LIBRARY_PATH -+ export LD_LIBRARY_PATH -+ ;; - esac - - # Add directory of the SDK tools to the path. diff --git a/editors/openoffice.org-2-RC/files/patch-odk+settings+settings.mk b/editors/openoffice.org-2-RC/files/patch-odk+settings+settings.mk deleted file mode 100644 index 8c3942d12f16..000000000000 --- a/editors/openoffice.org-2-RC/files/patch-odk+settings+settings.mk +++ /dev/null @@ -1,90 +0,0 @@ -http://qa.openoffice.org/issues/show_bug.cgi?id=24142 - ---- ../odk/settings/settings.mk Sun Jan 25 18:41:02 2004 -+++ ../odk/settings/settings.mk Sun Jan 25 18:45:09 2004 -@@ -368,3 +368,85 @@ - - endif - -+ifeq "$(PLATFORM)" "FreeBSD" -+# Settings for FreeBSD using gcc compiler -+ -+PROCTYPE := $(shell uname -m) -+ -+ -+# Default is freebsd on a intel machine -+PLATFORM=FreeBSD -+PACKAGE_LIB_DIR=freebsd_x86.plt -+JAVA_PROC_TYPE=i386 -+ -+OS=FREEBSD -+PS=/ -+CC=gcc -+LINK=gcc -+LIB=gcc -+ECHO=@echo -+MKDIR=mkdir -p -+CAT=cat -+OBJ_EXT=o -+SHAREDLIB_EXT=so -+SHAREDLIB_PRE=lib -+SHAREDLIB_OUT=$(OUT_LIB) -+ -+GCC_VERSION=$(shell $(CC) -dumpversion) -+ -+ifeq "$(shell echo $(GCC_VERSION) | cut -c 1)" "3" -+COMID=gcc3 -+CPPU_ENV=gcc3 -+else -+COMID=GCC -+CPPU_ENV=gcc2 -+endif -+ -+OSEP=\< -+CSEP=\> -+QUOTE=$(subst S,\,S) -+QM=\" -+ -+DEL=rm -f -+DELRECURSIVE=rm -rf -+COPY=cp -+URLPREFIX=file:// -+ -+# Include UDK version numbers -+include $(PRJ)/include/udkversion.mk -+ -+SALLIB=-lsal -+CPPULIB=-lcppu -+CPPUHELPERLIB=-lcppuhelper$(COMID) -+SALHELPERLIB=-lsalhelper$(COMID) -+STLPORTLIB=-lstlport_gcc -+ -+EMPTYSTRING= -+PATH_SEPARATOR=: -+ -+# -O is necessary for inlining (see gcc documentation) -+ifeq "$(DEBUG)" "yes" -+CC_FLAGS=-c -g -fpic -DPIC -fno-rtti %%PTHREAD_CFLAGS%% -+else -+CC_FLAGS=-c -O -fpic -DPIC -fno-rtti %%PTHREAD_CFLAGS%% -+endif -+ -+SDK_JAVA_INCLUDES = -I$(OO_SDK_JAVA_HOME)/include -I$(OO_SDK_JAVA_HOME)/include/freebsd -+CC_INCLUDES=-I. -I/usr/include -I$(OUT)/inc/examples -I$(PRJ)/include -+STL_INCLUDES=-I$(OO_SDK_HOME)/include/stl -+CC_DEFINES=-DUNX -DGCC -DFREEBSD -DCPPU_ENV=$(CPPU_ENV) -+ -+# define for used compiler necessary for UNO -+#-DCPPU_ENV=gcc2 -- gcc 2.91/2.95 -+#-DCPPU_ENV=gcc3 -- gcc3 3.0 -+ -+CC_OUTPUT_SWITCH=-o -+ -+LIBRARY_LINK_FLAGS=-shared '-Wl,-rpath,$$ORIGIN' -+ -+EXE_LINK_FLAGS=-Wl -+LINK_LIBS=-L$(OUT)/lib -L$(PRJ)/$(PLATFORM)/lib -L$(OFFICE_PROGRAM_PATH) %%PTHREAD_LIBS%% -+LINK_JAVA_LIBS=-L$(OO_SDK_JAVA_HOME)/jre/lib/$(JAVA_PROC_TYPE) -+ -+endif -+ diff --git a/editors/openoffice.org-2-RC/files/patch-psprint+source+helper+strhelper.cxx b/editors/openoffice.org-2-RC/files/patch-psprint+source+helper+strhelper.cxx new file mode 100644 index 000000000000..52530e403ac0 --- /dev/null +++ b/editors/openoffice.org-2-RC/files/patch-psprint+source+helper+strhelper.cxx @@ -0,0 +1,21 @@ +http://www.openoffice.org/issues/show_bug.cgi?id=27753 +The isnan() macro is a new feature of C99 and not yet part of C++. + +Index: source/helper/strhelper.cxx +=================================================================== +RCS file: /cvs/gsl/psprint/source/helper/strhelper.cxx,v +retrieving revision 1.6 +diff -u -r1.6 strhelper.cxx +--- ../psprint/source/helper/strhelper.cxx 30 Mar 2004 13:48:06 -0000 1.6 ++++ ../psprint/source/helper/strhelper.cxx 13 Apr 2004 22:26:11 -0000 +@@ -67,6 +67,10 @@ + #include <cmath> // for isnan + #include <cstring> + ++#if defined (FREEBSD) ++using namespace __gnu_cxx; //for isnan ++#endif ++ + namespace psp { + + inline int isSpace( char cChar ) diff --git a/editors/openoffice.org-2-RC/files/patch-setup2+mow+source+loader+makefile.mk b/editors/openoffice.org-2-RC/files/patch-setup2+mow+source+loader+makefile.mk deleted file mode 100644 index 7b25ff2635df..000000000000 --- a/editors/openoffice.org-2-RC/files/patch-setup2+mow+source+loader+makefile.mk +++ /dev/null @@ -1,17 +0,0 @@ -do not need -ldl - -http://qa.openoffice.org/issues/show_bug.cgi?id=27043 ---- ../setup2/mow/source/loader/makefile.mk~ Tue Mar 9 21:04:35 2004 -+++ ../setup2/mow/source/loader/makefile.mk Mon Mar 29 11:10:50 2004 -@@ -92,7 +92,11 @@ - LINK=gcc - LINKFLAGS= - LINKFLAGSAPP= -+.IF "$(OS)"=="FREEBSD" -+STDLIB= -lX11 -lc -lm -+.ELSE - STDLIB= -lX11 -ldl -lc -lm -+.ENDIF # "$(OS)"=="FREEBSD" - .ENDIF # "$(OS)$(COMID)"=="GCC" - - OBJFILES= $(OBJ)$/loader.obj diff --git a/editors/openoffice.org-2-RC/files/patch-sfx2+source+config+cfgmgr.cxx b/editors/openoffice.org-2-RC/files/patch-sfx2+source+config+cfgmgr.cxx deleted file mode 100644 index be38de290a51..000000000000 --- a/editors/openoffice.org-2-RC/files/patch-sfx2+source+config+cfgmgr.cxx +++ /dev/null @@ -1,16 +0,0 @@ -Wired 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.org-2-RC/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx b/editors/openoffice.org-2-RC/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx deleted file mode 100644 index 10c3f3c1f6e8..000000000000 --- a/editors/openoffice.org-2-RC/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx +++ /dev/null @@ -1,34 +0,0 @@ -http://qa.openoffice.org/issues/show_bug.cgi?id=24315 - -For FreeBSD, time_t is defined as -at /usr/include/machine/_types.h -49th typedef int __int32_t; -90th typedef __int32_t __time_t; /* time()... */ -and -/usr/include/pwd.h:typedef __time_t time_t; -/usr/include/time.h:typedef __time_t time_t; -/usr/include/timeconv.h:typedef __time_t time_t; -/usr/include/utime.h:typedef __time_t time_t; -so time_t is equal to 32 bit integer - -For LinuxPPC (Yellowdog 3.0.1) - - ---- ../shell/source/unix/sysshell/recently_used_file_handler.cxx.orig Tue Jan 13 00:56:37 2004 -+++ ../shell/source/unix/sysshell/recently_used_file_handler.cxx Tue Jan 13 00:57:26 2004 -@@ -188,9 +188,12 @@ - write_xml_start_tag(TAG_RECENT_ITEM, file, true); - write_xml_tag(TAG_URI, uri_, file); - write_xml_tag(TAG_MIME_TYPE, mime_type_, file); -- -- rtl::OString ts = rtl::OString::valueOf(timestamp_); -- write_xml_tag(TAG_TIMESTAMP, ts.getStr(), file); -+#if defined FREEBSD -+ rtl::OString ts = rtl::OString::valueOf((sal_Int32)timestamp_); -+#else -+ rtl::OString ts = rtl::OString::valueOf(timestamp_); -+#endif -+ write_xml_tag(TAG_TIMESTAMP, ts.getStr(), file); - - if (is_private_) - write_xml_tag(TAG_PRIVATE, file); diff --git a/editors/openoffice.org-2-RC/files/patch-solenv+inc+ant.mk b/editors/openoffice.org-2-RC/files/patch-solenv+inc+ant.mk deleted file mode 100644 index e050b85d41e9..000000000000 --- a/editors/openoffice.org-2-RC/files/patch-solenv+inc+ant.mk +++ /dev/null @@ -1,13 +0,0 @@ -http://qa.openoffice.org/issues/show_bug.cgi?id=27028 - ---- ../solenv/inc/ant.mk~ Wed Feb 4 21:37:16 2004 -+++ ../solenv/inc/ant.mk Fri Apr 2 23:59:27 2004 -@@ -100,7 +100,7 @@ - .ENDIF - .ENDIF - --ANT=$(WRAPCMD) java -classpath $(CLASSPATH) -Xmx128m org.apache.tools.ant.Main -Djava.home=$(JAVA_HOME) -Dant.home=$(ANT_HOME) -+#ANT=$(WRAPCMD) java -classpath $(CLASSPATH) -Xmx128m org.apache.tools.ant.Main -Djava.home=$(JAVA_HOME) -Dant.home=$(ANT_HOME) - #ANT=java -version - - .IF "$(ANT_BUILDFILE)"=="" diff --git a/editors/openoffice.org-2-RC/files/patch-solenv+inc+settings.mk b/editors/openoffice.org-2-RC/files/patch-solenv+inc+settings.mk deleted file mode 100644 index f93ee2ad6bf2..000000000000 --- a/editors/openoffice.org-2-RC/files/patch-solenv+inc+settings.mk +++ /dev/null @@ -1,15 +0,0 @@ -http://www.openoffice.org/issues/show_bug.cgi?id=25579 -We should set locale as UTF-8 when compiling -but this was due to violation of OOo coding style - ---- ../solenv/inc/settings.mk.old Tue Mar 9 21:19:28 2004 -+++ ../solenv/inc/settings.mk Mon Mar 29 13:23:31 2004 -@@ -172,7 +172,7 @@ - JAVAI=gij - JAVACPS=--classpath - .ELSE --JAVAC=javac -+JAVAC=javac -encoding UTF-8 - JAVAI=java - JAVACPS=-classpath - .ENDIF diff --git a/editors/openoffice.org-2-RC/files/patch-vcl+source+gdi+outdev3.cxx b/editors/openoffice.org-2-RC/files/patch-vcl+source+gdi+outdev3.cxx deleted file mode 100644 index 22ef6f26f45f..000000000000 --- a/editors/openoffice.org-2-RC/files/patch-vcl+source+gdi+outdev3.cxx +++ /dev/null @@ -1,14 +0,0 @@ -do not need <malloc.h> including stdlib.h is enough -http://qa.openoffice.org/issues/show_bug.cgi?id=27041 - ---- ../vcl/source/gdi/outdev3.cxx.old Mon Mar 29 09:42:28 2004 -+++ ../vcl/source/gdi/outdev3.cxx Mon Mar 29 09:42:59 2004 -@@ -176,7 +176,7 @@ - #if defined(SOLARIS) || defined(IRIX) - #include <alloca.h> - #else --#ifndef MACOSX -+#if !(defined(MACOSX) || defined(FREEBSD)) - #include <malloc.h> - #endif - #endif diff --git a/editors/openoffice.org-2-RC/files/patch-vcl+source+gdi+sallayout.cxx b/editors/openoffice.org-2-RC/files/patch-vcl+source+gdi+sallayout.cxx deleted file mode 100644 index 5cbc59bf7db7..000000000000 --- a/editors/openoffice.org-2-RC/files/patch-vcl+source+gdi+sallayout.cxx +++ /dev/null @@ -1,14 +0,0 @@ -malloc.h is deprecated -http://qa.openoffice.org/issues/show_bug.cgi?id=27041 - ---- ../vcl/source/gdi/sallayout.cxx.org Mon Mar 29 10:02:17 2004 -+++ ../vcl/source/gdi/sallayout.cxx Mon Mar 29 10:02:43 2004 -@@ -67,7 +67,7 @@ - #if defined(SOLARIS) || defined(IRIX) - #include <alloca.h> - #else --#ifndef MACOSX -+#if !(defined(MACOSX) || defined(FREEBSD)) - #include <malloc.h> - #endif - #endif diff --git a/editors/openoffice.org-2-RC/files/patch-vcl+source+glyphs+gcache_layout.cxx b/editors/openoffice.org-2-RC/files/patch-vcl+source+glyphs+gcache_layout.cxx deleted file mode 100644 index 53c7a909faf7..000000000000 --- a/editors/openoffice.org-2-RC/files/patch-vcl+source+glyphs+gcache_layout.cxx +++ /dev/null @@ -1,14 +0,0 @@ -malloc.h is deprecated -http://qa.openoffice.org/issues/show_bug.cgi?id=27041 - ---- ../vcl/source/glyphs/gcach_layout.cxx~ Tue Mar 9 21:15:32 2004 -+++ ../vcl/source/glyphs/gcach_layout.cxx Mon Mar 29 09:44:52 2004 -@@ -74,7 +74,7 @@ - #if defined(SOLARIS) || defined(IRIX) - #include <alloca.h> - #else --#ifndef MACOSX -+#if !(defined(MACOSX) || defined(FREEBSD)) - #include <malloc.h> - #endif - #endif diff --git a/editors/openoffice.org-2-RC/files/patch-vcl+unx+source+plugadapt+salmain.cxx b/editors/openoffice.org-2-RC/files/patch-vcl+unx+source+plugadapt+salmain.cxx deleted file mode 100644 index f5bd54364036..000000000000 --- a/editors/openoffice.org-2-RC/files/patch-vcl+unx+source+plugadapt+salmain.cxx +++ /dev/null @@ -1,24 +0,0 @@ -http://qa.openoffice.org/issues/show_bug.cgi?id=27042 - -include <sys/types.h> -Note: --- -* $RCSfile: salmain.cxx,v $ -* -* $Revision: 1.8.12.2 $ -* -* last change: $Author: hr $ $Date: 2004/01/09 18:14:00 $ --- -includes this patch - ---- ../vcl/unx/source/plugadapt/salmain.cxx~ Mon Mar 29 09:50:50 2004 -+++ ../vcl/unx/source/plugadapt/salmain.cxx Mon Mar 29 10:08:28 2004 -@@ -59,7 +59,7 @@ - * - ************************************************************************/ - --#ifdef MACOSX -+#if defined(MACOSX) || defined(FREEBSD) - // rlimit needs sys/types.h - #include <sys/types.h> - #include <sys/time.h> diff --git a/editors/openoffice.org-2-RC/files/patch-vcl+util+makefile.mk b/editors/openoffice.org-2-RC/files/patch-vcl+util+makefile.mk deleted file mode 100644 index 5d133486e032..000000000000 --- a/editors/openoffice.org-2-RC/files/patch-vcl+util+makefile.mk +++ /dev/null @@ -1,30 +0,0 @@ -FreeBSD doesn't require/need/have -ldl -http://qa.openoffice.org/issues/show_bug.cgi?id=27043 - ---- ../vcl/util/makefile.mk~ Mon Mar 29 09:50:51 2004 -+++ ../vcl/util/makefile.mk Mon Mar 29 10:19:04 2004 -@@ -208,7 +208,9 @@ - .IF "$(GUI)"!="UNX" - SHL1OBJS= $(SLO)$/salshl.obj - .ELSE --SHL1STDLIBS+=-ldl -+ .IF "$(OS)"!="FREEBSD" -+ SHL1STDLIBS+=-ldl -+ .ENDIF - .ENDIF - - .IF "$(GUI)" != "MAC" -@@ -351,8 +353,11 @@ - # libs for gtk plugin - SHL4STDLIBS=`pkg-config --libs gtk+-2.0 gthread-2.0` - SHL4STDLIBS+=-l$(SHL2TARGET) --SHL4STDLIBS+=$(SHL3STDLIBS) -lX11 -ldl -- -+ .IF "$(OS)"!="FREEBSD" -+ SHL4STDLIBS+=$(SHL3STDLIBS) -lX11 -ldl -+ .ELSE -+ SHL4STDLIBS+=$(SHL3STDLIBS) -lX11 -+ .ENDIF # FREEBSD - .ENDIF # UNX - - # --- Allgemein ---------------------------------------------------------- diff --git a/editors/openoffice.org-2-RC/files/patch-wizards+prj+build.lst b/editors/openoffice.org-2-RC/files/patch-wizards+prj+build.lst new file mode 100644 index 000000000000..5d5abb75a07e --- /dev/null +++ b/editors/openoffice.org-2-RC/files/patch-wizards+prj+build.lst @@ -0,0 +1,15 @@ +http://www.openoffice.org/issues/show_bug.cgi?id=29656 + +Index: wizards/prj/build.lst +=================================================================== +RCS file: /cvs/installation/wizards/prj/build.lst,v +retrieving revision 1.23 +diff -u -r1.23 build.lst +--- ../wizards/prj/build.lst 19 May 2004 16:35:11 -0000 1.23 ++++ ../wizards/prj/build.lst 8 Jun 2004 22:43:04 -0000 +@@ -1,4 +1,4 @@ +-wz wizards : rsc javaunohelper jut unoil NULL ++wz wizards : rsc qadevOOo javaunohelper jut unoil NULL + wz wizards\util nmake - all wz_util NULL + wz wizards\source\config nmake - all wz_config NULL + wz wizards\source\euro nmake - all wz_eurowiz NULL diff --git a/editors/openoffice.org-2-RC/files/patch-wizards+prj+d.lst b/editors/openoffice.org-2-RC/files/patch-wizards+prj+d.lst new file mode 100644 index 000000000000..d1b4255cca46 --- /dev/null +++ b/editors/openoffice.org-2-RC/files/patch-wizards+prj+d.lst @@ -0,0 +1,16 @@ +http://www.openoffice.org/issues/show_bug.cgi?id=29666 + +Index: wizards/prj/d.lst +=================================================================== +RCS file: /cvs/installation/wizards/prj/d.lst,v +retrieving revision 1.13 +diff -u -r1.13 d.lst +--- ../wizards/prj/d.lst 2 Feb 2004 19:16:11 -0000 1.13 ++++ ../wizards/prj/d.lst 9 Jun 2004 08:25:50 -0000 +@@ -1,5 +1,6 @@ + mkdir: %COMMON_DEST%\bin%_EXT%\hid + mkdir: %_DEST%\pck%_EXT% ++mkdir: %_DEST%\pck%_EXT%\img + ..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid + ..\%__SRC%\bin\*.zip %_DEST%\pck%_EXT%\*.zip + ..\%__SRC%\bin\iwz*.res %_DEST%\bin%_EXT%\iwz*.res diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile index d47c500c2e52..6c660a7b6fb8 100644 --- a/editors/openoffice.org-2-devel/Makefile +++ b/editors/openoffice.org-2-devel/Makefile @@ -24,7 +24,7 @@ MAINTAINER= openoffice@FreeBSD.org COMMENT= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser .endif -IGNORE= "Does not work yet, installation problems" +IGNORE= "Installation is not complete, manual installation works" NO_LATEST_LINK= yes UNZIP?= ${LOCALBASE}/bin/unzip @@ -33,13 +33,13 @@ ANT?= ${LOCALBASE}/bin/ant TCSH?= /bin/tcsh DIST_SUBDIR= openoffice2.0 BUILD_NR= 680 -MILESTONE= m30 +MILESTONE= m41 RELEASE_NR= 2.0 FRELEASE_NR= 2.0 -SNAPDATE= 20040402 +SNAPDATE= 20040611 INSTALLATION_BASEDIR= OpenOffice.org${RELEASE_NR} EXTRACT_ONLY= OOo_${BUILD_NR}${MILESTONE}_${SNAPDATE}_source.tar.bz2 -USE_GNOME= orbit gtk12 +USE_GNOME= orbit gtk12 gtk20 USE_REINPLACE= yes USE_PERL5= yes USE_BZIP2= yes @@ -48,7 +48,7 @@ USE_GMAKE= yes LANG_EXT?= 01 LANG_CONFIGURE_ARG?= ENUS WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work -WRKSRC= ${WRKDIR}/oo_${BUILD_NR}${MILESTONE}_src/config_office +WRKSRC= ${WRKDIR}/oo_${RELEASE_NR}_src/config_office #XXX dirty BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32 @@ -58,9 +58,11 @@ CXX= g++32 BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14 BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip BUILD_DEPENDS+= unzip:${PORTSDIR}/archivers/unzip -BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/apache-ant -BUILD_DEPENDS+= ${X11BASE}/lib/libgdk-x11-2.0.so:${PORTSDIR}/x11-toolkits/gtk20 +BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/apache-ant +BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries BUILD_DEPENDS+= ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft +BUILD_DEPENDS+= ${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip + .if !defined(DISPLAY) BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer .endif @@ -111,7 +113,7 @@ JDKDIR?= ${LOCALBASE}/jdk1.4.2 JAVAVM= ${JDKDIR}/bin/java GNU_CONFIGURE= yes -USE_AUTOCONF_VER= 253 +USE_AUTOCONF_VER= 259 .if defined(WITH_DEBUG) CFLAGS+= -g .if ${WITH_DEBUG} == 2 @@ -130,7 +132,7 @@ DISPLAYHACK=localhost:1001 CONFIGURE_ENV= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \ PTHREAD_LIBS=${PTHREAD_LIBS} CONFIGURE_ARGS+= --with-lang=${LANG_CONFIGURE_ARG} -CONFIGURE_ARGS+= --with-jdk-home=${JDKDIR} --with-ant-home=${LOCALBASE}/ant --with-gnu-cp=${LOCALBASE}/bin/gcp --enable-mozilla=no +CONFIGURE_ARGS+= --with-jdk-home=${JDKDIR} --with-ant-home=${LOCALBASE}/ant --with-gnu-cp=${LOCALBASE}/bin/gcp --enable-mozilla=yes .if defined(WITH_DEBUG) .if ${WITH_DEBUG} == 2 diff --git a/editors/openoffice.org-2-devel/distinfo b/editors/openoffice.org-2-devel/distinfo index 74de717eb2de..23f567c61dd8 100644 --- a/editors/openoffice.org-2-devel/distinfo +++ b/editors/openoffice.org-2-devel/distinfo @@ -1,5 +1,5 @@ -MD5 (openoffice2.0/OOo_680m30_20040402_source.tar.bz2) = 768b3d8246a12eff6bf83f098093fbee -SIZE (openoffice2.0/OOo_680m30_20040402_source.tar.bz2) = 195378119 +MD5 (openoffice2.0/OOo_680m41_20040611_source.tar.bz2) = 7b8a6d87b80022f85093a67c01064883 +SIZE (openoffice2.0/OOo_680m41_20040611_source.tar.bz2) = 221136281 MD5 (openoffice2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 SIZE (openoffice2.0/gpc231.tar.Z) = 27917 MD5 (openoffice2.0/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a diff --git a/editors/openoffice.org-2-devel/files/patch-config_office+configure.in b/editors/openoffice.org-2-devel/files/patch-config_office+configure.in deleted file mode 100644 index 8bd6e0668f6b..000000000000 --- a/editors/openoffice.org-2-devel/files/patch-config_office+configure.in +++ /dev/null @@ -1,50 +0,0 @@ -#i27028 and #i27028 -http://qa.openoffice.org/issues/show_bug.cgi?id=27021 (Xaw) -http://qa.openoffice.org/issues/show_bug.cgi?id=27028 (ant) - ---- ../config_office/configure.in.org Sat Mar 27 17:54:16 2004 -+++ ../config_office/configure.in Sun Mar 28 22:17:37 2004 -@@ -1478,7 +1478,7 @@ - elif test "$_os" != "WINNT" ; then - AC_PATH_X - AC_PATH_XTRA -- AC_CHECK_HEADERS(X11/Xaw/Label.h,[AC_MSG_RESULT([Ok])],[AC_MSG_ERROR([Xaw include headers not found])]) -+dnl AC_CHECK_HEADERS(X11/Xaw/Label.h,[AC_MSG_RESULT([Ok])],[AC_MSG_ERROR([Xaw include headers not found])]) - - if test "x$x_includes" = "x"; then - x_includes="/usr/include" -@@ -1830,10 +1830,12 @@ - - if test "$enable_java" != "no"; then - ANT_HOME=; export ANT_HOME -+WITH_ANT_HOME=; export WITH_ANT_HOME - if test -z "$with_ant_home"; then - AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat]) - else -- AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat],,$with_ant_home/bin) -+ AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat],,$with_ant_home/bin:$PATH) -+ WITH_ANT_HOME=$with_ant_home - fi - - -@@ -1873,7 +1875,11 @@ - AC_TRY_EVAL(ant_cmd) - if test $? = 0 && test -f ./conftest.class ; then - AC_MSG_RESULT([Ant works]) -- ANT_HOME=`echo $ANT | $SED -n "s/\/bin\/ant.*\$//p"` -+ if test -z "$WITH_ANT_HOME"; then -+ ANT_HOME=`echo $ANT | $SED -n "s/\/bin\/ant.*\$//p"` -+ else -+ ANT_HOME="$WITH_ANT_HOME" -+ fi - else - echo "configure: Ant test failed" >&5 - cat conftest.java >&5 -@@ -1885,6 +1891,7 @@ - - rm -f conftest* core core.* *.core - fi -+ - if test -z "$ANT_HOME"; then - ANT_HOME="NO_ANT_HOME" - fi diff --git a/editors/openoffice.org-2-devel/files/patch-config_office+set_soenv.in b/editors/openoffice.org-2-devel/files/patch-config_office+set_soenv.in deleted file mode 100644 index dbb4c3506e1e..000000000000 --- a/editors/openoffice.org-2-devel/files/patch-config_office+set_soenv.in +++ /dev/null @@ -1,13 +0,0 @@ -#i27028 -http://qa.openoffice.org/issues/show_bug.cgi?id=27028 - ---- ../config_office/set_soenv.in.old Tue Mar 9 21:31:38 2004 -+++ ../config_office/set_soenv.in Sun Mar 28 09:56:03 2004 -@@ -1419,6 +1419,7 @@ - ToFile( "XSLTPROC", "@XSLTPROC@", "e" ); - ToFile( "ANT_HOME", "@ANT_HOME@", "e" ); - ToFile( "ANT_LIB", "@ANT_LIB@", "e" ); -+ToFile( "ANT", "@ANT@", "e" ); - ToFile( "JDKLIB", $JAVA_LIB, "e" ); - ToFile( "STLPORT4", $STLPORT4, "e" ); - ToFile( "ASM_PATH", $ASM_PATH, "e" ); diff --git a/editors/openoffice.org-2-devel/files/patch-cppuhelper+source+gcc3_linux_intel.map b/editors/openoffice.org-2-devel/files/patch-cppuhelper+source+gcc3_linux_intel.map deleted file mode 100644 index cdb61b141eba..000000000000 --- a/editors/openoffice.org-2-devel/files/patch-cppuhelper+source+gcc3_linux_intel.map +++ /dev/null @@ -1,13 +0,0 @@ -Mysterious :) - -http://qa.openoffice.org/issues/show_bug.cgi?id=23917 ---- ../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.org-2-devel/files/patch-hwpfilter+source+hwpreader.hxx b/editors/openoffice.org-2-devel/files/patch-hwpfilter+source+hwpreader.hxx deleted file mode 100644 index 8d65e6a3ee83..000000000000 --- a/editors/openoffice.org-2-devel/files/patch-hwpfilter+source+hwpreader.hxx +++ /dev/null @@ -1,14 +0,0 @@ -http://qa.openoffice.org/issues/show_bug.cgi?id=27033 ---- ../hwpfilter/source/hwpreader.hxx~ Wed Oct 15 23:37:24 2003 -+++ ../hwpfilter/source/hwpreader.hxx Sun Mar 28 22:46:18 2004 -@@ -68,7 +68,9 @@ - #include <string.h> - #ifdef WIN32 - #include <malloc.h> --#else -+#endif -+ -+#if !defined(FREEBSD) - #include <alloca.h> - #endif - diff --git a/editors/openoffice.org-2-devel/files/patch-libxml2+prj+build.lst b/editors/openoffice.org-2-devel/files/patch-libxml2+prj+build.lst new file mode 100644 index 000000000000..f0d7b8f05fc8 --- /dev/null +++ b/editors/openoffice.org-2-devel/files/patch-libxml2+prj+build.lst @@ -0,0 +1,12 @@ +Index: libxml2/prj/build.lst +=================================================================== +RCS file: /cvs/external/libxml2/prj/build.lst,v +retrieving revision 1.1 +diff -u -r1.1 build.lst +--- ../libxml2/prj/build.lst 6 Feb 2004 10:15:09 -0000 1.1 ++++ ../libxml2/prj/build.lst 4 May 2004 20:20:20 -0000 +@@ -1,3 +1,3 @@ +-lx libxml2 : soltools NULL
++lx libxml2 : soltools xml2cmp NULL
+ lx libxml2 usr1 - all lx_mkout NULL
+ lx libxml2 nmake - all lx_libxml2 NULL
diff --git a/editors/openoffice.org-2-devel/files/patch-odk+setsdkenv_unix.in b/editors/openoffice.org-2-devel/files/patch-odk+setsdkenv_unix.in deleted file mode 100644 index e5551f883231..000000000000 --- a/editors/openoffice.org-2-devel/files/patch-odk+setsdkenv_unix.in +++ /dev/null @@ -1,27 +0,0 @@ -http://qa.openoffice.org/issues/show_bug.cgi?id=24142 ---- ../odk/setsdkenv_unix.in Sun Jan 25 18:41:01 2004 -+++ ../odk/setsdkenv_unix.in Sun Jan 25 18:42:00 2004 -@@ -2,7 +2,8 @@ - - # This script starts a new shell and sets all enviroment variables, which - # are necessary for building the examples of the Office Development Kit. --# The Script was developed for the operating systems Solaris and Linux. -+# The script was developed for the operating systems Solaris, Linux, MacOS X -+# and FreeBSD. - - # Installation directory of the Software Development Kit. - # Example: OO_SDK_HOME=/work/StarOffice_SDK -@@ -76,6 +77,13 @@ - LD_LIBRARY_PATH=$OO_SDK_HOME/$directoryname/lib:$OO_SDK_HOME/$exampleout/lib:$OFFICE_PROGRAM_PATH:.:$LD_LIBRARY_PATH - export LD_LIBRARY_PATH - ;; -+ -+ FreeBSD) -+ directoryname=freebsd -+ exampleout=FREEBSDexample.out -+ LD_LIBRARY_PATH=$OO_SDK_HOME/$directoryname/lib:$OO_SDK_HOME/$exampleout/lib:$OFFICE_PROGRAM_PATH:.:$LD_LIBRARY_PATH -+ export LD_LIBRARY_PATH -+ ;; - esac - - # Add directory of the SDK tools to the path. diff --git a/editors/openoffice.org-2-devel/files/patch-odk+settings+settings.mk b/editors/openoffice.org-2-devel/files/patch-odk+settings+settings.mk deleted file mode 100644 index 8c3942d12f16..000000000000 --- a/editors/openoffice.org-2-devel/files/patch-odk+settings+settings.mk +++ /dev/null @@ -1,90 +0,0 @@ -http://qa.openoffice.org/issues/show_bug.cgi?id=24142 - ---- ../odk/settings/settings.mk Sun Jan 25 18:41:02 2004 -+++ ../odk/settings/settings.mk Sun Jan 25 18:45:09 2004 -@@ -368,3 +368,85 @@ - - endif - -+ifeq "$(PLATFORM)" "FreeBSD" -+# Settings for FreeBSD using gcc compiler -+ -+PROCTYPE := $(shell uname -m) -+ -+ -+# Default is freebsd on a intel machine -+PLATFORM=FreeBSD -+PACKAGE_LIB_DIR=freebsd_x86.plt -+JAVA_PROC_TYPE=i386 -+ -+OS=FREEBSD -+PS=/ -+CC=gcc -+LINK=gcc -+LIB=gcc -+ECHO=@echo -+MKDIR=mkdir -p -+CAT=cat -+OBJ_EXT=o -+SHAREDLIB_EXT=so -+SHAREDLIB_PRE=lib -+SHAREDLIB_OUT=$(OUT_LIB) -+ -+GCC_VERSION=$(shell $(CC) -dumpversion) -+ -+ifeq "$(shell echo $(GCC_VERSION) | cut -c 1)" "3" -+COMID=gcc3 -+CPPU_ENV=gcc3 -+else -+COMID=GCC -+CPPU_ENV=gcc2 -+endif -+ -+OSEP=\< -+CSEP=\> -+QUOTE=$(subst S,\,S) -+QM=\" -+ -+DEL=rm -f -+DELRECURSIVE=rm -rf -+COPY=cp -+URLPREFIX=file:// -+ -+# Include UDK version numbers -+include $(PRJ)/include/udkversion.mk -+ -+SALLIB=-lsal -+CPPULIB=-lcppu -+CPPUHELPERLIB=-lcppuhelper$(COMID) -+SALHELPERLIB=-lsalhelper$(COMID) -+STLPORTLIB=-lstlport_gcc -+ -+EMPTYSTRING= -+PATH_SEPARATOR=: -+ -+# -O is necessary for inlining (see gcc documentation) -+ifeq "$(DEBUG)" "yes" -+CC_FLAGS=-c -g -fpic -DPIC -fno-rtti %%PTHREAD_CFLAGS%% -+else -+CC_FLAGS=-c -O -fpic -DPIC -fno-rtti %%PTHREAD_CFLAGS%% -+endif -+ -+SDK_JAVA_INCLUDES = -I$(OO_SDK_JAVA_HOME)/include -I$(OO_SDK_JAVA_HOME)/include/freebsd -+CC_INCLUDES=-I. -I/usr/include -I$(OUT)/inc/examples -I$(PRJ)/include -+STL_INCLUDES=-I$(OO_SDK_HOME)/include/stl -+CC_DEFINES=-DUNX -DGCC -DFREEBSD -DCPPU_ENV=$(CPPU_ENV) -+ -+# define for used compiler necessary for UNO -+#-DCPPU_ENV=gcc2 -- gcc 2.91/2.95 -+#-DCPPU_ENV=gcc3 -- gcc3 3.0 -+ -+CC_OUTPUT_SWITCH=-o -+ -+LIBRARY_LINK_FLAGS=-shared '-Wl,-rpath,$$ORIGIN' -+ -+EXE_LINK_FLAGS=-Wl -+LINK_LIBS=-L$(OUT)/lib -L$(PRJ)/$(PLATFORM)/lib -L$(OFFICE_PROGRAM_PATH) %%PTHREAD_LIBS%% -+LINK_JAVA_LIBS=-L$(OO_SDK_JAVA_HOME)/jre/lib/$(JAVA_PROC_TYPE) -+ -+endif -+ diff --git a/editors/openoffice.org-2-devel/files/patch-psprint+source+helper+strhelper.cxx b/editors/openoffice.org-2-devel/files/patch-psprint+source+helper+strhelper.cxx new file mode 100644 index 000000000000..52530e403ac0 --- /dev/null +++ b/editors/openoffice.org-2-devel/files/patch-psprint+source+helper+strhelper.cxx @@ -0,0 +1,21 @@ +http://www.openoffice.org/issues/show_bug.cgi?id=27753 +The isnan() macro is a new feature of C99 and not yet part of C++. + +Index: source/helper/strhelper.cxx +=================================================================== +RCS file: /cvs/gsl/psprint/source/helper/strhelper.cxx,v +retrieving revision 1.6 +diff -u -r1.6 strhelper.cxx +--- ../psprint/source/helper/strhelper.cxx 30 Mar 2004 13:48:06 -0000 1.6 ++++ ../psprint/source/helper/strhelper.cxx 13 Apr 2004 22:26:11 -0000 +@@ -67,6 +67,10 @@ + #include <cmath> // for isnan + #include <cstring> + ++#if defined (FREEBSD) ++using namespace __gnu_cxx; //for isnan ++#endif ++ + namespace psp { + + inline int isSpace( char cChar ) diff --git a/editors/openoffice.org-2-devel/files/patch-setup2+mow+source+loader+makefile.mk b/editors/openoffice.org-2-devel/files/patch-setup2+mow+source+loader+makefile.mk deleted file mode 100644 index 7b25ff2635df..000000000000 --- a/editors/openoffice.org-2-devel/files/patch-setup2+mow+source+loader+makefile.mk +++ /dev/null @@ -1,17 +0,0 @@ -do not need -ldl - -http://qa.openoffice.org/issues/show_bug.cgi?id=27043 ---- ../setup2/mow/source/loader/makefile.mk~ Tue Mar 9 21:04:35 2004 -+++ ../setup2/mow/source/loader/makefile.mk Mon Mar 29 11:10:50 2004 -@@ -92,7 +92,11 @@ - LINK=gcc - LINKFLAGS= - LINKFLAGSAPP= -+.IF "$(OS)"=="FREEBSD" -+STDLIB= -lX11 -lc -lm -+.ELSE - STDLIB= -lX11 -ldl -lc -lm -+.ENDIF # "$(OS)"=="FREEBSD" - .ENDIF # "$(OS)$(COMID)"=="GCC" - - OBJFILES= $(OBJ)$/loader.obj diff --git a/editors/openoffice.org-2-devel/files/patch-sfx2+source+config+cfgmgr.cxx b/editors/openoffice.org-2-devel/files/patch-sfx2+source+config+cfgmgr.cxx deleted file mode 100644 index be38de290a51..000000000000 --- a/editors/openoffice.org-2-devel/files/patch-sfx2+source+config+cfgmgr.cxx +++ /dev/null @@ -1,16 +0,0 @@ -Wired 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.org-2-devel/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx b/editors/openoffice.org-2-devel/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx deleted file mode 100644 index 10c3f3c1f6e8..000000000000 --- a/editors/openoffice.org-2-devel/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx +++ /dev/null @@ -1,34 +0,0 @@ -http://qa.openoffice.org/issues/show_bug.cgi?id=24315 - -For FreeBSD, time_t is defined as -at /usr/include/machine/_types.h -49th typedef int __int32_t; -90th typedef __int32_t __time_t; /* time()... */ -and -/usr/include/pwd.h:typedef __time_t time_t; -/usr/include/time.h:typedef __time_t time_t; -/usr/include/timeconv.h:typedef __time_t time_t; -/usr/include/utime.h:typedef __time_t time_t; -so time_t is equal to 32 bit integer - -For LinuxPPC (Yellowdog 3.0.1) - - ---- ../shell/source/unix/sysshell/recently_used_file_handler.cxx.orig Tue Jan 13 00:56:37 2004 -+++ ../shell/source/unix/sysshell/recently_used_file_handler.cxx Tue Jan 13 00:57:26 2004 -@@ -188,9 +188,12 @@ - write_xml_start_tag(TAG_RECENT_ITEM, file, true); - write_xml_tag(TAG_URI, uri_, file); - write_xml_tag(TAG_MIME_TYPE, mime_type_, file); -- -- rtl::OString ts = rtl::OString::valueOf(timestamp_); -- write_xml_tag(TAG_TIMESTAMP, ts.getStr(), file); -+#if defined FREEBSD -+ rtl::OString ts = rtl::OString::valueOf((sal_Int32)timestamp_); -+#else -+ rtl::OString ts = rtl::OString::valueOf(timestamp_); -+#endif -+ write_xml_tag(TAG_TIMESTAMP, ts.getStr(), file); - - if (is_private_) - write_xml_tag(TAG_PRIVATE, file); diff --git a/editors/openoffice.org-2-devel/files/patch-solenv+inc+ant.mk b/editors/openoffice.org-2-devel/files/patch-solenv+inc+ant.mk deleted file mode 100644 index e050b85d41e9..000000000000 --- a/editors/openoffice.org-2-devel/files/patch-solenv+inc+ant.mk +++ /dev/null @@ -1,13 +0,0 @@ -http://qa.openoffice.org/issues/show_bug.cgi?id=27028 - ---- ../solenv/inc/ant.mk~ Wed Feb 4 21:37:16 2004 -+++ ../solenv/inc/ant.mk Fri Apr 2 23:59:27 2004 -@@ -100,7 +100,7 @@ - .ENDIF - .ENDIF - --ANT=$(WRAPCMD) java -classpath $(CLASSPATH) -Xmx128m org.apache.tools.ant.Main -Djava.home=$(JAVA_HOME) -Dant.home=$(ANT_HOME) -+#ANT=$(WRAPCMD) java -classpath $(CLASSPATH) -Xmx128m org.apache.tools.ant.Main -Djava.home=$(JAVA_HOME) -Dant.home=$(ANT_HOME) - #ANT=java -version - - .IF "$(ANT_BUILDFILE)"=="" diff --git a/editors/openoffice.org-2-devel/files/patch-solenv+inc+settings.mk b/editors/openoffice.org-2-devel/files/patch-solenv+inc+settings.mk deleted file mode 100644 index f93ee2ad6bf2..000000000000 --- a/editors/openoffice.org-2-devel/files/patch-solenv+inc+settings.mk +++ /dev/null @@ -1,15 +0,0 @@ -http://www.openoffice.org/issues/show_bug.cgi?id=25579 -We should set locale as UTF-8 when compiling -but this was due to violation of OOo coding style - ---- ../solenv/inc/settings.mk.old Tue Mar 9 21:19:28 2004 -+++ ../solenv/inc/settings.mk Mon Mar 29 13:23:31 2004 -@@ -172,7 +172,7 @@ - JAVAI=gij - JAVACPS=--classpath - .ELSE --JAVAC=javac -+JAVAC=javac -encoding UTF-8 - JAVAI=java - JAVACPS=-classpath - .ENDIF diff --git a/editors/openoffice.org-2-devel/files/patch-vcl+source+gdi+outdev3.cxx b/editors/openoffice.org-2-devel/files/patch-vcl+source+gdi+outdev3.cxx deleted file mode 100644 index 22ef6f26f45f..000000000000 --- a/editors/openoffice.org-2-devel/files/patch-vcl+source+gdi+outdev3.cxx +++ /dev/null @@ -1,14 +0,0 @@ -do not need <malloc.h> including stdlib.h is enough -http://qa.openoffice.org/issues/show_bug.cgi?id=27041 - ---- ../vcl/source/gdi/outdev3.cxx.old Mon Mar 29 09:42:28 2004 -+++ ../vcl/source/gdi/outdev3.cxx Mon Mar 29 09:42:59 2004 -@@ -176,7 +176,7 @@ - #if defined(SOLARIS) || defined(IRIX) - #include <alloca.h> - #else --#ifndef MACOSX -+#if !(defined(MACOSX) || defined(FREEBSD)) - #include <malloc.h> - #endif - #endif diff --git a/editors/openoffice.org-2-devel/files/patch-vcl+source+gdi+sallayout.cxx b/editors/openoffice.org-2-devel/files/patch-vcl+source+gdi+sallayout.cxx deleted file mode 100644 index 5cbc59bf7db7..000000000000 --- a/editors/openoffice.org-2-devel/files/patch-vcl+source+gdi+sallayout.cxx +++ /dev/null @@ -1,14 +0,0 @@ -malloc.h is deprecated -http://qa.openoffice.org/issues/show_bug.cgi?id=27041 - ---- ../vcl/source/gdi/sallayout.cxx.org Mon Mar 29 10:02:17 2004 -+++ ../vcl/source/gdi/sallayout.cxx Mon Mar 29 10:02:43 2004 -@@ -67,7 +67,7 @@ - #if defined(SOLARIS) || defined(IRIX) - #include <alloca.h> - #else --#ifndef MACOSX -+#if !(defined(MACOSX) || defined(FREEBSD)) - #include <malloc.h> - #endif - #endif diff --git a/editors/openoffice.org-2-devel/files/patch-vcl+source+glyphs+gcache_layout.cxx b/editors/openoffice.org-2-devel/files/patch-vcl+source+glyphs+gcache_layout.cxx deleted file mode 100644 index 53c7a909faf7..000000000000 --- a/editors/openoffice.org-2-devel/files/patch-vcl+source+glyphs+gcache_layout.cxx +++ /dev/null @@ -1,14 +0,0 @@ -malloc.h is deprecated -http://qa.openoffice.org/issues/show_bug.cgi?id=27041 - ---- ../vcl/source/glyphs/gcach_layout.cxx~ Tue Mar 9 21:15:32 2004 -+++ ../vcl/source/glyphs/gcach_layout.cxx Mon Mar 29 09:44:52 2004 -@@ -74,7 +74,7 @@ - #if defined(SOLARIS) || defined(IRIX) - #include <alloca.h> - #else --#ifndef MACOSX -+#if !(defined(MACOSX) || defined(FREEBSD)) - #include <malloc.h> - #endif - #endif diff --git a/editors/openoffice.org-2-devel/files/patch-vcl+unx+source+plugadapt+salmain.cxx b/editors/openoffice.org-2-devel/files/patch-vcl+unx+source+plugadapt+salmain.cxx deleted file mode 100644 index f5bd54364036..000000000000 --- a/editors/openoffice.org-2-devel/files/patch-vcl+unx+source+plugadapt+salmain.cxx +++ /dev/null @@ -1,24 +0,0 @@ -http://qa.openoffice.org/issues/show_bug.cgi?id=27042 - -include <sys/types.h> -Note: --- -* $RCSfile: salmain.cxx,v $ -* -* $Revision: 1.8.12.2 $ -* -* last change: $Author: hr $ $Date: 2004/01/09 18:14:00 $ --- -includes this patch - ---- ../vcl/unx/source/plugadapt/salmain.cxx~ Mon Mar 29 09:50:50 2004 -+++ ../vcl/unx/source/plugadapt/salmain.cxx Mon Mar 29 10:08:28 2004 -@@ -59,7 +59,7 @@ - * - ************************************************************************/ - --#ifdef MACOSX -+#if defined(MACOSX) || defined(FREEBSD) - // rlimit needs sys/types.h - #include <sys/types.h> - #include <sys/time.h> diff --git a/editors/openoffice.org-2-devel/files/patch-vcl+util+makefile.mk b/editors/openoffice.org-2-devel/files/patch-vcl+util+makefile.mk deleted file mode 100644 index 5d133486e032..000000000000 --- a/editors/openoffice.org-2-devel/files/patch-vcl+util+makefile.mk +++ /dev/null @@ -1,30 +0,0 @@ -FreeBSD doesn't require/need/have -ldl -http://qa.openoffice.org/issues/show_bug.cgi?id=27043 - ---- ../vcl/util/makefile.mk~ Mon Mar 29 09:50:51 2004 -+++ ../vcl/util/makefile.mk Mon Mar 29 10:19:04 2004 -@@ -208,7 +208,9 @@ - .IF "$(GUI)"!="UNX" - SHL1OBJS= $(SLO)$/salshl.obj - .ELSE --SHL1STDLIBS+=-ldl -+ .IF "$(OS)"!="FREEBSD" -+ SHL1STDLIBS+=-ldl -+ .ENDIF - .ENDIF - - .IF "$(GUI)" != "MAC" -@@ -351,8 +353,11 @@ - # libs for gtk plugin - SHL4STDLIBS=`pkg-config --libs gtk+-2.0 gthread-2.0` - SHL4STDLIBS+=-l$(SHL2TARGET) --SHL4STDLIBS+=$(SHL3STDLIBS) -lX11 -ldl -- -+ .IF "$(OS)"!="FREEBSD" -+ SHL4STDLIBS+=$(SHL3STDLIBS) -lX11 -ldl -+ .ELSE -+ SHL4STDLIBS+=$(SHL3STDLIBS) -lX11 -+ .ENDIF # FREEBSD - .ENDIF # UNX - - # --- Allgemein ---------------------------------------------------------- diff --git a/editors/openoffice.org-2-devel/files/patch-wizards+prj+build.lst b/editors/openoffice.org-2-devel/files/patch-wizards+prj+build.lst new file mode 100644 index 000000000000..5d5abb75a07e --- /dev/null +++ b/editors/openoffice.org-2-devel/files/patch-wizards+prj+build.lst @@ -0,0 +1,15 @@ +http://www.openoffice.org/issues/show_bug.cgi?id=29656 + +Index: wizards/prj/build.lst +=================================================================== +RCS file: /cvs/installation/wizards/prj/build.lst,v +retrieving revision 1.23 +diff -u -r1.23 build.lst +--- ../wizards/prj/build.lst 19 May 2004 16:35:11 -0000 1.23 ++++ ../wizards/prj/build.lst 8 Jun 2004 22:43:04 -0000 +@@ -1,4 +1,4 @@ +-wz wizards : rsc javaunohelper jut unoil NULL ++wz wizards : rsc qadevOOo javaunohelper jut unoil NULL + wz wizards\util nmake - all wz_util NULL + wz wizards\source\config nmake - all wz_config NULL + wz wizards\source\euro nmake - all wz_eurowiz NULL diff --git a/editors/openoffice.org-2-devel/files/patch-wizards+prj+d.lst b/editors/openoffice.org-2-devel/files/patch-wizards+prj+d.lst new file mode 100644 index 000000000000..d1b4255cca46 --- /dev/null +++ b/editors/openoffice.org-2-devel/files/patch-wizards+prj+d.lst @@ -0,0 +1,16 @@ +http://www.openoffice.org/issues/show_bug.cgi?id=29666 + +Index: wizards/prj/d.lst +=================================================================== +RCS file: /cvs/installation/wizards/prj/d.lst,v +retrieving revision 1.13 +diff -u -r1.13 d.lst +--- ../wizards/prj/d.lst 2 Feb 2004 19:16:11 -0000 1.13 ++++ ../wizards/prj/d.lst 9 Jun 2004 08:25:50 -0000 +@@ -1,5 +1,6 @@ + mkdir: %COMMON_DEST%\bin%_EXT%\hid + mkdir: %_DEST%\pck%_EXT% ++mkdir: %_DEST%\pck%_EXT%\img + ..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid + ..\%__SRC%\bin\*.zip %_DEST%\pck%_EXT%\*.zip + ..\%__SRC%\bin\iwz*.res %_DEST%\bin%_EXT%\iwz*.res diff --git a/editors/openoffice.org-2.0-devel/Makefile b/editors/openoffice.org-2.0-devel/Makefile index d47c500c2e52..6c660a7b6fb8 100644 --- a/editors/openoffice.org-2.0-devel/Makefile +++ b/editors/openoffice.org-2.0-devel/Makefile @@ -24,7 +24,7 @@ MAINTAINER= openoffice@FreeBSD.org COMMENT= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser .endif -IGNORE= "Does not work yet, installation problems" +IGNORE= "Installation is not complete, manual installation works" NO_LATEST_LINK= yes UNZIP?= ${LOCALBASE}/bin/unzip @@ -33,13 +33,13 @@ ANT?= ${LOCALBASE}/bin/ant TCSH?= /bin/tcsh DIST_SUBDIR= openoffice2.0 BUILD_NR= 680 -MILESTONE= m30 +MILESTONE= m41 RELEASE_NR= 2.0 FRELEASE_NR= 2.0 -SNAPDATE= 20040402 +SNAPDATE= 20040611 INSTALLATION_BASEDIR= OpenOffice.org${RELEASE_NR} EXTRACT_ONLY= OOo_${BUILD_NR}${MILESTONE}_${SNAPDATE}_source.tar.bz2 -USE_GNOME= orbit gtk12 +USE_GNOME= orbit gtk12 gtk20 USE_REINPLACE= yes USE_PERL5= yes USE_BZIP2= yes @@ -48,7 +48,7 @@ USE_GMAKE= yes LANG_EXT?= 01 LANG_CONFIGURE_ARG?= ENUS WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work -WRKSRC= ${WRKDIR}/oo_${BUILD_NR}${MILESTONE}_src/config_office +WRKSRC= ${WRKDIR}/oo_${RELEASE_NR}_src/config_office #XXX dirty BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32 @@ -58,9 +58,11 @@ CXX= g++32 BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14 BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip BUILD_DEPENDS+= unzip:${PORTSDIR}/archivers/unzip -BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/apache-ant -BUILD_DEPENDS+= ${X11BASE}/lib/libgdk-x11-2.0.so:${PORTSDIR}/x11-toolkits/gtk20 +BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/apache-ant +BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries BUILD_DEPENDS+= ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft +BUILD_DEPENDS+= ${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip + .if !defined(DISPLAY) BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer .endif @@ -111,7 +113,7 @@ JDKDIR?= ${LOCALBASE}/jdk1.4.2 JAVAVM= ${JDKDIR}/bin/java GNU_CONFIGURE= yes -USE_AUTOCONF_VER= 253 +USE_AUTOCONF_VER= 259 .if defined(WITH_DEBUG) CFLAGS+= -g .if ${WITH_DEBUG} == 2 @@ -130,7 +132,7 @@ DISPLAYHACK=localhost:1001 CONFIGURE_ENV= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \ PTHREAD_LIBS=${PTHREAD_LIBS} CONFIGURE_ARGS+= --with-lang=${LANG_CONFIGURE_ARG} -CONFIGURE_ARGS+= --with-jdk-home=${JDKDIR} --with-ant-home=${LOCALBASE}/ant --with-gnu-cp=${LOCALBASE}/bin/gcp --enable-mozilla=no +CONFIGURE_ARGS+= --with-jdk-home=${JDKDIR} --with-ant-home=${LOCALBASE}/ant --with-gnu-cp=${LOCALBASE}/bin/gcp --enable-mozilla=yes .if defined(WITH_DEBUG) .if ${WITH_DEBUG} == 2 diff --git a/editors/openoffice.org-2.0-devel/distinfo b/editors/openoffice.org-2.0-devel/distinfo index 74de717eb2de..23f567c61dd8 100644 --- a/editors/openoffice.org-2.0-devel/distinfo +++ b/editors/openoffice.org-2.0-devel/distinfo @@ -1,5 +1,5 @@ -MD5 (openoffice2.0/OOo_680m30_20040402_source.tar.bz2) = 768b3d8246a12eff6bf83f098093fbee -SIZE (openoffice2.0/OOo_680m30_20040402_source.tar.bz2) = 195378119 +MD5 (openoffice2.0/OOo_680m41_20040611_source.tar.bz2) = 7b8a6d87b80022f85093a67c01064883 +SIZE (openoffice2.0/OOo_680m41_20040611_source.tar.bz2) = 221136281 MD5 (openoffice2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 SIZE (openoffice2.0/gpc231.tar.Z) = 27917 MD5 (openoffice2.0/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a diff --git a/editors/openoffice.org-2.0-devel/files/patch-config_office+configure.in b/editors/openoffice.org-2.0-devel/files/patch-config_office+configure.in deleted file mode 100644 index 8bd6e0668f6b..000000000000 --- a/editors/openoffice.org-2.0-devel/files/patch-config_office+configure.in +++ /dev/null @@ -1,50 +0,0 @@ -#i27028 and #i27028 -http://qa.openoffice.org/issues/show_bug.cgi?id=27021 (Xaw) -http://qa.openoffice.org/issues/show_bug.cgi?id=27028 (ant) - ---- ../config_office/configure.in.org Sat Mar 27 17:54:16 2004 -+++ ../config_office/configure.in Sun Mar 28 22:17:37 2004 -@@ -1478,7 +1478,7 @@ - elif test "$_os" != "WINNT" ; then - AC_PATH_X - AC_PATH_XTRA -- AC_CHECK_HEADERS(X11/Xaw/Label.h,[AC_MSG_RESULT([Ok])],[AC_MSG_ERROR([Xaw include headers not found])]) -+dnl AC_CHECK_HEADERS(X11/Xaw/Label.h,[AC_MSG_RESULT([Ok])],[AC_MSG_ERROR([Xaw include headers not found])]) - - if test "x$x_includes" = "x"; then - x_includes="/usr/include" -@@ -1830,10 +1830,12 @@ - - if test "$enable_java" != "no"; then - ANT_HOME=; export ANT_HOME -+WITH_ANT_HOME=; export WITH_ANT_HOME - if test -z "$with_ant_home"; then - AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat]) - else -- AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat],,$with_ant_home/bin) -+ AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat],,$with_ant_home/bin:$PATH) -+ WITH_ANT_HOME=$with_ant_home - fi - - -@@ -1873,7 +1875,11 @@ - AC_TRY_EVAL(ant_cmd) - if test $? = 0 && test -f ./conftest.class ; then - AC_MSG_RESULT([Ant works]) -- ANT_HOME=`echo $ANT | $SED -n "s/\/bin\/ant.*\$//p"` -+ if test -z "$WITH_ANT_HOME"; then -+ ANT_HOME=`echo $ANT | $SED -n "s/\/bin\/ant.*\$//p"` -+ else -+ ANT_HOME="$WITH_ANT_HOME" -+ fi - else - echo "configure: Ant test failed" >&5 - cat conftest.java >&5 -@@ -1885,6 +1891,7 @@ - - rm -f conftest* core core.* *.core - fi -+ - if test -z "$ANT_HOME"; then - ANT_HOME="NO_ANT_HOME" - fi diff --git a/editors/openoffice.org-2.0-devel/files/patch-config_office+set_soenv.in b/editors/openoffice.org-2.0-devel/files/patch-config_office+set_soenv.in deleted file mode 100644 index dbb4c3506e1e..000000000000 --- a/editors/openoffice.org-2.0-devel/files/patch-config_office+set_soenv.in +++ /dev/null @@ -1,13 +0,0 @@ -#i27028 -http://qa.openoffice.org/issues/show_bug.cgi?id=27028 - ---- ../config_office/set_soenv.in.old Tue Mar 9 21:31:38 2004 -+++ ../config_office/set_soenv.in Sun Mar 28 09:56:03 2004 -@@ -1419,6 +1419,7 @@ - ToFile( "XSLTPROC", "@XSLTPROC@", "e" ); - ToFile( "ANT_HOME", "@ANT_HOME@", "e" ); - ToFile( "ANT_LIB", "@ANT_LIB@", "e" ); -+ToFile( "ANT", "@ANT@", "e" ); - ToFile( "JDKLIB", $JAVA_LIB, "e" ); - ToFile( "STLPORT4", $STLPORT4, "e" ); - ToFile( "ASM_PATH", $ASM_PATH, "e" ); diff --git a/editors/openoffice.org-2.0-devel/files/patch-cppuhelper+source+gcc3_linux_intel.map b/editors/openoffice.org-2.0-devel/files/patch-cppuhelper+source+gcc3_linux_intel.map deleted file mode 100644 index cdb61b141eba..000000000000 --- a/editors/openoffice.org-2.0-devel/files/patch-cppuhelper+source+gcc3_linux_intel.map +++ /dev/null @@ -1,13 +0,0 @@ -Mysterious :) - -http://qa.openoffice.org/issues/show_bug.cgi?id=23917 ---- ../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.org-2.0-devel/files/patch-hwpfilter+source+hwpreader.hxx b/editors/openoffice.org-2.0-devel/files/patch-hwpfilter+source+hwpreader.hxx deleted file mode 100644 index 8d65e6a3ee83..000000000000 --- a/editors/openoffice.org-2.0-devel/files/patch-hwpfilter+source+hwpreader.hxx +++ /dev/null @@ -1,14 +0,0 @@ -http://qa.openoffice.org/issues/show_bug.cgi?id=27033 ---- ../hwpfilter/source/hwpreader.hxx~ Wed Oct 15 23:37:24 2003 -+++ ../hwpfilter/source/hwpreader.hxx Sun Mar 28 22:46:18 2004 -@@ -68,7 +68,9 @@ - #include <string.h> - #ifdef WIN32 - #include <malloc.h> --#else -+#endif -+ -+#if !defined(FREEBSD) - #include <alloca.h> - #endif - diff --git a/editors/openoffice.org-2.0-devel/files/patch-libxml2+prj+build.lst b/editors/openoffice.org-2.0-devel/files/patch-libxml2+prj+build.lst new file mode 100644 index 000000000000..f0d7b8f05fc8 --- /dev/null +++ b/editors/openoffice.org-2.0-devel/files/patch-libxml2+prj+build.lst @@ -0,0 +1,12 @@ +Index: libxml2/prj/build.lst +=================================================================== +RCS file: /cvs/external/libxml2/prj/build.lst,v +retrieving revision 1.1 +diff -u -r1.1 build.lst +--- ../libxml2/prj/build.lst 6 Feb 2004 10:15:09 -0000 1.1 ++++ ../libxml2/prj/build.lst 4 May 2004 20:20:20 -0000 +@@ -1,3 +1,3 @@ +-lx libxml2 : soltools NULL
++lx libxml2 : soltools xml2cmp NULL
+ lx libxml2 usr1 - all lx_mkout NULL
+ lx libxml2 nmake - all lx_libxml2 NULL
diff --git a/editors/openoffice.org-2.0-devel/files/patch-odk+setsdkenv_unix.in b/editors/openoffice.org-2.0-devel/files/patch-odk+setsdkenv_unix.in deleted file mode 100644 index e5551f883231..000000000000 --- a/editors/openoffice.org-2.0-devel/files/patch-odk+setsdkenv_unix.in +++ /dev/null @@ -1,27 +0,0 @@ -http://qa.openoffice.org/issues/show_bug.cgi?id=24142 ---- ../odk/setsdkenv_unix.in Sun Jan 25 18:41:01 2004 -+++ ../odk/setsdkenv_unix.in Sun Jan 25 18:42:00 2004 -@@ -2,7 +2,8 @@ - - # This script starts a new shell and sets all enviroment variables, which - # are necessary for building the examples of the Office Development Kit. --# The Script was developed for the operating systems Solaris and Linux. -+# The script was developed for the operating systems Solaris, Linux, MacOS X -+# and FreeBSD. - - # Installation directory of the Software Development Kit. - # Example: OO_SDK_HOME=/work/StarOffice_SDK -@@ -76,6 +77,13 @@ - LD_LIBRARY_PATH=$OO_SDK_HOME/$directoryname/lib:$OO_SDK_HOME/$exampleout/lib:$OFFICE_PROGRAM_PATH:.:$LD_LIBRARY_PATH - export LD_LIBRARY_PATH - ;; -+ -+ FreeBSD) -+ directoryname=freebsd -+ exampleout=FREEBSDexample.out -+ LD_LIBRARY_PATH=$OO_SDK_HOME/$directoryname/lib:$OO_SDK_HOME/$exampleout/lib:$OFFICE_PROGRAM_PATH:.:$LD_LIBRARY_PATH -+ export LD_LIBRARY_PATH -+ ;; - esac - - # Add directory of the SDK tools to the path. diff --git a/editors/openoffice.org-2.0-devel/files/patch-odk+settings+settings.mk b/editors/openoffice.org-2.0-devel/files/patch-odk+settings+settings.mk deleted file mode 100644 index 8c3942d12f16..000000000000 --- a/editors/openoffice.org-2.0-devel/files/patch-odk+settings+settings.mk +++ /dev/null @@ -1,90 +0,0 @@ -http://qa.openoffice.org/issues/show_bug.cgi?id=24142 - ---- ../odk/settings/settings.mk Sun Jan 25 18:41:02 2004 -+++ ../odk/settings/settings.mk Sun Jan 25 18:45:09 2004 -@@ -368,3 +368,85 @@ - - endif - -+ifeq "$(PLATFORM)" "FreeBSD" -+# Settings for FreeBSD using gcc compiler -+ -+PROCTYPE := $(shell uname -m) -+ -+ -+# Default is freebsd on a intel machine -+PLATFORM=FreeBSD -+PACKAGE_LIB_DIR=freebsd_x86.plt -+JAVA_PROC_TYPE=i386 -+ -+OS=FREEBSD -+PS=/ -+CC=gcc -+LINK=gcc -+LIB=gcc -+ECHO=@echo -+MKDIR=mkdir -p -+CAT=cat -+OBJ_EXT=o -+SHAREDLIB_EXT=so -+SHAREDLIB_PRE=lib -+SHAREDLIB_OUT=$(OUT_LIB) -+ -+GCC_VERSION=$(shell $(CC) -dumpversion) -+ -+ifeq "$(shell echo $(GCC_VERSION) | cut -c 1)" "3" -+COMID=gcc3 -+CPPU_ENV=gcc3 -+else -+COMID=GCC -+CPPU_ENV=gcc2 -+endif -+ -+OSEP=\< -+CSEP=\> -+QUOTE=$(subst S,\,S) -+QM=\" -+ -+DEL=rm -f -+DELRECURSIVE=rm -rf -+COPY=cp -+URLPREFIX=file:// -+ -+# Include UDK version numbers -+include $(PRJ)/include/udkversion.mk -+ -+SALLIB=-lsal -+CPPULIB=-lcppu -+CPPUHELPERLIB=-lcppuhelper$(COMID) -+SALHELPERLIB=-lsalhelper$(COMID) -+STLPORTLIB=-lstlport_gcc -+ -+EMPTYSTRING= -+PATH_SEPARATOR=: -+ -+# -O is necessary for inlining (see gcc documentation) -+ifeq "$(DEBUG)" "yes" -+CC_FLAGS=-c -g -fpic -DPIC -fno-rtti %%PTHREAD_CFLAGS%% -+else -+CC_FLAGS=-c -O -fpic -DPIC -fno-rtti %%PTHREAD_CFLAGS%% -+endif -+ -+SDK_JAVA_INCLUDES = -I$(OO_SDK_JAVA_HOME)/include -I$(OO_SDK_JAVA_HOME)/include/freebsd -+CC_INCLUDES=-I. -I/usr/include -I$(OUT)/inc/examples -I$(PRJ)/include -+STL_INCLUDES=-I$(OO_SDK_HOME)/include/stl -+CC_DEFINES=-DUNX -DGCC -DFREEBSD -DCPPU_ENV=$(CPPU_ENV) -+ -+# define for used compiler necessary for UNO -+#-DCPPU_ENV=gcc2 -- gcc 2.91/2.95 -+#-DCPPU_ENV=gcc3 -- gcc3 3.0 -+ -+CC_OUTPUT_SWITCH=-o -+ -+LIBRARY_LINK_FLAGS=-shared '-Wl,-rpath,$$ORIGIN' -+ -+EXE_LINK_FLAGS=-Wl -+LINK_LIBS=-L$(OUT)/lib -L$(PRJ)/$(PLATFORM)/lib -L$(OFFICE_PROGRAM_PATH) %%PTHREAD_LIBS%% -+LINK_JAVA_LIBS=-L$(OO_SDK_JAVA_HOME)/jre/lib/$(JAVA_PROC_TYPE) -+ -+endif -+ diff --git a/editors/openoffice.org-2.0-devel/files/patch-psprint+source+helper+strhelper.cxx b/editors/openoffice.org-2.0-devel/files/patch-psprint+source+helper+strhelper.cxx new file mode 100644 index 000000000000..52530e403ac0 --- /dev/null +++ b/editors/openoffice.org-2.0-devel/files/patch-psprint+source+helper+strhelper.cxx @@ -0,0 +1,21 @@ +http://www.openoffice.org/issues/show_bug.cgi?id=27753 +The isnan() macro is a new feature of C99 and not yet part of C++. + +Index: source/helper/strhelper.cxx +=================================================================== +RCS file: /cvs/gsl/psprint/source/helper/strhelper.cxx,v +retrieving revision 1.6 +diff -u -r1.6 strhelper.cxx +--- ../psprint/source/helper/strhelper.cxx 30 Mar 2004 13:48:06 -0000 1.6 ++++ ../psprint/source/helper/strhelper.cxx 13 Apr 2004 22:26:11 -0000 +@@ -67,6 +67,10 @@ + #include <cmath> // for isnan + #include <cstring> + ++#if defined (FREEBSD) ++using namespace __gnu_cxx; //for isnan ++#endif ++ + namespace psp { + + inline int isSpace( char cChar ) diff --git a/editors/openoffice.org-2.0-devel/files/patch-setup2+mow+source+loader+makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-setup2+mow+source+loader+makefile.mk deleted file mode 100644 index 7b25ff2635df..000000000000 --- a/editors/openoffice.org-2.0-devel/files/patch-setup2+mow+source+loader+makefile.mk +++ /dev/null @@ -1,17 +0,0 @@ -do not need -ldl - -http://qa.openoffice.org/issues/show_bug.cgi?id=27043 ---- ../setup2/mow/source/loader/makefile.mk~ Tue Mar 9 21:04:35 2004 -+++ ../setup2/mow/source/loader/makefile.mk Mon Mar 29 11:10:50 2004 -@@ -92,7 +92,11 @@ - LINK=gcc - LINKFLAGS= - LINKFLAGSAPP= -+.IF "$(OS)"=="FREEBSD" -+STDLIB= -lX11 -lc -lm -+.ELSE - STDLIB= -lX11 -ldl -lc -lm -+.ENDIF # "$(OS)"=="FREEBSD" - .ENDIF # "$(OS)$(COMID)"=="GCC" - - OBJFILES= $(OBJ)$/loader.obj diff --git a/editors/openoffice.org-2.0-devel/files/patch-sfx2+source+config+cfgmgr.cxx b/editors/openoffice.org-2.0-devel/files/patch-sfx2+source+config+cfgmgr.cxx deleted file mode 100644 index be38de290a51..000000000000 --- a/editors/openoffice.org-2.0-devel/files/patch-sfx2+source+config+cfgmgr.cxx +++ /dev/null @@ -1,16 +0,0 @@ -Wired 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.org-2.0-devel/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx b/editors/openoffice.org-2.0-devel/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx deleted file mode 100644 index 10c3f3c1f6e8..000000000000 --- a/editors/openoffice.org-2.0-devel/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx +++ /dev/null @@ -1,34 +0,0 @@ -http://qa.openoffice.org/issues/show_bug.cgi?id=24315 - -For FreeBSD, time_t is defined as -at /usr/include/machine/_types.h -49th typedef int __int32_t; -90th typedef __int32_t __time_t; /* time()... */ -and -/usr/include/pwd.h:typedef __time_t time_t; -/usr/include/time.h:typedef __time_t time_t; -/usr/include/timeconv.h:typedef __time_t time_t; -/usr/include/utime.h:typedef __time_t time_t; -so time_t is equal to 32 bit integer - -For LinuxPPC (Yellowdog 3.0.1) - - ---- ../shell/source/unix/sysshell/recently_used_file_handler.cxx.orig Tue Jan 13 00:56:37 2004 -+++ ../shell/source/unix/sysshell/recently_used_file_handler.cxx Tue Jan 13 00:57:26 2004 -@@ -188,9 +188,12 @@ - write_xml_start_tag(TAG_RECENT_ITEM, file, true); - write_xml_tag(TAG_URI, uri_, file); - write_xml_tag(TAG_MIME_TYPE, mime_type_, file); -- -- rtl::OString ts = rtl::OString::valueOf(timestamp_); -- write_xml_tag(TAG_TIMESTAMP, ts.getStr(), file); -+#if defined FREEBSD -+ rtl::OString ts = rtl::OString::valueOf((sal_Int32)timestamp_); -+#else -+ rtl::OString ts = rtl::OString::valueOf(timestamp_); -+#endif -+ write_xml_tag(TAG_TIMESTAMP, ts.getStr(), file); - - if (is_private_) - write_xml_tag(TAG_PRIVATE, file); diff --git a/editors/openoffice.org-2.0-devel/files/patch-solenv+inc+ant.mk b/editors/openoffice.org-2.0-devel/files/patch-solenv+inc+ant.mk deleted file mode 100644 index e050b85d41e9..000000000000 --- a/editors/openoffice.org-2.0-devel/files/patch-solenv+inc+ant.mk +++ /dev/null @@ -1,13 +0,0 @@ -http://qa.openoffice.org/issues/show_bug.cgi?id=27028 - ---- ../solenv/inc/ant.mk~ Wed Feb 4 21:37:16 2004 -+++ ../solenv/inc/ant.mk Fri Apr 2 23:59:27 2004 -@@ -100,7 +100,7 @@ - .ENDIF - .ENDIF - --ANT=$(WRAPCMD) java -classpath $(CLASSPATH) -Xmx128m org.apache.tools.ant.Main -Djava.home=$(JAVA_HOME) -Dant.home=$(ANT_HOME) -+#ANT=$(WRAPCMD) java -classpath $(CLASSPATH) -Xmx128m org.apache.tools.ant.Main -Djava.home=$(JAVA_HOME) -Dant.home=$(ANT_HOME) - #ANT=java -version - - .IF "$(ANT_BUILDFILE)"=="" diff --git a/editors/openoffice.org-2.0-devel/files/patch-solenv+inc+settings.mk b/editors/openoffice.org-2.0-devel/files/patch-solenv+inc+settings.mk deleted file mode 100644 index f93ee2ad6bf2..000000000000 --- a/editors/openoffice.org-2.0-devel/files/patch-solenv+inc+settings.mk +++ /dev/null @@ -1,15 +0,0 @@ -http://www.openoffice.org/issues/show_bug.cgi?id=25579 -We should set locale as UTF-8 when compiling -but this was due to violation of OOo coding style - ---- ../solenv/inc/settings.mk.old Tue Mar 9 21:19:28 2004 -+++ ../solenv/inc/settings.mk Mon Mar 29 13:23:31 2004 -@@ -172,7 +172,7 @@ - JAVAI=gij - JAVACPS=--classpath - .ELSE --JAVAC=javac -+JAVAC=javac -encoding UTF-8 - JAVAI=java - JAVACPS=-classpath - .ENDIF diff --git a/editors/openoffice.org-2.0-devel/files/patch-vcl+source+gdi+outdev3.cxx b/editors/openoffice.org-2.0-devel/files/patch-vcl+source+gdi+outdev3.cxx deleted file mode 100644 index 22ef6f26f45f..000000000000 --- a/editors/openoffice.org-2.0-devel/files/patch-vcl+source+gdi+outdev3.cxx +++ /dev/null @@ -1,14 +0,0 @@ -do not need <malloc.h> including stdlib.h is enough -http://qa.openoffice.org/issues/show_bug.cgi?id=27041 - ---- ../vcl/source/gdi/outdev3.cxx.old Mon Mar 29 09:42:28 2004 -+++ ../vcl/source/gdi/outdev3.cxx Mon Mar 29 09:42:59 2004 -@@ -176,7 +176,7 @@ - #if defined(SOLARIS) || defined(IRIX) - #include <alloca.h> - #else --#ifndef MACOSX -+#if !(defined(MACOSX) || defined(FREEBSD)) - #include <malloc.h> - #endif - #endif diff --git a/editors/openoffice.org-2.0-devel/files/patch-vcl+source+gdi+sallayout.cxx b/editors/openoffice.org-2.0-devel/files/patch-vcl+source+gdi+sallayout.cxx deleted file mode 100644 index 5cbc59bf7db7..000000000000 --- a/editors/openoffice.org-2.0-devel/files/patch-vcl+source+gdi+sallayout.cxx +++ /dev/null @@ -1,14 +0,0 @@ -malloc.h is deprecated -http://qa.openoffice.org/issues/show_bug.cgi?id=27041 - ---- ../vcl/source/gdi/sallayout.cxx.org Mon Mar 29 10:02:17 2004 -+++ ../vcl/source/gdi/sallayout.cxx Mon Mar 29 10:02:43 2004 -@@ -67,7 +67,7 @@ - #if defined(SOLARIS) || defined(IRIX) - #include <alloca.h> - #else --#ifndef MACOSX -+#if !(defined(MACOSX) || defined(FREEBSD)) - #include <malloc.h> - #endif - #endif diff --git a/editors/openoffice.org-2.0-devel/files/patch-vcl+source+glyphs+gcache_layout.cxx b/editors/openoffice.org-2.0-devel/files/patch-vcl+source+glyphs+gcache_layout.cxx deleted file mode 100644 index 53c7a909faf7..000000000000 --- a/editors/openoffice.org-2.0-devel/files/patch-vcl+source+glyphs+gcache_layout.cxx +++ /dev/null @@ -1,14 +0,0 @@ -malloc.h is deprecated -http://qa.openoffice.org/issues/show_bug.cgi?id=27041 - ---- ../vcl/source/glyphs/gcach_layout.cxx~ Tue Mar 9 21:15:32 2004 -+++ ../vcl/source/glyphs/gcach_layout.cxx Mon Mar 29 09:44:52 2004 -@@ -74,7 +74,7 @@ - #if defined(SOLARIS) || defined(IRIX) - #include <alloca.h> - #else --#ifndef MACOSX -+#if !(defined(MACOSX) || defined(FREEBSD)) - #include <malloc.h> - #endif - #endif diff --git a/editors/openoffice.org-2.0-devel/files/patch-vcl+unx+source+plugadapt+salmain.cxx b/editors/openoffice.org-2.0-devel/files/patch-vcl+unx+source+plugadapt+salmain.cxx deleted file mode 100644 index f5bd54364036..000000000000 --- a/editors/openoffice.org-2.0-devel/files/patch-vcl+unx+source+plugadapt+salmain.cxx +++ /dev/null @@ -1,24 +0,0 @@ -http://qa.openoffice.org/issues/show_bug.cgi?id=27042 - -include <sys/types.h> -Note: --- -* $RCSfile: salmain.cxx,v $ -* -* $Revision: 1.8.12.2 $ -* -* last change: $Author: hr $ $Date: 2004/01/09 18:14:00 $ --- -includes this patch - ---- ../vcl/unx/source/plugadapt/salmain.cxx~ Mon Mar 29 09:50:50 2004 -+++ ../vcl/unx/source/plugadapt/salmain.cxx Mon Mar 29 10:08:28 2004 -@@ -59,7 +59,7 @@ - * - ************************************************************************/ - --#ifdef MACOSX -+#if defined(MACOSX) || defined(FREEBSD) - // rlimit needs sys/types.h - #include <sys/types.h> - #include <sys/time.h> diff --git a/editors/openoffice.org-2.0-devel/files/patch-vcl+util+makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-vcl+util+makefile.mk deleted file mode 100644 index 5d133486e032..000000000000 --- a/editors/openoffice.org-2.0-devel/files/patch-vcl+util+makefile.mk +++ /dev/null @@ -1,30 +0,0 @@ -FreeBSD doesn't require/need/have -ldl -http://qa.openoffice.org/issues/show_bug.cgi?id=27043 - ---- ../vcl/util/makefile.mk~ Mon Mar 29 09:50:51 2004 -+++ ../vcl/util/makefile.mk Mon Mar 29 10:19:04 2004 -@@ -208,7 +208,9 @@ - .IF "$(GUI)"!="UNX" - SHL1OBJS= $(SLO)$/salshl.obj - .ELSE --SHL1STDLIBS+=-ldl -+ .IF "$(OS)"!="FREEBSD" -+ SHL1STDLIBS+=-ldl -+ .ENDIF - .ENDIF - - .IF "$(GUI)" != "MAC" -@@ -351,8 +353,11 @@ - # libs for gtk plugin - SHL4STDLIBS=`pkg-config --libs gtk+-2.0 gthread-2.0` - SHL4STDLIBS+=-l$(SHL2TARGET) --SHL4STDLIBS+=$(SHL3STDLIBS) -lX11 -ldl -- -+ .IF "$(OS)"!="FREEBSD" -+ SHL4STDLIBS+=$(SHL3STDLIBS) -lX11 -ldl -+ .ELSE -+ SHL4STDLIBS+=$(SHL3STDLIBS) -lX11 -+ .ENDIF # FREEBSD - .ENDIF # UNX - - # --- Allgemein ---------------------------------------------------------- diff --git a/editors/openoffice.org-2.0-devel/files/patch-wizards+prj+build.lst b/editors/openoffice.org-2.0-devel/files/patch-wizards+prj+build.lst new file mode 100644 index 000000000000..5d5abb75a07e --- /dev/null +++ b/editors/openoffice.org-2.0-devel/files/patch-wizards+prj+build.lst @@ -0,0 +1,15 @@ +http://www.openoffice.org/issues/show_bug.cgi?id=29656 + +Index: wizards/prj/build.lst +=================================================================== +RCS file: /cvs/installation/wizards/prj/build.lst,v +retrieving revision 1.23 +diff -u -r1.23 build.lst +--- ../wizards/prj/build.lst 19 May 2004 16:35:11 -0000 1.23 ++++ ../wizards/prj/build.lst 8 Jun 2004 22:43:04 -0000 +@@ -1,4 +1,4 @@ +-wz wizards : rsc javaunohelper jut unoil NULL ++wz wizards : rsc qadevOOo javaunohelper jut unoil NULL + wz wizards\util nmake - all wz_util NULL + wz wizards\source\config nmake - all wz_config NULL + wz wizards\source\euro nmake - all wz_eurowiz NULL diff --git a/editors/openoffice.org-2.0-devel/files/patch-wizards+prj+d.lst b/editors/openoffice.org-2.0-devel/files/patch-wizards+prj+d.lst new file mode 100644 index 000000000000..d1b4255cca46 --- /dev/null +++ b/editors/openoffice.org-2.0-devel/files/patch-wizards+prj+d.lst @@ -0,0 +1,16 @@ +http://www.openoffice.org/issues/show_bug.cgi?id=29666 + +Index: wizards/prj/d.lst +=================================================================== +RCS file: /cvs/installation/wizards/prj/d.lst,v +retrieving revision 1.13 +diff -u -r1.13 d.lst +--- ../wizards/prj/d.lst 2 Feb 2004 19:16:11 -0000 1.13 ++++ ../wizards/prj/d.lst 9 Jun 2004 08:25:50 -0000 +@@ -1,5 +1,6 @@ + mkdir: %COMMON_DEST%\bin%_EXT%\hid + mkdir: %_DEST%\pck%_EXT% ++mkdir: %_DEST%\pck%_EXT%\img + ..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid + ..\%__SRC%\bin\*.zip %_DEST%\pck%_EXT%\*.zip + ..\%__SRC%\bin\iwz*.res %_DEST%\bin%_EXT%\iwz*.res diff --git a/editors/openoffice.org-2.0/Makefile b/editors/openoffice.org-2.0/Makefile index d47c500c2e52..6c660a7b6fb8 100644 --- a/editors/openoffice.org-2.0/Makefile +++ b/editors/openoffice.org-2.0/Makefile @@ -24,7 +24,7 @@ MAINTAINER= openoffice@FreeBSD.org COMMENT= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser .endif -IGNORE= "Does not work yet, installation problems" +IGNORE= "Installation is not complete, manual installation works" NO_LATEST_LINK= yes UNZIP?= ${LOCALBASE}/bin/unzip @@ -33,13 +33,13 @@ ANT?= ${LOCALBASE}/bin/ant TCSH?= /bin/tcsh DIST_SUBDIR= openoffice2.0 BUILD_NR= 680 -MILESTONE= m30 +MILESTONE= m41 RELEASE_NR= 2.0 FRELEASE_NR= 2.0 -SNAPDATE= 20040402 +SNAPDATE= 20040611 INSTALLATION_BASEDIR= OpenOffice.org${RELEASE_NR} EXTRACT_ONLY= OOo_${BUILD_NR}${MILESTONE}_${SNAPDATE}_source.tar.bz2 -USE_GNOME= orbit gtk12 +USE_GNOME= orbit gtk12 gtk20 USE_REINPLACE= yes USE_PERL5= yes USE_BZIP2= yes @@ -48,7 +48,7 @@ USE_GMAKE= yes LANG_EXT?= 01 LANG_CONFIGURE_ARG?= ENUS WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work -WRKSRC= ${WRKDIR}/oo_${BUILD_NR}${MILESTONE}_src/config_office +WRKSRC= ${WRKDIR}/oo_${RELEASE_NR}_src/config_office #XXX dirty BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32 @@ -58,9 +58,11 @@ CXX= g++32 BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14 BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip BUILD_DEPENDS+= unzip:${PORTSDIR}/archivers/unzip -BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/apache-ant -BUILD_DEPENDS+= ${X11BASE}/lib/libgdk-x11-2.0.so:${PORTSDIR}/x11-toolkits/gtk20 +BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/apache-ant +BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries BUILD_DEPENDS+= ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft +BUILD_DEPENDS+= ${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip + .if !defined(DISPLAY) BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer .endif @@ -111,7 +113,7 @@ JDKDIR?= ${LOCALBASE}/jdk1.4.2 JAVAVM= ${JDKDIR}/bin/java GNU_CONFIGURE= yes -USE_AUTOCONF_VER= 253 +USE_AUTOCONF_VER= 259 .if defined(WITH_DEBUG) CFLAGS+= -g .if ${WITH_DEBUG} == 2 @@ -130,7 +132,7 @@ DISPLAYHACK=localhost:1001 CONFIGURE_ENV= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \ PTHREAD_LIBS=${PTHREAD_LIBS} CONFIGURE_ARGS+= --with-lang=${LANG_CONFIGURE_ARG} -CONFIGURE_ARGS+= --with-jdk-home=${JDKDIR} --with-ant-home=${LOCALBASE}/ant --with-gnu-cp=${LOCALBASE}/bin/gcp --enable-mozilla=no +CONFIGURE_ARGS+= --with-jdk-home=${JDKDIR} --with-ant-home=${LOCALBASE}/ant --with-gnu-cp=${LOCALBASE}/bin/gcp --enable-mozilla=yes .if defined(WITH_DEBUG) .if ${WITH_DEBUG} == 2 diff --git a/editors/openoffice.org-2.0/distinfo b/editors/openoffice.org-2.0/distinfo index 74de717eb2de..23f567c61dd8 100644 --- a/editors/openoffice.org-2.0/distinfo +++ b/editors/openoffice.org-2.0/distinfo @@ -1,5 +1,5 @@ -MD5 (openoffice2.0/OOo_680m30_20040402_source.tar.bz2) = 768b3d8246a12eff6bf83f098093fbee -SIZE (openoffice2.0/OOo_680m30_20040402_source.tar.bz2) = 195378119 +MD5 (openoffice2.0/OOo_680m41_20040611_source.tar.bz2) = 7b8a6d87b80022f85093a67c01064883 +SIZE (openoffice2.0/OOo_680m41_20040611_source.tar.bz2) = 221136281 MD5 (openoffice2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 SIZE (openoffice2.0/gpc231.tar.Z) = 27917 MD5 (openoffice2.0/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a diff --git a/editors/openoffice.org-2.0/files/patch-config_office+configure.in b/editors/openoffice.org-2.0/files/patch-config_office+configure.in deleted file mode 100644 index 8bd6e0668f6b..000000000000 --- a/editors/openoffice.org-2.0/files/patch-config_office+configure.in +++ /dev/null @@ -1,50 +0,0 @@ -#i27028 and #i27028 -http://qa.openoffice.org/issues/show_bug.cgi?id=27021 (Xaw) -http://qa.openoffice.org/issues/show_bug.cgi?id=27028 (ant) - ---- ../config_office/configure.in.org Sat Mar 27 17:54:16 2004 -+++ ../config_office/configure.in Sun Mar 28 22:17:37 2004 -@@ -1478,7 +1478,7 @@ - elif test "$_os" != "WINNT" ; then - AC_PATH_X - AC_PATH_XTRA -- AC_CHECK_HEADERS(X11/Xaw/Label.h,[AC_MSG_RESULT([Ok])],[AC_MSG_ERROR([Xaw include headers not found])]) -+dnl AC_CHECK_HEADERS(X11/Xaw/Label.h,[AC_MSG_RESULT([Ok])],[AC_MSG_ERROR([Xaw include headers not found])]) - - if test "x$x_includes" = "x"; then - x_includes="/usr/include" -@@ -1830,10 +1830,12 @@ - - if test "$enable_java" != "no"; then - ANT_HOME=; export ANT_HOME -+WITH_ANT_HOME=; export WITH_ANT_HOME - if test -z "$with_ant_home"; then - AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat]) - else -- AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat],,$with_ant_home/bin) -+ AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat],,$with_ant_home/bin:$PATH) -+ WITH_ANT_HOME=$with_ant_home - fi - - -@@ -1873,7 +1875,11 @@ - AC_TRY_EVAL(ant_cmd) - if test $? = 0 && test -f ./conftest.class ; then - AC_MSG_RESULT([Ant works]) -- ANT_HOME=`echo $ANT | $SED -n "s/\/bin\/ant.*\$//p"` -+ if test -z "$WITH_ANT_HOME"; then -+ ANT_HOME=`echo $ANT | $SED -n "s/\/bin\/ant.*\$//p"` -+ else -+ ANT_HOME="$WITH_ANT_HOME" -+ fi - else - echo "configure: Ant test failed" >&5 - cat conftest.java >&5 -@@ -1885,6 +1891,7 @@ - - rm -f conftest* core core.* *.core - fi -+ - if test -z "$ANT_HOME"; then - ANT_HOME="NO_ANT_HOME" - fi diff --git a/editors/openoffice.org-2.0/files/patch-config_office+set_soenv.in b/editors/openoffice.org-2.0/files/patch-config_office+set_soenv.in deleted file mode 100644 index dbb4c3506e1e..000000000000 --- a/editors/openoffice.org-2.0/files/patch-config_office+set_soenv.in +++ /dev/null @@ -1,13 +0,0 @@ -#i27028 -http://qa.openoffice.org/issues/show_bug.cgi?id=27028 - ---- ../config_office/set_soenv.in.old Tue Mar 9 21:31:38 2004 -+++ ../config_office/set_soenv.in Sun Mar 28 09:56:03 2004 -@@ -1419,6 +1419,7 @@ - ToFile( "XSLTPROC", "@XSLTPROC@", "e" ); - ToFile( "ANT_HOME", "@ANT_HOME@", "e" ); - ToFile( "ANT_LIB", "@ANT_LIB@", "e" ); -+ToFile( "ANT", "@ANT@", "e" ); - ToFile( "JDKLIB", $JAVA_LIB, "e" ); - ToFile( "STLPORT4", $STLPORT4, "e" ); - ToFile( "ASM_PATH", $ASM_PATH, "e" ); diff --git a/editors/openoffice.org-2.0/files/patch-cppuhelper+source+gcc3_linux_intel.map b/editors/openoffice.org-2.0/files/patch-cppuhelper+source+gcc3_linux_intel.map deleted file mode 100644 index cdb61b141eba..000000000000 --- a/editors/openoffice.org-2.0/files/patch-cppuhelper+source+gcc3_linux_intel.map +++ /dev/null @@ -1,13 +0,0 @@ -Mysterious :) - -http://qa.openoffice.org/issues/show_bug.cgi?id=23917 ---- ../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.org-2.0/files/patch-hwpfilter+source+hwpreader.hxx b/editors/openoffice.org-2.0/files/patch-hwpfilter+source+hwpreader.hxx deleted file mode 100644 index 8d65e6a3ee83..000000000000 --- a/editors/openoffice.org-2.0/files/patch-hwpfilter+source+hwpreader.hxx +++ /dev/null @@ -1,14 +0,0 @@ -http://qa.openoffice.org/issues/show_bug.cgi?id=27033 ---- ../hwpfilter/source/hwpreader.hxx~ Wed Oct 15 23:37:24 2003 -+++ ../hwpfilter/source/hwpreader.hxx Sun Mar 28 22:46:18 2004 -@@ -68,7 +68,9 @@ - #include <string.h> - #ifdef WIN32 - #include <malloc.h> --#else -+#endif -+ -+#if !defined(FREEBSD) - #include <alloca.h> - #endif - diff --git a/editors/openoffice.org-2.0/files/patch-libxml2+prj+build.lst b/editors/openoffice.org-2.0/files/patch-libxml2+prj+build.lst new file mode 100644 index 000000000000..f0d7b8f05fc8 --- /dev/null +++ b/editors/openoffice.org-2.0/files/patch-libxml2+prj+build.lst @@ -0,0 +1,12 @@ +Index: libxml2/prj/build.lst +=================================================================== +RCS file: /cvs/external/libxml2/prj/build.lst,v +retrieving revision 1.1 +diff -u -r1.1 build.lst +--- ../libxml2/prj/build.lst 6 Feb 2004 10:15:09 -0000 1.1 ++++ ../libxml2/prj/build.lst 4 May 2004 20:20:20 -0000 +@@ -1,3 +1,3 @@ +-lx libxml2 : soltools NULL
++lx libxml2 : soltools xml2cmp NULL
+ lx libxml2 usr1 - all lx_mkout NULL
+ lx libxml2 nmake - all lx_libxml2 NULL
diff --git a/editors/openoffice.org-2.0/files/patch-odk+setsdkenv_unix.in b/editors/openoffice.org-2.0/files/patch-odk+setsdkenv_unix.in deleted file mode 100644 index e5551f883231..000000000000 --- a/editors/openoffice.org-2.0/files/patch-odk+setsdkenv_unix.in +++ /dev/null @@ -1,27 +0,0 @@ -http://qa.openoffice.org/issues/show_bug.cgi?id=24142 ---- ../odk/setsdkenv_unix.in Sun Jan 25 18:41:01 2004 -+++ ../odk/setsdkenv_unix.in Sun Jan 25 18:42:00 2004 -@@ -2,7 +2,8 @@ - - # This script starts a new shell and sets all enviroment variables, which - # are necessary for building the examples of the Office Development Kit. --# The Script was developed for the operating systems Solaris and Linux. -+# The script was developed for the operating systems Solaris, Linux, MacOS X -+# and FreeBSD. - - # Installation directory of the Software Development Kit. - # Example: OO_SDK_HOME=/work/StarOffice_SDK -@@ -76,6 +77,13 @@ - LD_LIBRARY_PATH=$OO_SDK_HOME/$directoryname/lib:$OO_SDK_HOME/$exampleout/lib:$OFFICE_PROGRAM_PATH:.:$LD_LIBRARY_PATH - export LD_LIBRARY_PATH - ;; -+ -+ FreeBSD) -+ directoryname=freebsd -+ exampleout=FREEBSDexample.out -+ LD_LIBRARY_PATH=$OO_SDK_HOME/$directoryname/lib:$OO_SDK_HOME/$exampleout/lib:$OFFICE_PROGRAM_PATH:.:$LD_LIBRARY_PATH -+ export LD_LIBRARY_PATH -+ ;; - esac - - # Add directory of the SDK tools to the path. diff --git a/editors/openoffice.org-2.0/files/patch-odk+settings+settings.mk b/editors/openoffice.org-2.0/files/patch-odk+settings+settings.mk deleted file mode 100644 index 8c3942d12f16..000000000000 --- a/editors/openoffice.org-2.0/files/patch-odk+settings+settings.mk +++ /dev/null @@ -1,90 +0,0 @@ -http://qa.openoffice.org/issues/show_bug.cgi?id=24142 - ---- ../odk/settings/settings.mk Sun Jan 25 18:41:02 2004 -+++ ../odk/settings/settings.mk Sun Jan 25 18:45:09 2004 -@@ -368,3 +368,85 @@ - - endif - -+ifeq "$(PLATFORM)" "FreeBSD" -+# Settings for FreeBSD using gcc compiler -+ -+PROCTYPE := $(shell uname -m) -+ -+ -+# Default is freebsd on a intel machine -+PLATFORM=FreeBSD -+PACKAGE_LIB_DIR=freebsd_x86.plt -+JAVA_PROC_TYPE=i386 -+ -+OS=FREEBSD -+PS=/ -+CC=gcc -+LINK=gcc -+LIB=gcc -+ECHO=@echo -+MKDIR=mkdir -p -+CAT=cat -+OBJ_EXT=o -+SHAREDLIB_EXT=so -+SHAREDLIB_PRE=lib -+SHAREDLIB_OUT=$(OUT_LIB) -+ -+GCC_VERSION=$(shell $(CC) -dumpversion) -+ -+ifeq "$(shell echo $(GCC_VERSION) | cut -c 1)" "3" -+COMID=gcc3 -+CPPU_ENV=gcc3 -+else -+COMID=GCC -+CPPU_ENV=gcc2 -+endif -+ -+OSEP=\< -+CSEP=\> -+QUOTE=$(subst S,\,S) -+QM=\" -+ -+DEL=rm -f -+DELRECURSIVE=rm -rf -+COPY=cp -+URLPREFIX=file:// -+ -+# Include UDK version numbers -+include $(PRJ)/include/udkversion.mk -+ -+SALLIB=-lsal -+CPPULIB=-lcppu -+CPPUHELPERLIB=-lcppuhelper$(COMID) -+SALHELPERLIB=-lsalhelper$(COMID) -+STLPORTLIB=-lstlport_gcc -+ -+EMPTYSTRING= -+PATH_SEPARATOR=: -+ -+# -O is necessary for inlining (see gcc documentation) -+ifeq "$(DEBUG)" "yes" -+CC_FLAGS=-c -g -fpic -DPIC -fno-rtti %%PTHREAD_CFLAGS%% -+else -+CC_FLAGS=-c -O -fpic -DPIC -fno-rtti %%PTHREAD_CFLAGS%% -+endif -+ -+SDK_JAVA_INCLUDES = -I$(OO_SDK_JAVA_HOME)/include -I$(OO_SDK_JAVA_HOME)/include/freebsd -+CC_INCLUDES=-I. -I/usr/include -I$(OUT)/inc/examples -I$(PRJ)/include -+STL_INCLUDES=-I$(OO_SDK_HOME)/include/stl -+CC_DEFINES=-DUNX -DGCC -DFREEBSD -DCPPU_ENV=$(CPPU_ENV) -+ -+# define for used compiler necessary for UNO -+#-DCPPU_ENV=gcc2 -- gcc 2.91/2.95 -+#-DCPPU_ENV=gcc3 -- gcc3 3.0 -+ -+CC_OUTPUT_SWITCH=-o -+ -+LIBRARY_LINK_FLAGS=-shared '-Wl,-rpath,$$ORIGIN' -+ -+EXE_LINK_FLAGS=-Wl -+LINK_LIBS=-L$(OUT)/lib -L$(PRJ)/$(PLATFORM)/lib -L$(OFFICE_PROGRAM_PATH) %%PTHREAD_LIBS%% -+LINK_JAVA_LIBS=-L$(OO_SDK_JAVA_HOME)/jre/lib/$(JAVA_PROC_TYPE) -+ -+endif -+ diff --git a/editors/openoffice.org-2.0/files/patch-psprint+source+helper+strhelper.cxx b/editors/openoffice.org-2.0/files/patch-psprint+source+helper+strhelper.cxx new file mode 100644 index 000000000000..52530e403ac0 --- /dev/null +++ b/editors/openoffice.org-2.0/files/patch-psprint+source+helper+strhelper.cxx @@ -0,0 +1,21 @@ +http://www.openoffice.org/issues/show_bug.cgi?id=27753 +The isnan() macro is a new feature of C99 and not yet part of C++. + +Index: source/helper/strhelper.cxx +=================================================================== +RCS file: /cvs/gsl/psprint/source/helper/strhelper.cxx,v +retrieving revision 1.6 +diff -u -r1.6 strhelper.cxx +--- ../psprint/source/helper/strhelper.cxx 30 Mar 2004 13:48:06 -0000 1.6 ++++ ../psprint/source/helper/strhelper.cxx 13 Apr 2004 22:26:11 -0000 +@@ -67,6 +67,10 @@ + #include <cmath> // for isnan + #include <cstring> + ++#if defined (FREEBSD) ++using namespace __gnu_cxx; //for isnan ++#endif ++ + namespace psp { + + inline int isSpace( char cChar ) diff --git a/editors/openoffice.org-2.0/files/patch-setup2+mow+source+loader+makefile.mk b/editors/openoffice.org-2.0/files/patch-setup2+mow+source+loader+makefile.mk deleted file mode 100644 index 7b25ff2635df..000000000000 --- a/editors/openoffice.org-2.0/files/patch-setup2+mow+source+loader+makefile.mk +++ /dev/null @@ -1,17 +0,0 @@ -do not need -ldl - -http://qa.openoffice.org/issues/show_bug.cgi?id=27043 ---- ../setup2/mow/source/loader/makefile.mk~ Tue Mar 9 21:04:35 2004 -+++ ../setup2/mow/source/loader/makefile.mk Mon Mar 29 11:10:50 2004 -@@ -92,7 +92,11 @@ - LINK=gcc - LINKFLAGS= - LINKFLAGSAPP= -+.IF "$(OS)"=="FREEBSD" -+STDLIB= -lX11 -lc -lm -+.ELSE - STDLIB= -lX11 -ldl -lc -lm -+.ENDIF # "$(OS)"=="FREEBSD" - .ENDIF # "$(OS)$(COMID)"=="GCC" - - OBJFILES= $(OBJ)$/loader.obj diff --git a/editors/openoffice.org-2.0/files/patch-sfx2+source+config+cfgmgr.cxx b/editors/openoffice.org-2.0/files/patch-sfx2+source+config+cfgmgr.cxx deleted file mode 100644 index be38de290a51..000000000000 --- a/editors/openoffice.org-2.0/files/patch-sfx2+source+config+cfgmgr.cxx +++ /dev/null @@ -1,16 +0,0 @@ -Wired 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.org-2.0/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx b/editors/openoffice.org-2.0/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx deleted file mode 100644 index 10c3f3c1f6e8..000000000000 --- a/editors/openoffice.org-2.0/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx +++ /dev/null @@ -1,34 +0,0 @@ -http://qa.openoffice.org/issues/show_bug.cgi?id=24315 - -For FreeBSD, time_t is defined as -at /usr/include/machine/_types.h -49th typedef int __int32_t; -90th typedef __int32_t __time_t; /* time()... */ -and -/usr/include/pwd.h:typedef __time_t time_t; -/usr/include/time.h:typedef __time_t time_t; -/usr/include/timeconv.h:typedef __time_t time_t; -/usr/include/utime.h:typedef __time_t time_t; -so time_t is equal to 32 bit integer - -For LinuxPPC (Yellowdog 3.0.1) - - ---- ../shell/source/unix/sysshell/recently_used_file_handler.cxx.orig Tue Jan 13 00:56:37 2004 -+++ ../shell/source/unix/sysshell/recently_used_file_handler.cxx Tue Jan 13 00:57:26 2004 -@@ -188,9 +188,12 @@ - write_xml_start_tag(TAG_RECENT_ITEM, file, true); - write_xml_tag(TAG_URI, uri_, file); - write_xml_tag(TAG_MIME_TYPE, mime_type_, file); -- -- rtl::OString ts = rtl::OString::valueOf(timestamp_); -- write_xml_tag(TAG_TIMESTAMP, ts.getStr(), file); -+#if defined FREEBSD -+ rtl::OString ts = rtl::OString::valueOf((sal_Int32)timestamp_); -+#else -+ rtl::OString ts = rtl::OString::valueOf(timestamp_); -+#endif -+ write_xml_tag(TAG_TIMESTAMP, ts.getStr(), file); - - if (is_private_) - write_xml_tag(TAG_PRIVATE, file); diff --git a/editors/openoffice.org-2.0/files/patch-solenv+inc+ant.mk b/editors/openoffice.org-2.0/files/patch-solenv+inc+ant.mk deleted file mode 100644 index e050b85d41e9..000000000000 --- a/editors/openoffice.org-2.0/files/patch-solenv+inc+ant.mk +++ /dev/null @@ -1,13 +0,0 @@ -http://qa.openoffice.org/issues/show_bug.cgi?id=27028 - ---- ../solenv/inc/ant.mk~ Wed Feb 4 21:37:16 2004 -+++ ../solenv/inc/ant.mk Fri Apr 2 23:59:27 2004 -@@ -100,7 +100,7 @@ - .ENDIF - .ENDIF - --ANT=$(WRAPCMD) java -classpath $(CLASSPATH) -Xmx128m org.apache.tools.ant.Main -Djava.home=$(JAVA_HOME) -Dant.home=$(ANT_HOME) -+#ANT=$(WRAPCMD) java -classpath $(CLASSPATH) -Xmx128m org.apache.tools.ant.Main -Djava.home=$(JAVA_HOME) -Dant.home=$(ANT_HOME) - #ANT=java -version - - .IF "$(ANT_BUILDFILE)"=="" diff --git a/editors/openoffice.org-2.0/files/patch-solenv+inc+settings.mk b/editors/openoffice.org-2.0/files/patch-solenv+inc+settings.mk deleted file mode 100644 index f93ee2ad6bf2..000000000000 --- a/editors/openoffice.org-2.0/files/patch-solenv+inc+settings.mk +++ /dev/null @@ -1,15 +0,0 @@ -http://www.openoffice.org/issues/show_bug.cgi?id=25579 -We should set locale as UTF-8 when compiling -but this was due to violation of OOo coding style - ---- ../solenv/inc/settings.mk.old Tue Mar 9 21:19:28 2004 -+++ ../solenv/inc/settings.mk Mon Mar 29 13:23:31 2004 -@@ -172,7 +172,7 @@ - JAVAI=gij - JAVACPS=--classpath - .ELSE --JAVAC=javac -+JAVAC=javac -encoding UTF-8 - JAVAI=java - JAVACPS=-classpath - .ENDIF diff --git a/editors/openoffice.org-2.0/files/patch-vcl+source+gdi+outdev3.cxx b/editors/openoffice.org-2.0/files/patch-vcl+source+gdi+outdev3.cxx deleted file mode 100644 index 22ef6f26f45f..000000000000 --- a/editors/openoffice.org-2.0/files/patch-vcl+source+gdi+outdev3.cxx +++ /dev/null @@ -1,14 +0,0 @@ -do not need <malloc.h> including stdlib.h is enough -http://qa.openoffice.org/issues/show_bug.cgi?id=27041 - ---- ../vcl/source/gdi/outdev3.cxx.old Mon Mar 29 09:42:28 2004 -+++ ../vcl/source/gdi/outdev3.cxx Mon Mar 29 09:42:59 2004 -@@ -176,7 +176,7 @@ - #if defined(SOLARIS) || defined(IRIX) - #include <alloca.h> - #else --#ifndef MACOSX -+#if !(defined(MACOSX) || defined(FREEBSD)) - #include <malloc.h> - #endif - #endif diff --git a/editors/openoffice.org-2.0/files/patch-vcl+source+gdi+sallayout.cxx b/editors/openoffice.org-2.0/files/patch-vcl+source+gdi+sallayout.cxx deleted file mode 100644 index 5cbc59bf7db7..000000000000 --- a/editors/openoffice.org-2.0/files/patch-vcl+source+gdi+sallayout.cxx +++ /dev/null @@ -1,14 +0,0 @@ -malloc.h is deprecated -http://qa.openoffice.org/issues/show_bug.cgi?id=27041 - ---- ../vcl/source/gdi/sallayout.cxx.org Mon Mar 29 10:02:17 2004 -+++ ../vcl/source/gdi/sallayout.cxx Mon Mar 29 10:02:43 2004 -@@ -67,7 +67,7 @@ - #if defined(SOLARIS) || defined(IRIX) - #include <alloca.h> - #else --#ifndef MACOSX -+#if !(defined(MACOSX) || defined(FREEBSD)) - #include <malloc.h> - #endif - #endif diff --git a/editors/openoffice.org-2.0/files/patch-vcl+source+glyphs+gcache_layout.cxx b/editors/openoffice.org-2.0/files/patch-vcl+source+glyphs+gcache_layout.cxx deleted file mode 100644 index 53c7a909faf7..000000000000 --- a/editors/openoffice.org-2.0/files/patch-vcl+source+glyphs+gcache_layout.cxx +++ /dev/null @@ -1,14 +0,0 @@ -malloc.h is deprecated -http://qa.openoffice.org/issues/show_bug.cgi?id=27041 - ---- ../vcl/source/glyphs/gcach_layout.cxx~ Tue Mar 9 21:15:32 2004 -+++ ../vcl/source/glyphs/gcach_layout.cxx Mon Mar 29 09:44:52 2004 -@@ -74,7 +74,7 @@ - #if defined(SOLARIS) || defined(IRIX) - #include <alloca.h> - #else --#ifndef MACOSX -+#if !(defined(MACOSX) || defined(FREEBSD)) - #include <malloc.h> - #endif - #endif diff --git a/editors/openoffice.org-2.0/files/patch-vcl+unx+source+plugadapt+salmain.cxx b/editors/openoffice.org-2.0/files/patch-vcl+unx+source+plugadapt+salmain.cxx deleted file mode 100644 index f5bd54364036..000000000000 --- a/editors/openoffice.org-2.0/files/patch-vcl+unx+source+plugadapt+salmain.cxx +++ /dev/null @@ -1,24 +0,0 @@ -http://qa.openoffice.org/issues/show_bug.cgi?id=27042 - -include <sys/types.h> -Note: --- -* $RCSfile: salmain.cxx,v $ -* -* $Revision: 1.8.12.2 $ -* -* last change: $Author: hr $ $Date: 2004/01/09 18:14:00 $ --- -includes this patch - ---- ../vcl/unx/source/plugadapt/salmain.cxx~ Mon Mar 29 09:50:50 2004 -+++ ../vcl/unx/source/plugadapt/salmain.cxx Mon Mar 29 10:08:28 2004 -@@ -59,7 +59,7 @@ - * - ************************************************************************/ - --#ifdef MACOSX -+#if defined(MACOSX) || defined(FREEBSD) - // rlimit needs sys/types.h - #include <sys/types.h> - #include <sys/time.h> diff --git a/editors/openoffice.org-2.0/files/patch-vcl+util+makefile.mk b/editors/openoffice.org-2.0/files/patch-vcl+util+makefile.mk deleted file mode 100644 index 5d133486e032..000000000000 --- a/editors/openoffice.org-2.0/files/patch-vcl+util+makefile.mk +++ /dev/null @@ -1,30 +0,0 @@ -FreeBSD doesn't require/need/have -ldl -http://qa.openoffice.org/issues/show_bug.cgi?id=27043 - ---- ../vcl/util/makefile.mk~ Mon Mar 29 09:50:51 2004 -+++ ../vcl/util/makefile.mk Mon Mar 29 10:19:04 2004 -@@ -208,7 +208,9 @@ - .IF "$(GUI)"!="UNX" - SHL1OBJS= $(SLO)$/salshl.obj - .ELSE --SHL1STDLIBS+=-ldl -+ .IF "$(OS)"!="FREEBSD" -+ SHL1STDLIBS+=-ldl -+ .ENDIF - .ENDIF - - .IF "$(GUI)" != "MAC" -@@ -351,8 +353,11 @@ - # libs for gtk plugin - SHL4STDLIBS=`pkg-config --libs gtk+-2.0 gthread-2.0` - SHL4STDLIBS+=-l$(SHL2TARGET) --SHL4STDLIBS+=$(SHL3STDLIBS) -lX11 -ldl -- -+ .IF "$(OS)"!="FREEBSD" -+ SHL4STDLIBS+=$(SHL3STDLIBS) -lX11 -ldl -+ .ELSE -+ SHL4STDLIBS+=$(SHL3STDLIBS) -lX11 -+ .ENDIF # FREEBSD - .ENDIF # UNX - - # --- Allgemein ---------------------------------------------------------- diff --git a/editors/openoffice.org-2.0/files/patch-wizards+prj+build.lst b/editors/openoffice.org-2.0/files/patch-wizards+prj+build.lst new file mode 100644 index 000000000000..5d5abb75a07e --- /dev/null +++ b/editors/openoffice.org-2.0/files/patch-wizards+prj+build.lst @@ -0,0 +1,15 @@ +http://www.openoffice.org/issues/show_bug.cgi?id=29656 + +Index: wizards/prj/build.lst +=================================================================== +RCS file: /cvs/installation/wizards/prj/build.lst,v +retrieving revision 1.23 +diff -u -r1.23 build.lst +--- ../wizards/prj/build.lst 19 May 2004 16:35:11 -0000 1.23 ++++ ../wizards/prj/build.lst 8 Jun 2004 22:43:04 -0000 +@@ -1,4 +1,4 @@ +-wz wizards : rsc javaunohelper jut unoil NULL ++wz wizards : rsc qadevOOo javaunohelper jut unoil NULL + wz wizards\util nmake - all wz_util NULL + wz wizards\source\config nmake - all wz_config NULL + wz wizards\source\euro nmake - all wz_eurowiz NULL diff --git a/editors/openoffice.org-2.0/files/patch-wizards+prj+d.lst b/editors/openoffice.org-2.0/files/patch-wizards+prj+d.lst new file mode 100644 index 000000000000..d1b4255cca46 --- /dev/null +++ b/editors/openoffice.org-2.0/files/patch-wizards+prj+d.lst @@ -0,0 +1,16 @@ +http://www.openoffice.org/issues/show_bug.cgi?id=29666 + +Index: wizards/prj/d.lst +=================================================================== +RCS file: /cvs/installation/wizards/prj/d.lst,v +retrieving revision 1.13 +diff -u -r1.13 d.lst +--- ../wizards/prj/d.lst 2 Feb 2004 19:16:11 -0000 1.13 ++++ ../wizards/prj/d.lst 9 Jun 2004 08:25:50 -0000 +@@ -1,5 +1,6 @@ + mkdir: %COMMON_DEST%\bin%_EXT%\hid + mkdir: %_DEST%\pck%_EXT% ++mkdir: %_DEST%\pck%_EXT%\img + ..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid + ..\%__SRC%\bin\*.zip %_DEST%\pck%_EXT%\*.zip + ..\%__SRC%\bin\iwz*.res %_DEST%\bin%_EXT%\iwz*.res diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile index d47c500c2e52..6c660a7b6fb8 100644 --- a/editors/openoffice.org-2/Makefile +++ b/editors/openoffice.org-2/Makefile @@ -24,7 +24,7 @@ MAINTAINER= openoffice@FreeBSD.org COMMENT= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser .endif -IGNORE= "Does not work yet, installation problems" +IGNORE= "Installation is not complete, manual installation works" NO_LATEST_LINK= yes UNZIP?= ${LOCALBASE}/bin/unzip @@ -33,13 +33,13 @@ ANT?= ${LOCALBASE}/bin/ant TCSH?= /bin/tcsh DIST_SUBDIR= openoffice2.0 BUILD_NR= 680 -MILESTONE= m30 +MILESTONE= m41 RELEASE_NR= 2.0 FRELEASE_NR= 2.0 -SNAPDATE= 20040402 +SNAPDATE= 20040611 INSTALLATION_BASEDIR= OpenOffice.org${RELEASE_NR} EXTRACT_ONLY= OOo_${BUILD_NR}${MILESTONE}_${SNAPDATE}_source.tar.bz2 -USE_GNOME= orbit gtk12 +USE_GNOME= orbit gtk12 gtk20 USE_REINPLACE= yes USE_PERL5= yes USE_BZIP2= yes @@ -48,7 +48,7 @@ USE_GMAKE= yes LANG_EXT?= 01 LANG_CONFIGURE_ARG?= ENUS WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work -WRKSRC= ${WRKDIR}/oo_${BUILD_NR}${MILESTONE}_src/config_office +WRKSRC= ${WRKDIR}/oo_${RELEASE_NR}_src/config_office #XXX dirty BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32 @@ -58,9 +58,11 @@ CXX= g++32 BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14 BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip BUILD_DEPENDS+= unzip:${PORTSDIR}/archivers/unzip -BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/apache-ant -BUILD_DEPENDS+= ${X11BASE}/lib/libgdk-x11-2.0.so:${PORTSDIR}/x11-toolkits/gtk20 +BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/apache-ant +BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries BUILD_DEPENDS+= ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft +BUILD_DEPENDS+= ${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip + .if !defined(DISPLAY) BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer .endif @@ -111,7 +113,7 @@ JDKDIR?= ${LOCALBASE}/jdk1.4.2 JAVAVM= ${JDKDIR}/bin/java GNU_CONFIGURE= yes -USE_AUTOCONF_VER= 253 +USE_AUTOCONF_VER= 259 .if defined(WITH_DEBUG) CFLAGS+= -g .if ${WITH_DEBUG} == 2 @@ -130,7 +132,7 @@ DISPLAYHACK=localhost:1001 CONFIGURE_ENV= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \ PTHREAD_LIBS=${PTHREAD_LIBS} CONFIGURE_ARGS+= --with-lang=${LANG_CONFIGURE_ARG} -CONFIGURE_ARGS+= --with-jdk-home=${JDKDIR} --with-ant-home=${LOCALBASE}/ant --with-gnu-cp=${LOCALBASE}/bin/gcp --enable-mozilla=no +CONFIGURE_ARGS+= --with-jdk-home=${JDKDIR} --with-ant-home=${LOCALBASE}/ant --with-gnu-cp=${LOCALBASE}/bin/gcp --enable-mozilla=yes .if defined(WITH_DEBUG) .if ${WITH_DEBUG} == 2 diff --git a/editors/openoffice.org-2/distinfo b/editors/openoffice.org-2/distinfo index 74de717eb2de..23f567c61dd8 100644 --- a/editors/openoffice.org-2/distinfo +++ b/editors/openoffice.org-2/distinfo @@ -1,5 +1,5 @@ -MD5 (openoffice2.0/OOo_680m30_20040402_source.tar.bz2) = 768b3d8246a12eff6bf83f098093fbee -SIZE (openoffice2.0/OOo_680m30_20040402_source.tar.bz2) = 195378119 +MD5 (openoffice2.0/OOo_680m41_20040611_source.tar.bz2) = 7b8a6d87b80022f85093a67c01064883 +SIZE (openoffice2.0/OOo_680m41_20040611_source.tar.bz2) = 221136281 MD5 (openoffice2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 SIZE (openoffice2.0/gpc231.tar.Z) = 27917 MD5 (openoffice2.0/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a diff --git a/editors/openoffice.org-2/files/patch-config_office+configure.in b/editors/openoffice.org-2/files/patch-config_office+configure.in deleted file mode 100644 index 8bd6e0668f6b..000000000000 --- a/editors/openoffice.org-2/files/patch-config_office+configure.in +++ /dev/null @@ -1,50 +0,0 @@ -#i27028 and #i27028 -http://qa.openoffice.org/issues/show_bug.cgi?id=27021 (Xaw) -http://qa.openoffice.org/issues/show_bug.cgi?id=27028 (ant) - ---- ../config_office/configure.in.org Sat Mar 27 17:54:16 2004 -+++ ../config_office/configure.in Sun Mar 28 22:17:37 2004 -@@ -1478,7 +1478,7 @@ - elif test "$_os" != "WINNT" ; then - AC_PATH_X - AC_PATH_XTRA -- AC_CHECK_HEADERS(X11/Xaw/Label.h,[AC_MSG_RESULT([Ok])],[AC_MSG_ERROR([Xaw include headers not found])]) -+dnl AC_CHECK_HEADERS(X11/Xaw/Label.h,[AC_MSG_RESULT([Ok])],[AC_MSG_ERROR([Xaw include headers not found])]) - - if test "x$x_includes" = "x"; then - x_includes="/usr/include" -@@ -1830,10 +1830,12 @@ - - if test "$enable_java" != "no"; then - ANT_HOME=; export ANT_HOME -+WITH_ANT_HOME=; export WITH_ANT_HOME - if test -z "$with_ant_home"; then - AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat]) - else -- AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat],,$with_ant_home/bin) -+ AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat],,$with_ant_home/bin:$PATH) -+ WITH_ANT_HOME=$with_ant_home - fi - - -@@ -1873,7 +1875,11 @@ - AC_TRY_EVAL(ant_cmd) - if test $? = 0 && test -f ./conftest.class ; then - AC_MSG_RESULT([Ant works]) -- ANT_HOME=`echo $ANT | $SED -n "s/\/bin\/ant.*\$//p"` -+ if test -z "$WITH_ANT_HOME"; then -+ ANT_HOME=`echo $ANT | $SED -n "s/\/bin\/ant.*\$//p"` -+ else -+ ANT_HOME="$WITH_ANT_HOME" -+ fi - else - echo "configure: Ant test failed" >&5 - cat conftest.java >&5 -@@ -1885,6 +1891,7 @@ - - rm -f conftest* core core.* *.core - fi -+ - if test -z "$ANT_HOME"; then - ANT_HOME="NO_ANT_HOME" - fi diff --git a/editors/openoffice.org-2/files/patch-config_office+set_soenv.in b/editors/openoffice.org-2/files/patch-config_office+set_soenv.in deleted file mode 100644 index dbb4c3506e1e..000000000000 --- a/editors/openoffice.org-2/files/patch-config_office+set_soenv.in +++ /dev/null @@ -1,13 +0,0 @@ -#i27028 -http://qa.openoffice.org/issues/show_bug.cgi?id=27028 - ---- ../config_office/set_soenv.in.old Tue Mar 9 21:31:38 2004 -+++ ../config_office/set_soenv.in Sun Mar 28 09:56:03 2004 -@@ -1419,6 +1419,7 @@ - ToFile( "XSLTPROC", "@XSLTPROC@", "e" ); - ToFile( "ANT_HOME", "@ANT_HOME@", "e" ); - ToFile( "ANT_LIB", "@ANT_LIB@", "e" ); -+ToFile( "ANT", "@ANT@", "e" ); - ToFile( "JDKLIB", $JAVA_LIB, "e" ); - ToFile( "STLPORT4", $STLPORT4, "e" ); - ToFile( "ASM_PATH", $ASM_PATH, "e" ); diff --git a/editors/openoffice.org-2/files/patch-cppuhelper+source+gcc3_linux_intel.map b/editors/openoffice.org-2/files/patch-cppuhelper+source+gcc3_linux_intel.map deleted file mode 100644 index cdb61b141eba..000000000000 --- a/editors/openoffice.org-2/files/patch-cppuhelper+source+gcc3_linux_intel.map +++ /dev/null @@ -1,13 +0,0 @@ -Mysterious :) - -http://qa.openoffice.org/issues/show_bug.cgi?id=23917 ---- ../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.org-2/files/patch-hwpfilter+source+hwpreader.hxx b/editors/openoffice.org-2/files/patch-hwpfilter+source+hwpreader.hxx deleted file mode 100644 index 8d65e6a3ee83..000000000000 --- a/editors/openoffice.org-2/files/patch-hwpfilter+source+hwpreader.hxx +++ /dev/null @@ -1,14 +0,0 @@ -http://qa.openoffice.org/issues/show_bug.cgi?id=27033 ---- ../hwpfilter/source/hwpreader.hxx~ Wed Oct 15 23:37:24 2003 -+++ ../hwpfilter/source/hwpreader.hxx Sun Mar 28 22:46:18 2004 -@@ -68,7 +68,9 @@ - #include <string.h> - #ifdef WIN32 - #include <malloc.h> --#else -+#endif -+ -+#if !defined(FREEBSD) - #include <alloca.h> - #endif - diff --git a/editors/openoffice.org-2/files/patch-libxml2+prj+build.lst b/editors/openoffice.org-2/files/patch-libxml2+prj+build.lst new file mode 100644 index 000000000000..f0d7b8f05fc8 --- /dev/null +++ b/editors/openoffice.org-2/files/patch-libxml2+prj+build.lst @@ -0,0 +1,12 @@ +Index: libxml2/prj/build.lst +=================================================================== +RCS file: /cvs/external/libxml2/prj/build.lst,v +retrieving revision 1.1 +diff -u -r1.1 build.lst +--- ../libxml2/prj/build.lst 6 Feb 2004 10:15:09 -0000 1.1 ++++ ../libxml2/prj/build.lst 4 May 2004 20:20:20 -0000 +@@ -1,3 +1,3 @@ +-lx libxml2 : soltools NULL
++lx libxml2 : soltools xml2cmp NULL
+ lx libxml2 usr1 - all lx_mkout NULL
+ lx libxml2 nmake - all lx_libxml2 NULL
diff --git a/editors/openoffice.org-2/files/patch-odk+setsdkenv_unix.in b/editors/openoffice.org-2/files/patch-odk+setsdkenv_unix.in deleted file mode 100644 index e5551f883231..000000000000 --- a/editors/openoffice.org-2/files/patch-odk+setsdkenv_unix.in +++ /dev/null @@ -1,27 +0,0 @@ -http://qa.openoffice.org/issues/show_bug.cgi?id=24142 ---- ../odk/setsdkenv_unix.in Sun Jan 25 18:41:01 2004 -+++ ../odk/setsdkenv_unix.in Sun Jan 25 18:42:00 2004 -@@ -2,7 +2,8 @@ - - # This script starts a new shell and sets all enviroment variables, which - # are necessary for building the examples of the Office Development Kit. --# The Script was developed for the operating systems Solaris and Linux. -+# The script was developed for the operating systems Solaris, Linux, MacOS X -+# and FreeBSD. - - # Installation directory of the Software Development Kit. - # Example: OO_SDK_HOME=/work/StarOffice_SDK -@@ -76,6 +77,13 @@ - LD_LIBRARY_PATH=$OO_SDK_HOME/$directoryname/lib:$OO_SDK_HOME/$exampleout/lib:$OFFICE_PROGRAM_PATH:.:$LD_LIBRARY_PATH - export LD_LIBRARY_PATH - ;; -+ -+ FreeBSD) -+ directoryname=freebsd -+ exampleout=FREEBSDexample.out -+ LD_LIBRARY_PATH=$OO_SDK_HOME/$directoryname/lib:$OO_SDK_HOME/$exampleout/lib:$OFFICE_PROGRAM_PATH:.:$LD_LIBRARY_PATH -+ export LD_LIBRARY_PATH -+ ;; - esac - - # Add directory of the SDK tools to the path. diff --git a/editors/openoffice.org-2/files/patch-odk+settings+settings.mk b/editors/openoffice.org-2/files/patch-odk+settings+settings.mk deleted file mode 100644 index 8c3942d12f16..000000000000 --- a/editors/openoffice.org-2/files/patch-odk+settings+settings.mk +++ /dev/null @@ -1,90 +0,0 @@ -http://qa.openoffice.org/issues/show_bug.cgi?id=24142 - ---- ../odk/settings/settings.mk Sun Jan 25 18:41:02 2004 -+++ ../odk/settings/settings.mk Sun Jan 25 18:45:09 2004 -@@ -368,3 +368,85 @@ - - endif - -+ifeq "$(PLATFORM)" "FreeBSD" -+# Settings for FreeBSD using gcc compiler -+ -+PROCTYPE := $(shell uname -m) -+ -+ -+# Default is freebsd on a intel machine -+PLATFORM=FreeBSD -+PACKAGE_LIB_DIR=freebsd_x86.plt -+JAVA_PROC_TYPE=i386 -+ -+OS=FREEBSD -+PS=/ -+CC=gcc -+LINK=gcc -+LIB=gcc -+ECHO=@echo -+MKDIR=mkdir -p -+CAT=cat -+OBJ_EXT=o -+SHAREDLIB_EXT=so -+SHAREDLIB_PRE=lib -+SHAREDLIB_OUT=$(OUT_LIB) -+ -+GCC_VERSION=$(shell $(CC) -dumpversion) -+ -+ifeq "$(shell echo $(GCC_VERSION) | cut -c 1)" "3" -+COMID=gcc3 -+CPPU_ENV=gcc3 -+else -+COMID=GCC -+CPPU_ENV=gcc2 -+endif -+ -+OSEP=\< -+CSEP=\> -+QUOTE=$(subst S,\,S) -+QM=\" -+ -+DEL=rm -f -+DELRECURSIVE=rm -rf -+COPY=cp -+URLPREFIX=file:// -+ -+# Include UDK version numbers -+include $(PRJ)/include/udkversion.mk -+ -+SALLIB=-lsal -+CPPULIB=-lcppu -+CPPUHELPERLIB=-lcppuhelper$(COMID) -+SALHELPERLIB=-lsalhelper$(COMID) -+STLPORTLIB=-lstlport_gcc -+ -+EMPTYSTRING= -+PATH_SEPARATOR=: -+ -+# -O is necessary for inlining (see gcc documentation) -+ifeq "$(DEBUG)" "yes" -+CC_FLAGS=-c -g -fpic -DPIC -fno-rtti %%PTHREAD_CFLAGS%% -+else -+CC_FLAGS=-c -O -fpic -DPIC -fno-rtti %%PTHREAD_CFLAGS%% -+endif -+ -+SDK_JAVA_INCLUDES = -I$(OO_SDK_JAVA_HOME)/include -I$(OO_SDK_JAVA_HOME)/include/freebsd -+CC_INCLUDES=-I. -I/usr/include -I$(OUT)/inc/examples -I$(PRJ)/include -+STL_INCLUDES=-I$(OO_SDK_HOME)/include/stl -+CC_DEFINES=-DUNX -DGCC -DFREEBSD -DCPPU_ENV=$(CPPU_ENV) -+ -+# define for used compiler necessary for UNO -+#-DCPPU_ENV=gcc2 -- gcc 2.91/2.95 -+#-DCPPU_ENV=gcc3 -- gcc3 3.0 -+ -+CC_OUTPUT_SWITCH=-o -+ -+LIBRARY_LINK_FLAGS=-shared '-Wl,-rpath,$$ORIGIN' -+ -+EXE_LINK_FLAGS=-Wl -+LINK_LIBS=-L$(OUT)/lib -L$(PRJ)/$(PLATFORM)/lib -L$(OFFICE_PROGRAM_PATH) %%PTHREAD_LIBS%% -+LINK_JAVA_LIBS=-L$(OO_SDK_JAVA_HOME)/jre/lib/$(JAVA_PROC_TYPE) -+ -+endif -+ diff --git a/editors/openoffice.org-2/files/patch-psprint+source+helper+strhelper.cxx b/editors/openoffice.org-2/files/patch-psprint+source+helper+strhelper.cxx new file mode 100644 index 000000000000..52530e403ac0 --- /dev/null +++ b/editors/openoffice.org-2/files/patch-psprint+source+helper+strhelper.cxx @@ -0,0 +1,21 @@ +http://www.openoffice.org/issues/show_bug.cgi?id=27753 +The isnan() macro is a new feature of C99 and not yet part of C++. + +Index: source/helper/strhelper.cxx +=================================================================== +RCS file: /cvs/gsl/psprint/source/helper/strhelper.cxx,v +retrieving revision 1.6 +diff -u -r1.6 strhelper.cxx +--- ../psprint/source/helper/strhelper.cxx 30 Mar 2004 13:48:06 -0000 1.6 ++++ ../psprint/source/helper/strhelper.cxx 13 Apr 2004 22:26:11 -0000 +@@ -67,6 +67,10 @@ + #include <cmath> // for isnan + #include <cstring> + ++#if defined (FREEBSD) ++using namespace __gnu_cxx; //for isnan ++#endif ++ + namespace psp { + + inline int isSpace( char cChar ) diff --git a/editors/openoffice.org-2/files/patch-setup2+mow+source+loader+makefile.mk b/editors/openoffice.org-2/files/patch-setup2+mow+source+loader+makefile.mk deleted file mode 100644 index 7b25ff2635df..000000000000 --- a/editors/openoffice.org-2/files/patch-setup2+mow+source+loader+makefile.mk +++ /dev/null @@ -1,17 +0,0 @@ -do not need -ldl - -http://qa.openoffice.org/issues/show_bug.cgi?id=27043 ---- ../setup2/mow/source/loader/makefile.mk~ Tue Mar 9 21:04:35 2004 -+++ ../setup2/mow/source/loader/makefile.mk Mon Mar 29 11:10:50 2004 -@@ -92,7 +92,11 @@ - LINK=gcc - LINKFLAGS= - LINKFLAGSAPP= -+.IF "$(OS)"=="FREEBSD" -+STDLIB= -lX11 -lc -lm -+.ELSE - STDLIB= -lX11 -ldl -lc -lm -+.ENDIF # "$(OS)"=="FREEBSD" - .ENDIF # "$(OS)$(COMID)"=="GCC" - - OBJFILES= $(OBJ)$/loader.obj diff --git a/editors/openoffice.org-2/files/patch-sfx2+source+config+cfgmgr.cxx b/editors/openoffice.org-2/files/patch-sfx2+source+config+cfgmgr.cxx deleted file mode 100644 index be38de290a51..000000000000 --- a/editors/openoffice.org-2/files/patch-sfx2+source+config+cfgmgr.cxx +++ /dev/null @@ -1,16 +0,0 @@ -Wired 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.org-2/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx b/editors/openoffice.org-2/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx deleted file mode 100644 index 10c3f3c1f6e8..000000000000 --- a/editors/openoffice.org-2/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx +++ /dev/null @@ -1,34 +0,0 @@ -http://qa.openoffice.org/issues/show_bug.cgi?id=24315 - -For FreeBSD, time_t is defined as -at /usr/include/machine/_types.h -49th typedef int __int32_t; -90th typedef __int32_t __time_t; /* time()... */ -and -/usr/include/pwd.h:typedef __time_t time_t; -/usr/include/time.h:typedef __time_t time_t; -/usr/include/timeconv.h:typedef __time_t time_t; -/usr/include/utime.h:typedef __time_t time_t; -so time_t is equal to 32 bit integer - -For LinuxPPC (Yellowdog 3.0.1) - - ---- ../shell/source/unix/sysshell/recently_used_file_handler.cxx.orig Tue Jan 13 00:56:37 2004 -+++ ../shell/source/unix/sysshell/recently_used_file_handler.cxx Tue Jan 13 00:57:26 2004 -@@ -188,9 +188,12 @@ - write_xml_start_tag(TAG_RECENT_ITEM, file, true); - write_xml_tag(TAG_URI, uri_, file); - write_xml_tag(TAG_MIME_TYPE, mime_type_, file); -- -- rtl::OString ts = rtl::OString::valueOf(timestamp_); -- write_xml_tag(TAG_TIMESTAMP, ts.getStr(), file); -+#if defined FREEBSD -+ rtl::OString ts = rtl::OString::valueOf((sal_Int32)timestamp_); -+#else -+ rtl::OString ts = rtl::OString::valueOf(timestamp_); -+#endif -+ write_xml_tag(TAG_TIMESTAMP, ts.getStr(), file); - - if (is_private_) - write_xml_tag(TAG_PRIVATE, file); diff --git a/editors/openoffice.org-2/files/patch-solenv+inc+ant.mk b/editors/openoffice.org-2/files/patch-solenv+inc+ant.mk deleted file mode 100644 index e050b85d41e9..000000000000 --- a/editors/openoffice.org-2/files/patch-solenv+inc+ant.mk +++ /dev/null @@ -1,13 +0,0 @@ -http://qa.openoffice.org/issues/show_bug.cgi?id=27028 - ---- ../solenv/inc/ant.mk~ Wed Feb 4 21:37:16 2004 -+++ ../solenv/inc/ant.mk Fri Apr 2 23:59:27 2004 -@@ -100,7 +100,7 @@ - .ENDIF - .ENDIF - --ANT=$(WRAPCMD) java -classpath $(CLASSPATH) -Xmx128m org.apache.tools.ant.Main -Djava.home=$(JAVA_HOME) -Dant.home=$(ANT_HOME) -+#ANT=$(WRAPCMD) java -classpath $(CLASSPATH) -Xmx128m org.apache.tools.ant.Main -Djava.home=$(JAVA_HOME) -Dant.home=$(ANT_HOME) - #ANT=java -version - - .IF "$(ANT_BUILDFILE)"=="" diff --git a/editors/openoffice.org-2/files/patch-solenv+inc+settings.mk b/editors/openoffice.org-2/files/patch-solenv+inc+settings.mk deleted file mode 100644 index f93ee2ad6bf2..000000000000 --- a/editors/openoffice.org-2/files/patch-solenv+inc+settings.mk +++ /dev/null @@ -1,15 +0,0 @@ -http://www.openoffice.org/issues/show_bug.cgi?id=25579 -We should set locale as UTF-8 when compiling -but this was due to violation of OOo coding style - ---- ../solenv/inc/settings.mk.old Tue Mar 9 21:19:28 2004 -+++ ../solenv/inc/settings.mk Mon Mar 29 13:23:31 2004 -@@ -172,7 +172,7 @@ - JAVAI=gij - JAVACPS=--classpath - .ELSE --JAVAC=javac -+JAVAC=javac -encoding UTF-8 - JAVAI=java - JAVACPS=-classpath - .ENDIF diff --git a/editors/openoffice.org-2/files/patch-vcl+source+gdi+outdev3.cxx b/editors/openoffice.org-2/files/patch-vcl+source+gdi+outdev3.cxx deleted file mode 100644 index 22ef6f26f45f..000000000000 --- a/editors/openoffice.org-2/files/patch-vcl+source+gdi+outdev3.cxx +++ /dev/null @@ -1,14 +0,0 @@ -do not need <malloc.h> including stdlib.h is enough -http://qa.openoffice.org/issues/show_bug.cgi?id=27041 - ---- ../vcl/source/gdi/outdev3.cxx.old Mon Mar 29 09:42:28 2004 -+++ ../vcl/source/gdi/outdev3.cxx Mon Mar 29 09:42:59 2004 -@@ -176,7 +176,7 @@ - #if defined(SOLARIS) || defined(IRIX) - #include <alloca.h> - #else --#ifndef MACOSX -+#if !(defined(MACOSX) || defined(FREEBSD)) - #include <malloc.h> - #endif - #endif diff --git a/editors/openoffice.org-2/files/patch-vcl+source+gdi+sallayout.cxx b/editors/openoffice.org-2/files/patch-vcl+source+gdi+sallayout.cxx deleted file mode 100644 index 5cbc59bf7db7..000000000000 --- a/editors/openoffice.org-2/files/patch-vcl+source+gdi+sallayout.cxx +++ /dev/null @@ -1,14 +0,0 @@ -malloc.h is deprecated -http://qa.openoffice.org/issues/show_bug.cgi?id=27041 - ---- ../vcl/source/gdi/sallayout.cxx.org Mon Mar 29 10:02:17 2004 -+++ ../vcl/source/gdi/sallayout.cxx Mon Mar 29 10:02:43 2004 -@@ -67,7 +67,7 @@ - #if defined(SOLARIS) || defined(IRIX) - #include <alloca.h> - #else --#ifndef MACOSX -+#if !(defined(MACOSX) || defined(FREEBSD)) - #include <malloc.h> - #endif - #endif diff --git a/editors/openoffice.org-2/files/patch-vcl+source+glyphs+gcache_layout.cxx b/editors/openoffice.org-2/files/patch-vcl+source+glyphs+gcache_layout.cxx deleted file mode 100644 index 53c7a909faf7..000000000000 --- a/editors/openoffice.org-2/files/patch-vcl+source+glyphs+gcache_layout.cxx +++ /dev/null @@ -1,14 +0,0 @@ -malloc.h is deprecated -http://qa.openoffice.org/issues/show_bug.cgi?id=27041 - ---- ../vcl/source/glyphs/gcach_layout.cxx~ Tue Mar 9 21:15:32 2004 -+++ ../vcl/source/glyphs/gcach_layout.cxx Mon Mar 29 09:44:52 2004 -@@ -74,7 +74,7 @@ - #if defined(SOLARIS) || defined(IRIX) - #include <alloca.h> - #else --#ifndef MACOSX -+#if !(defined(MACOSX) || defined(FREEBSD)) - #include <malloc.h> - #endif - #endif diff --git a/editors/openoffice.org-2/files/patch-vcl+unx+source+plugadapt+salmain.cxx b/editors/openoffice.org-2/files/patch-vcl+unx+source+plugadapt+salmain.cxx deleted file mode 100644 index f5bd54364036..000000000000 --- a/editors/openoffice.org-2/files/patch-vcl+unx+source+plugadapt+salmain.cxx +++ /dev/null @@ -1,24 +0,0 @@ -http://qa.openoffice.org/issues/show_bug.cgi?id=27042 - -include <sys/types.h> -Note: --- -* $RCSfile: salmain.cxx,v $ -* -* $Revision: 1.8.12.2 $ -* -* last change: $Author: hr $ $Date: 2004/01/09 18:14:00 $ --- -includes this patch - ---- ../vcl/unx/source/plugadapt/salmain.cxx~ Mon Mar 29 09:50:50 2004 -+++ ../vcl/unx/source/plugadapt/salmain.cxx Mon Mar 29 10:08:28 2004 -@@ -59,7 +59,7 @@ - * - ************************************************************************/ - --#ifdef MACOSX -+#if defined(MACOSX) || defined(FREEBSD) - // rlimit needs sys/types.h - #include <sys/types.h> - #include <sys/time.h> diff --git a/editors/openoffice.org-2/files/patch-vcl+util+makefile.mk b/editors/openoffice.org-2/files/patch-vcl+util+makefile.mk deleted file mode 100644 index 5d133486e032..000000000000 --- a/editors/openoffice.org-2/files/patch-vcl+util+makefile.mk +++ /dev/null @@ -1,30 +0,0 @@ -FreeBSD doesn't require/need/have -ldl -http://qa.openoffice.org/issues/show_bug.cgi?id=27043 - ---- ../vcl/util/makefile.mk~ Mon Mar 29 09:50:51 2004 -+++ ../vcl/util/makefile.mk Mon Mar 29 10:19:04 2004 -@@ -208,7 +208,9 @@ - .IF "$(GUI)"!="UNX" - SHL1OBJS= $(SLO)$/salshl.obj - .ELSE --SHL1STDLIBS+=-ldl -+ .IF "$(OS)"!="FREEBSD" -+ SHL1STDLIBS+=-ldl -+ .ENDIF - .ENDIF - - .IF "$(GUI)" != "MAC" -@@ -351,8 +353,11 @@ - # libs for gtk plugin - SHL4STDLIBS=`pkg-config --libs gtk+-2.0 gthread-2.0` - SHL4STDLIBS+=-l$(SHL2TARGET) --SHL4STDLIBS+=$(SHL3STDLIBS) -lX11 -ldl -- -+ .IF "$(OS)"!="FREEBSD" -+ SHL4STDLIBS+=$(SHL3STDLIBS) -lX11 -ldl -+ .ELSE -+ SHL4STDLIBS+=$(SHL3STDLIBS) -lX11 -+ .ENDIF # FREEBSD - .ENDIF # UNX - - # --- Allgemein ---------------------------------------------------------- diff --git a/editors/openoffice.org-2/files/patch-wizards+prj+build.lst b/editors/openoffice.org-2/files/patch-wizards+prj+build.lst new file mode 100644 index 000000000000..5d5abb75a07e --- /dev/null +++ b/editors/openoffice.org-2/files/patch-wizards+prj+build.lst @@ -0,0 +1,15 @@ +http://www.openoffice.org/issues/show_bug.cgi?id=29656 + +Index: wizards/prj/build.lst +=================================================================== +RCS file: /cvs/installation/wizards/prj/build.lst,v +retrieving revision 1.23 +diff -u -r1.23 build.lst +--- ../wizards/prj/build.lst 19 May 2004 16:35:11 -0000 1.23 ++++ ../wizards/prj/build.lst 8 Jun 2004 22:43:04 -0000 +@@ -1,4 +1,4 @@ +-wz wizards : rsc javaunohelper jut unoil NULL ++wz wizards : rsc qadevOOo javaunohelper jut unoil NULL + wz wizards\util nmake - all wz_util NULL + wz wizards\source\config nmake - all wz_config NULL + wz wizards\source\euro nmake - all wz_eurowiz NULL diff --git a/editors/openoffice.org-2/files/patch-wizards+prj+d.lst b/editors/openoffice.org-2/files/patch-wizards+prj+d.lst new file mode 100644 index 000000000000..d1b4255cca46 --- /dev/null +++ b/editors/openoffice.org-2/files/patch-wizards+prj+d.lst @@ -0,0 +1,16 @@ +http://www.openoffice.org/issues/show_bug.cgi?id=29666 + +Index: wizards/prj/d.lst +=================================================================== +RCS file: /cvs/installation/wizards/prj/d.lst,v +retrieving revision 1.13 +diff -u -r1.13 d.lst +--- ../wizards/prj/d.lst 2 Feb 2004 19:16:11 -0000 1.13 ++++ ../wizards/prj/d.lst 9 Jun 2004 08:25:50 -0000 +@@ -1,5 +1,6 @@ + mkdir: %COMMON_DEST%\bin%_EXT%\hid + mkdir: %_DEST%\pck%_EXT% ++mkdir: %_DEST%\pck%_EXT%\img + ..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid + ..\%__SRC%\bin\*.zip %_DEST%\pck%_EXT%\*.zip + ..\%__SRC%\bin\iwz*.res %_DEST%\bin%_EXT%\iwz*.res diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile index d47c500c2e52..6c660a7b6fb8 100644 --- a/editors/openoffice.org-3-RC/Makefile +++ b/editors/openoffice.org-3-RC/Makefile @@ -24,7 +24,7 @@ MAINTAINER= openoffice@FreeBSD.org COMMENT= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser .endif -IGNORE= "Does not work yet, installation problems" +IGNORE= "Installation is not complete, manual installation works" NO_LATEST_LINK= yes UNZIP?= ${LOCALBASE}/bin/unzip @@ -33,13 +33,13 @@ ANT?= ${LOCALBASE}/bin/ant TCSH?= /bin/tcsh DIST_SUBDIR= openoffice2.0 BUILD_NR= 680 -MILESTONE= m30 +MILESTONE= m41 RELEASE_NR= 2.0 FRELEASE_NR= 2.0 -SNAPDATE= 20040402 +SNAPDATE= 20040611 INSTALLATION_BASEDIR= OpenOffice.org${RELEASE_NR} EXTRACT_ONLY= OOo_${BUILD_NR}${MILESTONE}_${SNAPDATE}_source.tar.bz2 -USE_GNOME= orbit gtk12 +USE_GNOME= orbit gtk12 gtk20 USE_REINPLACE= yes USE_PERL5= yes USE_BZIP2= yes @@ -48,7 +48,7 @@ USE_GMAKE= yes LANG_EXT?= 01 LANG_CONFIGURE_ARG?= ENUS WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work -WRKSRC= ${WRKDIR}/oo_${BUILD_NR}${MILESTONE}_src/config_office +WRKSRC= ${WRKDIR}/oo_${RELEASE_NR}_src/config_office #XXX dirty BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32 @@ -58,9 +58,11 @@ CXX= g++32 BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14 BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip BUILD_DEPENDS+= unzip:${PORTSDIR}/archivers/unzip -BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/apache-ant -BUILD_DEPENDS+= ${X11BASE}/lib/libgdk-x11-2.0.so:${PORTSDIR}/x11-toolkits/gtk20 +BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/apache-ant +BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries BUILD_DEPENDS+= ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft +BUILD_DEPENDS+= ${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip + .if !defined(DISPLAY) BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer .endif @@ -111,7 +113,7 @@ JDKDIR?= ${LOCALBASE}/jdk1.4.2 JAVAVM= ${JDKDIR}/bin/java GNU_CONFIGURE= yes -USE_AUTOCONF_VER= 253 +USE_AUTOCONF_VER= 259 .if defined(WITH_DEBUG) CFLAGS+= -g .if ${WITH_DEBUG} == 2 @@ -130,7 +132,7 @@ DISPLAYHACK=localhost:1001 CONFIGURE_ENV= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \ PTHREAD_LIBS=${PTHREAD_LIBS} CONFIGURE_ARGS+= --with-lang=${LANG_CONFIGURE_ARG} -CONFIGURE_ARGS+= --with-jdk-home=${JDKDIR} --with-ant-home=${LOCALBASE}/ant --with-gnu-cp=${LOCALBASE}/bin/gcp --enable-mozilla=no +CONFIGURE_ARGS+= --with-jdk-home=${JDKDIR} --with-ant-home=${LOCALBASE}/ant --with-gnu-cp=${LOCALBASE}/bin/gcp --enable-mozilla=yes .if defined(WITH_DEBUG) .if ${WITH_DEBUG} == 2 diff --git a/editors/openoffice.org-3-RC/distinfo b/editors/openoffice.org-3-RC/distinfo index 74de717eb2de..23f567c61dd8 100644 --- a/editors/openoffice.org-3-RC/distinfo +++ b/editors/openoffice.org-3-RC/distinfo @@ -1,5 +1,5 @@ -MD5 (openoffice2.0/OOo_680m30_20040402_source.tar.bz2) = 768b3d8246a12eff6bf83f098093fbee -SIZE (openoffice2.0/OOo_680m30_20040402_source.tar.bz2) = 195378119 +MD5 (openoffice2.0/OOo_680m41_20040611_source.tar.bz2) = 7b8a6d87b80022f85093a67c01064883 +SIZE (openoffice2.0/OOo_680m41_20040611_source.tar.bz2) = 221136281 MD5 (openoffice2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 SIZE (openoffice2.0/gpc231.tar.Z) = 27917 MD5 (openoffice2.0/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a diff --git a/editors/openoffice.org-3-RC/files/patch-config_office+configure.in b/editors/openoffice.org-3-RC/files/patch-config_office+configure.in deleted file mode 100644 index 8bd6e0668f6b..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-config_office+configure.in +++ /dev/null @@ -1,50 +0,0 @@ -#i27028 and #i27028 -http://qa.openoffice.org/issues/show_bug.cgi?id=27021 (Xaw) -http://qa.openoffice.org/issues/show_bug.cgi?id=27028 (ant) - ---- ../config_office/configure.in.org Sat Mar 27 17:54:16 2004 -+++ ../config_office/configure.in Sun Mar 28 22:17:37 2004 -@@ -1478,7 +1478,7 @@ - elif test "$_os" != "WINNT" ; then - AC_PATH_X - AC_PATH_XTRA -- AC_CHECK_HEADERS(X11/Xaw/Label.h,[AC_MSG_RESULT([Ok])],[AC_MSG_ERROR([Xaw include headers not found])]) -+dnl AC_CHECK_HEADERS(X11/Xaw/Label.h,[AC_MSG_RESULT([Ok])],[AC_MSG_ERROR([Xaw include headers not found])]) - - if test "x$x_includes" = "x"; then - x_includes="/usr/include" -@@ -1830,10 +1830,12 @@ - - if test "$enable_java" != "no"; then - ANT_HOME=; export ANT_HOME -+WITH_ANT_HOME=; export WITH_ANT_HOME - if test -z "$with_ant_home"; then - AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat]) - else -- AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat],,$with_ant_home/bin) -+ AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat],,$with_ant_home/bin:$PATH) -+ WITH_ANT_HOME=$with_ant_home - fi - - -@@ -1873,7 +1875,11 @@ - AC_TRY_EVAL(ant_cmd) - if test $? = 0 && test -f ./conftest.class ; then - AC_MSG_RESULT([Ant works]) -- ANT_HOME=`echo $ANT | $SED -n "s/\/bin\/ant.*\$//p"` -+ if test -z "$WITH_ANT_HOME"; then -+ ANT_HOME=`echo $ANT | $SED -n "s/\/bin\/ant.*\$//p"` -+ else -+ ANT_HOME="$WITH_ANT_HOME" -+ fi - else - echo "configure: Ant test failed" >&5 - cat conftest.java >&5 -@@ -1885,6 +1891,7 @@ - - rm -f conftest* core core.* *.core - fi -+ - if test -z "$ANT_HOME"; then - ANT_HOME="NO_ANT_HOME" - fi diff --git a/editors/openoffice.org-3-RC/files/patch-config_office+set_soenv.in b/editors/openoffice.org-3-RC/files/patch-config_office+set_soenv.in deleted file mode 100644 index dbb4c3506e1e..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-config_office+set_soenv.in +++ /dev/null @@ -1,13 +0,0 @@ -#i27028 -http://qa.openoffice.org/issues/show_bug.cgi?id=27028 - ---- ../config_office/set_soenv.in.old Tue Mar 9 21:31:38 2004 -+++ ../config_office/set_soenv.in Sun Mar 28 09:56:03 2004 -@@ -1419,6 +1419,7 @@ - ToFile( "XSLTPROC", "@XSLTPROC@", "e" ); - ToFile( "ANT_HOME", "@ANT_HOME@", "e" ); - ToFile( "ANT_LIB", "@ANT_LIB@", "e" ); -+ToFile( "ANT", "@ANT@", "e" ); - ToFile( "JDKLIB", $JAVA_LIB, "e" ); - ToFile( "STLPORT4", $STLPORT4, "e" ); - ToFile( "ASM_PATH", $ASM_PATH, "e" ); diff --git a/editors/openoffice.org-3-RC/files/patch-cppuhelper+source+gcc3_linux_intel.map b/editors/openoffice.org-3-RC/files/patch-cppuhelper+source+gcc3_linux_intel.map deleted file mode 100644 index cdb61b141eba..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-cppuhelper+source+gcc3_linux_intel.map +++ /dev/null @@ -1,13 +0,0 @@ -Mysterious :) - -http://qa.openoffice.org/issues/show_bug.cgi?id=23917 ---- ../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.org-3-RC/files/patch-hwpfilter+source+hwpreader.hxx b/editors/openoffice.org-3-RC/files/patch-hwpfilter+source+hwpreader.hxx deleted file mode 100644 index 8d65e6a3ee83..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-hwpfilter+source+hwpreader.hxx +++ /dev/null @@ -1,14 +0,0 @@ -http://qa.openoffice.org/issues/show_bug.cgi?id=27033 ---- ../hwpfilter/source/hwpreader.hxx~ Wed Oct 15 23:37:24 2003 -+++ ../hwpfilter/source/hwpreader.hxx Sun Mar 28 22:46:18 2004 -@@ -68,7 +68,9 @@ - #include <string.h> - #ifdef WIN32 - #include <malloc.h> --#else -+#endif -+ -+#if !defined(FREEBSD) - #include <alloca.h> - #endif - diff --git a/editors/openoffice.org-3-RC/files/patch-libxml2+prj+build.lst b/editors/openoffice.org-3-RC/files/patch-libxml2+prj+build.lst new file mode 100644 index 000000000000..f0d7b8f05fc8 --- /dev/null +++ b/editors/openoffice.org-3-RC/files/patch-libxml2+prj+build.lst @@ -0,0 +1,12 @@ +Index: libxml2/prj/build.lst +=================================================================== +RCS file: /cvs/external/libxml2/prj/build.lst,v +retrieving revision 1.1 +diff -u -r1.1 build.lst +--- ../libxml2/prj/build.lst 6 Feb 2004 10:15:09 -0000 1.1 ++++ ../libxml2/prj/build.lst 4 May 2004 20:20:20 -0000 +@@ -1,3 +1,3 @@ +-lx libxml2 : soltools NULL
++lx libxml2 : soltools xml2cmp NULL
+ lx libxml2 usr1 - all lx_mkout NULL
+ lx libxml2 nmake - all lx_libxml2 NULL
diff --git a/editors/openoffice.org-3-RC/files/patch-odk+setsdkenv_unix.in b/editors/openoffice.org-3-RC/files/patch-odk+setsdkenv_unix.in deleted file mode 100644 index e5551f883231..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-odk+setsdkenv_unix.in +++ /dev/null @@ -1,27 +0,0 @@ -http://qa.openoffice.org/issues/show_bug.cgi?id=24142 ---- ../odk/setsdkenv_unix.in Sun Jan 25 18:41:01 2004 -+++ ../odk/setsdkenv_unix.in Sun Jan 25 18:42:00 2004 -@@ -2,7 +2,8 @@ - - # This script starts a new shell and sets all enviroment variables, which - # are necessary for building the examples of the Office Development Kit. --# The Script was developed for the operating systems Solaris and Linux. -+# The script was developed for the operating systems Solaris, Linux, MacOS X -+# and FreeBSD. - - # Installation directory of the Software Development Kit. - # Example: OO_SDK_HOME=/work/StarOffice_SDK -@@ -76,6 +77,13 @@ - LD_LIBRARY_PATH=$OO_SDK_HOME/$directoryname/lib:$OO_SDK_HOME/$exampleout/lib:$OFFICE_PROGRAM_PATH:.:$LD_LIBRARY_PATH - export LD_LIBRARY_PATH - ;; -+ -+ FreeBSD) -+ directoryname=freebsd -+ exampleout=FREEBSDexample.out -+ LD_LIBRARY_PATH=$OO_SDK_HOME/$directoryname/lib:$OO_SDK_HOME/$exampleout/lib:$OFFICE_PROGRAM_PATH:.:$LD_LIBRARY_PATH -+ export LD_LIBRARY_PATH -+ ;; - esac - - # Add directory of the SDK tools to the path. diff --git a/editors/openoffice.org-3-RC/files/patch-odk+settings+settings.mk b/editors/openoffice.org-3-RC/files/patch-odk+settings+settings.mk deleted file mode 100644 index 8c3942d12f16..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-odk+settings+settings.mk +++ /dev/null @@ -1,90 +0,0 @@ -http://qa.openoffice.org/issues/show_bug.cgi?id=24142 - ---- ../odk/settings/settings.mk Sun Jan 25 18:41:02 2004 -+++ ../odk/settings/settings.mk Sun Jan 25 18:45:09 2004 -@@ -368,3 +368,85 @@ - - endif - -+ifeq "$(PLATFORM)" "FreeBSD" -+# Settings for FreeBSD using gcc compiler -+ -+PROCTYPE := $(shell uname -m) -+ -+ -+# Default is freebsd on a intel machine -+PLATFORM=FreeBSD -+PACKAGE_LIB_DIR=freebsd_x86.plt -+JAVA_PROC_TYPE=i386 -+ -+OS=FREEBSD -+PS=/ -+CC=gcc -+LINK=gcc -+LIB=gcc -+ECHO=@echo -+MKDIR=mkdir -p -+CAT=cat -+OBJ_EXT=o -+SHAREDLIB_EXT=so -+SHAREDLIB_PRE=lib -+SHAREDLIB_OUT=$(OUT_LIB) -+ -+GCC_VERSION=$(shell $(CC) -dumpversion) -+ -+ifeq "$(shell echo $(GCC_VERSION) | cut -c 1)" "3" -+COMID=gcc3 -+CPPU_ENV=gcc3 -+else -+COMID=GCC -+CPPU_ENV=gcc2 -+endif -+ -+OSEP=\< -+CSEP=\> -+QUOTE=$(subst S,\,S) -+QM=\" -+ -+DEL=rm -f -+DELRECURSIVE=rm -rf -+COPY=cp -+URLPREFIX=file:// -+ -+# Include UDK version numbers -+include $(PRJ)/include/udkversion.mk -+ -+SALLIB=-lsal -+CPPULIB=-lcppu -+CPPUHELPERLIB=-lcppuhelper$(COMID) -+SALHELPERLIB=-lsalhelper$(COMID) -+STLPORTLIB=-lstlport_gcc -+ -+EMPTYSTRING= -+PATH_SEPARATOR=: -+ -+# -O is necessary for inlining (see gcc documentation) -+ifeq "$(DEBUG)" "yes" -+CC_FLAGS=-c -g -fpic -DPIC -fno-rtti %%PTHREAD_CFLAGS%% -+else -+CC_FLAGS=-c -O -fpic -DPIC -fno-rtti %%PTHREAD_CFLAGS%% -+endif -+ -+SDK_JAVA_INCLUDES = -I$(OO_SDK_JAVA_HOME)/include -I$(OO_SDK_JAVA_HOME)/include/freebsd -+CC_INCLUDES=-I. -I/usr/include -I$(OUT)/inc/examples -I$(PRJ)/include -+STL_INCLUDES=-I$(OO_SDK_HOME)/include/stl -+CC_DEFINES=-DUNX -DGCC -DFREEBSD -DCPPU_ENV=$(CPPU_ENV) -+ -+# define for used compiler necessary for UNO -+#-DCPPU_ENV=gcc2 -- gcc 2.91/2.95 -+#-DCPPU_ENV=gcc3 -- gcc3 3.0 -+ -+CC_OUTPUT_SWITCH=-o -+ -+LIBRARY_LINK_FLAGS=-shared '-Wl,-rpath,$$ORIGIN' -+ -+EXE_LINK_FLAGS=-Wl -+LINK_LIBS=-L$(OUT)/lib -L$(PRJ)/$(PLATFORM)/lib -L$(OFFICE_PROGRAM_PATH) %%PTHREAD_LIBS%% -+LINK_JAVA_LIBS=-L$(OO_SDK_JAVA_HOME)/jre/lib/$(JAVA_PROC_TYPE) -+ -+endif -+ diff --git a/editors/openoffice.org-3-RC/files/patch-psprint+source+helper+strhelper.cxx b/editors/openoffice.org-3-RC/files/patch-psprint+source+helper+strhelper.cxx new file mode 100644 index 000000000000..52530e403ac0 --- /dev/null +++ b/editors/openoffice.org-3-RC/files/patch-psprint+source+helper+strhelper.cxx @@ -0,0 +1,21 @@ +http://www.openoffice.org/issues/show_bug.cgi?id=27753 +The isnan() macro is a new feature of C99 and not yet part of C++. + +Index: source/helper/strhelper.cxx +=================================================================== +RCS file: /cvs/gsl/psprint/source/helper/strhelper.cxx,v +retrieving revision 1.6 +diff -u -r1.6 strhelper.cxx +--- ../psprint/source/helper/strhelper.cxx 30 Mar 2004 13:48:06 -0000 1.6 ++++ ../psprint/source/helper/strhelper.cxx 13 Apr 2004 22:26:11 -0000 +@@ -67,6 +67,10 @@ + #include <cmath> // for isnan + #include <cstring> + ++#if defined (FREEBSD) ++using namespace __gnu_cxx; //for isnan ++#endif ++ + namespace psp { + + inline int isSpace( char cChar ) diff --git a/editors/openoffice.org-3-RC/files/patch-setup2+mow+source+loader+makefile.mk b/editors/openoffice.org-3-RC/files/patch-setup2+mow+source+loader+makefile.mk deleted file mode 100644 index 7b25ff2635df..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-setup2+mow+source+loader+makefile.mk +++ /dev/null @@ -1,17 +0,0 @@ -do not need -ldl - -http://qa.openoffice.org/issues/show_bug.cgi?id=27043 ---- ../setup2/mow/source/loader/makefile.mk~ Tue Mar 9 21:04:35 2004 -+++ ../setup2/mow/source/loader/makefile.mk Mon Mar 29 11:10:50 2004 -@@ -92,7 +92,11 @@ - LINK=gcc - LINKFLAGS= - LINKFLAGSAPP= -+.IF "$(OS)"=="FREEBSD" -+STDLIB= -lX11 -lc -lm -+.ELSE - STDLIB= -lX11 -ldl -lc -lm -+.ENDIF # "$(OS)"=="FREEBSD" - .ENDIF # "$(OS)$(COMID)"=="GCC" - - OBJFILES= $(OBJ)$/loader.obj diff --git a/editors/openoffice.org-3-RC/files/patch-sfx2+source+config+cfgmgr.cxx b/editors/openoffice.org-3-RC/files/patch-sfx2+source+config+cfgmgr.cxx deleted file mode 100644 index be38de290a51..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-sfx2+source+config+cfgmgr.cxx +++ /dev/null @@ -1,16 +0,0 @@ -Wired 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.org-3-RC/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx b/editors/openoffice.org-3-RC/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx deleted file mode 100644 index 10c3f3c1f6e8..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx +++ /dev/null @@ -1,34 +0,0 @@ -http://qa.openoffice.org/issues/show_bug.cgi?id=24315 - -For FreeBSD, time_t is defined as -at /usr/include/machine/_types.h -49th typedef int __int32_t; -90th typedef __int32_t __time_t; /* time()... */ -and -/usr/include/pwd.h:typedef __time_t time_t; -/usr/include/time.h:typedef __time_t time_t; -/usr/include/timeconv.h:typedef __time_t time_t; -/usr/include/utime.h:typedef __time_t time_t; -so time_t is equal to 32 bit integer - -For LinuxPPC (Yellowdog 3.0.1) - - ---- ../shell/source/unix/sysshell/recently_used_file_handler.cxx.orig Tue Jan 13 00:56:37 2004 -+++ ../shell/source/unix/sysshell/recently_used_file_handler.cxx Tue Jan 13 00:57:26 2004 -@@ -188,9 +188,12 @@ - write_xml_start_tag(TAG_RECENT_ITEM, file, true); - write_xml_tag(TAG_URI, uri_, file); - write_xml_tag(TAG_MIME_TYPE, mime_type_, file); -- -- rtl::OString ts = rtl::OString::valueOf(timestamp_); -- write_xml_tag(TAG_TIMESTAMP, ts.getStr(), file); -+#if defined FREEBSD -+ rtl::OString ts = rtl::OString::valueOf((sal_Int32)timestamp_); -+#else -+ rtl::OString ts = rtl::OString::valueOf(timestamp_); -+#endif -+ write_xml_tag(TAG_TIMESTAMP, ts.getStr(), file); - - if (is_private_) - write_xml_tag(TAG_PRIVATE, file); diff --git a/editors/openoffice.org-3-RC/files/patch-solenv+inc+ant.mk b/editors/openoffice.org-3-RC/files/patch-solenv+inc+ant.mk deleted file mode 100644 index e050b85d41e9..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-solenv+inc+ant.mk +++ /dev/null @@ -1,13 +0,0 @@ -http://qa.openoffice.org/issues/show_bug.cgi?id=27028 - ---- ../solenv/inc/ant.mk~ Wed Feb 4 21:37:16 2004 -+++ ../solenv/inc/ant.mk Fri Apr 2 23:59:27 2004 -@@ -100,7 +100,7 @@ - .ENDIF - .ENDIF - --ANT=$(WRAPCMD) java -classpath $(CLASSPATH) -Xmx128m org.apache.tools.ant.Main -Djava.home=$(JAVA_HOME) -Dant.home=$(ANT_HOME) -+#ANT=$(WRAPCMD) java -classpath $(CLASSPATH) -Xmx128m org.apache.tools.ant.Main -Djava.home=$(JAVA_HOME) -Dant.home=$(ANT_HOME) - #ANT=java -version - - .IF "$(ANT_BUILDFILE)"=="" diff --git a/editors/openoffice.org-3-RC/files/patch-solenv+inc+settings.mk b/editors/openoffice.org-3-RC/files/patch-solenv+inc+settings.mk deleted file mode 100644 index f93ee2ad6bf2..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-solenv+inc+settings.mk +++ /dev/null @@ -1,15 +0,0 @@ -http://www.openoffice.org/issues/show_bug.cgi?id=25579 -We should set locale as UTF-8 when compiling -but this was due to violation of OOo coding style - ---- ../solenv/inc/settings.mk.old Tue Mar 9 21:19:28 2004 -+++ ../solenv/inc/settings.mk Mon Mar 29 13:23:31 2004 -@@ -172,7 +172,7 @@ - JAVAI=gij - JAVACPS=--classpath - .ELSE --JAVAC=javac -+JAVAC=javac -encoding UTF-8 - JAVAI=java - JAVACPS=-classpath - .ENDIF diff --git a/editors/openoffice.org-3-RC/files/patch-vcl+source+gdi+outdev3.cxx b/editors/openoffice.org-3-RC/files/patch-vcl+source+gdi+outdev3.cxx deleted file mode 100644 index 22ef6f26f45f..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-vcl+source+gdi+outdev3.cxx +++ /dev/null @@ -1,14 +0,0 @@ -do not need <malloc.h> including stdlib.h is enough -http://qa.openoffice.org/issues/show_bug.cgi?id=27041 - ---- ../vcl/source/gdi/outdev3.cxx.old Mon Mar 29 09:42:28 2004 -+++ ../vcl/source/gdi/outdev3.cxx Mon Mar 29 09:42:59 2004 -@@ -176,7 +176,7 @@ - #if defined(SOLARIS) || defined(IRIX) - #include <alloca.h> - #else --#ifndef MACOSX -+#if !(defined(MACOSX) || defined(FREEBSD)) - #include <malloc.h> - #endif - #endif diff --git a/editors/openoffice.org-3-RC/files/patch-vcl+source+gdi+sallayout.cxx b/editors/openoffice.org-3-RC/files/patch-vcl+source+gdi+sallayout.cxx deleted file mode 100644 index 5cbc59bf7db7..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-vcl+source+gdi+sallayout.cxx +++ /dev/null @@ -1,14 +0,0 @@ -malloc.h is deprecated -http://qa.openoffice.org/issues/show_bug.cgi?id=27041 - ---- ../vcl/source/gdi/sallayout.cxx.org Mon Mar 29 10:02:17 2004 -+++ ../vcl/source/gdi/sallayout.cxx Mon Mar 29 10:02:43 2004 -@@ -67,7 +67,7 @@ - #if defined(SOLARIS) || defined(IRIX) - #include <alloca.h> - #else --#ifndef MACOSX -+#if !(defined(MACOSX) || defined(FREEBSD)) - #include <malloc.h> - #endif - #endif diff --git a/editors/openoffice.org-3-RC/files/patch-vcl+source+glyphs+gcache_layout.cxx b/editors/openoffice.org-3-RC/files/patch-vcl+source+glyphs+gcache_layout.cxx deleted file mode 100644 index 53c7a909faf7..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-vcl+source+glyphs+gcache_layout.cxx +++ /dev/null @@ -1,14 +0,0 @@ -malloc.h is deprecated -http://qa.openoffice.org/issues/show_bug.cgi?id=27041 - ---- ../vcl/source/glyphs/gcach_layout.cxx~ Tue Mar 9 21:15:32 2004 -+++ ../vcl/source/glyphs/gcach_layout.cxx Mon Mar 29 09:44:52 2004 -@@ -74,7 +74,7 @@ - #if defined(SOLARIS) || defined(IRIX) - #include <alloca.h> - #else --#ifndef MACOSX -+#if !(defined(MACOSX) || defined(FREEBSD)) - #include <malloc.h> - #endif - #endif diff --git a/editors/openoffice.org-3-RC/files/patch-vcl+unx+source+plugadapt+salmain.cxx b/editors/openoffice.org-3-RC/files/patch-vcl+unx+source+plugadapt+salmain.cxx deleted file mode 100644 index f5bd54364036..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-vcl+unx+source+plugadapt+salmain.cxx +++ /dev/null @@ -1,24 +0,0 @@ -http://qa.openoffice.org/issues/show_bug.cgi?id=27042 - -include <sys/types.h> -Note: --- -* $RCSfile: salmain.cxx,v $ -* -* $Revision: 1.8.12.2 $ -* -* last change: $Author: hr $ $Date: 2004/01/09 18:14:00 $ --- -includes this patch - ---- ../vcl/unx/source/plugadapt/salmain.cxx~ Mon Mar 29 09:50:50 2004 -+++ ../vcl/unx/source/plugadapt/salmain.cxx Mon Mar 29 10:08:28 2004 -@@ -59,7 +59,7 @@ - * - ************************************************************************/ - --#ifdef MACOSX -+#if defined(MACOSX) || defined(FREEBSD) - // rlimit needs sys/types.h - #include <sys/types.h> - #include <sys/time.h> diff --git a/editors/openoffice.org-3-RC/files/patch-vcl+util+makefile.mk b/editors/openoffice.org-3-RC/files/patch-vcl+util+makefile.mk deleted file mode 100644 index 5d133486e032..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-vcl+util+makefile.mk +++ /dev/null @@ -1,30 +0,0 @@ -FreeBSD doesn't require/need/have -ldl -http://qa.openoffice.org/issues/show_bug.cgi?id=27043 - ---- ../vcl/util/makefile.mk~ Mon Mar 29 09:50:51 2004 -+++ ../vcl/util/makefile.mk Mon Mar 29 10:19:04 2004 -@@ -208,7 +208,9 @@ - .IF "$(GUI)"!="UNX" - SHL1OBJS= $(SLO)$/salshl.obj - .ELSE --SHL1STDLIBS+=-ldl -+ .IF "$(OS)"!="FREEBSD" -+ SHL1STDLIBS+=-ldl -+ .ENDIF - .ENDIF - - .IF "$(GUI)" != "MAC" -@@ -351,8 +353,11 @@ - # libs for gtk plugin - SHL4STDLIBS=`pkg-config --libs gtk+-2.0 gthread-2.0` - SHL4STDLIBS+=-l$(SHL2TARGET) --SHL4STDLIBS+=$(SHL3STDLIBS) -lX11 -ldl -- -+ .IF "$(OS)"!="FREEBSD" -+ SHL4STDLIBS+=$(SHL3STDLIBS) -lX11 -ldl -+ .ELSE -+ SHL4STDLIBS+=$(SHL3STDLIBS) -lX11 -+ .ENDIF # FREEBSD - .ENDIF # UNX - - # --- Allgemein ---------------------------------------------------------- diff --git a/editors/openoffice.org-3-RC/files/patch-wizards+prj+build.lst b/editors/openoffice.org-3-RC/files/patch-wizards+prj+build.lst new file mode 100644 index 000000000000..5d5abb75a07e --- /dev/null +++ b/editors/openoffice.org-3-RC/files/patch-wizards+prj+build.lst @@ -0,0 +1,15 @@ +http://www.openoffice.org/issues/show_bug.cgi?id=29656 + +Index: wizards/prj/build.lst +=================================================================== +RCS file: /cvs/installation/wizards/prj/build.lst,v +retrieving revision 1.23 +diff -u -r1.23 build.lst +--- ../wizards/prj/build.lst 19 May 2004 16:35:11 -0000 1.23 ++++ ../wizards/prj/build.lst 8 Jun 2004 22:43:04 -0000 +@@ -1,4 +1,4 @@ +-wz wizards : rsc javaunohelper jut unoil NULL ++wz wizards : rsc qadevOOo javaunohelper jut unoil NULL + wz wizards\util nmake - all wz_util NULL + wz wizards\source\config nmake - all wz_config NULL + wz wizards\source\euro nmake - all wz_eurowiz NULL diff --git a/editors/openoffice.org-3-RC/files/patch-wizards+prj+d.lst b/editors/openoffice.org-3-RC/files/patch-wizards+prj+d.lst new file mode 100644 index 000000000000..d1b4255cca46 --- /dev/null +++ b/editors/openoffice.org-3-RC/files/patch-wizards+prj+d.lst @@ -0,0 +1,16 @@ +http://www.openoffice.org/issues/show_bug.cgi?id=29666 + +Index: wizards/prj/d.lst +=================================================================== +RCS file: /cvs/installation/wizards/prj/d.lst,v +retrieving revision 1.13 +diff -u -r1.13 d.lst +--- ../wizards/prj/d.lst 2 Feb 2004 19:16:11 -0000 1.13 ++++ ../wizards/prj/d.lst 9 Jun 2004 08:25:50 -0000 +@@ -1,5 +1,6 @@ + mkdir: %COMMON_DEST%\bin%_EXT%\hid + mkdir: %_DEST%\pck%_EXT% ++mkdir: %_DEST%\pck%_EXT%\img + ..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid + ..\%__SRC%\bin\*.zip %_DEST%\pck%_EXT%\*.zip + ..\%__SRC%\bin\iwz*.res %_DEST%\bin%_EXT%\iwz*.res diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile index d47c500c2e52..6c660a7b6fb8 100644 --- a/editors/openoffice.org-3-devel/Makefile +++ b/editors/openoffice.org-3-devel/Makefile @@ -24,7 +24,7 @@ MAINTAINER= openoffice@FreeBSD.org COMMENT= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser .endif -IGNORE= "Does not work yet, installation problems" +IGNORE= "Installation is not complete, manual installation works" NO_LATEST_LINK= yes UNZIP?= ${LOCALBASE}/bin/unzip @@ -33,13 +33,13 @@ ANT?= ${LOCALBASE}/bin/ant TCSH?= /bin/tcsh DIST_SUBDIR= openoffice2.0 BUILD_NR= 680 -MILESTONE= m30 +MILESTONE= m41 RELEASE_NR= 2.0 FRELEASE_NR= 2.0 -SNAPDATE= 20040402 +SNAPDATE= 20040611 INSTALLATION_BASEDIR= OpenOffice.org${RELEASE_NR} EXTRACT_ONLY= OOo_${BUILD_NR}${MILESTONE}_${SNAPDATE}_source.tar.bz2 -USE_GNOME= orbit gtk12 +USE_GNOME= orbit gtk12 gtk20 USE_REINPLACE= yes USE_PERL5= yes USE_BZIP2= yes @@ -48,7 +48,7 @@ USE_GMAKE= yes LANG_EXT?= 01 LANG_CONFIGURE_ARG?= ENUS WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work -WRKSRC= ${WRKDIR}/oo_${BUILD_NR}${MILESTONE}_src/config_office +WRKSRC= ${WRKDIR}/oo_${RELEASE_NR}_src/config_office #XXX dirty BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32 @@ -58,9 +58,11 @@ CXX= g++32 BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14 BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip BUILD_DEPENDS+= unzip:${PORTSDIR}/archivers/unzip -BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/apache-ant -BUILD_DEPENDS+= ${X11BASE}/lib/libgdk-x11-2.0.so:${PORTSDIR}/x11-toolkits/gtk20 +BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/apache-ant +BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries BUILD_DEPENDS+= ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft +BUILD_DEPENDS+= ${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip + .if !defined(DISPLAY) BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer .endif @@ -111,7 +113,7 @@ JDKDIR?= ${LOCALBASE}/jdk1.4.2 JAVAVM= ${JDKDIR}/bin/java GNU_CONFIGURE= yes -USE_AUTOCONF_VER= 253 +USE_AUTOCONF_VER= 259 .if defined(WITH_DEBUG) CFLAGS+= -g .if ${WITH_DEBUG} == 2 @@ -130,7 +132,7 @@ DISPLAYHACK=localhost:1001 CONFIGURE_ENV= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \ PTHREAD_LIBS=${PTHREAD_LIBS} CONFIGURE_ARGS+= --with-lang=${LANG_CONFIGURE_ARG} -CONFIGURE_ARGS+= --with-jdk-home=${JDKDIR} --with-ant-home=${LOCALBASE}/ant --with-gnu-cp=${LOCALBASE}/bin/gcp --enable-mozilla=no +CONFIGURE_ARGS+= --with-jdk-home=${JDKDIR} --with-ant-home=${LOCALBASE}/ant --with-gnu-cp=${LOCALBASE}/bin/gcp --enable-mozilla=yes .if defined(WITH_DEBUG) .if ${WITH_DEBUG} == 2 diff --git a/editors/openoffice.org-3-devel/distinfo b/editors/openoffice.org-3-devel/distinfo index 74de717eb2de..23f567c61dd8 100644 --- a/editors/openoffice.org-3-devel/distinfo +++ b/editors/openoffice.org-3-devel/distinfo @@ -1,5 +1,5 @@ -MD5 (openoffice2.0/OOo_680m30_20040402_source.tar.bz2) = 768b3d8246a12eff6bf83f098093fbee -SIZE (openoffice2.0/OOo_680m30_20040402_source.tar.bz2) = 195378119 +MD5 (openoffice2.0/OOo_680m41_20040611_source.tar.bz2) = 7b8a6d87b80022f85093a67c01064883 +SIZE (openoffice2.0/OOo_680m41_20040611_source.tar.bz2) = 221136281 MD5 (openoffice2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 SIZE (openoffice2.0/gpc231.tar.Z) = 27917 MD5 (openoffice2.0/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a diff --git a/editors/openoffice.org-3-devel/files/patch-config_office+configure.in b/editors/openoffice.org-3-devel/files/patch-config_office+configure.in deleted file mode 100644 index 8bd6e0668f6b..000000000000 --- a/editors/openoffice.org-3-devel/files/patch-config_office+configure.in +++ /dev/null @@ -1,50 +0,0 @@ -#i27028 and #i27028 -http://qa.openoffice.org/issues/show_bug.cgi?id=27021 (Xaw) -http://qa.openoffice.org/issues/show_bug.cgi?id=27028 (ant) - ---- ../config_office/configure.in.org Sat Mar 27 17:54:16 2004 -+++ ../config_office/configure.in Sun Mar 28 22:17:37 2004 -@@ -1478,7 +1478,7 @@ - elif test "$_os" != "WINNT" ; then - AC_PATH_X - AC_PATH_XTRA -- AC_CHECK_HEADERS(X11/Xaw/Label.h,[AC_MSG_RESULT([Ok])],[AC_MSG_ERROR([Xaw include headers not found])]) -+dnl AC_CHECK_HEADERS(X11/Xaw/Label.h,[AC_MSG_RESULT([Ok])],[AC_MSG_ERROR([Xaw include headers not found])]) - - if test "x$x_includes" = "x"; then - x_includes="/usr/include" -@@ -1830,10 +1830,12 @@ - - if test "$enable_java" != "no"; then - ANT_HOME=; export ANT_HOME -+WITH_ANT_HOME=; export WITH_ANT_HOME - if test -z "$with_ant_home"; then - AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat]) - else -- AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat],,$with_ant_home/bin) -+ AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat],,$with_ant_home/bin:$PATH) -+ WITH_ANT_HOME=$with_ant_home - fi - - -@@ -1873,7 +1875,11 @@ - AC_TRY_EVAL(ant_cmd) - if test $? = 0 && test -f ./conftest.class ; then - AC_MSG_RESULT([Ant works]) -- ANT_HOME=`echo $ANT | $SED -n "s/\/bin\/ant.*\$//p"` -+ if test -z "$WITH_ANT_HOME"; then -+ ANT_HOME=`echo $ANT | $SED -n "s/\/bin\/ant.*\$//p"` -+ else -+ ANT_HOME="$WITH_ANT_HOME" -+ fi - else - echo "configure: Ant test failed" >&5 - cat conftest.java >&5 -@@ -1885,6 +1891,7 @@ - - rm -f conftest* core core.* *.core - fi -+ - if test -z "$ANT_HOME"; then - ANT_HOME="NO_ANT_HOME" - fi diff --git a/editors/openoffice.org-3-devel/files/patch-config_office+set_soenv.in b/editors/openoffice.org-3-devel/files/patch-config_office+set_soenv.in deleted file mode 100644 index dbb4c3506e1e..000000000000 --- a/editors/openoffice.org-3-devel/files/patch-config_office+set_soenv.in +++ /dev/null @@ -1,13 +0,0 @@ -#i27028 -http://qa.openoffice.org/issues/show_bug.cgi?id=27028 - ---- ../config_office/set_soenv.in.old Tue Mar 9 21:31:38 2004 -+++ ../config_office/set_soenv.in Sun Mar 28 09:56:03 2004 -@@ -1419,6 +1419,7 @@ - ToFile( "XSLTPROC", "@XSLTPROC@", "e" ); - ToFile( "ANT_HOME", "@ANT_HOME@", "e" ); - ToFile( "ANT_LIB", "@ANT_LIB@", "e" ); -+ToFile( "ANT", "@ANT@", "e" ); - ToFile( "JDKLIB", $JAVA_LIB, "e" ); - ToFile( "STLPORT4", $STLPORT4, "e" ); - ToFile( "ASM_PATH", $ASM_PATH, "e" ); diff --git a/editors/openoffice.org-3-devel/files/patch-cppuhelper+source+gcc3_linux_intel.map b/editors/openoffice.org-3-devel/files/patch-cppuhelper+source+gcc3_linux_intel.map deleted file mode 100644 index cdb61b141eba..000000000000 --- a/editors/openoffice.org-3-devel/files/patch-cppuhelper+source+gcc3_linux_intel.map +++ /dev/null @@ -1,13 +0,0 @@ -Mysterious :) - -http://qa.openoffice.org/issues/show_bug.cgi?id=23917 ---- ../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.org-3-devel/files/patch-hwpfilter+source+hwpreader.hxx b/editors/openoffice.org-3-devel/files/patch-hwpfilter+source+hwpreader.hxx deleted file mode 100644 index 8d65e6a3ee83..000000000000 --- a/editors/openoffice.org-3-devel/files/patch-hwpfilter+source+hwpreader.hxx +++ /dev/null @@ -1,14 +0,0 @@ -http://qa.openoffice.org/issues/show_bug.cgi?id=27033 ---- ../hwpfilter/source/hwpreader.hxx~ Wed Oct 15 23:37:24 2003 -+++ ../hwpfilter/source/hwpreader.hxx Sun Mar 28 22:46:18 2004 -@@ -68,7 +68,9 @@ - #include <string.h> - #ifdef WIN32 - #include <malloc.h> --#else -+#endif -+ -+#if !defined(FREEBSD) - #include <alloca.h> - #endif - diff --git a/editors/openoffice.org-3-devel/files/patch-libxml2+prj+build.lst b/editors/openoffice.org-3-devel/files/patch-libxml2+prj+build.lst new file mode 100644 index 000000000000..f0d7b8f05fc8 --- /dev/null +++ b/editors/openoffice.org-3-devel/files/patch-libxml2+prj+build.lst @@ -0,0 +1,12 @@ +Index: libxml2/prj/build.lst +=================================================================== +RCS file: /cvs/external/libxml2/prj/build.lst,v +retrieving revision 1.1 +diff -u -r1.1 build.lst +--- ../libxml2/prj/build.lst 6 Feb 2004 10:15:09 -0000 1.1 ++++ ../libxml2/prj/build.lst 4 May 2004 20:20:20 -0000 +@@ -1,3 +1,3 @@ +-lx libxml2 : soltools NULL
++lx libxml2 : soltools xml2cmp NULL
+ lx libxml2 usr1 - all lx_mkout NULL
+ lx libxml2 nmake - all lx_libxml2 NULL
diff --git a/editors/openoffice.org-3-devel/files/patch-odk+setsdkenv_unix.in b/editors/openoffice.org-3-devel/files/patch-odk+setsdkenv_unix.in deleted file mode 100644 index e5551f883231..000000000000 --- a/editors/openoffice.org-3-devel/files/patch-odk+setsdkenv_unix.in +++ /dev/null @@ -1,27 +0,0 @@ -http://qa.openoffice.org/issues/show_bug.cgi?id=24142 ---- ../odk/setsdkenv_unix.in Sun Jan 25 18:41:01 2004 -+++ ../odk/setsdkenv_unix.in Sun Jan 25 18:42:00 2004 -@@ -2,7 +2,8 @@ - - # This script starts a new shell and sets all enviroment variables, which - # are necessary for building the examples of the Office Development Kit. --# The Script was developed for the operating systems Solaris and Linux. -+# The script was developed for the operating systems Solaris, Linux, MacOS X -+# and FreeBSD. - - # Installation directory of the Software Development Kit. - # Example: OO_SDK_HOME=/work/StarOffice_SDK -@@ -76,6 +77,13 @@ - LD_LIBRARY_PATH=$OO_SDK_HOME/$directoryname/lib:$OO_SDK_HOME/$exampleout/lib:$OFFICE_PROGRAM_PATH:.:$LD_LIBRARY_PATH - export LD_LIBRARY_PATH - ;; -+ -+ FreeBSD) -+ directoryname=freebsd -+ exampleout=FREEBSDexample.out -+ LD_LIBRARY_PATH=$OO_SDK_HOME/$directoryname/lib:$OO_SDK_HOME/$exampleout/lib:$OFFICE_PROGRAM_PATH:.:$LD_LIBRARY_PATH -+ export LD_LIBRARY_PATH -+ ;; - esac - - # Add directory of the SDK tools to the path. diff --git a/editors/openoffice.org-3-devel/files/patch-odk+settings+settings.mk b/editors/openoffice.org-3-devel/files/patch-odk+settings+settings.mk deleted file mode 100644 index 8c3942d12f16..000000000000 --- a/editors/openoffice.org-3-devel/files/patch-odk+settings+settings.mk +++ /dev/null @@ -1,90 +0,0 @@ -http://qa.openoffice.org/issues/show_bug.cgi?id=24142 - ---- ../odk/settings/settings.mk Sun Jan 25 18:41:02 2004 -+++ ../odk/settings/settings.mk Sun Jan 25 18:45:09 2004 -@@ -368,3 +368,85 @@ - - endif - -+ifeq "$(PLATFORM)" "FreeBSD" -+# Settings for FreeBSD using gcc compiler -+ -+PROCTYPE := $(shell uname -m) -+ -+ -+# Default is freebsd on a intel machine -+PLATFORM=FreeBSD -+PACKAGE_LIB_DIR=freebsd_x86.plt -+JAVA_PROC_TYPE=i386 -+ -+OS=FREEBSD -+PS=/ -+CC=gcc -+LINK=gcc -+LIB=gcc -+ECHO=@echo -+MKDIR=mkdir -p -+CAT=cat -+OBJ_EXT=o -+SHAREDLIB_EXT=so -+SHAREDLIB_PRE=lib -+SHAREDLIB_OUT=$(OUT_LIB) -+ -+GCC_VERSION=$(shell $(CC) -dumpversion) -+ -+ifeq "$(shell echo $(GCC_VERSION) | cut -c 1)" "3" -+COMID=gcc3 -+CPPU_ENV=gcc3 -+else -+COMID=GCC -+CPPU_ENV=gcc2 -+endif -+ -+OSEP=\< -+CSEP=\> -+QUOTE=$(subst S,\,S) -+QM=\" -+ -+DEL=rm -f -+DELRECURSIVE=rm -rf -+COPY=cp -+URLPREFIX=file:// -+ -+# Include UDK version numbers -+include $(PRJ)/include/udkversion.mk -+ -+SALLIB=-lsal -+CPPULIB=-lcppu -+CPPUHELPERLIB=-lcppuhelper$(COMID) -+SALHELPERLIB=-lsalhelper$(COMID) -+STLPORTLIB=-lstlport_gcc -+ -+EMPTYSTRING= -+PATH_SEPARATOR=: -+ -+# -O is necessary for inlining (see gcc documentation) -+ifeq "$(DEBUG)" "yes" -+CC_FLAGS=-c -g -fpic -DPIC -fno-rtti %%PTHREAD_CFLAGS%% -+else -+CC_FLAGS=-c -O -fpic -DPIC -fno-rtti %%PTHREAD_CFLAGS%% -+endif -+ -+SDK_JAVA_INCLUDES = -I$(OO_SDK_JAVA_HOME)/include -I$(OO_SDK_JAVA_HOME)/include/freebsd -+CC_INCLUDES=-I. -I/usr/include -I$(OUT)/inc/examples -I$(PRJ)/include -+STL_INCLUDES=-I$(OO_SDK_HOME)/include/stl -+CC_DEFINES=-DUNX -DGCC -DFREEBSD -DCPPU_ENV=$(CPPU_ENV) -+ -+# define for used compiler necessary for UNO -+#-DCPPU_ENV=gcc2 -- gcc 2.91/2.95 -+#-DCPPU_ENV=gcc3 -- gcc3 3.0 -+ -+CC_OUTPUT_SWITCH=-o -+ -+LIBRARY_LINK_FLAGS=-shared '-Wl,-rpath,$$ORIGIN' -+ -+EXE_LINK_FLAGS=-Wl -+LINK_LIBS=-L$(OUT)/lib -L$(PRJ)/$(PLATFORM)/lib -L$(OFFICE_PROGRAM_PATH) %%PTHREAD_LIBS%% -+LINK_JAVA_LIBS=-L$(OO_SDK_JAVA_HOME)/jre/lib/$(JAVA_PROC_TYPE) -+ -+endif -+ diff --git a/editors/openoffice.org-3-devel/files/patch-psprint+source+helper+strhelper.cxx b/editors/openoffice.org-3-devel/files/patch-psprint+source+helper+strhelper.cxx new file mode 100644 index 000000000000..52530e403ac0 --- /dev/null +++ b/editors/openoffice.org-3-devel/files/patch-psprint+source+helper+strhelper.cxx @@ -0,0 +1,21 @@ +http://www.openoffice.org/issues/show_bug.cgi?id=27753 +The isnan() macro is a new feature of C99 and not yet part of C++. + +Index: source/helper/strhelper.cxx +=================================================================== +RCS file: /cvs/gsl/psprint/source/helper/strhelper.cxx,v +retrieving revision 1.6 +diff -u -r1.6 strhelper.cxx +--- ../psprint/source/helper/strhelper.cxx 30 Mar 2004 13:48:06 -0000 1.6 ++++ ../psprint/source/helper/strhelper.cxx 13 Apr 2004 22:26:11 -0000 +@@ -67,6 +67,10 @@ + #include <cmath> // for isnan + #include <cstring> + ++#if defined (FREEBSD) ++using namespace __gnu_cxx; //for isnan ++#endif ++ + namespace psp { + + inline int isSpace( char cChar ) diff --git a/editors/openoffice.org-3-devel/files/patch-setup2+mow+source+loader+makefile.mk b/editors/openoffice.org-3-devel/files/patch-setup2+mow+source+loader+makefile.mk deleted file mode 100644 index 7b25ff2635df..000000000000 --- a/editors/openoffice.org-3-devel/files/patch-setup2+mow+source+loader+makefile.mk +++ /dev/null @@ -1,17 +0,0 @@ -do not need -ldl - -http://qa.openoffice.org/issues/show_bug.cgi?id=27043 ---- ../setup2/mow/source/loader/makefile.mk~ Tue Mar 9 21:04:35 2004 -+++ ../setup2/mow/source/loader/makefile.mk Mon Mar 29 11:10:50 2004 -@@ -92,7 +92,11 @@ - LINK=gcc - LINKFLAGS= - LINKFLAGSAPP= -+.IF "$(OS)"=="FREEBSD" -+STDLIB= -lX11 -lc -lm -+.ELSE - STDLIB= -lX11 -ldl -lc -lm -+.ENDIF # "$(OS)"=="FREEBSD" - .ENDIF # "$(OS)$(COMID)"=="GCC" - - OBJFILES= $(OBJ)$/loader.obj diff --git a/editors/openoffice.org-3-devel/files/patch-sfx2+source+config+cfgmgr.cxx b/editors/openoffice.org-3-devel/files/patch-sfx2+source+config+cfgmgr.cxx deleted file mode 100644 index be38de290a51..000000000000 --- a/editors/openoffice.org-3-devel/files/patch-sfx2+source+config+cfgmgr.cxx +++ /dev/null @@ -1,16 +0,0 @@ -Wired 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.org-3-devel/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx b/editors/openoffice.org-3-devel/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx deleted file mode 100644 index 10c3f3c1f6e8..000000000000 --- a/editors/openoffice.org-3-devel/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx +++ /dev/null @@ -1,34 +0,0 @@ -http://qa.openoffice.org/issues/show_bug.cgi?id=24315 - -For FreeBSD, time_t is defined as -at /usr/include/machine/_types.h -49th typedef int __int32_t; -90th typedef __int32_t __time_t; /* time()... */ -and -/usr/include/pwd.h:typedef __time_t time_t; -/usr/include/time.h:typedef __time_t time_t; -/usr/include/timeconv.h:typedef __time_t time_t; -/usr/include/utime.h:typedef __time_t time_t; -so time_t is equal to 32 bit integer - -For LinuxPPC (Yellowdog 3.0.1) - - ---- ../shell/source/unix/sysshell/recently_used_file_handler.cxx.orig Tue Jan 13 00:56:37 2004 -+++ ../shell/source/unix/sysshell/recently_used_file_handler.cxx Tue Jan 13 00:57:26 2004 -@@ -188,9 +188,12 @@ - write_xml_start_tag(TAG_RECENT_ITEM, file, true); - write_xml_tag(TAG_URI, uri_, file); - write_xml_tag(TAG_MIME_TYPE, mime_type_, file); -- -- rtl::OString ts = rtl::OString::valueOf(timestamp_); -- write_xml_tag(TAG_TIMESTAMP, ts.getStr(), file); -+#if defined FREEBSD -+ rtl::OString ts = rtl::OString::valueOf((sal_Int32)timestamp_); -+#else -+ rtl::OString ts = rtl::OString::valueOf(timestamp_); -+#endif -+ write_xml_tag(TAG_TIMESTAMP, ts.getStr(), file); - - if (is_private_) - write_xml_tag(TAG_PRIVATE, file); diff --git a/editors/openoffice.org-3-devel/files/patch-solenv+inc+ant.mk b/editors/openoffice.org-3-devel/files/patch-solenv+inc+ant.mk deleted file mode 100644 index e050b85d41e9..000000000000 --- a/editors/openoffice.org-3-devel/files/patch-solenv+inc+ant.mk +++ /dev/null @@ -1,13 +0,0 @@ -http://qa.openoffice.org/issues/show_bug.cgi?id=27028 - ---- ../solenv/inc/ant.mk~ Wed Feb 4 21:37:16 2004 -+++ ../solenv/inc/ant.mk Fri Apr 2 23:59:27 2004 -@@ -100,7 +100,7 @@ - .ENDIF - .ENDIF - --ANT=$(WRAPCMD) java -classpath $(CLASSPATH) -Xmx128m org.apache.tools.ant.Main -Djava.home=$(JAVA_HOME) -Dant.home=$(ANT_HOME) -+#ANT=$(WRAPCMD) java -classpath $(CLASSPATH) -Xmx128m org.apache.tools.ant.Main -Djava.home=$(JAVA_HOME) -Dant.home=$(ANT_HOME) - #ANT=java -version - - .IF "$(ANT_BUILDFILE)"=="" diff --git a/editors/openoffice.org-3-devel/files/patch-solenv+inc+settings.mk b/editors/openoffice.org-3-devel/files/patch-solenv+inc+settings.mk deleted file mode 100644 index f93ee2ad6bf2..000000000000 --- a/editors/openoffice.org-3-devel/files/patch-solenv+inc+settings.mk +++ /dev/null @@ -1,15 +0,0 @@ -http://www.openoffice.org/issues/show_bug.cgi?id=25579 -We should set locale as UTF-8 when compiling -but this was due to violation of OOo coding style - ---- ../solenv/inc/settings.mk.old Tue Mar 9 21:19:28 2004 -+++ ../solenv/inc/settings.mk Mon Mar 29 13:23:31 2004 -@@ -172,7 +172,7 @@ - JAVAI=gij - JAVACPS=--classpath - .ELSE --JAVAC=javac -+JAVAC=javac -encoding UTF-8 - JAVAI=java - JAVACPS=-classpath - .ENDIF diff --git a/editors/openoffice.org-3-devel/files/patch-vcl+source+gdi+outdev3.cxx b/editors/openoffice.org-3-devel/files/patch-vcl+source+gdi+outdev3.cxx deleted file mode 100644 index 22ef6f26f45f..000000000000 --- a/editors/openoffice.org-3-devel/files/patch-vcl+source+gdi+outdev3.cxx +++ /dev/null @@ -1,14 +0,0 @@ -do not need <malloc.h> including stdlib.h is enough -http://qa.openoffice.org/issues/show_bug.cgi?id=27041 - ---- ../vcl/source/gdi/outdev3.cxx.old Mon Mar 29 09:42:28 2004 -+++ ../vcl/source/gdi/outdev3.cxx Mon Mar 29 09:42:59 2004 -@@ -176,7 +176,7 @@ - #if defined(SOLARIS) || defined(IRIX) - #include <alloca.h> - #else --#ifndef MACOSX -+#if !(defined(MACOSX) || defined(FREEBSD)) - #include <malloc.h> - #endif - #endif diff --git a/editors/openoffice.org-3-devel/files/patch-vcl+source+gdi+sallayout.cxx b/editors/openoffice.org-3-devel/files/patch-vcl+source+gdi+sallayout.cxx deleted file mode 100644 index 5cbc59bf7db7..000000000000 --- a/editors/openoffice.org-3-devel/files/patch-vcl+source+gdi+sallayout.cxx +++ /dev/null @@ -1,14 +0,0 @@ -malloc.h is deprecated -http://qa.openoffice.org/issues/show_bug.cgi?id=27041 - ---- ../vcl/source/gdi/sallayout.cxx.org Mon Mar 29 10:02:17 2004 -+++ ../vcl/source/gdi/sallayout.cxx Mon Mar 29 10:02:43 2004 -@@ -67,7 +67,7 @@ - #if defined(SOLARIS) || defined(IRIX) - #include <alloca.h> - #else --#ifndef MACOSX -+#if !(defined(MACOSX) || defined(FREEBSD)) - #include <malloc.h> - #endif - #endif diff --git a/editors/openoffice.org-3-devel/files/patch-vcl+source+glyphs+gcache_layout.cxx b/editors/openoffice.org-3-devel/files/patch-vcl+source+glyphs+gcache_layout.cxx deleted file mode 100644 index 53c7a909faf7..000000000000 --- a/editors/openoffice.org-3-devel/files/patch-vcl+source+glyphs+gcache_layout.cxx +++ /dev/null @@ -1,14 +0,0 @@ -malloc.h is deprecated -http://qa.openoffice.org/issues/show_bug.cgi?id=27041 - ---- ../vcl/source/glyphs/gcach_layout.cxx~ Tue Mar 9 21:15:32 2004 -+++ ../vcl/source/glyphs/gcach_layout.cxx Mon Mar 29 09:44:52 2004 -@@ -74,7 +74,7 @@ - #if defined(SOLARIS) || defined(IRIX) - #include <alloca.h> - #else --#ifndef MACOSX -+#if !(defined(MACOSX) || defined(FREEBSD)) - #include <malloc.h> - #endif - #endif diff --git a/editors/openoffice.org-3-devel/files/patch-vcl+unx+source+plugadapt+salmain.cxx b/editors/openoffice.org-3-devel/files/patch-vcl+unx+source+plugadapt+salmain.cxx deleted file mode 100644 index f5bd54364036..000000000000 --- a/editors/openoffice.org-3-devel/files/patch-vcl+unx+source+plugadapt+salmain.cxx +++ /dev/null @@ -1,24 +0,0 @@ -http://qa.openoffice.org/issues/show_bug.cgi?id=27042 - -include <sys/types.h> -Note: --- -* $RCSfile: salmain.cxx,v $ -* -* $Revision: 1.8.12.2 $ -* -* last change: $Author: hr $ $Date: 2004/01/09 18:14:00 $ --- -includes this patch - ---- ../vcl/unx/source/plugadapt/salmain.cxx~ Mon Mar 29 09:50:50 2004 -+++ ../vcl/unx/source/plugadapt/salmain.cxx Mon Mar 29 10:08:28 2004 -@@ -59,7 +59,7 @@ - * - ************************************************************************/ - --#ifdef MACOSX -+#if defined(MACOSX) || defined(FREEBSD) - // rlimit needs sys/types.h - #include <sys/types.h> - #include <sys/time.h> diff --git a/editors/openoffice.org-3-devel/files/patch-vcl+util+makefile.mk b/editors/openoffice.org-3-devel/files/patch-vcl+util+makefile.mk deleted file mode 100644 index 5d133486e032..000000000000 --- a/editors/openoffice.org-3-devel/files/patch-vcl+util+makefile.mk +++ /dev/null @@ -1,30 +0,0 @@ -FreeBSD doesn't require/need/have -ldl -http://qa.openoffice.org/issues/show_bug.cgi?id=27043 - ---- ../vcl/util/makefile.mk~ Mon Mar 29 09:50:51 2004 -+++ ../vcl/util/makefile.mk Mon Mar 29 10:19:04 2004 -@@ -208,7 +208,9 @@ - .IF "$(GUI)"!="UNX" - SHL1OBJS= $(SLO)$/salshl.obj - .ELSE --SHL1STDLIBS+=-ldl -+ .IF "$(OS)"!="FREEBSD" -+ SHL1STDLIBS+=-ldl -+ .ENDIF - .ENDIF - - .IF "$(GUI)" != "MAC" -@@ -351,8 +353,11 @@ - # libs for gtk plugin - SHL4STDLIBS=`pkg-config --libs gtk+-2.0 gthread-2.0` - SHL4STDLIBS+=-l$(SHL2TARGET) --SHL4STDLIBS+=$(SHL3STDLIBS) -lX11 -ldl -- -+ .IF "$(OS)"!="FREEBSD" -+ SHL4STDLIBS+=$(SHL3STDLIBS) -lX11 -ldl -+ .ELSE -+ SHL4STDLIBS+=$(SHL3STDLIBS) -lX11 -+ .ENDIF # FREEBSD - .ENDIF # UNX - - # --- Allgemein ---------------------------------------------------------- diff --git a/editors/openoffice.org-3-devel/files/patch-wizards+prj+build.lst b/editors/openoffice.org-3-devel/files/patch-wizards+prj+build.lst new file mode 100644 index 000000000000..5d5abb75a07e --- /dev/null +++ b/editors/openoffice.org-3-devel/files/patch-wizards+prj+build.lst @@ -0,0 +1,15 @@ +http://www.openoffice.org/issues/show_bug.cgi?id=29656 + +Index: wizards/prj/build.lst +=================================================================== +RCS file: /cvs/installation/wizards/prj/build.lst,v +retrieving revision 1.23 +diff -u -r1.23 build.lst +--- ../wizards/prj/build.lst 19 May 2004 16:35:11 -0000 1.23 ++++ ../wizards/prj/build.lst 8 Jun 2004 22:43:04 -0000 +@@ -1,4 +1,4 @@ +-wz wizards : rsc javaunohelper jut unoil NULL ++wz wizards : rsc qadevOOo javaunohelper jut unoil NULL + wz wizards\util nmake - all wz_util NULL + wz wizards\source\config nmake - all wz_config NULL + wz wizards\source\euro nmake - all wz_eurowiz NULL diff --git a/editors/openoffice.org-3-devel/files/patch-wizards+prj+d.lst b/editors/openoffice.org-3-devel/files/patch-wizards+prj+d.lst new file mode 100644 index 000000000000..d1b4255cca46 --- /dev/null +++ b/editors/openoffice.org-3-devel/files/patch-wizards+prj+d.lst @@ -0,0 +1,16 @@ +http://www.openoffice.org/issues/show_bug.cgi?id=29666 + +Index: wizards/prj/d.lst +=================================================================== +RCS file: /cvs/installation/wizards/prj/d.lst,v +retrieving revision 1.13 +diff -u -r1.13 d.lst +--- ../wizards/prj/d.lst 2 Feb 2004 19:16:11 -0000 1.13 ++++ ../wizards/prj/d.lst 9 Jun 2004 08:25:50 -0000 +@@ -1,5 +1,6 @@ + mkdir: %COMMON_DEST%\bin%_EXT%\hid + mkdir: %_DEST%\pck%_EXT% ++mkdir: %_DEST%\pck%_EXT%\img + ..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid + ..\%__SRC%\bin\*.zip %_DEST%\pck%_EXT%\*.zip + ..\%__SRC%\bin\iwz*.res %_DEST%\bin%_EXT%\iwz*.res diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile index d47c500c2e52..6c660a7b6fb8 100644 --- a/editors/openoffice.org-3/Makefile +++ b/editors/openoffice.org-3/Makefile @@ -24,7 +24,7 @@ MAINTAINER= openoffice@FreeBSD.org COMMENT= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser .endif -IGNORE= "Does not work yet, installation problems" +IGNORE= "Installation is not complete, manual installation works" NO_LATEST_LINK= yes UNZIP?= ${LOCALBASE}/bin/unzip @@ -33,13 +33,13 @@ ANT?= ${LOCALBASE}/bin/ant TCSH?= /bin/tcsh DIST_SUBDIR= openoffice2.0 BUILD_NR= 680 -MILESTONE= m30 +MILESTONE= m41 RELEASE_NR= 2.0 FRELEASE_NR= 2.0 -SNAPDATE= 20040402 +SNAPDATE= 20040611 INSTALLATION_BASEDIR= OpenOffice.org${RELEASE_NR} EXTRACT_ONLY= OOo_${BUILD_NR}${MILESTONE}_${SNAPDATE}_source.tar.bz2 -USE_GNOME= orbit gtk12 +USE_GNOME= orbit gtk12 gtk20 USE_REINPLACE= yes USE_PERL5= yes USE_BZIP2= yes @@ -48,7 +48,7 @@ USE_GMAKE= yes LANG_EXT?= 01 LANG_CONFIGURE_ARG?= ENUS WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work -WRKSRC= ${WRKDIR}/oo_${BUILD_NR}${MILESTONE}_src/config_office +WRKSRC= ${WRKDIR}/oo_${RELEASE_NR}_src/config_office #XXX dirty BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32 @@ -58,9 +58,11 @@ CXX= g++32 BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14 BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip BUILD_DEPENDS+= unzip:${PORTSDIR}/archivers/unzip -BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/apache-ant -BUILD_DEPENDS+= ${X11BASE}/lib/libgdk-x11-2.0.so:${PORTSDIR}/x11-toolkits/gtk20 +BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/apache-ant +BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries BUILD_DEPENDS+= ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft +BUILD_DEPENDS+= ${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip + .if !defined(DISPLAY) BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer .endif @@ -111,7 +113,7 @@ JDKDIR?= ${LOCALBASE}/jdk1.4.2 JAVAVM= ${JDKDIR}/bin/java GNU_CONFIGURE= yes -USE_AUTOCONF_VER= 253 +USE_AUTOCONF_VER= 259 .if defined(WITH_DEBUG) CFLAGS+= -g .if ${WITH_DEBUG} == 2 @@ -130,7 +132,7 @@ DISPLAYHACK=localhost:1001 CONFIGURE_ENV= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \ PTHREAD_LIBS=${PTHREAD_LIBS} CONFIGURE_ARGS+= --with-lang=${LANG_CONFIGURE_ARG} -CONFIGURE_ARGS+= --with-jdk-home=${JDKDIR} --with-ant-home=${LOCALBASE}/ant --with-gnu-cp=${LOCALBASE}/bin/gcp --enable-mozilla=no +CONFIGURE_ARGS+= --with-jdk-home=${JDKDIR} --with-ant-home=${LOCALBASE}/ant --with-gnu-cp=${LOCALBASE}/bin/gcp --enable-mozilla=yes .if defined(WITH_DEBUG) .if ${WITH_DEBUG} == 2 diff --git a/editors/openoffice.org-3/distinfo b/editors/openoffice.org-3/distinfo index 74de717eb2de..23f567c61dd8 100644 --- a/editors/openoffice.org-3/distinfo +++ b/editors/openoffice.org-3/distinfo @@ -1,5 +1,5 @@ -MD5 (openoffice2.0/OOo_680m30_20040402_source.tar.bz2) = 768b3d8246a12eff6bf83f098093fbee -SIZE (openoffice2.0/OOo_680m30_20040402_source.tar.bz2) = 195378119 +MD5 (openoffice2.0/OOo_680m41_20040611_source.tar.bz2) = 7b8a6d87b80022f85093a67c01064883 +SIZE (openoffice2.0/OOo_680m41_20040611_source.tar.bz2) = 221136281 MD5 (openoffice2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 SIZE (openoffice2.0/gpc231.tar.Z) = 27917 MD5 (openoffice2.0/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a diff --git a/editors/openoffice.org-3/files/patch-config_office+configure.in b/editors/openoffice.org-3/files/patch-config_office+configure.in deleted file mode 100644 index 8bd6e0668f6b..000000000000 --- a/editors/openoffice.org-3/files/patch-config_office+configure.in +++ /dev/null @@ -1,50 +0,0 @@ -#i27028 and #i27028 -http://qa.openoffice.org/issues/show_bug.cgi?id=27021 (Xaw) -http://qa.openoffice.org/issues/show_bug.cgi?id=27028 (ant) - ---- ../config_office/configure.in.org Sat Mar 27 17:54:16 2004 -+++ ../config_office/configure.in Sun Mar 28 22:17:37 2004 -@@ -1478,7 +1478,7 @@ - elif test "$_os" != "WINNT" ; then - AC_PATH_X - AC_PATH_XTRA -- AC_CHECK_HEADERS(X11/Xaw/Label.h,[AC_MSG_RESULT([Ok])],[AC_MSG_ERROR([Xaw include headers not found])]) -+dnl AC_CHECK_HEADERS(X11/Xaw/Label.h,[AC_MSG_RESULT([Ok])],[AC_MSG_ERROR([Xaw include headers not found])]) - - if test "x$x_includes" = "x"; then - x_includes="/usr/include" -@@ -1830,10 +1830,12 @@ - - if test "$enable_java" != "no"; then - ANT_HOME=; export ANT_HOME -+WITH_ANT_HOME=; export WITH_ANT_HOME - if test -z "$with_ant_home"; then - AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat]) - else -- AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat],,$with_ant_home/bin) -+ AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat],,$with_ant_home/bin:$PATH) -+ WITH_ANT_HOME=$with_ant_home - fi - - -@@ -1873,7 +1875,11 @@ - AC_TRY_EVAL(ant_cmd) - if test $? = 0 && test -f ./conftest.class ; then - AC_MSG_RESULT([Ant works]) -- ANT_HOME=`echo $ANT | $SED -n "s/\/bin\/ant.*\$//p"` -+ if test -z "$WITH_ANT_HOME"; then -+ ANT_HOME=`echo $ANT | $SED -n "s/\/bin\/ant.*\$//p"` -+ else -+ ANT_HOME="$WITH_ANT_HOME" -+ fi - else - echo "configure: Ant test failed" >&5 - cat conftest.java >&5 -@@ -1885,6 +1891,7 @@ - - rm -f conftest* core core.* *.core - fi -+ - if test -z "$ANT_HOME"; then - ANT_HOME="NO_ANT_HOME" - fi diff --git a/editors/openoffice.org-3/files/patch-config_office+set_soenv.in b/editors/openoffice.org-3/files/patch-config_office+set_soenv.in deleted file mode 100644 index dbb4c3506e1e..000000000000 --- a/editors/openoffice.org-3/files/patch-config_office+set_soenv.in +++ /dev/null @@ -1,13 +0,0 @@ -#i27028 -http://qa.openoffice.org/issues/show_bug.cgi?id=27028 - ---- ../config_office/set_soenv.in.old Tue Mar 9 21:31:38 2004 -+++ ../config_office/set_soenv.in Sun Mar 28 09:56:03 2004 -@@ -1419,6 +1419,7 @@ - ToFile( "XSLTPROC", "@XSLTPROC@", "e" ); - ToFile( "ANT_HOME", "@ANT_HOME@", "e" ); - ToFile( "ANT_LIB", "@ANT_LIB@", "e" ); -+ToFile( "ANT", "@ANT@", "e" ); - ToFile( "JDKLIB", $JAVA_LIB, "e" ); - ToFile( "STLPORT4", $STLPORT4, "e" ); - ToFile( "ASM_PATH", $ASM_PATH, "e" ); diff --git a/editors/openoffice.org-3/files/patch-cppuhelper+source+gcc3_linux_intel.map b/editors/openoffice.org-3/files/patch-cppuhelper+source+gcc3_linux_intel.map deleted file mode 100644 index cdb61b141eba..000000000000 --- a/editors/openoffice.org-3/files/patch-cppuhelper+source+gcc3_linux_intel.map +++ /dev/null @@ -1,13 +0,0 @@ -Mysterious :) - -http://qa.openoffice.org/issues/show_bug.cgi?id=23917 ---- ../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.org-3/files/patch-hwpfilter+source+hwpreader.hxx b/editors/openoffice.org-3/files/patch-hwpfilter+source+hwpreader.hxx deleted file mode 100644 index 8d65e6a3ee83..000000000000 --- a/editors/openoffice.org-3/files/patch-hwpfilter+source+hwpreader.hxx +++ /dev/null @@ -1,14 +0,0 @@ -http://qa.openoffice.org/issues/show_bug.cgi?id=27033 ---- ../hwpfilter/source/hwpreader.hxx~ Wed Oct 15 23:37:24 2003 -+++ ../hwpfilter/source/hwpreader.hxx Sun Mar 28 22:46:18 2004 -@@ -68,7 +68,9 @@ - #include <string.h> - #ifdef WIN32 - #include <malloc.h> --#else -+#endif -+ -+#if !defined(FREEBSD) - #include <alloca.h> - #endif - diff --git a/editors/openoffice.org-3/files/patch-libxml2+prj+build.lst b/editors/openoffice.org-3/files/patch-libxml2+prj+build.lst new file mode 100644 index 000000000000..f0d7b8f05fc8 --- /dev/null +++ b/editors/openoffice.org-3/files/patch-libxml2+prj+build.lst @@ -0,0 +1,12 @@ +Index: libxml2/prj/build.lst +=================================================================== +RCS file: /cvs/external/libxml2/prj/build.lst,v +retrieving revision 1.1 +diff -u -r1.1 build.lst +--- ../libxml2/prj/build.lst 6 Feb 2004 10:15:09 -0000 1.1 ++++ ../libxml2/prj/build.lst 4 May 2004 20:20:20 -0000 +@@ -1,3 +1,3 @@ +-lx libxml2 : soltools NULL
++lx libxml2 : soltools xml2cmp NULL
+ lx libxml2 usr1 - all lx_mkout NULL
+ lx libxml2 nmake - all lx_libxml2 NULL
diff --git a/editors/openoffice.org-3/files/patch-odk+setsdkenv_unix.in b/editors/openoffice.org-3/files/patch-odk+setsdkenv_unix.in deleted file mode 100644 index e5551f883231..000000000000 --- a/editors/openoffice.org-3/files/patch-odk+setsdkenv_unix.in +++ /dev/null @@ -1,27 +0,0 @@ -http://qa.openoffice.org/issues/show_bug.cgi?id=24142 ---- ../odk/setsdkenv_unix.in Sun Jan 25 18:41:01 2004 -+++ ../odk/setsdkenv_unix.in Sun Jan 25 18:42:00 2004 -@@ -2,7 +2,8 @@ - - # This script starts a new shell and sets all enviroment variables, which - # are necessary for building the examples of the Office Development Kit. --# The Script was developed for the operating systems Solaris and Linux. -+# The script was developed for the operating systems Solaris, Linux, MacOS X -+# and FreeBSD. - - # Installation directory of the Software Development Kit. - # Example: OO_SDK_HOME=/work/StarOffice_SDK -@@ -76,6 +77,13 @@ - LD_LIBRARY_PATH=$OO_SDK_HOME/$directoryname/lib:$OO_SDK_HOME/$exampleout/lib:$OFFICE_PROGRAM_PATH:.:$LD_LIBRARY_PATH - export LD_LIBRARY_PATH - ;; -+ -+ FreeBSD) -+ directoryname=freebsd -+ exampleout=FREEBSDexample.out -+ LD_LIBRARY_PATH=$OO_SDK_HOME/$directoryname/lib:$OO_SDK_HOME/$exampleout/lib:$OFFICE_PROGRAM_PATH:.:$LD_LIBRARY_PATH -+ export LD_LIBRARY_PATH -+ ;; - esac - - # Add directory of the SDK tools to the path. diff --git a/editors/openoffice.org-3/files/patch-odk+settings+settings.mk b/editors/openoffice.org-3/files/patch-odk+settings+settings.mk deleted file mode 100644 index 8c3942d12f16..000000000000 --- a/editors/openoffice.org-3/files/patch-odk+settings+settings.mk +++ /dev/null @@ -1,90 +0,0 @@ -http://qa.openoffice.org/issues/show_bug.cgi?id=24142 - ---- ../odk/settings/settings.mk Sun Jan 25 18:41:02 2004 -+++ ../odk/settings/settings.mk Sun Jan 25 18:45:09 2004 -@@ -368,3 +368,85 @@ - - endif - -+ifeq "$(PLATFORM)" "FreeBSD" -+# Settings for FreeBSD using gcc compiler -+ -+PROCTYPE := $(shell uname -m) -+ -+ -+# Default is freebsd on a intel machine -+PLATFORM=FreeBSD -+PACKAGE_LIB_DIR=freebsd_x86.plt -+JAVA_PROC_TYPE=i386 -+ -+OS=FREEBSD -+PS=/ -+CC=gcc -+LINK=gcc -+LIB=gcc -+ECHO=@echo -+MKDIR=mkdir -p -+CAT=cat -+OBJ_EXT=o -+SHAREDLIB_EXT=so -+SHAREDLIB_PRE=lib -+SHAREDLIB_OUT=$(OUT_LIB) -+ -+GCC_VERSION=$(shell $(CC) -dumpversion) -+ -+ifeq "$(shell echo $(GCC_VERSION) | cut -c 1)" "3" -+COMID=gcc3 -+CPPU_ENV=gcc3 -+else -+COMID=GCC -+CPPU_ENV=gcc2 -+endif -+ -+OSEP=\< -+CSEP=\> -+QUOTE=$(subst S,\,S) -+QM=\" -+ -+DEL=rm -f -+DELRECURSIVE=rm -rf -+COPY=cp -+URLPREFIX=file:// -+ -+# Include UDK version numbers -+include $(PRJ)/include/udkversion.mk -+ -+SALLIB=-lsal -+CPPULIB=-lcppu -+CPPUHELPERLIB=-lcppuhelper$(COMID) -+SALHELPERLIB=-lsalhelper$(COMID) -+STLPORTLIB=-lstlport_gcc -+ -+EMPTYSTRING= -+PATH_SEPARATOR=: -+ -+# -O is necessary for inlining (see gcc documentation) -+ifeq "$(DEBUG)" "yes" -+CC_FLAGS=-c -g -fpic -DPIC -fno-rtti %%PTHREAD_CFLAGS%% -+else -+CC_FLAGS=-c -O -fpic -DPIC -fno-rtti %%PTHREAD_CFLAGS%% -+endif -+ -+SDK_JAVA_INCLUDES = -I$(OO_SDK_JAVA_HOME)/include -I$(OO_SDK_JAVA_HOME)/include/freebsd -+CC_INCLUDES=-I. -I/usr/include -I$(OUT)/inc/examples -I$(PRJ)/include -+STL_INCLUDES=-I$(OO_SDK_HOME)/include/stl -+CC_DEFINES=-DUNX -DGCC -DFREEBSD -DCPPU_ENV=$(CPPU_ENV) -+ -+# define for used compiler necessary for UNO -+#-DCPPU_ENV=gcc2 -- gcc 2.91/2.95 -+#-DCPPU_ENV=gcc3 -- gcc3 3.0 -+ -+CC_OUTPUT_SWITCH=-o -+ -+LIBRARY_LINK_FLAGS=-shared '-Wl,-rpath,$$ORIGIN' -+ -+EXE_LINK_FLAGS=-Wl -+LINK_LIBS=-L$(OUT)/lib -L$(PRJ)/$(PLATFORM)/lib -L$(OFFICE_PROGRAM_PATH) %%PTHREAD_LIBS%% -+LINK_JAVA_LIBS=-L$(OO_SDK_JAVA_HOME)/jre/lib/$(JAVA_PROC_TYPE) -+ -+endif -+ diff --git a/editors/openoffice.org-3/files/patch-psprint+source+helper+strhelper.cxx b/editors/openoffice.org-3/files/patch-psprint+source+helper+strhelper.cxx new file mode 100644 index 000000000000..52530e403ac0 --- /dev/null +++ b/editors/openoffice.org-3/files/patch-psprint+source+helper+strhelper.cxx @@ -0,0 +1,21 @@ +http://www.openoffice.org/issues/show_bug.cgi?id=27753 +The isnan() macro is a new feature of C99 and not yet part of C++. + +Index: source/helper/strhelper.cxx +=================================================================== +RCS file: /cvs/gsl/psprint/source/helper/strhelper.cxx,v +retrieving revision 1.6 +diff -u -r1.6 strhelper.cxx +--- ../psprint/source/helper/strhelper.cxx 30 Mar 2004 13:48:06 -0000 1.6 ++++ ../psprint/source/helper/strhelper.cxx 13 Apr 2004 22:26:11 -0000 +@@ -67,6 +67,10 @@ + #include <cmath> // for isnan + #include <cstring> + ++#if defined (FREEBSD) ++using namespace __gnu_cxx; //for isnan ++#endif ++ + namespace psp { + + inline int isSpace( char cChar ) diff --git a/editors/openoffice.org-3/files/patch-setup2+mow+source+loader+makefile.mk b/editors/openoffice.org-3/files/patch-setup2+mow+source+loader+makefile.mk deleted file mode 100644 index 7b25ff2635df..000000000000 --- a/editors/openoffice.org-3/files/patch-setup2+mow+source+loader+makefile.mk +++ /dev/null @@ -1,17 +0,0 @@ -do not need -ldl - -http://qa.openoffice.org/issues/show_bug.cgi?id=27043 ---- ../setup2/mow/source/loader/makefile.mk~ Tue Mar 9 21:04:35 2004 -+++ ../setup2/mow/source/loader/makefile.mk Mon Mar 29 11:10:50 2004 -@@ -92,7 +92,11 @@ - LINK=gcc - LINKFLAGS= - LINKFLAGSAPP= -+.IF "$(OS)"=="FREEBSD" -+STDLIB= -lX11 -lc -lm -+.ELSE - STDLIB= -lX11 -ldl -lc -lm -+.ENDIF # "$(OS)"=="FREEBSD" - .ENDIF # "$(OS)$(COMID)"=="GCC" - - OBJFILES= $(OBJ)$/loader.obj diff --git a/editors/openoffice.org-3/files/patch-sfx2+source+config+cfgmgr.cxx b/editors/openoffice.org-3/files/patch-sfx2+source+config+cfgmgr.cxx deleted file mode 100644 index be38de290a51..000000000000 --- a/editors/openoffice.org-3/files/patch-sfx2+source+config+cfgmgr.cxx +++ /dev/null @@ -1,16 +0,0 @@ -Wired 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.org-3/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx b/editors/openoffice.org-3/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx deleted file mode 100644 index 10c3f3c1f6e8..000000000000 --- a/editors/openoffice.org-3/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx +++ /dev/null @@ -1,34 +0,0 @@ -http://qa.openoffice.org/issues/show_bug.cgi?id=24315 - -For FreeBSD, time_t is defined as -at /usr/include/machine/_types.h -49th typedef int __int32_t; -90th typedef __int32_t __time_t; /* time()... */ -and -/usr/include/pwd.h:typedef __time_t time_t; -/usr/include/time.h:typedef __time_t time_t; -/usr/include/timeconv.h:typedef __time_t time_t; -/usr/include/utime.h:typedef __time_t time_t; -so time_t is equal to 32 bit integer - -For LinuxPPC (Yellowdog 3.0.1) - - ---- ../shell/source/unix/sysshell/recently_used_file_handler.cxx.orig Tue Jan 13 00:56:37 2004 -+++ ../shell/source/unix/sysshell/recently_used_file_handler.cxx Tue Jan 13 00:57:26 2004 -@@ -188,9 +188,12 @@ - write_xml_start_tag(TAG_RECENT_ITEM, file, true); - write_xml_tag(TAG_URI, uri_, file); - write_xml_tag(TAG_MIME_TYPE, mime_type_, file); -- -- rtl::OString ts = rtl::OString::valueOf(timestamp_); -- write_xml_tag(TAG_TIMESTAMP, ts.getStr(), file); -+#if defined FREEBSD -+ rtl::OString ts = rtl::OString::valueOf((sal_Int32)timestamp_); -+#else -+ rtl::OString ts = rtl::OString::valueOf(timestamp_); -+#endif -+ write_xml_tag(TAG_TIMESTAMP, ts.getStr(), file); - - if (is_private_) - write_xml_tag(TAG_PRIVATE, file); diff --git a/editors/openoffice.org-3/files/patch-solenv+inc+ant.mk b/editors/openoffice.org-3/files/patch-solenv+inc+ant.mk deleted file mode 100644 index e050b85d41e9..000000000000 --- a/editors/openoffice.org-3/files/patch-solenv+inc+ant.mk +++ /dev/null @@ -1,13 +0,0 @@ -http://qa.openoffice.org/issues/show_bug.cgi?id=27028 - ---- ../solenv/inc/ant.mk~ Wed Feb 4 21:37:16 2004 -+++ ../solenv/inc/ant.mk Fri Apr 2 23:59:27 2004 -@@ -100,7 +100,7 @@ - .ENDIF - .ENDIF - --ANT=$(WRAPCMD) java -classpath $(CLASSPATH) -Xmx128m org.apache.tools.ant.Main -Djava.home=$(JAVA_HOME) -Dant.home=$(ANT_HOME) -+#ANT=$(WRAPCMD) java -classpath $(CLASSPATH) -Xmx128m org.apache.tools.ant.Main -Djava.home=$(JAVA_HOME) -Dant.home=$(ANT_HOME) - #ANT=java -version - - .IF "$(ANT_BUILDFILE)"=="" diff --git a/editors/openoffice.org-3/files/patch-solenv+inc+settings.mk b/editors/openoffice.org-3/files/patch-solenv+inc+settings.mk deleted file mode 100644 index f93ee2ad6bf2..000000000000 --- a/editors/openoffice.org-3/files/patch-solenv+inc+settings.mk +++ /dev/null @@ -1,15 +0,0 @@ -http://www.openoffice.org/issues/show_bug.cgi?id=25579 -We should set locale as UTF-8 when compiling -but this was due to violation of OOo coding style - ---- ../solenv/inc/settings.mk.old Tue Mar 9 21:19:28 2004 -+++ ../solenv/inc/settings.mk Mon Mar 29 13:23:31 2004 -@@ -172,7 +172,7 @@ - JAVAI=gij - JAVACPS=--classpath - .ELSE --JAVAC=javac -+JAVAC=javac -encoding UTF-8 - JAVAI=java - JAVACPS=-classpath - .ENDIF diff --git a/editors/openoffice.org-3/files/patch-vcl+source+gdi+outdev3.cxx b/editors/openoffice.org-3/files/patch-vcl+source+gdi+outdev3.cxx deleted file mode 100644 index 22ef6f26f45f..000000000000 --- a/editors/openoffice.org-3/files/patch-vcl+source+gdi+outdev3.cxx +++ /dev/null @@ -1,14 +0,0 @@ -do not need <malloc.h> including stdlib.h is enough -http://qa.openoffice.org/issues/show_bug.cgi?id=27041 - ---- ../vcl/source/gdi/outdev3.cxx.old Mon Mar 29 09:42:28 2004 -+++ ../vcl/source/gdi/outdev3.cxx Mon Mar 29 09:42:59 2004 -@@ -176,7 +176,7 @@ - #if defined(SOLARIS) || defined(IRIX) - #include <alloca.h> - #else --#ifndef MACOSX -+#if !(defined(MACOSX) || defined(FREEBSD)) - #include <malloc.h> - #endif - #endif diff --git a/editors/openoffice.org-3/files/patch-vcl+source+gdi+sallayout.cxx b/editors/openoffice.org-3/files/patch-vcl+source+gdi+sallayout.cxx deleted file mode 100644 index 5cbc59bf7db7..000000000000 --- a/editors/openoffice.org-3/files/patch-vcl+source+gdi+sallayout.cxx +++ /dev/null @@ -1,14 +0,0 @@ -malloc.h is deprecated -http://qa.openoffice.org/issues/show_bug.cgi?id=27041 - ---- ../vcl/source/gdi/sallayout.cxx.org Mon Mar 29 10:02:17 2004 -+++ ../vcl/source/gdi/sallayout.cxx Mon Mar 29 10:02:43 2004 -@@ -67,7 +67,7 @@ - #if defined(SOLARIS) || defined(IRIX) - #include <alloca.h> - #else --#ifndef MACOSX -+#if !(defined(MACOSX) || defined(FREEBSD)) - #include <malloc.h> - #endif - #endif diff --git a/editors/openoffice.org-3/files/patch-vcl+source+glyphs+gcache_layout.cxx b/editors/openoffice.org-3/files/patch-vcl+source+glyphs+gcache_layout.cxx deleted file mode 100644 index 53c7a909faf7..000000000000 --- a/editors/openoffice.org-3/files/patch-vcl+source+glyphs+gcache_layout.cxx +++ /dev/null @@ -1,14 +0,0 @@ -malloc.h is deprecated -http://qa.openoffice.org/issues/show_bug.cgi?id=27041 - ---- ../vcl/source/glyphs/gcach_layout.cxx~ Tue Mar 9 21:15:32 2004 -+++ ../vcl/source/glyphs/gcach_layout.cxx Mon Mar 29 09:44:52 2004 -@@ -74,7 +74,7 @@ - #if defined(SOLARIS) || defined(IRIX) - #include <alloca.h> - #else --#ifndef MACOSX -+#if !(defined(MACOSX) || defined(FREEBSD)) - #include <malloc.h> - #endif - #endif diff --git a/editors/openoffice.org-3/files/patch-vcl+unx+source+plugadapt+salmain.cxx b/editors/openoffice.org-3/files/patch-vcl+unx+source+plugadapt+salmain.cxx deleted file mode 100644 index f5bd54364036..000000000000 --- a/editors/openoffice.org-3/files/patch-vcl+unx+source+plugadapt+salmain.cxx +++ /dev/null @@ -1,24 +0,0 @@ -http://qa.openoffice.org/issues/show_bug.cgi?id=27042 - -include <sys/types.h> -Note: --- -* $RCSfile: salmain.cxx,v $ -* -* $Revision: 1.8.12.2 $ -* -* last change: $Author: hr $ $Date: 2004/01/09 18:14:00 $ --- -includes this patch - ---- ../vcl/unx/source/plugadapt/salmain.cxx~ Mon Mar 29 09:50:50 2004 -+++ ../vcl/unx/source/plugadapt/salmain.cxx Mon Mar 29 10:08:28 2004 -@@ -59,7 +59,7 @@ - * - ************************************************************************/ - --#ifdef MACOSX -+#if defined(MACOSX) || defined(FREEBSD) - // rlimit needs sys/types.h - #include <sys/types.h> - #include <sys/time.h> diff --git a/editors/openoffice.org-3/files/patch-vcl+util+makefile.mk b/editors/openoffice.org-3/files/patch-vcl+util+makefile.mk deleted file mode 100644 index 5d133486e032..000000000000 --- a/editors/openoffice.org-3/files/patch-vcl+util+makefile.mk +++ /dev/null @@ -1,30 +0,0 @@ -FreeBSD doesn't require/need/have -ldl -http://qa.openoffice.org/issues/show_bug.cgi?id=27043 - ---- ../vcl/util/makefile.mk~ Mon Mar 29 09:50:51 2004 -+++ ../vcl/util/makefile.mk Mon Mar 29 10:19:04 2004 -@@ -208,7 +208,9 @@ - .IF "$(GUI)"!="UNX" - SHL1OBJS= $(SLO)$/salshl.obj - .ELSE --SHL1STDLIBS+=-ldl -+ .IF "$(OS)"!="FREEBSD" -+ SHL1STDLIBS+=-ldl -+ .ENDIF - .ENDIF - - .IF "$(GUI)" != "MAC" -@@ -351,8 +353,11 @@ - # libs for gtk plugin - SHL4STDLIBS=`pkg-config --libs gtk+-2.0 gthread-2.0` - SHL4STDLIBS+=-l$(SHL2TARGET) --SHL4STDLIBS+=$(SHL3STDLIBS) -lX11 -ldl -- -+ .IF "$(OS)"!="FREEBSD" -+ SHL4STDLIBS+=$(SHL3STDLIBS) -lX11 -ldl -+ .ELSE -+ SHL4STDLIBS+=$(SHL3STDLIBS) -lX11 -+ .ENDIF # FREEBSD - .ENDIF # UNX - - # --- Allgemein ---------------------------------------------------------- diff --git a/editors/openoffice.org-3/files/patch-wizards+prj+build.lst b/editors/openoffice.org-3/files/patch-wizards+prj+build.lst new file mode 100644 index 000000000000..5d5abb75a07e --- /dev/null +++ b/editors/openoffice.org-3/files/patch-wizards+prj+build.lst @@ -0,0 +1,15 @@ +http://www.openoffice.org/issues/show_bug.cgi?id=29656 + +Index: wizards/prj/build.lst +=================================================================== +RCS file: /cvs/installation/wizards/prj/build.lst,v +retrieving revision 1.23 +diff -u -r1.23 build.lst +--- ../wizards/prj/build.lst 19 May 2004 16:35:11 -0000 1.23 ++++ ../wizards/prj/build.lst 8 Jun 2004 22:43:04 -0000 +@@ -1,4 +1,4 @@ +-wz wizards : rsc javaunohelper jut unoil NULL ++wz wizards : rsc qadevOOo javaunohelper jut unoil NULL + wz wizards\util nmake - all wz_util NULL + wz wizards\source\config nmake - all wz_config NULL + wz wizards\source\euro nmake - all wz_eurowiz NULL diff --git a/editors/openoffice.org-3/files/patch-wizards+prj+d.lst b/editors/openoffice.org-3/files/patch-wizards+prj+d.lst new file mode 100644 index 000000000000..d1b4255cca46 --- /dev/null +++ b/editors/openoffice.org-3/files/patch-wizards+prj+d.lst @@ -0,0 +1,16 @@ +http://www.openoffice.org/issues/show_bug.cgi?id=29666 + +Index: wizards/prj/d.lst +=================================================================== +RCS file: /cvs/installation/wizards/prj/d.lst,v +retrieving revision 1.13 +diff -u -r1.13 d.lst +--- ../wizards/prj/d.lst 2 Feb 2004 19:16:11 -0000 1.13 ++++ ../wizards/prj/d.lst 9 Jun 2004 08:25:50 -0000 +@@ -1,5 +1,6 @@ + mkdir: %COMMON_DEST%\bin%_EXT%\hid + mkdir: %_DEST%\pck%_EXT% ++mkdir: %_DEST%\pck%_EXT%\img + ..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid + ..\%__SRC%\bin\*.zip %_DEST%\pck%_EXT%\*.zip + ..\%__SRC%\bin\iwz*.res %_DEST%\bin%_EXT%\iwz*.res diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile index d47c500c2e52..6c660a7b6fb8 100644 --- a/editors/openoffice.org-vcltesttool/Makefile +++ b/editors/openoffice.org-vcltesttool/Makefile @@ -24,7 +24,7 @@ MAINTAINER= openoffice@FreeBSD.org COMMENT= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser .endif -IGNORE= "Does not work yet, installation problems" +IGNORE= "Installation is not complete, manual installation works" NO_LATEST_LINK= yes UNZIP?= ${LOCALBASE}/bin/unzip @@ -33,13 +33,13 @@ ANT?= ${LOCALBASE}/bin/ant TCSH?= /bin/tcsh DIST_SUBDIR= openoffice2.0 BUILD_NR= 680 -MILESTONE= m30 +MILESTONE= m41 RELEASE_NR= 2.0 FRELEASE_NR= 2.0 -SNAPDATE= 20040402 +SNAPDATE= 20040611 INSTALLATION_BASEDIR= OpenOffice.org${RELEASE_NR} EXTRACT_ONLY= OOo_${BUILD_NR}${MILESTONE}_${SNAPDATE}_source.tar.bz2 -USE_GNOME= orbit gtk12 +USE_GNOME= orbit gtk12 gtk20 USE_REINPLACE= yes USE_PERL5= yes USE_BZIP2= yes @@ -48,7 +48,7 @@ USE_GMAKE= yes LANG_EXT?= 01 LANG_CONFIGURE_ARG?= ENUS WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work -WRKSRC= ${WRKDIR}/oo_${BUILD_NR}${MILESTONE}_src/config_office +WRKSRC= ${WRKDIR}/oo_${RELEASE_NR}_src/config_office #XXX dirty BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32 @@ -58,9 +58,11 @@ CXX= g++32 BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14 BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip BUILD_DEPENDS+= unzip:${PORTSDIR}/archivers/unzip -BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/apache-ant -BUILD_DEPENDS+= ${X11BASE}/lib/libgdk-x11-2.0.so:${PORTSDIR}/x11-toolkits/gtk20 +BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/apache-ant +BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries BUILD_DEPENDS+= ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft +BUILD_DEPENDS+= ${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip + .if !defined(DISPLAY) BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer .endif @@ -111,7 +113,7 @@ JDKDIR?= ${LOCALBASE}/jdk1.4.2 JAVAVM= ${JDKDIR}/bin/java GNU_CONFIGURE= yes -USE_AUTOCONF_VER= 253 +USE_AUTOCONF_VER= 259 .if defined(WITH_DEBUG) CFLAGS+= -g .if ${WITH_DEBUG} == 2 @@ -130,7 +132,7 @@ DISPLAYHACK=localhost:1001 CONFIGURE_ENV= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \ PTHREAD_LIBS=${PTHREAD_LIBS} CONFIGURE_ARGS+= --with-lang=${LANG_CONFIGURE_ARG} -CONFIGURE_ARGS+= --with-jdk-home=${JDKDIR} --with-ant-home=${LOCALBASE}/ant --with-gnu-cp=${LOCALBASE}/bin/gcp --enable-mozilla=no +CONFIGURE_ARGS+= --with-jdk-home=${JDKDIR} --with-ant-home=${LOCALBASE}/ant --with-gnu-cp=${LOCALBASE}/bin/gcp --enable-mozilla=yes .if defined(WITH_DEBUG) .if ${WITH_DEBUG} == 2 diff --git a/editors/openoffice.org-vcltesttool/distinfo b/editors/openoffice.org-vcltesttool/distinfo index 74de717eb2de..23f567c61dd8 100644 --- a/editors/openoffice.org-vcltesttool/distinfo +++ b/editors/openoffice.org-vcltesttool/distinfo @@ -1,5 +1,5 @@ -MD5 (openoffice2.0/OOo_680m30_20040402_source.tar.bz2) = 768b3d8246a12eff6bf83f098093fbee -SIZE (openoffice2.0/OOo_680m30_20040402_source.tar.bz2) = 195378119 +MD5 (openoffice2.0/OOo_680m41_20040611_source.tar.bz2) = 7b8a6d87b80022f85093a67c01064883 +SIZE (openoffice2.0/OOo_680m41_20040611_source.tar.bz2) = 221136281 MD5 (openoffice2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 SIZE (openoffice2.0/gpc231.tar.Z) = 27917 MD5 (openoffice2.0/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a diff --git a/editors/openoffice.org-vcltesttool/files/patch-config_office+configure.in b/editors/openoffice.org-vcltesttool/files/patch-config_office+configure.in deleted file mode 100644 index 8bd6e0668f6b..000000000000 --- a/editors/openoffice.org-vcltesttool/files/patch-config_office+configure.in +++ /dev/null @@ -1,50 +0,0 @@ -#i27028 and #i27028 -http://qa.openoffice.org/issues/show_bug.cgi?id=27021 (Xaw) -http://qa.openoffice.org/issues/show_bug.cgi?id=27028 (ant) - ---- ../config_office/configure.in.org Sat Mar 27 17:54:16 2004 -+++ ../config_office/configure.in Sun Mar 28 22:17:37 2004 -@@ -1478,7 +1478,7 @@ - elif test "$_os" != "WINNT" ; then - AC_PATH_X - AC_PATH_XTRA -- AC_CHECK_HEADERS(X11/Xaw/Label.h,[AC_MSG_RESULT([Ok])],[AC_MSG_ERROR([Xaw include headers not found])]) -+dnl AC_CHECK_HEADERS(X11/Xaw/Label.h,[AC_MSG_RESULT([Ok])],[AC_MSG_ERROR([Xaw include headers not found])]) - - if test "x$x_includes" = "x"; then - x_includes="/usr/include" -@@ -1830,10 +1830,12 @@ - - if test "$enable_java" != "no"; then - ANT_HOME=; export ANT_HOME -+WITH_ANT_HOME=; export WITH_ANT_HOME - if test -z "$with_ant_home"; then - AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat]) - else -- AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat],,$with_ant_home/bin) -+ AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat],,$with_ant_home/bin:$PATH) -+ WITH_ANT_HOME=$with_ant_home - fi - - -@@ -1873,7 +1875,11 @@ - AC_TRY_EVAL(ant_cmd) - if test $? = 0 && test -f ./conftest.class ; then - AC_MSG_RESULT([Ant works]) -- ANT_HOME=`echo $ANT | $SED -n "s/\/bin\/ant.*\$//p"` -+ if test -z "$WITH_ANT_HOME"; then -+ ANT_HOME=`echo $ANT | $SED -n "s/\/bin\/ant.*\$//p"` -+ else -+ ANT_HOME="$WITH_ANT_HOME" -+ fi - else - echo "configure: Ant test failed" >&5 - cat conftest.java >&5 -@@ -1885,6 +1891,7 @@ - - rm -f conftest* core core.* *.core - fi -+ - if test -z "$ANT_HOME"; then - ANT_HOME="NO_ANT_HOME" - fi diff --git a/editors/openoffice.org-vcltesttool/files/patch-config_office+set_soenv.in b/editors/openoffice.org-vcltesttool/files/patch-config_office+set_soenv.in deleted file mode 100644 index dbb4c3506e1e..000000000000 --- a/editors/openoffice.org-vcltesttool/files/patch-config_office+set_soenv.in +++ /dev/null @@ -1,13 +0,0 @@ -#i27028 -http://qa.openoffice.org/issues/show_bug.cgi?id=27028 - ---- ../config_office/set_soenv.in.old Tue Mar 9 21:31:38 2004 -+++ ../config_office/set_soenv.in Sun Mar 28 09:56:03 2004 -@@ -1419,6 +1419,7 @@ - ToFile( "XSLTPROC", "@XSLTPROC@", "e" ); - ToFile( "ANT_HOME", "@ANT_HOME@", "e" ); - ToFile( "ANT_LIB", "@ANT_LIB@", "e" ); -+ToFile( "ANT", "@ANT@", "e" ); - ToFile( "JDKLIB", $JAVA_LIB, "e" ); - ToFile( "STLPORT4", $STLPORT4, "e" ); - ToFile( "ASM_PATH", $ASM_PATH, "e" ); diff --git a/editors/openoffice.org-vcltesttool/files/patch-cppuhelper+source+gcc3_linux_intel.map b/editors/openoffice.org-vcltesttool/files/patch-cppuhelper+source+gcc3_linux_intel.map deleted file mode 100644 index cdb61b141eba..000000000000 --- a/editors/openoffice.org-vcltesttool/files/patch-cppuhelper+source+gcc3_linux_intel.map +++ /dev/null @@ -1,13 +0,0 @@ -Mysterious :) - -http://qa.openoffice.org/issues/show_bug.cgi?id=23917 ---- ../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.org-vcltesttool/files/patch-hwpfilter+source+hwpreader.hxx b/editors/openoffice.org-vcltesttool/files/patch-hwpfilter+source+hwpreader.hxx deleted file mode 100644 index 8d65e6a3ee83..000000000000 --- a/editors/openoffice.org-vcltesttool/files/patch-hwpfilter+source+hwpreader.hxx +++ /dev/null @@ -1,14 +0,0 @@ -http://qa.openoffice.org/issues/show_bug.cgi?id=27033 ---- ../hwpfilter/source/hwpreader.hxx~ Wed Oct 15 23:37:24 2003 -+++ ../hwpfilter/source/hwpreader.hxx Sun Mar 28 22:46:18 2004 -@@ -68,7 +68,9 @@ - #include <string.h> - #ifdef WIN32 - #include <malloc.h> --#else -+#endif -+ -+#if !defined(FREEBSD) - #include <alloca.h> - #endif - diff --git a/editors/openoffice.org-vcltesttool/files/patch-libxml2+prj+build.lst b/editors/openoffice.org-vcltesttool/files/patch-libxml2+prj+build.lst new file mode 100644 index 000000000000..f0d7b8f05fc8 --- /dev/null +++ b/editors/openoffice.org-vcltesttool/files/patch-libxml2+prj+build.lst @@ -0,0 +1,12 @@ +Index: libxml2/prj/build.lst +=================================================================== +RCS file: /cvs/external/libxml2/prj/build.lst,v +retrieving revision 1.1 +diff -u -r1.1 build.lst +--- ../libxml2/prj/build.lst 6 Feb 2004 10:15:09 -0000 1.1 ++++ ../libxml2/prj/build.lst 4 May 2004 20:20:20 -0000 +@@ -1,3 +1,3 @@ +-lx libxml2 : soltools NULL
++lx libxml2 : soltools xml2cmp NULL
+ lx libxml2 usr1 - all lx_mkout NULL
+ lx libxml2 nmake - all lx_libxml2 NULL
diff --git a/editors/openoffice.org-vcltesttool/files/patch-odk+setsdkenv_unix.in b/editors/openoffice.org-vcltesttool/files/patch-odk+setsdkenv_unix.in deleted file mode 100644 index e5551f883231..000000000000 --- a/editors/openoffice.org-vcltesttool/files/patch-odk+setsdkenv_unix.in +++ /dev/null @@ -1,27 +0,0 @@ -http://qa.openoffice.org/issues/show_bug.cgi?id=24142 ---- ../odk/setsdkenv_unix.in Sun Jan 25 18:41:01 2004 -+++ ../odk/setsdkenv_unix.in Sun Jan 25 18:42:00 2004 -@@ -2,7 +2,8 @@ - - # This script starts a new shell and sets all enviroment variables, which - # are necessary for building the examples of the Office Development Kit. --# The Script was developed for the operating systems Solaris and Linux. -+# The script was developed for the operating systems Solaris, Linux, MacOS X -+# and FreeBSD. - - # Installation directory of the Software Development Kit. - # Example: OO_SDK_HOME=/work/StarOffice_SDK -@@ -76,6 +77,13 @@ - LD_LIBRARY_PATH=$OO_SDK_HOME/$directoryname/lib:$OO_SDK_HOME/$exampleout/lib:$OFFICE_PROGRAM_PATH:.:$LD_LIBRARY_PATH - export LD_LIBRARY_PATH - ;; -+ -+ FreeBSD) -+ directoryname=freebsd -+ exampleout=FREEBSDexample.out -+ LD_LIBRARY_PATH=$OO_SDK_HOME/$directoryname/lib:$OO_SDK_HOME/$exampleout/lib:$OFFICE_PROGRAM_PATH:.:$LD_LIBRARY_PATH -+ export LD_LIBRARY_PATH -+ ;; - esac - - # Add directory of the SDK tools to the path. diff --git a/editors/openoffice.org-vcltesttool/files/patch-odk+settings+settings.mk b/editors/openoffice.org-vcltesttool/files/patch-odk+settings+settings.mk deleted file mode 100644 index 8c3942d12f16..000000000000 --- a/editors/openoffice.org-vcltesttool/files/patch-odk+settings+settings.mk +++ /dev/null @@ -1,90 +0,0 @@ -http://qa.openoffice.org/issues/show_bug.cgi?id=24142 - ---- ../odk/settings/settings.mk Sun Jan 25 18:41:02 2004 -+++ ../odk/settings/settings.mk Sun Jan 25 18:45:09 2004 -@@ -368,3 +368,85 @@ - - endif - -+ifeq "$(PLATFORM)" "FreeBSD" -+# Settings for FreeBSD using gcc compiler -+ -+PROCTYPE := $(shell uname -m) -+ -+ -+# Default is freebsd on a intel machine -+PLATFORM=FreeBSD -+PACKAGE_LIB_DIR=freebsd_x86.plt -+JAVA_PROC_TYPE=i386 -+ -+OS=FREEBSD -+PS=/ -+CC=gcc -+LINK=gcc -+LIB=gcc -+ECHO=@echo -+MKDIR=mkdir -p -+CAT=cat -+OBJ_EXT=o -+SHAREDLIB_EXT=so -+SHAREDLIB_PRE=lib -+SHAREDLIB_OUT=$(OUT_LIB) -+ -+GCC_VERSION=$(shell $(CC) -dumpversion) -+ -+ifeq "$(shell echo $(GCC_VERSION) | cut -c 1)" "3" -+COMID=gcc3 -+CPPU_ENV=gcc3 -+else -+COMID=GCC -+CPPU_ENV=gcc2 -+endif -+ -+OSEP=\< -+CSEP=\> -+QUOTE=$(subst S,\,S) -+QM=\" -+ -+DEL=rm -f -+DELRECURSIVE=rm -rf -+COPY=cp -+URLPREFIX=file:// -+ -+# Include UDK version numbers -+include $(PRJ)/include/udkversion.mk -+ -+SALLIB=-lsal -+CPPULIB=-lcppu -+CPPUHELPERLIB=-lcppuhelper$(COMID) -+SALHELPERLIB=-lsalhelper$(COMID) -+STLPORTLIB=-lstlport_gcc -+ -+EMPTYSTRING= -+PATH_SEPARATOR=: -+ -+# -O is necessary for inlining (see gcc documentation) -+ifeq "$(DEBUG)" "yes" -+CC_FLAGS=-c -g -fpic -DPIC -fno-rtti %%PTHREAD_CFLAGS%% -+else -+CC_FLAGS=-c -O -fpic -DPIC -fno-rtti %%PTHREAD_CFLAGS%% -+endif -+ -+SDK_JAVA_INCLUDES = -I$(OO_SDK_JAVA_HOME)/include -I$(OO_SDK_JAVA_HOME)/include/freebsd -+CC_INCLUDES=-I. -I/usr/include -I$(OUT)/inc/examples -I$(PRJ)/include -+STL_INCLUDES=-I$(OO_SDK_HOME)/include/stl -+CC_DEFINES=-DUNX -DGCC -DFREEBSD -DCPPU_ENV=$(CPPU_ENV) -+ -+# define for used compiler necessary for UNO -+#-DCPPU_ENV=gcc2 -- gcc 2.91/2.95 -+#-DCPPU_ENV=gcc3 -- gcc3 3.0 -+ -+CC_OUTPUT_SWITCH=-o -+ -+LIBRARY_LINK_FLAGS=-shared '-Wl,-rpath,$$ORIGIN' -+ -+EXE_LINK_FLAGS=-Wl -+LINK_LIBS=-L$(OUT)/lib -L$(PRJ)/$(PLATFORM)/lib -L$(OFFICE_PROGRAM_PATH) %%PTHREAD_LIBS%% -+LINK_JAVA_LIBS=-L$(OO_SDK_JAVA_HOME)/jre/lib/$(JAVA_PROC_TYPE) -+ -+endif -+ diff --git a/editors/openoffice.org-vcltesttool/files/patch-psprint+source+helper+strhelper.cxx b/editors/openoffice.org-vcltesttool/files/patch-psprint+source+helper+strhelper.cxx new file mode 100644 index 000000000000..52530e403ac0 --- /dev/null +++ b/editors/openoffice.org-vcltesttool/files/patch-psprint+source+helper+strhelper.cxx @@ -0,0 +1,21 @@ +http://www.openoffice.org/issues/show_bug.cgi?id=27753 +The isnan() macro is a new feature of C99 and not yet part of C++. + +Index: source/helper/strhelper.cxx +=================================================================== +RCS file: /cvs/gsl/psprint/source/helper/strhelper.cxx,v +retrieving revision 1.6 +diff -u -r1.6 strhelper.cxx +--- ../psprint/source/helper/strhelper.cxx 30 Mar 2004 13:48:06 -0000 1.6 ++++ ../psprint/source/helper/strhelper.cxx 13 Apr 2004 22:26:11 -0000 +@@ -67,6 +67,10 @@ + #include <cmath> // for isnan + #include <cstring> + ++#if defined (FREEBSD) ++using namespace __gnu_cxx; //for isnan ++#endif ++ + namespace psp { + + inline int isSpace( char cChar ) diff --git a/editors/openoffice.org-vcltesttool/files/patch-setup2+mow+source+loader+makefile.mk b/editors/openoffice.org-vcltesttool/files/patch-setup2+mow+source+loader+makefile.mk deleted file mode 100644 index 7b25ff2635df..000000000000 --- a/editors/openoffice.org-vcltesttool/files/patch-setup2+mow+source+loader+makefile.mk +++ /dev/null @@ -1,17 +0,0 @@ -do not need -ldl - -http://qa.openoffice.org/issues/show_bug.cgi?id=27043 ---- ../setup2/mow/source/loader/makefile.mk~ Tue Mar 9 21:04:35 2004 -+++ ../setup2/mow/source/loader/makefile.mk Mon Mar 29 11:10:50 2004 -@@ -92,7 +92,11 @@ - LINK=gcc - LINKFLAGS= - LINKFLAGSAPP= -+.IF "$(OS)"=="FREEBSD" -+STDLIB= -lX11 -lc -lm -+.ELSE - STDLIB= -lX11 -ldl -lc -lm -+.ENDIF # "$(OS)"=="FREEBSD" - .ENDIF # "$(OS)$(COMID)"=="GCC" - - OBJFILES= $(OBJ)$/loader.obj diff --git a/editors/openoffice.org-vcltesttool/files/patch-sfx2+source+config+cfgmgr.cxx b/editors/openoffice.org-vcltesttool/files/patch-sfx2+source+config+cfgmgr.cxx deleted file mode 100644 index be38de290a51..000000000000 --- a/editors/openoffice.org-vcltesttool/files/patch-sfx2+source+config+cfgmgr.cxx +++ /dev/null @@ -1,16 +0,0 @@ -Wired 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.org-vcltesttool/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx b/editors/openoffice.org-vcltesttool/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx deleted file mode 100644 index 10c3f3c1f6e8..000000000000 --- a/editors/openoffice.org-vcltesttool/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx +++ /dev/null @@ -1,34 +0,0 @@ -http://qa.openoffice.org/issues/show_bug.cgi?id=24315 - -For FreeBSD, time_t is defined as -at /usr/include/machine/_types.h -49th typedef int __int32_t; -90th typedef __int32_t __time_t; /* time()... */ -and -/usr/include/pwd.h:typedef __time_t time_t; -/usr/include/time.h:typedef __time_t time_t; -/usr/include/timeconv.h:typedef __time_t time_t; -/usr/include/utime.h:typedef __time_t time_t; -so time_t is equal to 32 bit integer - -For LinuxPPC (Yellowdog 3.0.1) - - ---- ../shell/source/unix/sysshell/recently_used_file_handler.cxx.orig Tue Jan 13 00:56:37 2004 -+++ ../shell/source/unix/sysshell/recently_used_file_handler.cxx Tue Jan 13 00:57:26 2004 -@@ -188,9 +188,12 @@ - write_xml_start_tag(TAG_RECENT_ITEM, file, true); - write_xml_tag(TAG_URI, uri_, file); - write_xml_tag(TAG_MIME_TYPE, mime_type_, file); -- -- rtl::OString ts = rtl::OString::valueOf(timestamp_); -- write_xml_tag(TAG_TIMESTAMP, ts.getStr(), file); -+#if defined FREEBSD -+ rtl::OString ts = rtl::OString::valueOf((sal_Int32)timestamp_); -+#else -+ rtl::OString ts = rtl::OString::valueOf(timestamp_); -+#endif -+ write_xml_tag(TAG_TIMESTAMP, ts.getStr(), file); - - if (is_private_) - write_xml_tag(TAG_PRIVATE, file); diff --git a/editors/openoffice.org-vcltesttool/files/patch-solenv+inc+ant.mk b/editors/openoffice.org-vcltesttool/files/patch-solenv+inc+ant.mk deleted file mode 100644 index e050b85d41e9..000000000000 --- a/editors/openoffice.org-vcltesttool/files/patch-solenv+inc+ant.mk +++ /dev/null @@ -1,13 +0,0 @@ -http://qa.openoffice.org/issues/show_bug.cgi?id=27028 - ---- ../solenv/inc/ant.mk~ Wed Feb 4 21:37:16 2004 -+++ ../solenv/inc/ant.mk Fri Apr 2 23:59:27 2004 -@@ -100,7 +100,7 @@ - .ENDIF - .ENDIF - --ANT=$(WRAPCMD) java -classpath $(CLASSPATH) -Xmx128m org.apache.tools.ant.Main -Djava.home=$(JAVA_HOME) -Dant.home=$(ANT_HOME) -+#ANT=$(WRAPCMD) java -classpath $(CLASSPATH) -Xmx128m org.apache.tools.ant.Main -Djava.home=$(JAVA_HOME) -Dant.home=$(ANT_HOME) - #ANT=java -version - - .IF "$(ANT_BUILDFILE)"=="" diff --git a/editors/openoffice.org-vcltesttool/files/patch-solenv+inc+settings.mk b/editors/openoffice.org-vcltesttool/files/patch-solenv+inc+settings.mk deleted file mode 100644 index f93ee2ad6bf2..000000000000 --- a/editors/openoffice.org-vcltesttool/files/patch-solenv+inc+settings.mk +++ /dev/null @@ -1,15 +0,0 @@ -http://www.openoffice.org/issues/show_bug.cgi?id=25579 -We should set locale as UTF-8 when compiling -but this was due to violation of OOo coding style - ---- ../solenv/inc/settings.mk.old Tue Mar 9 21:19:28 2004 -+++ ../solenv/inc/settings.mk Mon Mar 29 13:23:31 2004 -@@ -172,7 +172,7 @@ - JAVAI=gij - JAVACPS=--classpath - .ELSE --JAVAC=javac -+JAVAC=javac -encoding UTF-8 - JAVAI=java - JAVACPS=-classpath - .ENDIF diff --git a/editors/openoffice.org-vcltesttool/files/patch-vcl+source+gdi+outdev3.cxx b/editors/openoffice.org-vcltesttool/files/patch-vcl+source+gdi+outdev3.cxx deleted file mode 100644 index 22ef6f26f45f..000000000000 --- a/editors/openoffice.org-vcltesttool/files/patch-vcl+source+gdi+outdev3.cxx +++ /dev/null @@ -1,14 +0,0 @@ -do not need <malloc.h> including stdlib.h is enough -http://qa.openoffice.org/issues/show_bug.cgi?id=27041 - ---- ../vcl/source/gdi/outdev3.cxx.old Mon Mar 29 09:42:28 2004 -+++ ../vcl/source/gdi/outdev3.cxx Mon Mar 29 09:42:59 2004 -@@ -176,7 +176,7 @@ - #if defined(SOLARIS) || defined(IRIX) - #include <alloca.h> - #else --#ifndef MACOSX -+#if !(defined(MACOSX) || defined(FREEBSD)) - #include <malloc.h> - #endif - #endif diff --git a/editors/openoffice.org-vcltesttool/files/patch-vcl+source+gdi+sallayout.cxx b/editors/openoffice.org-vcltesttool/files/patch-vcl+source+gdi+sallayout.cxx deleted file mode 100644 index 5cbc59bf7db7..000000000000 --- a/editors/openoffice.org-vcltesttool/files/patch-vcl+source+gdi+sallayout.cxx +++ /dev/null @@ -1,14 +0,0 @@ -malloc.h is deprecated -http://qa.openoffice.org/issues/show_bug.cgi?id=27041 - ---- ../vcl/source/gdi/sallayout.cxx.org Mon Mar 29 10:02:17 2004 -+++ ../vcl/source/gdi/sallayout.cxx Mon Mar 29 10:02:43 2004 -@@ -67,7 +67,7 @@ - #if defined(SOLARIS) || defined(IRIX) - #include <alloca.h> - #else --#ifndef MACOSX -+#if !(defined(MACOSX) || defined(FREEBSD)) - #include <malloc.h> - #endif - #endif diff --git a/editors/openoffice.org-vcltesttool/files/patch-vcl+source+glyphs+gcache_layout.cxx b/editors/openoffice.org-vcltesttool/files/patch-vcl+source+glyphs+gcache_layout.cxx deleted file mode 100644 index 53c7a909faf7..000000000000 --- a/editors/openoffice.org-vcltesttool/files/patch-vcl+source+glyphs+gcache_layout.cxx +++ /dev/null @@ -1,14 +0,0 @@ -malloc.h is deprecated -http://qa.openoffice.org/issues/show_bug.cgi?id=27041 - ---- ../vcl/source/glyphs/gcach_layout.cxx~ Tue Mar 9 21:15:32 2004 -+++ ../vcl/source/glyphs/gcach_layout.cxx Mon Mar 29 09:44:52 2004 -@@ -74,7 +74,7 @@ - #if defined(SOLARIS) || defined(IRIX) - #include <alloca.h> - #else --#ifndef MACOSX -+#if !(defined(MACOSX) || defined(FREEBSD)) - #include <malloc.h> - #endif - #endif diff --git a/editors/openoffice.org-vcltesttool/files/patch-vcl+unx+source+plugadapt+salmain.cxx b/editors/openoffice.org-vcltesttool/files/patch-vcl+unx+source+plugadapt+salmain.cxx deleted file mode 100644 index f5bd54364036..000000000000 --- a/editors/openoffice.org-vcltesttool/files/patch-vcl+unx+source+plugadapt+salmain.cxx +++ /dev/null @@ -1,24 +0,0 @@ -http://qa.openoffice.org/issues/show_bug.cgi?id=27042 - -include <sys/types.h> -Note: --- -* $RCSfile: salmain.cxx,v $ -* -* $Revision: 1.8.12.2 $ -* -* last change: $Author: hr $ $Date: 2004/01/09 18:14:00 $ --- -includes this patch - ---- ../vcl/unx/source/plugadapt/salmain.cxx~ Mon Mar 29 09:50:50 2004 -+++ ../vcl/unx/source/plugadapt/salmain.cxx Mon Mar 29 10:08:28 2004 -@@ -59,7 +59,7 @@ - * - ************************************************************************/ - --#ifdef MACOSX -+#if defined(MACOSX) || defined(FREEBSD) - // rlimit needs sys/types.h - #include <sys/types.h> - #include <sys/time.h> diff --git a/editors/openoffice.org-vcltesttool/files/patch-vcl+util+makefile.mk b/editors/openoffice.org-vcltesttool/files/patch-vcl+util+makefile.mk deleted file mode 100644 index 5d133486e032..000000000000 --- a/editors/openoffice.org-vcltesttool/files/patch-vcl+util+makefile.mk +++ /dev/null @@ -1,30 +0,0 @@ -FreeBSD doesn't require/need/have -ldl -http://qa.openoffice.org/issues/show_bug.cgi?id=27043 - ---- ../vcl/util/makefile.mk~ Mon Mar 29 09:50:51 2004 -+++ ../vcl/util/makefile.mk Mon Mar 29 10:19:04 2004 -@@ -208,7 +208,9 @@ - .IF "$(GUI)"!="UNX" - SHL1OBJS= $(SLO)$/salshl.obj - .ELSE --SHL1STDLIBS+=-ldl -+ .IF "$(OS)"!="FREEBSD" -+ SHL1STDLIBS+=-ldl -+ .ENDIF - .ENDIF - - .IF "$(GUI)" != "MAC" -@@ -351,8 +353,11 @@ - # libs for gtk plugin - SHL4STDLIBS=`pkg-config --libs gtk+-2.0 gthread-2.0` - SHL4STDLIBS+=-l$(SHL2TARGET) --SHL4STDLIBS+=$(SHL3STDLIBS) -lX11 -ldl -- -+ .IF "$(OS)"!="FREEBSD" -+ SHL4STDLIBS+=$(SHL3STDLIBS) -lX11 -ldl -+ .ELSE -+ SHL4STDLIBS+=$(SHL3STDLIBS) -lX11 -+ .ENDIF # FREEBSD - .ENDIF # UNX - - # --- Allgemein ---------------------------------------------------------- diff --git a/editors/openoffice.org-vcltesttool/files/patch-wizards+prj+build.lst b/editors/openoffice.org-vcltesttool/files/patch-wizards+prj+build.lst new file mode 100644 index 000000000000..5d5abb75a07e --- /dev/null +++ b/editors/openoffice.org-vcltesttool/files/patch-wizards+prj+build.lst @@ -0,0 +1,15 @@ +http://www.openoffice.org/issues/show_bug.cgi?id=29656 + +Index: wizards/prj/build.lst +=================================================================== +RCS file: /cvs/installation/wizards/prj/build.lst,v +retrieving revision 1.23 +diff -u -r1.23 build.lst +--- ../wizards/prj/build.lst 19 May 2004 16:35:11 -0000 1.23 ++++ ../wizards/prj/build.lst 8 Jun 2004 22:43:04 -0000 +@@ -1,4 +1,4 @@ +-wz wizards : rsc javaunohelper jut unoil NULL ++wz wizards : rsc qadevOOo javaunohelper jut unoil NULL + wz wizards\util nmake - all wz_util NULL + wz wizards\source\config nmake - all wz_config NULL + wz wizards\source\euro nmake - all wz_eurowiz NULL diff --git a/editors/openoffice.org-vcltesttool/files/patch-wizards+prj+d.lst b/editors/openoffice.org-vcltesttool/files/patch-wizards+prj+d.lst new file mode 100644 index 000000000000..d1b4255cca46 --- /dev/null +++ b/editors/openoffice.org-vcltesttool/files/patch-wizards+prj+d.lst @@ -0,0 +1,16 @@ +http://www.openoffice.org/issues/show_bug.cgi?id=29666 + +Index: wizards/prj/d.lst +=================================================================== +RCS file: /cvs/installation/wizards/prj/d.lst,v +retrieving revision 1.13 +diff -u -r1.13 d.lst +--- ../wizards/prj/d.lst 2 Feb 2004 19:16:11 -0000 1.13 ++++ ../wizards/prj/d.lst 9 Jun 2004 08:25:50 -0000 +@@ -1,5 +1,6 @@ + mkdir: %COMMON_DEST%\bin%_EXT%\hid + mkdir: %_DEST%\pck%_EXT% ++mkdir: %_DEST%\pck%_EXT%\img + ..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid + ..\%__SRC%\bin\*.zip %_DEST%\pck%_EXT%\*.zip + ..\%__SRC%\bin\iwz*.res %_DEST%\bin%_EXT%\iwz*.res |