From 9cb138b3a955baf071f7229fc0e6a403e48f9792 Mon Sep 17 00:00:00 2001 From: maho Date: Tue, 12 Oct 2004 08:48:50 +0000 Subject: update to SRX645_m49 (will be 1.1.4) a) Use CONFIGURE_WRKSRC. no longer need .. for patches. b) Still weird though, WITH_CCACHE works. c) Fix: build without X, Makefile invokes build twice. --- editors/openoffice-1.1-devel/Makefile | 54 +++++++++++----------- editors/openoffice-1.1-devel/distinfo | 6 ++- .../openoffice-1.1-devel/files/Makefile.mozilla | 6 +-- .../files/debugpatch-solenv+inc+unxfbsdi.mk | 18 -------- .../patch-cppuhelper+source+gcc3_linux_intel.map | 4 +- .../files/patch-odk+configure.pl | 4 +- .../files/patch-odk+setsdkenv_unix.in | 4 +- .../files/patch-odk+settings+settings.mk | 4 +- .../files/patch-sch_setLogicRectHack | 6 ++- .../files/patch-sfx2+source+config+cfgmgr.cxx | 6 +-- ...ce+unix+sysshell+recently_used_file_handler.cxx | 4 +- .../files/patch-svx_setLogicRectHack | 5 +- editors/openoffice.org-1.1-devel/Makefile | 54 +++++++++++----------- editors/openoffice.org-1.1-devel/distinfo | 6 ++- .../files/Makefile.mozilla | 6 +-- .../files/debugpatch-solenv+inc+unxfbsdi.mk | 18 -------- .../patch-cppuhelper+source+gcc3_linux_intel.map | 4 +- .../files/patch-odk+configure.pl | 4 +- .../files/patch-odk+setsdkenv_unix.in | 4 +- .../files/patch-odk+settings+settings.mk | 4 +- .../files/patch-sch_setLogicRectHack | 6 ++- .../files/patch-sfx2+source+config+cfgmgr.cxx | 6 +-- ...ce+unix+sysshell+recently_used_file_handler.cxx | 4 +- .../files/patch-svx_setLogicRectHack | 5 +- 24 files changed, 108 insertions(+), 134 deletions(-) delete mode 100644 editors/openoffice-1.1-devel/files/debugpatch-solenv+inc+unxfbsdi.mk delete mode 100644 editors/openoffice.org-1.1-devel/files/debugpatch-solenv+inc+unxfbsdi.mk diff --git a/editors/openoffice-1.1-devel/Makefile b/editors/openoffice-1.1-devel/Makefile index 5566fb00ce99..393863a3bbd7 100644 --- a/editors/openoffice-1.1-devel/Makefile +++ b/editors/openoffice-1.1-devel/Makefile @@ -1,12 +1,12 @@ # New ports collection makefile for: OpenOffice.org -# Date created: 28 Februar 2002 +# Date created: 28 February 2002 # Whom: Martin Blapp # # $FreeBSD$ # PORTNAME= openoffice -PORTVERSION= 1.1.3.${SNAPDATE} +PORTVERSION= 1.1.4.${SNAPDATE} CATEGORIES+= editors MASTER_SITES+= ${MASTER_SITE_LOCAL} \ ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \ @@ -21,7 +21,7 @@ EXTRACT_ONLY= OOo_${PORTVERSION}_source.tar.bz2 MAINTAINER= openoffice@FreeBSD.org -SNAPDATE= 20040810 +SNAPDATE= 20041012 NO_LATEST_LINK= yes USE_GNOME= gtk20 .if !defined(WITHOUT_MOZILLA) @@ -67,15 +67,13 @@ L10NHELPS= helpcontent_31_unix.tgz helpcontent_33_unix.tgz \ .endif COMMENT?= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser - BUILD_NR= 645 RELEASE_NR= 1.1.3 INSTALLATION_BASEDIR= OpenOffice.org${RELEASE_NR} DIST_SUBDIR= openoffice1.1 -SIMPLEOSVER!= ${UNAME} -r | ${SED} -e 's/\.//' | ${SED} -e 's/\..*//' - +SIMPLEOSVER!= ${UNAME} -r | ${SED} -e 's/\.//g' | ${SED} -e 's/-.*//' BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32 -USE_GCC=3.2 +# FIXME .if defined(WITH_CCACHE) BUILD_DEPENDS+= ccache:${PORTSDIR}/devel/ccache CC= ccache gcc32 @@ -84,7 +82,6 @@ CXX= ccache g++32 CC= gcc32 CXX= g++32 .endif - BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \ unzip:${PORTSDIR}/archivers/unzip \ gcp:${PORTSDIR}/sysutils/coreutils \ @@ -104,7 +101,8 @@ BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/apache-ant GNU_CONFIGURE= yes USE_AUTOCONF_VER= 259 WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work -WRKSRC= ${WRKDIR}/oo_${RELEASE_NR}_src/config_office +WRKSRC= ${WRKDIR}/OOo_${RELEASE_NR}_src +CONFIGURE_WRKSRC= ${WRKDIR}/OOo_${RELEASE_NR}_src/config_office ANT?= ${LOCALBASE}/bin/ant TCSH?= /bin/tcsh ZIP?= ${PREFIX}/bin/zip @@ -128,6 +126,7 @@ CONFIGURE_ARGS+= --with-jdk-home="${JAVA_HOME}" .if defined(WITHOUT_MOZILLA) CONFIGURE_ARGS+= --disable-mozilla .endif + .if defined(ALL_LOCALIZED_LANGS) CONFIGURE_ARGS+= --with-lang=ALL .else @@ -196,8 +195,8 @@ pre-everything:: post-extract: @cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/gpc231.tar.Z | ${TAR} xfz - - @${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/../external/gpc/ - @${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/../external/gpc/ + @${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/external/gpc/ + @${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/external/gpc/ .if defined(L10NHELP) @${ECHO_MSG} "===> Extracting L10NHELP sub project" @${MKDIR} ${WRKDIR}/L10NHELP @@ -214,8 +213,8 @@ post-extract: .endif post-patch: - @${REINPLACE_CMD} -e 's+%%PTHREAD_LIBS%%+${PTHREAD_LIBS}+g;' ${WRKSRC}/../odk/settings/settings.mk - @${REINPLACE_CMD} -e 's+%%PTHREAD_CFLAGS%%+${PTHREAD_CFLAGS}+g' ${WRKSRC}/../odk/settings/settings.mk + @${REINPLACE_CMD} -e 's+%%PTHREAD_LIBS%%+${PTHREAD_LIBS}+g;' ${WRKSRC}/odk/settings/settings.mk + @${REINPLACE_CMD} -e 's+%%PTHREAD_CFLAGS%%+${PTHREAD_CFLAGS}+g' ${WRKSRC}/odk/settings/settings.mk .if defined(WITH_TTF_BYTECODE_ENABLED) @if [ "`echo ${PATCHDIR}/optpatch-*`" != "${PATCHDIR}/optpatch-*" ]; then \ ${ECHO_MSG} "===> Applying additional TTF bytecode patches for ${PKGNAME}" ; \ @@ -227,9 +226,9 @@ post-patch: .endif .if !defined(WITHOUT_MOZILLA) && ( \ - !exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIruntime.zip) || \ - !exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIlib.zip) || \ - !exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIinc.zip) ) + !exists(${WRKSRC}/moz/zipped/FREEBSDGCCIruntime.zip) || \ + !exists(${WRKSRC}/moz/zipped/FREEBSDGCCIlib.zip) || \ + !exists(${WRKSRC}/moz/zipped/FREEBSDGCCIinc.zip) ) .include <${FILESDIR}/Makefile.mozilla> do-build: mozilla .else @@ -246,19 +245,20 @@ do-build: ${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid @sleep 5 .endif - @cd ${WRKSRC}/.. ; PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ./bootstrap + @cd ${WRKSRC} ; PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ./bootstrap .if defined(L10NHELP) || defined(ALL_LOCALIZED_LANGS) - @${MKDIR} ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck - @${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck + @${MKDIR} ${WRKSRC}/solver/${BUILD_NR}/unxfbsd.pro/pck + @${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/solver/${BUILD_NR}/unxfbsd.pro/pck .endif .if !defined(DISPLAY) - @cd ${WRKSRC}/.. ; DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ; \ + @cd ${WRKSRC} ; DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ; \ ${TCSH} -c 'source FreeBSDEnv.Set ; unsetenv TOP ; ${BUILD}' @-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill @${RM} -f ${WRKDIR}/.Xvfb.pid -.endif - @cd ${WRKSRC}/.. ; DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ; \ +.else + @cd ${WRKSRC} ; DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ; \ ${TCSH} -c 'source FreeBSDEnv.Set ; unsetenv TOP ; ${BUILD}' +.endif do-install: .if !defined(DISPLAY) # @@ -266,12 +266,12 @@ do-install: # ${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid @sleep 5 - @cd ${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/ ; \ + @cd ${WRKSRC}/instsetoo/*.pro/${LANG_EXT}/normal/ ; \ SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} ./install --prefix=${PREFIX} @-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill @${RM} -f ${WRKDIR}/.Xvfb.pid .else - @cd ${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/ ; \ + @cd ${WRKSRC}/instsetoo/*.pro/${LANG_EXT}/normal/ ; \ SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} ./install --prefix=${PREFIX} .endif @@ -320,12 +320,12 @@ package-rename: sdk: @${ECHO_MSG} "===> Make SDK of OOo" - @cd ${WRKSRC}/.. ; DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ; \ + @cd ${WRKSRC} ; DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ; \ ${TCSH} -c 'source FreeBSDEnv.Set ; unsetenv TOP ; cd sdk_oo ; build.pl ; deliver.pl' - @${MV} ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/bin/OpenOffice.org${RELEASE_NR}_SDK.tar.gz ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel_sdk.tar.gz + @${MV} ${WRKSRC}/solver/${BUILD_NR}/unxfbsd.pro/bin/OpenOffice.org${RELEASE_NR}_SDK.tar.gz ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel_sdk.tar.gz solver: @${ECHO_MSG} "===> Make Solver of OOo" - @cd ${WRKSRC}/.. ; ${TAR} cfz ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel_solver.tar.gz solver + @cd ${WRKSRC} ; ${TAR} cfz ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel_solver.tar.gz solver .include diff --git a/editors/openoffice-1.1-devel/distinfo b/editors/openoffice-1.1-devel/distinfo index 4dfc23c0df2d..5e392d9f3384 100644 --- a/editors/openoffice-1.1-devel/distinfo +++ b/editors/openoffice-1.1-devel/distinfo @@ -1,5 +1,5 @@ -MD5 (openoffice1.1/OOo_1.1.3.20040810_source.tar.bz2) = 86f1d320b1a644ed97db649e18ceafe0 -SIZE (openoffice1.1/OOo_1.1.3.20040810_source.tar.bz2) = 201561173 +MD5 (openoffice1.1/OOo_1.1.4.20041012_source.tar.bz2) = f73ad434dee7684be1f4b0686b70ae8a +SIZE (openoffice1.1/OOo_1.1.4.20041012_source.tar.bz2) = 194161671 MD5 (openoffice1.1/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 SIZE (openoffice1.1/gpc231.tar.Z) = 27917 MD5 (openoffice1.1/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a @@ -26,5 +26,7 @@ MD5 (openoffice1.1/helpcontent_82_unix.tgz) = 3121fbd251176d7c7b6e33ecec744c65 SIZE (openoffice1.1/helpcontent_82_unix.tgz) = 12369920 MD5 (openoffice1.1/helpcontent_86_unix.tgz) = aee37935139c5ccd4b6d8abdd2037c66 SIZE (openoffice1.1/helpcontent_86_unix.tgz) = 12769280 +MD5 (openoffice1.1/helpcontent_88_unix.tgz) = 3b00571318e45965dee0545d86306d65 +SIZE (openoffice1.1/helpcontent_88_unix.tgz) = 12953600 MD5 (openoffice1.1/helpcontent_90_unix.tgz) = 9521a01c5817e87178f356762f8cdab5 SIZE (openoffice1.1/helpcontent_90_unix.tgz) = 12495734 diff --git a/editors/openoffice-1.1-devel/files/Makefile.mozilla b/editors/openoffice-1.1-devel/files/Makefile.mozilla index 73637f27d724..9593c16dba89 100644 --- a/editors/openoffice-1.1-devel/files/Makefile.mozilla +++ b/editors/openoffice-1.1-devel/files/Makefile.mozilla @@ -32,9 +32,9 @@ build-mozilla: .endif install-mozilla: - @${CP} ${WRKDIR}/FREEBSDGCCIinc.zip ${WRKSRC}/../moz/zipped/ - @${CP} ${WRKDIR}/FREEBSDGCCIlib.zip ${WRKSRC}/../moz/zipped/ - @${CP} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKSRC}/../moz/zipped/ + @${CP} ${WRKDIR}/FREEBSDGCCIinc.zip ${WRKSRC}/moz/zipped/ + @${CP} ${WRKDIR}/FREEBSDGCCIlib.zip ${WRKSRC}/moz/zipped/ + @${CP} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKSRC}/moz/zipped/ register-mozilla: .if exists(${WRKDIR}/mozilla-runtime) diff --git a/editors/openoffice-1.1-devel/files/debugpatch-solenv+inc+unxfbsdi.mk b/editors/openoffice-1.1-devel/files/debugpatch-solenv+inc+unxfbsdi.mk deleted file mode 100644 index 054f342ecfe0..000000000000 --- a/editors/openoffice-1.1-devel/files/debugpatch-solenv+inc+unxfbsdi.mk +++ /dev/null @@ -1,18 +0,0 @@ ---- ../solenv/inc/unxfbsdi.mk.orig Thu Jun 5 08:44:59 2003 -+++ ../solenv/inc/unxfbsdi.mk Tue Jun 10 17:30:40 2003 -@@ -92,12 +92,12 @@ - CDEFS+= $(PTHREAD_CFLAGS) -D_REENTRANT - - # flags for C and C++ Compile --CFLAGS+= -w -c $(INCLUDE) -+CFLAGS+= -g -ggdb -w -c $(INCLUDE) - CFLAGS+= -I/usr/X11R6/include - - # flags for the C++ Compiler --CFLAGSCC= -pipe -fno-rtti --CFLAGSCXX= -pipe -fno-for-scope -fpermissive -fno-rtti -+CFLAGSCC= -g -ggdb -pipe -fno-rtti -+CFLAGSCXX= -g -ggdb -pipe -fno-for-scope -fpermissive -fno-rtti - - # Flags for enabling exception handling - CFLAGSEXCEPTIONS= -fexceptions diff --git a/editors/openoffice-1.1-devel/files/patch-cppuhelper+source+gcc3_linux_intel.map b/editors/openoffice-1.1-devel/files/patch-cppuhelper+source+gcc3_linux_intel.map index da9fd94b39c0..bbbfeab36816 100644 --- a/editors/openoffice-1.1-devel/files/patch-cppuhelper+source+gcc3_linux_intel.map +++ b/editors/openoffice-1.1-devel/files/patch-cppuhelper+source+gcc3_linux_intel.map @@ -1,5 +1,5 @@ ---- ../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 +--- 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; diff --git a/editors/openoffice-1.1-devel/files/patch-odk+configure.pl b/editors/openoffice-1.1-devel/files/patch-odk+configure.pl index eeebf346c600..bd269a961590 100644 --- a/editors/openoffice-1.1-devel/files/patch-odk+configure.pl +++ b/editors/openoffice-1.1-devel/files/patch-odk+configure.pl @@ -5,8 +5,8 @@ Index: configure.pl RCS file: /cvs/api/odk/configure.pl,v retrieving revision 1.4.12.3 diff -u -r1.4.12.3 configure.pl ---- ../odk/configure.pl 18 May 2004 10:02:00 -0000 1.4.12.3 -+++ ../configure.pl 11 Aug 2004 08:21:04 -0000 +--- odk/configure.pl.orig 18 May 2004 10:02:00 -0000 1.4.12.3 ++++ odk/configure.pl 11 Aug 2004 08:21:04 -0000 @@ -19,7 +19,7 @@ chop ($main::OFFICE_HOME_SUGGESTION); diff --git a/editors/openoffice-1.1-devel/files/patch-odk+setsdkenv_unix.in b/editors/openoffice-1.1-devel/files/patch-odk+setsdkenv_unix.in index dbcad91a1fb4..59269742ab37 100644 --- a/editors/openoffice-1.1-devel/files/patch-odk+setsdkenv_unix.in +++ b/editors/openoffice-1.1-devel/files/patch-odk+setsdkenv_unix.in @@ -1,7 +1,7 @@ http://www.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 +--- odk/setsdkenv_unix.in.orig 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 diff --git a/editors/openoffice-1.1-devel/files/patch-odk+settings+settings.mk b/editors/openoffice-1.1-devel/files/patch-odk+settings+settings.mk index 22fd7fd2f816..78814a4cfaee 100644 --- a/editors/openoffice-1.1-devel/files/patch-odk+settings+settings.mk +++ b/editors/openoffice-1.1-devel/files/patch-odk+settings+settings.mk @@ -1,7 +1,7 @@ http://www.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 +--- odk/settings/settings.mk.orig Sun Jan 25 18:41:02 2004 ++++ odk/settings/settings.mk Sun Jan 25 18:45:09 2004 @@ -368,3 +368,85 @@ endif diff --git a/editors/openoffice-1.1-devel/files/patch-sch_setLogicRectHack b/editors/openoffice-1.1-devel/files/patch-sch_setLogicRectHack index 34b26e9cfc39..44de26bd9cfd 100644 --- a/editors/openoffice-1.1-devel/files/patch-sch_setLogicRectHack +++ b/editors/openoffice-1.1-devel/files/patch-sch_setLogicRectHack @@ -1,5 +1,7 @@ ---- ../sch/source/ui/unoidl/ChXChartObject.cxx 7 Aug 2002 16:01:42 -0000 1.34 -+++ ../sch/source/ui/unoidl/ChXChartObject.cxx 20 Feb 2004 00:43:10 -0000 +#iZ 9462 + +--- sch/source/ui/unoidl/ChXChartObject.cxx.orig 7 Aug 2002 16:01:42 -0000 1.34 ++++ sch/source/ui/unoidl/ChXChartObject.cxx 20 Feb 2004 00:43:10 -0000 @@ -161,9 +161,11 @@ // XShape diff --git a/editors/openoffice-1.1-devel/files/patch-sfx2+source+config+cfgmgr.cxx b/editors/openoffice-1.1-devel/files/patch-sfx2+source+config+cfgmgr.cxx index be38de290a51..420c61cc7b7b 100644 --- a/editors/openoffice-1.1-devel/files/patch-sfx2+source+config+cfgmgr.cxx +++ b/editors/openoffice-1.1-devel/files/patch-sfx2+source+config+cfgmgr.cxx @@ -1,8 +1,8 @@ -Wired bug? +Weird bug? http://qa.openoffice.org/issues/show_bug.cgi?id=22253 ---- ../sfx2/source/config/cfgmgr.cxx.org Fri Nov 7 19:11:25 2003 -+++ ../sfx2/source/config/cfgmgr.cxx Fri Nov 7 19:30:26 2003 +--- 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&) { diff --git a/editors/openoffice-1.1-devel/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx b/editors/openoffice-1.1-devel/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx index c07cab2ab7e8..196084c1657b 100644 --- a/editors/openoffice-1.1-devel/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx +++ b/editors/openoffice-1.1-devel/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx @@ -1,5 +1,5 @@ ---- ../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 +--- 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); diff --git a/editors/openoffice-1.1-devel/files/patch-svx_setLogicRectHack b/editors/openoffice-1.1-devel/files/patch-svx_setLogicRectHack index 035db5e5e21c..e8c2725e58ab 100644 --- a/editors/openoffice-1.1-devel/files/patch-svx_setLogicRectHack +++ b/editors/openoffice-1.1-devel/files/patch-svx_setLogicRectHack @@ -1,5 +1,6 @@ ---- ../svx/source/unodraw/unoshape.cxx 4 Feb 2004 13:21:23 -0000 1.109 -+++ ../svx/source/unodraw/unoshape.cxx 20 Feb 2004 00:43:50 -0000 +#i9462# +--- svx/source/unodraw/unoshape.cxx.orig 4 Feb 2004 13:21:23 -0000 1.109 ++++ svx/source/unodraw/unoshape.cxx 20 Feb 2004 00:43:50 -0000 @@ -1067,8 +1067,10 @@ // XShape diff --git a/editors/openoffice.org-1.1-devel/Makefile b/editors/openoffice.org-1.1-devel/Makefile index 5566fb00ce99..393863a3bbd7 100644 --- a/editors/openoffice.org-1.1-devel/Makefile +++ b/editors/openoffice.org-1.1-devel/Makefile @@ -1,12 +1,12 @@ # New ports collection makefile for: OpenOffice.org -# Date created: 28 Februar 2002 +# Date created: 28 February 2002 # Whom: Martin Blapp # # $FreeBSD$ # PORTNAME= openoffice -PORTVERSION= 1.1.3.${SNAPDATE} +PORTVERSION= 1.1.4.${SNAPDATE} CATEGORIES+= editors MASTER_SITES+= ${MASTER_SITE_LOCAL} \ ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \ @@ -21,7 +21,7 @@ EXTRACT_ONLY= OOo_${PORTVERSION}_source.tar.bz2 MAINTAINER= openoffice@FreeBSD.org -SNAPDATE= 20040810 +SNAPDATE= 20041012 NO_LATEST_LINK= yes USE_GNOME= gtk20 .if !defined(WITHOUT_MOZILLA) @@ -67,15 +67,13 @@ L10NHELPS= helpcontent_31_unix.tgz helpcontent_33_unix.tgz \ .endif COMMENT?= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser - BUILD_NR= 645 RELEASE_NR= 1.1.3 INSTALLATION_BASEDIR= OpenOffice.org${RELEASE_NR} DIST_SUBDIR= openoffice1.1 -SIMPLEOSVER!= ${UNAME} -r | ${SED} -e 's/\.//' | ${SED} -e 's/\..*//' - +SIMPLEOSVER!= ${UNAME} -r | ${SED} -e 's/\.//g' | ${SED} -e 's/-.*//' BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32 -USE_GCC=3.2 +# FIXME .if defined(WITH_CCACHE) BUILD_DEPENDS+= ccache:${PORTSDIR}/devel/ccache CC= ccache gcc32 @@ -84,7 +82,6 @@ CXX= ccache g++32 CC= gcc32 CXX= g++32 .endif - BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \ unzip:${PORTSDIR}/archivers/unzip \ gcp:${PORTSDIR}/sysutils/coreutils \ @@ -104,7 +101,8 @@ BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/apache-ant GNU_CONFIGURE= yes USE_AUTOCONF_VER= 259 WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work -WRKSRC= ${WRKDIR}/oo_${RELEASE_NR}_src/config_office +WRKSRC= ${WRKDIR}/OOo_${RELEASE_NR}_src +CONFIGURE_WRKSRC= ${WRKDIR}/OOo_${RELEASE_NR}_src/config_office ANT?= ${LOCALBASE}/bin/ant TCSH?= /bin/tcsh ZIP?= ${PREFIX}/bin/zip @@ -128,6 +126,7 @@ CONFIGURE_ARGS+= --with-jdk-home="${JAVA_HOME}" .if defined(WITHOUT_MOZILLA) CONFIGURE_ARGS+= --disable-mozilla .endif + .if defined(ALL_LOCALIZED_LANGS) CONFIGURE_ARGS+= --with-lang=ALL .else @@ -196,8 +195,8 @@ pre-everything:: post-extract: @cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/gpc231.tar.Z | ${TAR} xfz - - @${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/../external/gpc/ - @${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/../external/gpc/ + @${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/external/gpc/ + @${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/external/gpc/ .if defined(L10NHELP) @${ECHO_MSG} "===> Extracting L10NHELP sub project" @${MKDIR} ${WRKDIR}/L10NHELP @@ -214,8 +213,8 @@ post-extract: .endif post-patch: - @${REINPLACE_CMD} -e 's+%%PTHREAD_LIBS%%+${PTHREAD_LIBS}+g;' ${WRKSRC}/../odk/settings/settings.mk - @${REINPLACE_CMD} -e 's+%%PTHREAD_CFLAGS%%+${PTHREAD_CFLAGS}+g' ${WRKSRC}/../odk/settings/settings.mk + @${REINPLACE_CMD} -e 's+%%PTHREAD_LIBS%%+${PTHREAD_LIBS}+g;' ${WRKSRC}/odk/settings/settings.mk + @${REINPLACE_CMD} -e 's+%%PTHREAD_CFLAGS%%+${PTHREAD_CFLAGS}+g' ${WRKSRC}/odk/settings/settings.mk .if defined(WITH_TTF_BYTECODE_ENABLED) @if [ "`echo ${PATCHDIR}/optpatch-*`" != "${PATCHDIR}/optpatch-*" ]; then \ ${ECHO_MSG} "===> Applying additional TTF bytecode patches for ${PKGNAME}" ; \ @@ -227,9 +226,9 @@ post-patch: .endif .if !defined(WITHOUT_MOZILLA) && ( \ - !exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIruntime.zip) || \ - !exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIlib.zip) || \ - !exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIinc.zip) ) + !exists(${WRKSRC}/moz/zipped/FREEBSDGCCIruntime.zip) || \ + !exists(${WRKSRC}/moz/zipped/FREEBSDGCCIlib.zip) || \ + !exists(${WRKSRC}/moz/zipped/FREEBSDGCCIinc.zip) ) .include <${FILESDIR}/Makefile.mozilla> do-build: mozilla .else @@ -246,19 +245,20 @@ do-build: ${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid @sleep 5 .endif - @cd ${WRKSRC}/.. ; PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ./bootstrap + @cd ${WRKSRC} ; PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ./bootstrap .if defined(L10NHELP) || defined(ALL_LOCALIZED_LANGS) - @${MKDIR} ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck - @${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck + @${MKDIR} ${WRKSRC}/solver/${BUILD_NR}/unxfbsd.pro/pck + @${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/solver/${BUILD_NR}/unxfbsd.pro/pck .endif .if !defined(DISPLAY) - @cd ${WRKSRC}/.. ; DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ; \ + @cd ${WRKSRC} ; DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ; \ ${TCSH} -c 'source FreeBSDEnv.Set ; unsetenv TOP ; ${BUILD}' @-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill @${RM} -f ${WRKDIR}/.Xvfb.pid -.endif - @cd ${WRKSRC}/.. ; DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ; \ +.else + @cd ${WRKSRC} ; DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ; \ ${TCSH} -c 'source FreeBSDEnv.Set ; unsetenv TOP ; ${BUILD}' +.endif do-install: .if !defined(DISPLAY) # @@ -266,12 +266,12 @@ do-install: # ${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid @sleep 5 - @cd ${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/ ; \ + @cd ${WRKSRC}/instsetoo/*.pro/${LANG_EXT}/normal/ ; \ SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} ./install --prefix=${PREFIX} @-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill @${RM} -f ${WRKDIR}/.Xvfb.pid .else - @cd ${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/ ; \ + @cd ${WRKSRC}/instsetoo/*.pro/${LANG_EXT}/normal/ ; \ SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} ./install --prefix=${PREFIX} .endif @@ -320,12 +320,12 @@ package-rename: sdk: @${ECHO_MSG} "===> Make SDK of OOo" - @cd ${WRKSRC}/.. ; DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ; \ + @cd ${WRKSRC} ; DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ; \ ${TCSH} -c 'source FreeBSDEnv.Set ; unsetenv TOP ; cd sdk_oo ; build.pl ; deliver.pl' - @${MV} ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/bin/OpenOffice.org${RELEASE_NR}_SDK.tar.gz ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel_sdk.tar.gz + @${MV} ${WRKSRC}/solver/${BUILD_NR}/unxfbsd.pro/bin/OpenOffice.org${RELEASE_NR}_SDK.tar.gz ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel_sdk.tar.gz solver: @${ECHO_MSG} "===> Make Solver of OOo" - @cd ${WRKSRC}/.. ; ${TAR} cfz ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel_solver.tar.gz solver + @cd ${WRKSRC} ; ${TAR} cfz ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel_solver.tar.gz solver .include diff --git a/editors/openoffice.org-1.1-devel/distinfo b/editors/openoffice.org-1.1-devel/distinfo index 4dfc23c0df2d..5e392d9f3384 100644 --- a/editors/openoffice.org-1.1-devel/distinfo +++ b/editors/openoffice.org-1.1-devel/distinfo @@ -1,5 +1,5 @@ -MD5 (openoffice1.1/OOo_1.1.3.20040810_source.tar.bz2) = 86f1d320b1a644ed97db649e18ceafe0 -SIZE (openoffice1.1/OOo_1.1.3.20040810_source.tar.bz2) = 201561173 +MD5 (openoffice1.1/OOo_1.1.4.20041012_source.tar.bz2) = f73ad434dee7684be1f4b0686b70ae8a +SIZE (openoffice1.1/OOo_1.1.4.20041012_source.tar.bz2) = 194161671 MD5 (openoffice1.1/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 SIZE (openoffice1.1/gpc231.tar.Z) = 27917 MD5 (openoffice1.1/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a @@ -26,5 +26,7 @@ MD5 (openoffice1.1/helpcontent_82_unix.tgz) = 3121fbd251176d7c7b6e33ecec744c65 SIZE (openoffice1.1/helpcontent_82_unix.tgz) = 12369920 MD5 (openoffice1.1/helpcontent_86_unix.tgz) = aee37935139c5ccd4b6d8abdd2037c66 SIZE (openoffice1.1/helpcontent_86_unix.tgz) = 12769280 +MD5 (openoffice1.1/helpcontent_88_unix.tgz) = 3b00571318e45965dee0545d86306d65 +SIZE (openoffice1.1/helpcontent_88_unix.tgz) = 12953600 MD5 (openoffice1.1/helpcontent_90_unix.tgz) = 9521a01c5817e87178f356762f8cdab5 SIZE (openoffice1.1/helpcontent_90_unix.tgz) = 12495734 diff --git a/editors/openoffice.org-1.1-devel/files/Makefile.mozilla b/editors/openoffice.org-1.1-devel/files/Makefile.mozilla index 73637f27d724..9593c16dba89 100644 --- a/editors/openoffice.org-1.1-devel/files/Makefile.mozilla +++ b/editors/openoffice.org-1.1-devel/files/Makefile.mozilla @@ -32,9 +32,9 @@ build-mozilla: .endif install-mozilla: - @${CP} ${WRKDIR}/FREEBSDGCCIinc.zip ${WRKSRC}/../moz/zipped/ - @${CP} ${WRKDIR}/FREEBSDGCCIlib.zip ${WRKSRC}/../moz/zipped/ - @${CP} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKSRC}/../moz/zipped/ + @${CP} ${WRKDIR}/FREEBSDGCCIinc.zip ${WRKSRC}/moz/zipped/ + @${CP} ${WRKDIR}/FREEBSDGCCIlib.zip ${WRKSRC}/moz/zipped/ + @${CP} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKSRC}/moz/zipped/ register-mozilla: .if exists(${WRKDIR}/mozilla-runtime) diff --git a/editors/openoffice.org-1.1-devel/files/debugpatch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-1.1-devel/files/debugpatch-solenv+inc+unxfbsdi.mk deleted file mode 100644 index 054f342ecfe0..000000000000 --- a/editors/openoffice.org-1.1-devel/files/debugpatch-solenv+inc+unxfbsdi.mk +++ /dev/null @@ -1,18 +0,0 @@ ---- ../solenv/inc/unxfbsdi.mk.orig Thu Jun 5 08:44:59 2003 -+++ ../solenv/inc/unxfbsdi.mk Tue Jun 10 17:30:40 2003 -@@ -92,12 +92,12 @@ - CDEFS+= $(PTHREAD_CFLAGS) -D_REENTRANT - - # flags for C and C++ Compile --CFLAGS+= -w -c $(INCLUDE) -+CFLAGS+= -g -ggdb -w -c $(INCLUDE) - CFLAGS+= -I/usr/X11R6/include - - # flags for the C++ Compiler --CFLAGSCC= -pipe -fno-rtti --CFLAGSCXX= -pipe -fno-for-scope -fpermissive -fno-rtti -+CFLAGSCC= -g -ggdb -pipe -fno-rtti -+CFLAGSCXX= -g -ggdb -pipe -fno-for-scope -fpermissive -fno-rtti - - # Flags for enabling exception handling - CFLAGSEXCEPTIONS= -fexceptions diff --git a/editors/openoffice.org-1.1-devel/files/patch-cppuhelper+source+gcc3_linux_intel.map b/editors/openoffice.org-1.1-devel/files/patch-cppuhelper+source+gcc3_linux_intel.map index da9fd94b39c0..bbbfeab36816 100644 --- a/editors/openoffice.org-1.1-devel/files/patch-cppuhelper+source+gcc3_linux_intel.map +++ b/editors/openoffice.org-1.1-devel/files/patch-cppuhelper+source+gcc3_linux_intel.map @@ -1,5 +1,5 @@ ---- ../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 +--- 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; diff --git a/editors/openoffice.org-1.1-devel/files/patch-odk+configure.pl b/editors/openoffice.org-1.1-devel/files/patch-odk+configure.pl index eeebf346c600..bd269a961590 100644 --- a/editors/openoffice.org-1.1-devel/files/patch-odk+configure.pl +++ b/editors/openoffice.org-1.1-devel/files/patch-odk+configure.pl @@ -5,8 +5,8 @@ Index: configure.pl RCS file: /cvs/api/odk/configure.pl,v retrieving revision 1.4.12.3 diff -u -r1.4.12.3 configure.pl ---- ../odk/configure.pl 18 May 2004 10:02:00 -0000 1.4.12.3 -+++ ../configure.pl 11 Aug 2004 08:21:04 -0000 +--- odk/configure.pl.orig 18 May 2004 10:02:00 -0000 1.4.12.3 ++++ odk/configure.pl 11 Aug 2004 08:21:04 -0000 @@ -19,7 +19,7 @@ chop ($main::OFFICE_HOME_SUGGESTION); diff --git a/editors/openoffice.org-1.1-devel/files/patch-odk+setsdkenv_unix.in b/editors/openoffice.org-1.1-devel/files/patch-odk+setsdkenv_unix.in index dbcad91a1fb4..59269742ab37 100644 --- a/editors/openoffice.org-1.1-devel/files/patch-odk+setsdkenv_unix.in +++ b/editors/openoffice.org-1.1-devel/files/patch-odk+setsdkenv_unix.in @@ -1,7 +1,7 @@ http://www.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 +--- odk/setsdkenv_unix.in.orig 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 diff --git a/editors/openoffice.org-1.1-devel/files/patch-odk+settings+settings.mk b/editors/openoffice.org-1.1-devel/files/patch-odk+settings+settings.mk index 22fd7fd2f816..78814a4cfaee 100644 --- a/editors/openoffice.org-1.1-devel/files/patch-odk+settings+settings.mk +++ b/editors/openoffice.org-1.1-devel/files/patch-odk+settings+settings.mk @@ -1,7 +1,7 @@ http://www.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 +--- odk/settings/settings.mk.orig Sun Jan 25 18:41:02 2004 ++++ odk/settings/settings.mk Sun Jan 25 18:45:09 2004 @@ -368,3 +368,85 @@ endif diff --git a/editors/openoffice.org-1.1-devel/files/patch-sch_setLogicRectHack b/editors/openoffice.org-1.1-devel/files/patch-sch_setLogicRectHack index 34b26e9cfc39..44de26bd9cfd 100644 --- a/editors/openoffice.org-1.1-devel/files/patch-sch_setLogicRectHack +++ b/editors/openoffice.org-1.1-devel/files/patch-sch_setLogicRectHack @@ -1,5 +1,7 @@ ---- ../sch/source/ui/unoidl/ChXChartObject.cxx 7 Aug 2002 16:01:42 -0000 1.34 -+++ ../sch/source/ui/unoidl/ChXChartObject.cxx 20 Feb 2004 00:43:10 -0000 +#iZ 9462 + +--- sch/source/ui/unoidl/ChXChartObject.cxx.orig 7 Aug 2002 16:01:42 -0000 1.34 ++++ sch/source/ui/unoidl/ChXChartObject.cxx 20 Feb 2004 00:43:10 -0000 @@ -161,9 +161,11 @@ // XShape diff --git a/editors/openoffice.org-1.1-devel/files/patch-sfx2+source+config+cfgmgr.cxx b/editors/openoffice.org-1.1-devel/files/patch-sfx2+source+config+cfgmgr.cxx index be38de290a51..420c61cc7b7b 100644 --- a/editors/openoffice.org-1.1-devel/files/patch-sfx2+source+config+cfgmgr.cxx +++ b/editors/openoffice.org-1.1-devel/files/patch-sfx2+source+config+cfgmgr.cxx @@ -1,8 +1,8 @@ -Wired bug? +Weird bug? http://qa.openoffice.org/issues/show_bug.cgi?id=22253 ---- ../sfx2/source/config/cfgmgr.cxx.org Fri Nov 7 19:11:25 2003 -+++ ../sfx2/source/config/cfgmgr.cxx Fri Nov 7 19:30:26 2003 +--- 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&) { diff --git a/editors/openoffice.org-1.1-devel/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx b/editors/openoffice.org-1.1-devel/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx index c07cab2ab7e8..196084c1657b 100644 --- a/editors/openoffice.org-1.1-devel/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx +++ b/editors/openoffice.org-1.1-devel/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx @@ -1,5 +1,5 @@ ---- ../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 +--- 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); diff --git a/editors/openoffice.org-1.1-devel/files/patch-svx_setLogicRectHack b/editors/openoffice.org-1.1-devel/files/patch-svx_setLogicRectHack index 035db5e5e21c..e8c2725e58ab 100644 --- a/editors/openoffice.org-1.1-devel/files/patch-svx_setLogicRectHack +++ b/editors/openoffice.org-1.1-devel/files/patch-svx_setLogicRectHack @@ -1,5 +1,6 @@ ---- ../svx/source/unodraw/unoshape.cxx 4 Feb 2004 13:21:23 -0000 1.109 -+++ ../svx/source/unodraw/unoshape.cxx 20 Feb 2004 00:43:50 -0000 +#i9462# +--- svx/source/unodraw/unoshape.cxx.orig 4 Feb 2004 13:21:23 -0000 1.109 ++++ svx/source/unodraw/unoshape.cxx 20 Feb 2004 00:43:50 -0000 @@ -1067,8 +1067,10 @@ // XShape -- cgit