Update to cws_src680_ooo20040329, checked out at 20040402
This commit is contained in:
Maho Nakata
parent
230841f16a
commit
7c36a93577
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=106619
@ -1,5 +1,5 @@
|
||||
# New ports collection makefile for: OpenOffice.org
|
||||
# Date created: 28 Februar 2002
|
||||
# Date created: 28 February 2002
|
||||
# Whom: Martin Blapp
|
||||
#
|
||||
# $FreeBSD$
|
||||
@ -9,51 +9,73 @@ PORTNAME= openoffice
|
||||
PORTVERSION= 2.0
|
||||
CATEGORIES+= editors
|
||||
MASTER_SITES+= http://people.freebsd.org/~maho/ \
|
||||
ftp://openofficeorg.secsup.org/pub/software/openoffice/stable/%SUBDIR%/ \
|
||||
ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice.org/stable/%SUBDIR%/ \
|
||||
${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/stable/&,} \
|
||||
http://www.binarycode.org/openoffice/stable/%SUBDIR%/ \
|
||||
http://ftp.gwdg.de/pub/misc/openoffice/stable/%SUBDIR%/ \
|
||||
ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
|
||||
http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/:help \
|
||||
http://people.freebsd.org/~mbr/ooo/:moz
|
||||
MASTER_SITE_SUBDIR= ${PORTVERSION}
|
||||
DISTFILES+= cws_src680_ooo20031216_20031208.tar.bz2 gpc231.tar.Z:gpc \
|
||||
DISTFILES+= OOo_${BUILD_NR}${MILESTONE}_${SNAPDATE}_source.tar.bz2 gpc231.tar.Z:gpc \
|
||||
patch-openoffice-mozilla101-2002-10-14:moz mozilla-vendor-1.0.2a.tgz:moz
|
||||
.if defined(L10NHELP)
|
||||
DISTFILES+= ${L10NHELP:S/$/:help/}
|
||||
.endif
|
||||
|
||||
FIND?= /usr/bin/find
|
||||
CUT?= /usr/bin/cut
|
||||
AWK?= /usr/bin/awk
|
||||
GREP?= /usr/bin/grep
|
||||
ZIP?= ${PREFIX}/bin/zip
|
||||
UNZIP?= ${PREFIX}/bin/unzip
|
||||
ANT?= ${LOCALBASE}/bin/ant
|
||||
TCSH?= /bin/tcsh
|
||||
PASTE?= /usr/bin/paste
|
||||
MAINTAINER= openoffice@FreeBSD.org
|
||||
.if !defined(COMMENT)
|
||||
COMMENT= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
|
||||
.endif
|
||||
|
||||
WANT_GNOME= yes
|
||||
IGNORE= "Does not work yet, installation problems"
|
||||
|
||||
NO_LATEST_LINK= yes
|
||||
UNZIP?= ${LOCALBASE}/bin/unzip
|
||||
ZIP?= ${LOCALBASE}/bin/zip
|
||||
ANT?= ${LOCALBASE}/bin/ant
|
||||
TCSH?= /bin/tcsh
|
||||
DIST_SUBDIR= openoffice2.0
|
||||
BUILD_NR= 680
|
||||
MILESTONE= m30
|
||||
RELEASE_NR= 2.0
|
||||
FRELEASE_NR= 2.0
|
||||
SNAPDATE= 20040402
|
||||
INSTALLATION_BASEDIR= OpenOffice.org${RELEASE_NR}
|
||||
EXTRACT_ONLY= OOo_${BUILD_NR}${MILESTONE}_${SNAPDATE}_source.tar.bz2
|
||||
USE_GNOME= orbit gtk12
|
||||
USE_REINPLACE= yes
|
||||
USE_PERL5= yes
|
||||
USE_BZIP2= yes
|
||||
USE_BISON= yes
|
||||
USE_GMAKE= yes
|
||||
LANG_EXT?= 01
|
||||
LANG_CONFIGURE_ARG?= ENUS
|
||||
WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work
|
||||
WRKSRC= ${WRKDIR}/oo_${BUILD_NR}${MILESTONE}_src/config_office
|
||||
|
||||
#XXX dirty
|
||||
BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
|
||||
USE_GCC=3.2
|
||||
CC= gcc32
|
||||
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+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries
|
||||
BUILD_DEPENDS+= ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft
|
||||
.if !defined(DISPLAY)
|
||||
BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer
|
||||
.endif
|
||||
|
||||
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
|
||||
png.5:${PORTSDIR}/graphics/png \
|
||||
mng.1:${PORTSDIR}/graphics/libmng \
|
||||
freetype.9:${PORTSDIR}/print/freetype2
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
|
||||
BUILD_NR= 645
|
||||
RELEASE_NR= 1.1
|
||||
FRELEASE_NR= 1.1.0
|
||||
INSTALLATION_BASEDIR= OpenOffice.org${FRELEASE_NR}
|
||||
DIST_SUBDIR= openoffice1.1
|
||||
DICT_DIR= ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
|
||||
|
||||
#
|
||||
# configuration for language specific slave ports
|
||||
#
|
||||
.if !defined(LANG_EXT)
|
||||
LANG_EXT=01
|
||||
.else
|
||||
#
|
||||
# Add pkg-descr and pkg-message if available
|
||||
#
|
||||
.if exists(${.CURDIR}/pkg-descr)
|
||||
DESCR= ${.CURDIR}/pkg-descr
|
||||
.endif
|
||||
@ -69,13 +91,6 @@ PKGNAMEPREFIX= ${LANG_PKGNAME}-
|
||||
PKGNAMESUFFIX= -${LANG_SUFFIX}
|
||||
.endif
|
||||
.endif # if defined(LANG_PKGNAME)
|
||||
#
|
||||
# LANG_CONFIGURE_ARG is missing for the german port
|
||||
#
|
||||
.if defined(LANG_EXT)
|
||||
CONFIGURE_ARGS+= --with-lang=${LANG_CONFIGURE_ARG},ENUS
|
||||
.endif
|
||||
.endif
|
||||
|
||||
.if !defined (LANG) && !defined(USE_LANG)
|
||||
USE_LANG= en_US.ISO8859-15
|
||||
@ -88,62 +103,16 @@ USE_LANG= ${LANG}
|
||||
|
||||
LANG_SORTED=`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
|
||||
|
||||
.if ${OSVERSION} < 500000
|
||||
# OOo requires gcc 3.3 (not systems's gcc)
|
||||
BUILD_DEPENDS+= gcc33:${PORTSDIR}/lang/gcc33
|
||||
USE_GCC=3.3 # make no sense yet
|
||||
CC= gcc33
|
||||
CXX= g++33
|
||||
.endif
|
||||
|
||||
EXTRACT_ONLY= OOo_${PORTVERSION}_source.tar.bz2
|
||||
|
||||
MAINTAINER= openoffice@FreeBSD.org
|
||||
.if !defined(COMMENT)
|
||||
COMMENT= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
|
||||
.endif
|
||||
|
||||
BROKEN= "under construction"
|
||||
#
|
||||
# The JDK dependency needs to be at the first place, so all
|
||||
# following dependencies use the same JDK.
|
||||
#
|
||||
BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14
|
||||
BUILD_DEPENDS+= 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+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries
|
||||
BUILD_DEPENDS+= ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft
|
||||
.if !defined(DISPLAY)
|
||||
BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer
|
||||
.endif
|
||||
|
||||
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
|
||||
png.5:${PORTSDIR}/graphics/png \
|
||||
mng.1:${PORTSDIR}/graphics/libmng \
|
||||
freetype.9:${PORTSDIR}/print/freetype2
|
||||
|
||||
USE_PERL5= yes
|
||||
USE_BZIP2= yes
|
||||
USE_BISON= yes
|
||||
USE_GMAKE= yes
|
||||
USE_GNOME= orbit gtk12
|
||||
|
||||
EXTRACT_BEFORE_ARGS_R= -dc
|
||||
EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
|
||||
EXTRACT_CMD_R= ${GZIP_CMD}
|
||||
EXTRACT_REST= gpc231.tar.Z
|
||||
|
||||
JDKDIR?= ${LOCALBASE}/jdk1.4.1
|
||||
JDKDIR?= ${LOCALBASE}/jdk1.4.2
|
||||
JAVAVM= ${JDKDIR}/bin/java
|
||||
|
||||
GNU_CONFIGURE= yes
|
||||
USE_AUTOCONF_VER= 253
|
||||
WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work
|
||||
WRKSRC= ${WRKDIR}/oo_${RELEASE_NR}_src/config_office
|
||||
LD_PATH1= ${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
|
||||
LD_PATH= ${LD_PATH1}:${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/lib/
|
||||
.if defined(WITH_DEBUG)
|
||||
CFLAGS+= -g
|
||||
.if ${WITH_DEBUG} == 2
|
||||
@ -161,7 +130,8 @@ DISPLAYHACK=localhost:1001
|
||||
|
||||
CONFIGURE_ENV= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
|
||||
PTHREAD_LIBS=${PTHREAD_LIBS}
|
||||
CONFIGURE_ARGS+= --with-jdk-home=${JDKDIR}
|
||||
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
|
||||
|
||||
.if defined(WITH_DEBUG)
|
||||
.if ${WITH_DEBUG} == 2
|
||||
@ -194,15 +164,6 @@ pre-fetch:
|
||||
@${ECHO}
|
||||
.endif
|
||||
@${ECHO} "OPTIONS:"
|
||||
.if !defined(USE_GCC)
|
||||
@${ECHO}
|
||||
@${ECHO} "You can compile OO with different"
|
||||
@${ECHO} "gcc compiler versions:"
|
||||
@${ECHO}
|
||||
@${ECHO} "Add USE_GCC=2.95 or USE_GCC=3.2"
|
||||
@${ECHO} "to compile openoffice with your"
|
||||
@${ECHO} "preferred compiler."
|
||||
.endif
|
||||
.if !defined(WITH_DEBUG)
|
||||
@${ECHO}
|
||||
@${ECHO} "You can compile OO with debug symbols"
|
||||
@ -225,94 +186,9 @@ pre-fetch:
|
||||
@${ECHO} "quality of glyphs at small bitmap sizes."
|
||||
@${ECHO}
|
||||
.endif
|
||||
.if !defined(WITH_GIF_LZW_COMPRESSION)
|
||||
@${ECHO}
|
||||
@${ECHO} "You may set WITH_GIF_LZW_COMPRESSION=YES"
|
||||
@${ECHO} "If you want to make compressed gif images"
|
||||
@${ECHO}
|
||||
@${ECHO} "If must have license from the Unisys and IBM patents"
|
||||
@${ECHO} "to enable this option to get compressed GIF images."
|
||||
@${ECHO}
|
||||
.endif
|
||||
.if ${OSVERSION} < 450002
|
||||
@${ECHO}
|
||||
@${ECHO} "OS-VERSION ${OSVERSION} too low"
|
||||
@${ECHO}
|
||||
@${ECHO} "OO need some important libc_r and"
|
||||
@${ECHO} "gcc fixes to build. Please upgrade to 4.6"
|
||||
@${ECHO} "RELEASE or 4.6 STABLE."
|
||||
@${FALSE}
|
||||
.endif
|
||||
@${ECHO}
|
||||
@${ECHO} "NOTICE:"
|
||||
@${ECHO}
|
||||
@${ECHO} "To build Openoffice, you should have a lot"
|
||||
.if defined(WITH_DEBUG)
|
||||
@${ECHO} "of free diskspace (~ 8GB)."
|
||||
.else
|
||||
@${ECHO} "of free diskspace (~ 4GB)."
|
||||
.endif
|
||||
@${ECHO}
|
||||
.if (defined(USE_GCC) && ${USE_GCC} == 2.95) || \
|
||||
(${OSVERSION} < 500000 && !defined(USE_GCC))
|
||||
@${ECHO} "KERNEL CONFIGURATION:"
|
||||
@${ECHO}
|
||||
@${ECHO} "Openoffice needs a larger stack- and"
|
||||
@${ECHO} "datasize to build. Check your limit"
|
||||
@${ECHO} "settings and and put this in /boot/loader.conf"
|
||||
@${ECHO} "if neccessary:"
|
||||
@${ECHO}
|
||||
@${ECHO} "kern.maxdsiz=\"1073741824\""
|
||||
@${ECHO} "kern.maxssiz=\"268435456\""
|
||||
.endif
|
||||
@${ECHO}
|
||||
.if ${OSVERSION} < 460002
|
||||
@${ECHO} "REQUIRED SYSTEM PATCHES:"
|
||||
@${ECHO}
|
||||
.endif
|
||||
.if ${OSVERSION} < 500000
|
||||
@${ECHO} "OO.org can crash if you enter a non existing path"
|
||||
@${ECHO} "or URL in the location bar. To fix these crashes"
|
||||
@${ECHO} "you need a uncommitted system patch for rtld:"
|
||||
@${ECHO}
|
||||
@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-symlookup.diff"
|
||||
@${ECHO}
|
||||
.endif
|
||||
.if ${OSVERSION} < 460001
|
||||
@${ECHO}
|
||||
@${ECHO} "OO setup is broken on STABLE < 4.6"
|
||||
@${ECHO} "including 4.6 RELEASE."
|
||||
@${ECHO} "You'll need a system patch to solve"
|
||||
@${ECHO} "this problem:"
|
||||
@${ECHO}
|
||||
@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-alloca.diff"
|
||||
@${ECHO}
|
||||
.endif
|
||||
.if ${OSVERSION} < 460002
|
||||
@${ECHO}
|
||||
@${ECHO} "OO.org soffice binary can deadlock. You can work around"
|
||||
@${ECHO} "this problem with this patch:"
|
||||
@${ECHO}
|
||||
@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-deadlock.diff"
|
||||
@${ECHO}
|
||||
.endif
|
||||
.if ${OSVERSION} < 500000
|
||||
@${ECHO}
|
||||
@${ECHO} "OO.org build can deadlock in regmerge. You can work around"
|
||||
@${ECHO} "this problem with this patch:"
|
||||
@${ECHO}
|
||||
@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-builddeadlock.diff"
|
||||
@${ECHO}
|
||||
.endif
|
||||
.if !exists(/usr/include/langinfo.h)
|
||||
@${ECHO}
|
||||
@${ECHO} "langinfo.h is missing !"
|
||||
@${ECHO}
|
||||
@${ECHO} "Please upgrade to 4.6 RELEASE or"
|
||||
@${ECHO} "4.6 STABLE."
|
||||
@${ECHO}
|
||||
@${FALSE}
|
||||
.endif
|
||||
@${ECHO} "If you want SDK and/or solver, please type make sdk and/or make solver"
|
||||
|
||||
.include <${FILESDIR}/Makefile.mozilla>
|
||||
|
||||
post-extract:
|
||||
@for file in ${EXTRACT_REST}; do \
|
||||
@ -326,7 +202,6 @@ post-extract:
|
||||
@${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/../external/gpc/
|
||||
@${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/../external/gpc/
|
||||
@${MAKE} extract-mozilla
|
||||
@-${RM} -f ${WRKSRC}/../moz/zipped/*.zip
|
||||
@${CHMOD} +x ${WRKSRC}/../solenv/bin/zipdep.pl
|
||||
.if defined(L10NHELP)
|
||||
@${ECHO_MSG} "===> Extracting L10NHELP sub project"
|
||||
@ -336,9 +211,9 @@ 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
|
||||
@${MAKE} patch-mozilla
|
||||
@${MAKE} fix-kdewrappers
|
||||
@${MAKE} fix-gnomewrappers
|
||||
.if defined(WITH_TTF_BYTECODE_ENABLED)
|
||||
@if [ "`echo ${PATCHDIR}/optpatch-*`" != "${PATCHDIR}/optpatch-*" ]; then \
|
||||
${ECHO_MSG} "===> Applying additional TTF bytecode patches for ${PKGNAME}" ; \
|
||||
@ -348,116 +223,6 @@ post-patch:
|
||||
${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/optpatch-freetype+patch ; \
|
||||
fi
|
||||
.endif
|
||||
.if !defined(WITH_GIF_LZW_COMPRESSION)
|
||||
@if [ "`echo ${PATCHDIR}/gifpatch-*`" != "${PATCHDIR}/gifpatch-*" ]; then \
|
||||
${ECHO_MSG} "===> Removing GIF LZW compression for ${PKGNAME}" ; \
|
||||
if [ ${PATCH_DEBUG_TMP} = yes ]; then \
|
||||
${ECHO_MSG} "===> Applying GIF LZW compression ${OPSYS} patch" ; \
|
||||
fi; \
|
||||
${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx ; \
|
||||
${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx ; \
|
||||
${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/gifpatch-goodies+source+filter.vcl+egif+makefile.mk ; \
|
||||
fi
|
||||
.endif
|
||||
.if defined(WITH_DEBUG)
|
||||
@if [ "`echo ${PATCHDIR}/debugpatch-*`" != "${PATCHDIR}/debugpatch-*" ]; then \
|
||||
${ECHO_MSG} "===> Applying additional debug ${OPSYS} patches for ${PKGNAME}" ; \
|
||||
PATCHES_APPLIED="" ; \
|
||||
for i in ${PATCHDIR}/debugpatch-*; do \
|
||||
case $$i in \
|
||||
*.orig|*.rej|*~) \
|
||||
${ECHO_MSG} "===> Ignoring patchfile $$i" ; \
|
||||
;; \
|
||||
*) \
|
||||
if [ ${PATCH_DEBUG_TMP} = yes ]; then \
|
||||
${ECHO_MSG} "===> Applying ${OPSYS} patch $$i" ; \
|
||||
fi; \
|
||||
if ${PATCH} ${PATCH_ARGS} < $$i ; then \
|
||||
PATCHES_APPLIED="$$PATCHES_APPLIED $$i" ; \
|
||||
else \
|
||||
${ECHO_MSG} `${ECHO_CMD} ">> Patch $$i failed to apply cleanly." | ${SED} "s|${PATCHDIR}/||"` ; \
|
||||
if [ x"$$PATCHES_APPLIED" != x"" ]; then \
|
||||
${ECHO_MSG} `${ECHO_CMD} ">> Patch(es) $$PATCHES_APPLIED applied cleanly." | ${SED} "s|${PATCHDIR}/||g"` ; \
|
||||
fi; \
|
||||
${FALSE} ; \
|
||||
fi; \
|
||||
;; \
|
||||
esac; \
|
||||
done; \
|
||||
fi;
|
||||
.endif
|
||||
@${ECHO_MSG} "===> Find old malloc.h defines and fix them in ${PKGNAME} source"
|
||||
@${FIND} ${WRKSRC}/.. | ${EGREP} "\.(cxx|h|c)$$" | ${XARGS} \
|
||||
${PERL} -pi -e "s|<malloc.h>|<stdlib.h>|g"
|
||||
|
||||
fix-kdewrappers:
|
||||
# @${PERL} -pi -e 's|"Exec", "\\"\<progpath\>/program/|"Exec", "\\"${PREFIX}/bin/openoffice_${RELEASE_NR}-|' \
|
||||
# ${WRKSRC}/../sysui/oounix/office/kde2/kdeint
|
||||
|
||||
fix-gnomewrappers:
|
||||
# @${PERL} -pi -e 's|"Exec", "<progpath>/program/|"Exec", "${PREFIX}/bin/openoffice_${RELEASE_NR}-|' \
|
||||
# ${WRKSRC}/../sysui/oounix/office/gnome/gnomeint
|
||||
|
||||
extract-mozilla:
|
||||
.if ! exists(${WRKDIR}/mozilla/Makefile)
|
||||
@${ECHO_MSG} "===> Extracting mozilla sub project"
|
||||
@cd ${WRKDIR} && tar -xzf ${DISTDIR}/${DIST_SUBDIR}/mozilla-vendor-1.0.2a.tgz
|
||||
.endif
|
||||
@cd ${WRKDIR}/mozilla && ${MAKE} extract WRKDIRPREFIX=""
|
||||
|
||||
patch-mozilla:
|
||||
@${CP} ${DISTDIR}/${DIST_SUBDIR}/patch-openoffice-mozilla101-2002-10-14 \
|
||||
${WRKDIR}/mozilla/files/
|
||||
@cd ${WRKDIR}/mozilla && ${MAKE} patch WRKDIRPREFIX=""
|
||||
|
||||
build-mozilla:
|
||||
.if ! exists(${WRKDIR}/FREEBSDGCCIruntime.zip)
|
||||
@${ECHO_MSG} "===> Building mozilla sub project"
|
||||
.if defined(WITH_DEBUG)
|
||||
@${CP} ${WRKDIR}/mozilla/Makefile ${WRKDIR}/mozilla/Makefile.new
|
||||
@${SED} -e 's|--disable-debug||' \
|
||||
-e 's|--disable-cpp-rtti||' \
|
||||
-e 's|--enable-strip||' \
|
||||
< ${WRKDIR}/mozilla/Makefile.new > ${WRKDIR}/mozilla/Makefile
|
||||
.endif
|
||||
.if defined(USE_GCC)
|
||||
@cd ${WRKDIR}/mozilla && ${MAKE} CXX=${CXX} CC=${CC} CFLAGS="${CFLAGS}" USE_GCC=${USE_GCC} build WRKDIRPREFIX=""
|
||||
.else
|
||||
@cd ${WRKDIR}/mozilla && ${MAKE} CFLAGS="${CFLAGS}" build WRKDIRPREFIX=""
|
||||
.endif
|
||||
@${CP} ${FILESDIR}/zipmoz.sh ${WRKDIR}
|
||||
@${CHMOD} 755 ${WRKDIR}/zipmoz.sh
|
||||
@${WRKDIR}/zipmoz.sh ${WRKDIR}/mozilla/work/mozilla/dist FREEBSDGCCI ${WRKDIR}
|
||||
.endif
|
||||
|
||||
install-mozilla:
|
||||
@${CP} ${WRKDIR}/FREEBSDGCCIinc.zip ${WRKSRC}/../moz/zipped/
|
||||
@${CP} ${WRKDIR}/FREEBSDGCCIlib.zip ${WRKSRC}/../moz/zipped/
|
||||
@${CP} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKSRC}/../moz/zipped/
|
||||
|
||||
register-mozilla:
|
||||
.if exists(${WRKDIR}/mozilla-runtime)
|
||||
@${RM} -rf ${WRKDIR}/mozilla-runtime
|
||||
.endif
|
||||
@${MKDIR} ${WRKDIR}/mozilla-runtime
|
||||
@cd ${WRKDIR}/mozilla-runtime && ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIruntime.zip
|
||||
@cd ${WRKDIR}/mozilla-runtime && ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIlib.zip
|
||||
@${CP} ${WRKDIR}/mozilla/work/mozilla/dist/bin/regxpcom ${WRKDIR}/mozilla-runtime/
|
||||
@-${RM} ${WRKDIR}/mozilla-runtime/components/component.reg
|
||||
@cd ${WRKDIR}/mozilla-runtime && export MOZILLA_FIVE_HOME=. \
|
||||
&& export LD_LIBRARY_PATH=.:./lib && ./regxpcom
|
||||
@${CP} ${WRKDIR}/mozilla-runtime/components/xpti.dat \
|
||||
${WRKDIR}/mozilla-runtime/components/xptitemp.dat
|
||||
@${RM} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKDIR}/mozilla-runtime/regxpcom
|
||||
@cd ${WRKDIR}/mozilla-runtime && ${FIND} . -type f \
|
||||
| ${ZIP} ${WRKDIR}/FREEBSDGCCIruntime.zip -@
|
||||
|
||||
mozilla:
|
||||
@${MAKE} extract-mozilla
|
||||
@${MAKE} patch-mozilla
|
||||
@${MAKE} build-mozilla
|
||||
@${MAKE} register-mozilla
|
||||
@${MAKE} install-mozilla
|
||||
|
||||
do-build:
|
||||
.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIruntime.zip)
|
||||
@ -512,14 +277,12 @@ do-install:
|
||||
#
|
||||
${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
|
||||
@sleep 5
|
||||
@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \
|
||||
TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
|
||||
@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
|
||||
${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
|
||||
@-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
|
||||
@${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
|
||||
@${RM} -f ${WRKDIR}/.Xvfb.pid
|
||||
.else
|
||||
@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \
|
||||
TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
|
||||
@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
|
||||
${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
|
||||
.endif
|
||||
|
||||
@ -562,20 +325,24 @@ post-install:
|
||||
package-rename:
|
||||
@${ECHO_MSG} "===> Rename package for OO.org mirror upload";
|
||||
.if defined(LANG_SUFFIX)
|
||||
@${MV} ${WRKDIR}/../${PKGNAMEPREFIX}openoffice-${LANG_SUFFIX}-${PORTVERSION}_${PORTREVISION}.tbz2 \
|
||||
${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}Intel_install_${LANG_PKGNAME}-${LANG_SUFFIX}.tbz2
|
||||
@${MV} ${PKGFILE} \
|
||||
${WRKDIR}/../OOo_${BUILD_NR}${MILESTONE}_${OPSYS}${SIMPLEOSVER}Intel_install_${LANG_PKGNAME}-${LANG_SUFFIX}${PKG_SUFX}
|
||||
.elif defined(LANG_PKGNAME)
|
||||
@${MV} ${PKGFILE} \
|
||||
${WRKDIR}/../OOo_${BUILD_NR}${MILESTONE}_${OPSYS}${SIMPLEOSVER}Intel_install_${LANG_PKGNAME}${PKG_SUFX}
|
||||
.else
|
||||
@${MV} ${WRKDIR}/../${PKGNAMEPREFIX}openoffice-${PORTVERSION}_${PORTREVISION}.tbz2 \
|
||||
${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}Intel_install_${LANG_PKGNAME}.tbz2
|
||||
@${MV} ${PKGFILE} \
|
||||
${WRKDIR}/../OOo_${BUILD_NR}${MILESTONE}_${OPSYS}${SIMPLEOSVER}Intel_install${PKG_SUFX}
|
||||
.endif
|
||||
|
||||
update:
|
||||
@${MAKE} fetch
|
||||
@${MAKE} extract
|
||||
@cd ${WRKSRC}/.. && for dir in *; do \
|
||||
if [ -d $$dir ]; then \
|
||||
cd $$dir; cvs update -d; cd ..; \
|
||||
fi \
|
||||
done
|
||||
sdk:
|
||||
@${ECHO_MSG} "===> Make SDK of OpenOffice.org"
|
||||
@cd ${WRKSRC}/.. && DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
|
||||
${SH} -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_${BUILD_NR}${MILESTONE}_${OPSYS}${SIMPLEOSVER}Intel_sdk.tar.gz
|
||||
|
||||
solver:
|
||||
@${ECHO_MSG} "===> Make Solver of OpenOffice.org"
|
||||
@cd ${WRKSRC}/.. ; ${TAR} cfz ${WRKDIR}/../OOo_${BUILD_NR}${MILESTONE}_${OPSYS}${SIMPLEOSVER}Intel_solver.tar.gz solver
|
||||
|
||||
.include <bsd.port.post.mk>
|
||||
|
||||
@ -1,4 +1,8 @@
|
||||
MD5 (openoffice2.0/cws_src680_ooo20031216_20031208.tar.bz2) = d841d81ad9ca3b46dd49ae997854032b
|
||||
MD5 (openoffice2.0/OOo_680m30_20040402_source.tar.bz2) = 768b3d8246a12eff6bf83f098093fbee
|
||||
SIZE (openoffice2.0/OOo_680m30_20040402_source.tar.bz2) = 195378119
|
||||
MD5 (openoffice2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
|
||||
MD5 (openoffice2.0/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
|
||||
SIZE (openoffice2.0/gpc231.tar.Z) = 27917
|
||||
MD5 (openoffice2.0/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
|
||||
SIZE (openoffice2.0/patch-openoffice-mozilla101-2002-10-14) = 29105
|
||||
MD5 (openoffice2.0/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
|
||||
SIZE (openoffice2.0/mozilla-vendor-1.0.2a.tgz) = 7292
|
||||
|
||||
61
editors/openoffice-2.0-devel/files/Makefile.mozilla
Normal file
61
editors/openoffice-2.0-devel/files/Makefile.mozilla
Normal file
@ -0,0 +1,61 @@
|
||||
extract-mozilla:
|
||||
.if ! exists(${WRKDIR}/mozilla/Makefile)
|
||||
@${ECHO_MSG} "===> Extracting mozilla sub project"
|
||||
@cd ${WRKDIR} && tar -xzf ${DISTDIR}/${DIST_SUBDIR}/mozilla-vendor-1.0.2a.tgz
|
||||
.endif
|
||||
@cd ${WRKDIR}/mozilla && ${MAKE} extract WRKDIRPREFIX=""
|
||||
|
||||
patch-mozilla:
|
||||
@${CP} ${DISTDIR}/${DIST_SUBDIR}/patch-openoffice-mozilla101-2002-10-14 \
|
||||
${WRKDIR}/mozilla/files/
|
||||
@cd ${WRKDIR}/mozilla && ${MAKE} patch WRKDIRPREFIX=""
|
||||
|
||||
build-mozilla:
|
||||
.if ! exists(${WRKDIR}/FREEBSDGCCIruntime.zip)
|
||||
@${ECHO_MSG} "===> Building mozilla sub project"
|
||||
.if defined(WITH_DEBUG)
|
||||
@${CP} ${WRKDIR}/mozilla/Makefile ${WRKDIR}/mozilla/Makefile.new
|
||||
@${SED} -e 's|--disable-debug||' \
|
||||
-e 's|--disable-cpp-rtti||' \
|
||||
-e 's|--enable-strip||' \
|
||||
< ${WRKDIR}/mozilla/Makefile.new > ${WRKDIR}/mozilla/Makefile
|
||||
.endif
|
||||
.if defined(USE_GCC)
|
||||
@cd ${WRKDIR}/mozilla && ${MAKE} CXX="${CXX}" CC="${CC}" CFLAGS="${CFLAGS}" USE_GCC=${USE_GCC} build WRKDIRPREFIX=""
|
||||
.else
|
||||
@cd ${WRKDIR}/mozilla && ${MAKE} CFLAGS="${CFLAGS}" build WRKDIRPREFIX=""
|
||||
.endif
|
||||
@${CP} ${FILESDIR}/zipmoz.sh ${WRKDIR}
|
||||
@${CHMOD} 755 ${WRKDIR}/zipmoz.sh
|
||||
@${WRKDIR}/zipmoz.sh ${WRKDIR}/mozilla/work/mozilla/dist FREEBSDGCCI ${WRKDIR}
|
||||
.endif
|
||||
|
||||
install-mozilla:
|
||||
@${CP} ${WRKDIR}/FREEBSDGCCIinc.zip ${WRKSRC}/../moz/zipped/
|
||||
@${CP} ${WRKDIR}/FREEBSDGCCIlib.zip ${WRKSRC}/../moz/zipped/
|
||||
@${CP} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKSRC}/../moz/zipped/
|
||||
|
||||
register-mozilla:
|
||||
.if exists(${WRKDIR}/mozilla-runtime)
|
||||
@${RM} -rf ${WRKDIR}/mozilla-runtime
|
||||
.endif
|
||||
@${MKDIR} ${WRKDIR}/mozilla-runtime
|
||||
@cd ${WRKDIR}/mozilla-runtime && ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIruntime.zip
|
||||
@cd ${WRKDIR}/mozilla-runtime && ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIlib.zip
|
||||
@${CP} ${WRKDIR}/mozilla/work/mozilla/dist/bin/regxpcom ${WRKDIR}/mozilla-runtime/
|
||||
@-${RM} ${WRKDIR}/mozilla-runtime/components/component.reg
|
||||
@cd ${WRKDIR}/mozilla-runtime && export MOZILLA_FIVE_HOME=. \
|
||||
&& export LD_LIBRARY_PATH=.:./lib && ./regxpcom
|
||||
@${CP} ${WRKDIR}/mozilla-runtime/components/xpti.dat \
|
||||
${WRKDIR}/mozilla-runtime/components/xptitemp.dat
|
||||
@${RM} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKDIR}/mozilla-runtime/regxpcom
|
||||
@cd ${WRKDIR}/mozilla-runtime && ${FIND} . -type f \
|
||||
| ${ZIP} ${WRKDIR}/FREEBSDGCCIruntime.zip -@
|
||||
|
||||
mozilla:
|
||||
@${MAKE} extract-mozilla
|
||||
@${MAKE} patch-mozilla
|
||||
@${MAKE} build-mozilla
|
||||
@${MAKE} register-mozilla
|
||||
@${MAKE} install-mozilla
|
||||
|
||||
@ -1,21 +0,0 @@
|
||||
--- ../setup2/mow/source/loader/loader.c.orig Mon Jun 2 08:25:13 2003
|
||||
+++ ../setup2/mow/source/loader/loader.c Tue Jun 3 07:58:22 2003
|
||||
@@ -1069,6 +1069,7 @@
|
||||
|
||||
void KillSetupDir()
|
||||
{
|
||||
+#if 0
|
||||
DIR* pDir;
|
||||
struct dirent* pFile;
|
||||
|
||||
@@ -1088,6 +1089,10 @@
|
||||
closedir( pDir );
|
||||
chdir( strInitPath );
|
||||
rmdir( strTmpPath );
|
||||
+#else
|
||||
+ fprintf(stderr, "\nLeaving behind temporary directory: %s\n",
|
||||
+ strTmpPath);
|
||||
+#endif
|
||||
}
|
||||
|
||||
void makeSymLink( char* s )
|
||||
@ -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
|
||||
@ -1,290 +0,0 @@
|
||||
--- ../goodies/source/filter.vcl/egif/giflzwc.cxx Sun Apr 13 14:33:24 2003
|
||||
+++ /dev/null Mon Apr 14 06:10:35 2003
|
||||
@@ -1,287 +0,0 @@
|
||||
-/*************************************************************************
|
||||
- *
|
||||
- * $RCSfile: giflzwc.cxx,v $
|
||||
- *
|
||||
- * $Revision: 1.1.1.1 $
|
||||
- *
|
||||
- * last change: $Author: hr $ $Date: 2000/09/18 16:30:11 $
|
||||
- *
|
||||
- * The Contents of this file are made available subject to the terms of
|
||||
- * either of the following licenses
|
||||
- *
|
||||
- * - GNU Lesser General Public License Version 2.1
|
||||
- * - Sun Industry Standards Source License Version 1.1
|
||||
- *
|
||||
- * Sun Microsystems Inc., October, 2000
|
||||
- *
|
||||
- * GNU Lesser General Public License Version 2.1
|
||||
- * =============================================
|
||||
- * Copyright 2000 by Sun Microsystems, Inc.
|
||||
- * 901 San Antonio Road, Palo Alto, CA 94303, USA
|
||||
- *
|
||||
- * This library is free software; you can redistribute it and/or
|
||||
- * modify it under the terms of the GNU Lesser General Public
|
||||
- * License version 2.1, as published by the Free Software Foundation.
|
||||
- *
|
||||
- * This library is distributed in the hope that it will be useful,
|
||||
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
- * Lesser General Public License for more details.
|
||||
- *
|
||||
- * You should have received a copy of the GNU Lesser General Public
|
||||
- * License along with this library; if not, write to the Free Software
|
||||
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
|
||||
- * MA 02111-1307 USA
|
||||
- *
|
||||
- *
|
||||
- * Sun Industry Standards Source License Version 1.1
|
||||
- * =================================================
|
||||
- * The contents of this file are subject to the Sun Industry Standards
|
||||
- * Source License Version 1.1 (the "License"); You may not use this file
|
||||
- * except in compliance with the License. You may obtain a copy of the
|
||||
- * License at http://www.openoffice.org/license.html.
|
||||
- *
|
||||
- * Software provided under this License is provided on an "AS IS" basis,
|
||||
- * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
|
||||
- * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
|
||||
- * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
|
||||
- * See the License for the specific provisions governing your rights and
|
||||
- * obligations concerning the Software.
|
||||
- *
|
||||
- * The Initial Developer of the Original Code is: Sun Microsystems, Inc.
|
||||
- *
|
||||
- * Copyright: 2000 by Sun Microsystems, Inc.
|
||||
- *
|
||||
- * All Rights Reserved.
|
||||
- *
|
||||
- * Contributor(s): _______________________________________
|
||||
- *
|
||||
- *
|
||||
- ************************************************************************/
|
||||
-
|
||||
-#include <tools/stream.hxx>
|
||||
-#include "giflzwc.hxx"
|
||||
-
|
||||
-// ----------------------------
|
||||
-// - GIFImageDataOutputStream -
|
||||
-// ----------------------------
|
||||
-
|
||||
-class GIFImageDataOutputStream
|
||||
-{
|
||||
-private:
|
||||
-
|
||||
- void FlushBlockBuf();
|
||||
- inline void FlushBitsBufsFullBytes();
|
||||
-
|
||||
- SvStream& rStream;
|
||||
- BYTE* pBlockBuf;
|
||||
- BYTE nBlockBufSize;
|
||||
- ULONG nBitsBuf;
|
||||
- USHORT nBitsBufSize;
|
||||
-
|
||||
-public:
|
||||
-
|
||||
- GIFImageDataOutputStream( SvStream & rGIF, BYTE nLZWDataSize );
|
||||
- ~GIFImageDataOutputStream();
|
||||
-
|
||||
- inline void WriteBits( USHORT nCode, USHORT nCodeLen );
|
||||
-};
|
||||
-
|
||||
-// ------------------------------------------------------------------------
|
||||
-
|
||||
-inline void GIFImageDataOutputStream::FlushBitsBufsFullBytes()
|
||||
-{
|
||||
- while (nBitsBufSize>=8)
|
||||
- {
|
||||
- if( nBlockBufSize==255 )
|
||||
- FlushBlockBuf();
|
||||
-
|
||||
- pBlockBuf[nBlockBufSize++] = (BYTE) nBitsBuf;
|
||||
- nBitsBuf >>= 8;
|
||||
- nBitsBufSize -= 8;
|
||||
- }
|
||||
-}
|
||||
-
|
||||
-// ------------------------------------------------------------------------
|
||||
-
|
||||
-inline void GIFImageDataOutputStream::WriteBits( USHORT nCode, USHORT nCodeLen )
|
||||
-{
|
||||
- if( nBitsBufSize+nCodeLen>32 )
|
||||
- FlushBitsBufsFullBytes();
|
||||
-
|
||||
- nBitsBuf |= (ULONG) nCode << nBitsBufSize;
|
||||
- nBitsBufSize += nCodeLen;
|
||||
-}
|
||||
-
|
||||
-// ------------------------------------------------------------------------
|
||||
-
|
||||
-GIFImageDataOutputStream::GIFImageDataOutputStream( SvStream & rGIF, BYTE nLZWDataSize ) :
|
||||
- rStream(rGIF)
|
||||
-{
|
||||
- pBlockBuf = new BYTE[ 255 ];
|
||||
- nBlockBufSize = 0;
|
||||
- nBitsBufSize = 0;
|
||||
- nBitsBuf = 0;
|
||||
- rStream << nLZWDataSize;
|
||||
-}
|
||||
-
|
||||
-// ------------------------------------------------------------------------
|
||||
-
|
||||
-
|
||||
-GIFImageDataOutputStream::~GIFImageDataOutputStream()
|
||||
-{
|
||||
- WriteBits(0,7);
|
||||
- FlushBitsBufsFullBytes();
|
||||
- FlushBlockBuf();
|
||||
- rStream << (BYTE)0;
|
||||
- delete[] pBlockBuf;
|
||||
-}
|
||||
-
|
||||
-// ------------------------------------------------------------------------
|
||||
-
|
||||
-void GIFImageDataOutputStream::FlushBlockBuf()
|
||||
-{
|
||||
- if( nBlockBufSize )
|
||||
- {
|
||||
- rStream << (BYTE) nBlockBufSize;
|
||||
- rStream.Write( pBlockBuf,nBlockBufSize );
|
||||
- nBlockBufSize = 0;
|
||||
- }
|
||||
-}
|
||||
-
|
||||
-// -------------------
|
||||
-// - GIFLZWCTreeNode -
|
||||
-// -------------------
|
||||
-
|
||||
-struct GIFLZWCTreeNode
|
||||
-{
|
||||
-
|
||||
- GIFLZWCTreeNode* pBrother; // naechster Knoten, der den selben Vater hat
|
||||
- GIFLZWCTreeNode* pFirstChild; // erster Sohn
|
||||
- USHORT nCode; // Der Code fuer den String von Pixelwerten, der sich ergibt, wenn
|
||||
- USHORT nValue; // Der Pixelwert
|
||||
-};
|
||||
-
|
||||
-// --------------------
|
||||
-// - GIFLZWCompressor -
|
||||
-// --------------------
|
||||
-
|
||||
-GIFLZWCompressor::GIFLZWCompressor()
|
||||
-{
|
||||
- pIDOS=NULL;
|
||||
-}
|
||||
-
|
||||
-// ------------------------------------------------------------------------
|
||||
-
|
||||
-GIFLZWCompressor::~GIFLZWCompressor()
|
||||
-{
|
||||
- if (pIDOS!=NULL) EndCompression();
|
||||
-}
|
||||
-
|
||||
-// ------------------------------------------------------------------------
|
||||
-
|
||||
-void GIFLZWCompressor::StartCompression( SvStream& rGIF, USHORT nPixelSize )
|
||||
-{
|
||||
- if( !pIDOS )
|
||||
- {
|
||||
- USHORT i;
|
||||
-
|
||||
- nDataSize = nPixelSize;
|
||||
-
|
||||
- if( nDataSize < 2 )
|
||||
- nDataSize=2;
|
||||
-
|
||||
- nClearCode=1<<nDataSize;
|
||||
- nEOICode=nClearCode+1;
|
||||
- nTableSize=nEOICode+1;
|
||||
- nCodeSize=nDataSize+1;
|
||||
-
|
||||
- pIDOS=new GIFImageDataOutputStream(rGIF,(BYTE)nDataSize);
|
||||
- pTable=new GIFLZWCTreeNode[4096];
|
||||
-
|
||||
- for (i=0; i<4096; i++)
|
||||
- {
|
||||
- pTable[i].pBrother = pTable[i].pFirstChild = NULL;
|
||||
- pTable[i].nValue = (BYTE) ( pTable[i].nCode = i );
|
||||
- }
|
||||
-
|
||||
- pPrefix = NULL;
|
||||
- pIDOS->WriteBits( nClearCode,nCodeSize );
|
||||
- }
|
||||
-}
|
||||
-
|
||||
-// ------------------------------------------------------------------------
|
||||
-
|
||||
-void GIFLZWCompressor::Compress( HPBYTE pSrc, ULONG nSize )
|
||||
-{
|
||||
- if( pIDOS )
|
||||
- {
|
||||
- GIFLZWCTreeNode* p;
|
||||
- USHORT i;
|
||||
- BYTE nV;
|
||||
-
|
||||
- if( !pPrefix && nSize )
|
||||
- {
|
||||
- pPrefix=pTable+(*pSrc++);
|
||||
- nSize--;
|
||||
- }
|
||||
-
|
||||
- while( nSize )
|
||||
- {
|
||||
- nSize--;
|
||||
- nV=*pSrc++;
|
||||
- for( p=pPrefix->pFirstChild; p!=NULL; p=p->pBrother )
|
||||
- {
|
||||
- if (p->nValue==nV)
|
||||
- break;
|
||||
- }
|
||||
-
|
||||
- if( p)
|
||||
- pPrefix=p;
|
||||
- else
|
||||
- {
|
||||
- pIDOS->WriteBits(pPrefix->nCode,nCodeSize);
|
||||
-
|
||||
- if (nTableSize==4096)
|
||||
- {
|
||||
- pIDOS->WriteBits(nClearCode,nCodeSize);
|
||||
-
|
||||
- for (i=0; i<nClearCode; i++)
|
||||
- pTable[i].pFirstChild=NULL;
|
||||
-
|
||||
- nCodeSize=nDataSize+1;
|
||||
- nTableSize=nEOICode+1;
|
||||
- }
|
||||
- else
|
||||
- {
|
||||
- if(nTableSize==(USHORT)(1<<nCodeSize))
|
||||
- nCodeSize++;
|
||||
-
|
||||
- p=pTable+(nTableSize++);
|
||||
- p->pBrother=pPrefix->pFirstChild;
|
||||
- pPrefix->pFirstChild=p;
|
||||
- p->nValue=nV;
|
||||
- p->pFirstChild=NULL;
|
||||
- }
|
||||
-
|
||||
- pPrefix=pTable+nV;
|
||||
- }
|
||||
- }
|
||||
- }
|
||||
-}
|
||||
-
|
||||
-// ------------------------------------------------------------------------
|
||||
-
|
||||
-void GIFLZWCompressor::EndCompression()
|
||||
-{
|
||||
- if( pIDOS )
|
||||
- {
|
||||
- if( pPrefix )
|
||||
- pIDOS->WriteBits(pPrefix->nCode,nCodeSize);
|
||||
-
|
||||
- pIDOS->WriteBits( nEOICode,nCodeSize );
|
||||
- delete[] pTable;
|
||||
- delete pIDOS;
|
||||
- pIDOS=NULL;
|
||||
- }
|
||||
-}
|
||||
@ -1,45 +0,0 @@
|
||||
--- /dev/null 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ ../goodies/source/filter.vcl/egif/giflzwc_disabled.cxx 2002-08-15 15:09:47.000000000 +0200
|
||||
@@ -0,0 +1,42 @@
|
||||
+/**********************************
|
||||
+ * This code is copied from giflzwc.cxx, with the patented LZW compression code removed.
|
||||
+ **********************************/
|
||||
+
|
||||
+//#include <tools/stream.hxx>
|
||||
+#include "giflzwc.hxx"
|
||||
+
|
||||
+// --------------------
|
||||
+// - GIFLZWCompressor -
|
||||
+// --------------------
|
||||
+
|
||||
+GIFLZWCompressor::GIFLZWCompressor()
|
||||
+{
|
||||
+ pIDOS=NULL;
|
||||
+}
|
||||
+
|
||||
+// ------------------------------------------------------------------------
|
||||
+
|
||||
+GIFLZWCompressor::~GIFLZWCompressor()
|
||||
+{
|
||||
+}
|
||||
+
|
||||
+// ------------------------------------------------------------------------
|
||||
+
|
||||
+void GIFLZWCompressor::StartCompression( SvStream& rGIF, USHORT nPixelSize )
|
||||
+{
|
||||
+ /********************** DISABLED *************************/
|
||||
+}
|
||||
+
|
||||
+// ------------------------------------------------------------------------
|
||||
+
|
||||
+void GIFLZWCompressor::Compress( HPBYTE pSrc, ULONG nSize )
|
||||
+{
|
||||
+ /********************** DISABLED *************************/
|
||||
+}
|
||||
+
|
||||
+// ------------------------------------------------------------------------
|
||||
+
|
||||
+void GIFLZWCompressor::EndCompression()
|
||||
+{
|
||||
+ /********************** DISABLED *************************/
|
||||
+}
|
||||
@ -1,11 +0,0 @@
|
||||
--- ../goodies/source/filter.vcl/egif/makefile.mk.orig Tue Aug 14 23:22:54 2001
|
||||
+++ ../goodies/source/filter.vcl/egif/makefile.mk Mon Apr 14 06:04:55 2003
|
||||
@@ -89,7 +89,7 @@
|
||||
|
||||
SLOFILES= $(SLO)$/egif.obj \
|
||||
$(SLO)$/dlgegif.obj \
|
||||
- $(SLO)$/giflzwc.obj
|
||||
+ $(SLO)$/giflzwc_disabled.obj
|
||||
|
||||
|
||||
# ==========================================================================
|
||||
@ -1,17 +0,0 @@
|
||||
--- ../connectivity/prj/build.lst 2 Jun 2003 07:53:47 -0000 1.18
|
||||
+++ ../connectivity/prj/build.lst 8 Aug 2003 07:21:31 -0000
|
||||
@@ -1,4 +1,4 @@
|
||||
-cn connectivity : comphelper moz svtools unixODBC NULL
|
||||
+cn connectivity : comphelper svtools unixODBC NULL
|
||||
cn connectivity usr1 - all cn_mkout NULL
|
||||
cn connectivity\source\types nmake - all cn_types NULL
|
||||
cn connectivity\source\commontools nmake - all cn_cmtools cn_parse cn_types NULL
|
||||
@@ -7,8 +7,6 @@
|
||||
cn connectivity\source\resource nmake - all cn_res NULL
|
||||
cn connectivity\source\sdbcx nmake - all cn_sdbcx cn_types NULL
|
||||
cn connectivity\source\drivers\ado nmake - w cn_ado cn_dbtools NULL
|
||||
-cn connectivity\source\drivers\mozab\mozillasrc nmake - all cn_mozab_mozillasrc cn_file NULL
|
||||
-cn connectivity\source\drivers\mozab nmake - all cn_mozab cn_mozab_mozillasrc cn_dbtools NULL
|
||||
cn connectivity\source\drivers\evoab nmake - all cn_evoab cn_dbtools cn_file NULL
|
||||
cn connectivity\source\drivers\calc nmake - all cn_calc cn_file NULL
|
||||
cn connectivity\source\drivers\odbc nmake - all cn_odbc cn_dbtools NULL
|
||||
@ -1,34 +0,0 @@
|
||||
Index: scp/source/office/files.scp
|
||||
===================================================================
|
||||
RCS file: /cvs/installation/scp/source/office/files.scp,v
|
||||
retrieving revision 1.369.10.1
|
||||
diff -u -r1.369.10.1 files.scp
|
||||
--- scp/source/office/files.scp 1 Aug 2003 12:14:45 -0000 1.369.10.1
|
||||
+++ scp/source/office/files.scp 20 Aug 2003 11:45:05 -0000
|
||||
@@ -388,7 +388,7 @@
|
||||
Styles = (PACKED);
|
||||
End
|
||||
|
||||
-#ifndef MACOSX
|
||||
+#if !(defined(MACOSX) || defined(FREEBSD))
|
||||
File GID_FILE_LIB_MOZABDRV
|
||||
TXT_FILE_BODY;
|
||||
#ifdef UNX
|
||||
@@ -750,7 +750,7 @@
|
||||
#endif
|
||||
End
|
||||
|
||||
-#ifndef MACOSX
|
||||
+#if !(defined(MACOSX) || defined(FREEBSD))
|
||||
File GID_FILE_LIB_MOZAB_2
|
||||
TXT_FILE_BODY;
|
||||
Styles = (PACKED,UNO_COMPONENT);
|
||||
@@ -3184,7 +3184,7 @@
|
||||
|
||||
#endif
|
||||
// of #ifdef SOLAR_JAVA
|
||||
-#ifndef MACOSX
|
||||
+#if !(defined(MACOSX) || defined(FREEBSD))
|
||||
File GID_FILE_MOZILLA_RUNTIME
|
||||
TXT_FILE_BODY;
|
||||
Styles = (ARCHIVE);
|
||||
@ -0,0 +1,50 @@
|
||||
#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
|
||||
@ -0,0 +1,13 @@
|
||||
#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" );
|
||||
@ -0,0 +1,13 @@
|
||||
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:
|
||||
*;
|
||||
@ -0,0 +1,14 @@
|
||||
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
|
||||
|
||||
@ -0,0 +1,27 @@
|
||||
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.
|
||||
@ -0,0 +1,90 @@
|
||||
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
|
||||
+
|
||||
@ -0,0 +1,17 @@
|
||||
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
|
||||
@ -0,0 +1,16 @@
|
||||
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 );
|
||||
@ -0,0 +1,34 @@
|
||||
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);
|
||||
13
editors/openoffice-2.0-devel/files/patch-solenv+inc+ant.mk
Normal file
13
editors/openoffice-2.0-devel/files/patch-solenv+inc+ant.mk
Normal file
@ -0,0 +1,13 @@
|
||||
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)"==""
|
||||
@ -0,0 +1,15 @@
|
||||
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
|
||||
@ -0,0 +1,14 @@
|
||||
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
|
||||
@ -0,0 +1,14 @@
|
||||
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
|
||||
@ -0,0 +1,14 @@
|
||||
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
|
||||
@ -0,0 +1,24 @@
|
||||
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>
|
||||
@ -0,0 +1,30 @@
|
||||
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 ----------------------------------------------------------
|
||||
@ -1,5 +1,5 @@
|
||||
# New ports collection makefile for: OpenOffice.org
|
||||
# Date created: 28 Februar 2002
|
||||
# Date created: 28 February 2002
|
||||
# Whom: Martin Blapp
|
||||
#
|
||||
# $FreeBSD$
|
||||
@ -9,51 +9,73 @@ PORTNAME= openoffice
|
||||
PORTVERSION= 2.0
|
||||
CATEGORIES+= editors
|
||||
MASTER_SITES+= http://people.freebsd.org/~maho/ \
|
||||
ftp://openofficeorg.secsup.org/pub/software/openoffice/stable/%SUBDIR%/ \
|
||||
ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice.org/stable/%SUBDIR%/ \
|
||||
${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/stable/&,} \
|
||||
http://www.binarycode.org/openoffice/stable/%SUBDIR%/ \
|
||||
http://ftp.gwdg.de/pub/misc/openoffice/stable/%SUBDIR%/ \
|
||||
ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
|
||||
http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/:help \
|
||||
http://people.freebsd.org/~mbr/ooo/:moz
|
||||
MASTER_SITE_SUBDIR= ${PORTVERSION}
|
||||
DISTFILES+= cws_src680_ooo20031216_20031208.tar.bz2 gpc231.tar.Z:gpc \
|
||||
DISTFILES+= OOo_${BUILD_NR}${MILESTONE}_${SNAPDATE}_source.tar.bz2 gpc231.tar.Z:gpc \
|
||||
patch-openoffice-mozilla101-2002-10-14:moz mozilla-vendor-1.0.2a.tgz:moz
|
||||
.if defined(L10NHELP)
|
||||
DISTFILES+= ${L10NHELP:S/$/:help/}
|
||||
.endif
|
||||
|
||||
FIND?= /usr/bin/find
|
||||
CUT?= /usr/bin/cut
|
||||
AWK?= /usr/bin/awk
|
||||
GREP?= /usr/bin/grep
|
||||
ZIP?= ${PREFIX}/bin/zip
|
||||
UNZIP?= ${PREFIX}/bin/unzip
|
||||
ANT?= ${LOCALBASE}/bin/ant
|
||||
TCSH?= /bin/tcsh
|
||||
PASTE?= /usr/bin/paste
|
||||
MAINTAINER= openoffice@FreeBSD.org
|
||||
.if !defined(COMMENT)
|
||||
COMMENT= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
|
||||
.endif
|
||||
|
||||
WANT_GNOME= yes
|
||||
IGNORE= "Does not work yet, installation problems"
|
||||
|
||||
NO_LATEST_LINK= yes
|
||||
UNZIP?= ${LOCALBASE}/bin/unzip
|
||||
ZIP?= ${LOCALBASE}/bin/zip
|
||||
ANT?= ${LOCALBASE}/bin/ant
|
||||
TCSH?= /bin/tcsh
|
||||
DIST_SUBDIR= openoffice2.0
|
||||
BUILD_NR= 680
|
||||
MILESTONE= m30
|
||||
RELEASE_NR= 2.0
|
||||
FRELEASE_NR= 2.0
|
||||
SNAPDATE= 20040402
|
||||
INSTALLATION_BASEDIR= OpenOffice.org${RELEASE_NR}
|
||||
EXTRACT_ONLY= OOo_${BUILD_NR}${MILESTONE}_${SNAPDATE}_source.tar.bz2
|
||||
USE_GNOME= orbit gtk12
|
||||
USE_REINPLACE= yes
|
||||
USE_PERL5= yes
|
||||
USE_BZIP2= yes
|
||||
USE_BISON= yes
|
||||
USE_GMAKE= yes
|
||||
LANG_EXT?= 01
|
||||
LANG_CONFIGURE_ARG?= ENUS
|
||||
WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work
|
||||
WRKSRC= ${WRKDIR}/oo_${BUILD_NR}${MILESTONE}_src/config_office
|
||||
|
||||
#XXX dirty
|
||||
BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
|
||||
USE_GCC=3.2
|
||||
CC= gcc32
|
||||
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+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries
|
||||
BUILD_DEPENDS+= ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft
|
||||
.if !defined(DISPLAY)
|
||||
BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer
|
||||
.endif
|
||||
|
||||
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
|
||||
png.5:${PORTSDIR}/graphics/png \
|
||||
mng.1:${PORTSDIR}/graphics/libmng \
|
||||
freetype.9:${PORTSDIR}/print/freetype2
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
|
||||
BUILD_NR= 645
|
||||
RELEASE_NR= 1.1
|
||||
FRELEASE_NR= 1.1.0
|
||||
INSTALLATION_BASEDIR= OpenOffice.org${FRELEASE_NR}
|
||||
DIST_SUBDIR= openoffice1.1
|
||||
DICT_DIR= ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
|
||||
|
||||
#
|
||||
# configuration for language specific slave ports
|
||||
#
|
||||
.if !defined(LANG_EXT)
|
||||
LANG_EXT=01
|
||||
.else
|
||||
#
|
||||
# Add pkg-descr and pkg-message if available
|
||||
#
|
||||
.if exists(${.CURDIR}/pkg-descr)
|
||||
DESCR= ${.CURDIR}/pkg-descr
|
||||
.endif
|
||||
@ -69,13 +91,6 @@ PKGNAMEPREFIX= ${LANG_PKGNAME}-
|
||||
PKGNAMESUFFIX= -${LANG_SUFFIX}
|
||||
.endif
|
||||
.endif # if defined(LANG_PKGNAME)
|
||||
#
|
||||
# LANG_CONFIGURE_ARG is missing for the german port
|
||||
#
|
||||
.if defined(LANG_EXT)
|
||||
CONFIGURE_ARGS+= --with-lang=${LANG_CONFIGURE_ARG},ENUS
|
||||
.endif
|
||||
.endif
|
||||
|
||||
.if !defined (LANG) && !defined(USE_LANG)
|
||||
USE_LANG= en_US.ISO8859-15
|
||||
@ -88,62 +103,16 @@ USE_LANG= ${LANG}
|
||||
|
||||
LANG_SORTED=`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
|
||||
|
||||
.if ${OSVERSION} < 500000
|
||||
# OOo requires gcc 3.3 (not systems's gcc)
|
||||
BUILD_DEPENDS+= gcc33:${PORTSDIR}/lang/gcc33
|
||||
USE_GCC=3.3 # make no sense yet
|
||||
CC= gcc33
|
||||
CXX= g++33
|
||||
.endif
|
||||
|
||||
EXTRACT_ONLY= OOo_${PORTVERSION}_source.tar.bz2
|
||||
|
||||
MAINTAINER= openoffice@FreeBSD.org
|
||||
.if !defined(COMMENT)
|
||||
COMMENT= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
|
||||
.endif
|
||||
|
||||
BROKEN= "under construction"
|
||||
#
|
||||
# The JDK dependency needs to be at the first place, so all
|
||||
# following dependencies use the same JDK.
|
||||
#
|
||||
BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14
|
||||
BUILD_DEPENDS+= 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+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries
|
||||
BUILD_DEPENDS+= ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft
|
||||
.if !defined(DISPLAY)
|
||||
BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer
|
||||
.endif
|
||||
|
||||
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
|
||||
png.5:${PORTSDIR}/graphics/png \
|
||||
mng.1:${PORTSDIR}/graphics/libmng \
|
||||
freetype.9:${PORTSDIR}/print/freetype2
|
||||
|
||||
USE_PERL5= yes
|
||||
USE_BZIP2= yes
|
||||
USE_BISON= yes
|
||||
USE_GMAKE= yes
|
||||
USE_GNOME= orbit gtk12
|
||||
|
||||
EXTRACT_BEFORE_ARGS_R= -dc
|
||||
EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
|
||||
EXTRACT_CMD_R= ${GZIP_CMD}
|
||||
EXTRACT_REST= gpc231.tar.Z
|
||||
|
||||
JDKDIR?= ${LOCALBASE}/jdk1.4.1
|
||||
JDKDIR?= ${LOCALBASE}/jdk1.4.2
|
||||
JAVAVM= ${JDKDIR}/bin/java
|
||||
|
||||
GNU_CONFIGURE= yes
|
||||
USE_AUTOCONF_VER= 253
|
||||
WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work
|
||||
WRKSRC= ${WRKDIR}/oo_${RELEASE_NR}_src/config_office
|
||||
LD_PATH1= ${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
|
||||
LD_PATH= ${LD_PATH1}:${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/lib/
|
||||
.if defined(WITH_DEBUG)
|
||||
CFLAGS+= -g
|
||||
.if ${WITH_DEBUG} == 2
|
||||
@ -161,7 +130,8 @@ DISPLAYHACK=localhost:1001
|
||||
|
||||
CONFIGURE_ENV= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
|
||||
PTHREAD_LIBS=${PTHREAD_LIBS}
|
||||
CONFIGURE_ARGS+= --with-jdk-home=${JDKDIR}
|
||||
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
|
||||
|
||||
.if defined(WITH_DEBUG)
|
||||
.if ${WITH_DEBUG} == 2
|
||||
@ -194,15 +164,6 @@ pre-fetch:
|
||||
@${ECHO}
|
||||
.endif
|
||||
@${ECHO} "OPTIONS:"
|
||||
.if !defined(USE_GCC)
|
||||
@${ECHO}
|
||||
@${ECHO} "You can compile OO with different"
|
||||
@${ECHO} "gcc compiler versions:"
|
||||
@${ECHO}
|
||||
@${ECHO} "Add USE_GCC=2.95 or USE_GCC=3.2"
|
||||
@${ECHO} "to compile openoffice with your"
|
||||
@${ECHO} "preferred compiler."
|
||||
.endif
|
||||
.if !defined(WITH_DEBUG)
|
||||
@${ECHO}
|
||||
@${ECHO} "You can compile OO with debug symbols"
|
||||
@ -225,94 +186,9 @@ pre-fetch:
|
||||
@${ECHO} "quality of glyphs at small bitmap sizes."
|
||||
@${ECHO}
|
||||
.endif
|
||||
.if !defined(WITH_GIF_LZW_COMPRESSION)
|
||||
@${ECHO}
|
||||
@${ECHO} "You may set WITH_GIF_LZW_COMPRESSION=YES"
|
||||
@${ECHO} "If you want to make compressed gif images"
|
||||
@${ECHO}
|
||||
@${ECHO} "If must have license from the Unisys and IBM patents"
|
||||
@${ECHO} "to enable this option to get compressed GIF images."
|
||||
@${ECHO}
|
||||
.endif
|
||||
.if ${OSVERSION} < 450002
|
||||
@${ECHO}
|
||||
@${ECHO} "OS-VERSION ${OSVERSION} too low"
|
||||
@${ECHO}
|
||||
@${ECHO} "OO need some important libc_r and"
|
||||
@${ECHO} "gcc fixes to build. Please upgrade to 4.6"
|
||||
@${ECHO} "RELEASE or 4.6 STABLE."
|
||||
@${FALSE}
|
||||
.endif
|
||||
@${ECHO}
|
||||
@${ECHO} "NOTICE:"
|
||||
@${ECHO}
|
||||
@${ECHO} "To build Openoffice, you should have a lot"
|
||||
.if defined(WITH_DEBUG)
|
||||
@${ECHO} "of free diskspace (~ 8GB)."
|
||||
.else
|
||||
@${ECHO} "of free diskspace (~ 4GB)."
|
||||
.endif
|
||||
@${ECHO}
|
||||
.if (defined(USE_GCC) && ${USE_GCC} == 2.95) || \
|
||||
(${OSVERSION} < 500000 && !defined(USE_GCC))
|
||||
@${ECHO} "KERNEL CONFIGURATION:"
|
||||
@${ECHO}
|
||||
@${ECHO} "Openoffice needs a larger stack- and"
|
||||
@${ECHO} "datasize to build. Check your limit"
|
||||
@${ECHO} "settings and and put this in /boot/loader.conf"
|
||||
@${ECHO} "if neccessary:"
|
||||
@${ECHO}
|
||||
@${ECHO} "kern.maxdsiz=\"1073741824\""
|
||||
@${ECHO} "kern.maxssiz=\"268435456\""
|
||||
.endif
|
||||
@${ECHO}
|
||||
.if ${OSVERSION} < 460002
|
||||
@${ECHO} "REQUIRED SYSTEM PATCHES:"
|
||||
@${ECHO}
|
||||
.endif
|
||||
.if ${OSVERSION} < 500000
|
||||
@${ECHO} "OO.org can crash if you enter a non existing path"
|
||||
@${ECHO} "or URL in the location bar. To fix these crashes"
|
||||
@${ECHO} "you need a uncommitted system patch for rtld:"
|
||||
@${ECHO}
|
||||
@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-symlookup.diff"
|
||||
@${ECHO}
|
||||
.endif
|
||||
.if ${OSVERSION} < 460001
|
||||
@${ECHO}
|
||||
@${ECHO} "OO setup is broken on STABLE < 4.6"
|
||||
@${ECHO} "including 4.6 RELEASE."
|
||||
@${ECHO} "You'll need a system patch to solve"
|
||||
@${ECHO} "this problem:"
|
||||
@${ECHO}
|
||||
@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-alloca.diff"
|
||||
@${ECHO}
|
||||
.endif
|
||||
.if ${OSVERSION} < 460002
|
||||
@${ECHO}
|
||||
@${ECHO} "OO.org soffice binary can deadlock. You can work around"
|
||||
@${ECHO} "this problem with this patch:"
|
||||
@${ECHO}
|
||||
@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-deadlock.diff"
|
||||
@${ECHO}
|
||||
.endif
|
||||
.if ${OSVERSION} < 500000
|
||||
@${ECHO}
|
||||
@${ECHO} "OO.org build can deadlock in regmerge. You can work around"
|
||||
@${ECHO} "this problem with this patch:"
|
||||
@${ECHO}
|
||||
@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-builddeadlock.diff"
|
||||
@${ECHO}
|
||||
.endif
|
||||
.if !exists(/usr/include/langinfo.h)
|
||||
@${ECHO}
|
||||
@${ECHO} "langinfo.h is missing !"
|
||||
@${ECHO}
|
||||
@${ECHO} "Please upgrade to 4.6 RELEASE or"
|
||||
@${ECHO} "4.6 STABLE."
|
||||
@${ECHO}
|
||||
@${FALSE}
|
||||
.endif
|
||||
@${ECHO} "If you want SDK and/or solver, please type make sdk and/or make solver"
|
||||
|
||||
.include <${FILESDIR}/Makefile.mozilla>
|
||||
|
||||
post-extract:
|
||||
@for file in ${EXTRACT_REST}; do \
|
||||
@ -326,7 +202,6 @@ post-extract:
|
||||
@${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/../external/gpc/
|
||||
@${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/../external/gpc/
|
||||
@${MAKE} extract-mozilla
|
||||
@-${RM} -f ${WRKSRC}/../moz/zipped/*.zip
|
||||
@${CHMOD} +x ${WRKSRC}/../solenv/bin/zipdep.pl
|
||||
.if defined(L10NHELP)
|
||||
@${ECHO_MSG} "===> Extracting L10NHELP sub project"
|
||||
@ -336,9 +211,9 @@ 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
|
||||
@${MAKE} patch-mozilla
|
||||
@${MAKE} fix-kdewrappers
|
||||
@${MAKE} fix-gnomewrappers
|
||||
.if defined(WITH_TTF_BYTECODE_ENABLED)
|
||||
@if [ "`echo ${PATCHDIR}/optpatch-*`" != "${PATCHDIR}/optpatch-*" ]; then \
|
||||
${ECHO_MSG} "===> Applying additional TTF bytecode patches for ${PKGNAME}" ; \
|
||||
@ -348,116 +223,6 @@ post-patch:
|
||||
${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/optpatch-freetype+patch ; \
|
||||
fi
|
||||
.endif
|
||||
.if !defined(WITH_GIF_LZW_COMPRESSION)
|
||||
@if [ "`echo ${PATCHDIR}/gifpatch-*`" != "${PATCHDIR}/gifpatch-*" ]; then \
|
||||
${ECHO_MSG} "===> Removing GIF LZW compression for ${PKGNAME}" ; \
|
||||
if [ ${PATCH_DEBUG_TMP} = yes ]; then \
|
||||
${ECHO_MSG} "===> Applying GIF LZW compression ${OPSYS} patch" ; \
|
||||
fi; \
|
||||
${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx ; \
|
||||
${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx ; \
|
||||
${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/gifpatch-goodies+source+filter.vcl+egif+makefile.mk ; \
|
||||
fi
|
||||
.endif
|
||||
.if defined(WITH_DEBUG)
|
||||
@if [ "`echo ${PATCHDIR}/debugpatch-*`" != "${PATCHDIR}/debugpatch-*" ]; then \
|
||||
${ECHO_MSG} "===> Applying additional debug ${OPSYS} patches for ${PKGNAME}" ; \
|
||||
PATCHES_APPLIED="" ; \
|
||||
for i in ${PATCHDIR}/debugpatch-*; do \
|
||||
case $$i in \
|
||||
*.orig|*.rej|*~) \
|
||||
${ECHO_MSG} "===> Ignoring patchfile $$i" ; \
|
||||
;; \
|
||||
*) \
|
||||
if [ ${PATCH_DEBUG_TMP} = yes ]; then \
|
||||
${ECHO_MSG} "===> Applying ${OPSYS} patch $$i" ; \
|
||||
fi; \
|
||||
if ${PATCH} ${PATCH_ARGS} < $$i ; then \
|
||||
PATCHES_APPLIED="$$PATCHES_APPLIED $$i" ; \
|
||||
else \
|
||||
${ECHO_MSG} `${ECHO_CMD} ">> Patch $$i failed to apply cleanly." | ${SED} "s|${PATCHDIR}/||"` ; \
|
||||
if [ x"$$PATCHES_APPLIED" != x"" ]; then \
|
||||
${ECHO_MSG} `${ECHO_CMD} ">> Patch(es) $$PATCHES_APPLIED applied cleanly." | ${SED} "s|${PATCHDIR}/||g"` ; \
|
||||
fi; \
|
||||
${FALSE} ; \
|
||||
fi; \
|
||||
;; \
|
||||
esac; \
|
||||
done; \
|
||||
fi;
|
||||
.endif
|
||||
@${ECHO_MSG} "===> Find old malloc.h defines and fix them in ${PKGNAME} source"
|
||||
@${FIND} ${WRKSRC}/.. | ${EGREP} "\.(cxx|h|c)$$" | ${XARGS} \
|
||||
${PERL} -pi -e "s|<malloc.h>|<stdlib.h>|g"
|
||||
|
||||
fix-kdewrappers:
|
||||
# @${PERL} -pi -e 's|"Exec", "\\"\<progpath\>/program/|"Exec", "\\"${PREFIX}/bin/openoffice_${RELEASE_NR}-|' \
|
||||
# ${WRKSRC}/../sysui/oounix/office/kde2/kdeint
|
||||
|
||||
fix-gnomewrappers:
|
||||
# @${PERL} -pi -e 's|"Exec", "<progpath>/program/|"Exec", "${PREFIX}/bin/openoffice_${RELEASE_NR}-|' \
|
||||
# ${WRKSRC}/../sysui/oounix/office/gnome/gnomeint
|
||||
|
||||
extract-mozilla:
|
||||
.if ! exists(${WRKDIR}/mozilla/Makefile)
|
||||
@${ECHO_MSG} "===> Extracting mozilla sub project"
|
||||
@cd ${WRKDIR} && tar -xzf ${DISTDIR}/${DIST_SUBDIR}/mozilla-vendor-1.0.2a.tgz
|
||||
.endif
|
||||
@cd ${WRKDIR}/mozilla && ${MAKE} extract WRKDIRPREFIX=""
|
||||
|
||||
patch-mozilla:
|
||||
@${CP} ${DISTDIR}/${DIST_SUBDIR}/patch-openoffice-mozilla101-2002-10-14 \
|
||||
${WRKDIR}/mozilla/files/
|
||||
@cd ${WRKDIR}/mozilla && ${MAKE} patch WRKDIRPREFIX=""
|
||||
|
||||
build-mozilla:
|
||||
.if ! exists(${WRKDIR}/FREEBSDGCCIruntime.zip)
|
||||
@${ECHO_MSG} "===> Building mozilla sub project"
|
||||
.if defined(WITH_DEBUG)
|
||||
@${CP} ${WRKDIR}/mozilla/Makefile ${WRKDIR}/mozilla/Makefile.new
|
||||
@${SED} -e 's|--disable-debug||' \
|
||||
-e 's|--disable-cpp-rtti||' \
|
||||
-e 's|--enable-strip||' \
|
||||
< ${WRKDIR}/mozilla/Makefile.new > ${WRKDIR}/mozilla/Makefile
|
||||
.endif
|
||||
.if defined(USE_GCC)
|
||||
@cd ${WRKDIR}/mozilla && ${MAKE} CXX=${CXX} CC=${CC} CFLAGS="${CFLAGS}" USE_GCC=${USE_GCC} build WRKDIRPREFIX=""
|
||||
.else
|
||||
@cd ${WRKDIR}/mozilla && ${MAKE} CFLAGS="${CFLAGS}" build WRKDIRPREFIX=""
|
||||
.endif
|
||||
@${CP} ${FILESDIR}/zipmoz.sh ${WRKDIR}
|
||||
@${CHMOD} 755 ${WRKDIR}/zipmoz.sh
|
||||
@${WRKDIR}/zipmoz.sh ${WRKDIR}/mozilla/work/mozilla/dist FREEBSDGCCI ${WRKDIR}
|
||||
.endif
|
||||
|
||||
install-mozilla:
|
||||
@${CP} ${WRKDIR}/FREEBSDGCCIinc.zip ${WRKSRC}/../moz/zipped/
|
||||
@${CP} ${WRKDIR}/FREEBSDGCCIlib.zip ${WRKSRC}/../moz/zipped/
|
||||
@${CP} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKSRC}/../moz/zipped/
|
||||
|
||||
register-mozilla:
|
||||
.if exists(${WRKDIR}/mozilla-runtime)
|
||||
@${RM} -rf ${WRKDIR}/mozilla-runtime
|
||||
.endif
|
||||
@${MKDIR} ${WRKDIR}/mozilla-runtime
|
||||
@cd ${WRKDIR}/mozilla-runtime && ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIruntime.zip
|
||||
@cd ${WRKDIR}/mozilla-runtime && ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIlib.zip
|
||||
@${CP} ${WRKDIR}/mozilla/work/mozilla/dist/bin/regxpcom ${WRKDIR}/mozilla-runtime/
|
||||
@-${RM} ${WRKDIR}/mozilla-runtime/components/component.reg
|
||||
@cd ${WRKDIR}/mozilla-runtime && export MOZILLA_FIVE_HOME=. \
|
||||
&& export LD_LIBRARY_PATH=.:./lib && ./regxpcom
|
||||
@${CP} ${WRKDIR}/mozilla-runtime/components/xpti.dat \
|
||||
${WRKDIR}/mozilla-runtime/components/xptitemp.dat
|
||||
@${RM} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKDIR}/mozilla-runtime/regxpcom
|
||||
@cd ${WRKDIR}/mozilla-runtime && ${FIND} . -type f \
|
||||
| ${ZIP} ${WRKDIR}/FREEBSDGCCIruntime.zip -@
|
||||
|
||||
mozilla:
|
||||
@${MAKE} extract-mozilla
|
||||
@${MAKE} patch-mozilla
|
||||
@${MAKE} build-mozilla
|
||||
@${MAKE} register-mozilla
|
||||
@${MAKE} install-mozilla
|
||||
|
||||
do-build:
|
||||
.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIruntime.zip)
|
||||
@ -512,14 +277,12 @@ do-install:
|
||||
#
|
||||
${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
|
||||
@sleep 5
|
||||
@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \
|
||||
TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
|
||||
@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
|
||||
${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
|
||||
@-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
|
||||
@${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
|
||||
@${RM} -f ${WRKDIR}/.Xvfb.pid
|
||||
.else
|
||||
@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \
|
||||
TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
|
||||
@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
|
||||
${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
|
||||
.endif
|
||||
|
||||
@ -562,20 +325,24 @@ post-install:
|
||||
package-rename:
|
||||
@${ECHO_MSG} "===> Rename package for OO.org mirror upload";
|
||||
.if defined(LANG_SUFFIX)
|
||||
@${MV} ${WRKDIR}/../${PKGNAMEPREFIX}openoffice-${LANG_SUFFIX}-${PORTVERSION}_${PORTREVISION}.tbz2 \
|
||||
${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}Intel_install_${LANG_PKGNAME}-${LANG_SUFFIX}.tbz2
|
||||
@${MV} ${PKGFILE} \
|
||||
${WRKDIR}/../OOo_${BUILD_NR}${MILESTONE}_${OPSYS}${SIMPLEOSVER}Intel_install_${LANG_PKGNAME}-${LANG_SUFFIX}${PKG_SUFX}
|
||||
.elif defined(LANG_PKGNAME)
|
||||
@${MV} ${PKGFILE} \
|
||||
${WRKDIR}/../OOo_${BUILD_NR}${MILESTONE}_${OPSYS}${SIMPLEOSVER}Intel_install_${LANG_PKGNAME}${PKG_SUFX}
|
||||
.else
|
||||
@${MV} ${WRKDIR}/../${PKGNAMEPREFIX}openoffice-${PORTVERSION}_${PORTREVISION}.tbz2 \
|
||||
${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}Intel_install_${LANG_PKGNAME}.tbz2
|
||||
@${MV} ${PKGFILE} \
|
||||
${WRKDIR}/../OOo_${BUILD_NR}${MILESTONE}_${OPSYS}${SIMPLEOSVER}Intel_install${PKG_SUFX}
|
||||
.endif
|
||||
|
||||
update:
|
||||
@${MAKE} fetch
|
||||
@${MAKE} extract
|
||||
@cd ${WRKSRC}/.. && for dir in *; do \
|
||||
if [ -d $$dir ]; then \
|
||||
cd $$dir; cvs update -d; cd ..; \
|
||||
fi \
|
||||
done
|
||||
sdk:
|
||||
@${ECHO_MSG} "===> Make SDK of OpenOffice.org"
|
||||
@cd ${WRKSRC}/.. && DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
|
||||
${SH} -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_${BUILD_NR}${MILESTONE}_${OPSYS}${SIMPLEOSVER}Intel_sdk.tar.gz
|
||||
|
||||
solver:
|
||||
@${ECHO_MSG} "===> Make Solver of OpenOffice.org"
|
||||
@cd ${WRKSRC}/.. ; ${TAR} cfz ${WRKDIR}/../OOo_${BUILD_NR}${MILESTONE}_${OPSYS}${SIMPLEOSVER}Intel_solver.tar.gz solver
|
||||
|
||||
.include <bsd.port.post.mk>
|
||||
|
||||
@ -1,4 +1,8 @@
|
||||
MD5 (openoffice2.0/cws_src680_ooo20031216_20031208.tar.bz2) = d841d81ad9ca3b46dd49ae997854032b
|
||||
MD5 (openoffice2.0/OOo_680m30_20040402_source.tar.bz2) = 768b3d8246a12eff6bf83f098093fbee
|
||||
SIZE (openoffice2.0/OOo_680m30_20040402_source.tar.bz2) = 195378119
|
||||
MD5 (openoffice2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
|
||||
MD5 (openoffice2.0/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
|
||||
SIZE (openoffice2.0/gpc231.tar.Z) = 27917
|
||||
MD5 (openoffice2.0/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
|
||||
SIZE (openoffice2.0/patch-openoffice-mozilla101-2002-10-14) = 29105
|
||||
MD5 (openoffice2.0/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
|
||||
SIZE (openoffice2.0/mozilla-vendor-1.0.2a.tgz) = 7292
|
||||
|
||||
61
editors/openoffice-3-devel/files/Makefile.mozilla
Normal file
61
editors/openoffice-3-devel/files/Makefile.mozilla
Normal file
@ -0,0 +1,61 @@
|
||||
extract-mozilla:
|
||||
.if ! exists(${WRKDIR}/mozilla/Makefile)
|
||||
@${ECHO_MSG} "===> Extracting mozilla sub project"
|
||||
@cd ${WRKDIR} && tar -xzf ${DISTDIR}/${DIST_SUBDIR}/mozilla-vendor-1.0.2a.tgz
|
||||
.endif
|
||||
@cd ${WRKDIR}/mozilla && ${MAKE} extract WRKDIRPREFIX=""
|
||||
|
||||
patch-mozilla:
|
||||
@${CP} ${DISTDIR}/${DIST_SUBDIR}/patch-openoffice-mozilla101-2002-10-14 \
|
||||
${WRKDIR}/mozilla/files/
|
||||
@cd ${WRKDIR}/mozilla && ${MAKE} patch WRKDIRPREFIX=""
|
||||
|
||||
build-mozilla:
|
||||
.if ! exists(${WRKDIR}/FREEBSDGCCIruntime.zip)
|
||||
@${ECHO_MSG} "===> Building mozilla sub project"
|
||||
.if defined(WITH_DEBUG)
|
||||
@${CP} ${WRKDIR}/mozilla/Makefile ${WRKDIR}/mozilla/Makefile.new
|
||||
@${SED} -e 's|--disable-debug||' \
|
||||
-e 's|--disable-cpp-rtti||' \
|
||||
-e 's|--enable-strip||' \
|
||||
< ${WRKDIR}/mozilla/Makefile.new > ${WRKDIR}/mozilla/Makefile
|
||||
.endif
|
||||
.if defined(USE_GCC)
|
||||
@cd ${WRKDIR}/mozilla && ${MAKE} CXX="${CXX}" CC="${CC}" CFLAGS="${CFLAGS}" USE_GCC=${USE_GCC} build WRKDIRPREFIX=""
|
||||
.else
|
||||
@cd ${WRKDIR}/mozilla && ${MAKE} CFLAGS="${CFLAGS}" build WRKDIRPREFIX=""
|
||||
.endif
|
||||
@${CP} ${FILESDIR}/zipmoz.sh ${WRKDIR}
|
||||
@${CHMOD} 755 ${WRKDIR}/zipmoz.sh
|
||||
@${WRKDIR}/zipmoz.sh ${WRKDIR}/mozilla/work/mozilla/dist FREEBSDGCCI ${WRKDIR}
|
||||
.endif
|
||||
|
||||
install-mozilla:
|
||||
@${CP} ${WRKDIR}/FREEBSDGCCIinc.zip ${WRKSRC}/../moz/zipped/
|
||||
@${CP} ${WRKDIR}/FREEBSDGCCIlib.zip ${WRKSRC}/../moz/zipped/
|
||||
@${CP} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKSRC}/../moz/zipped/
|
||||
|
||||
register-mozilla:
|
||||
.if exists(${WRKDIR}/mozilla-runtime)
|
||||
@${RM} -rf ${WRKDIR}/mozilla-runtime
|
||||
.endif
|
||||
@${MKDIR} ${WRKDIR}/mozilla-runtime
|
||||
@cd ${WRKDIR}/mozilla-runtime && ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIruntime.zip
|
||||
@cd ${WRKDIR}/mozilla-runtime && ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIlib.zip
|
||||
@${CP} ${WRKDIR}/mozilla/work/mozilla/dist/bin/regxpcom ${WRKDIR}/mozilla-runtime/
|
||||
@-${RM} ${WRKDIR}/mozilla-runtime/components/component.reg
|
||||
@cd ${WRKDIR}/mozilla-runtime && export MOZILLA_FIVE_HOME=. \
|
||||
&& export LD_LIBRARY_PATH=.:./lib && ./regxpcom
|
||||
@${CP} ${WRKDIR}/mozilla-runtime/components/xpti.dat \
|
||||
${WRKDIR}/mozilla-runtime/components/xptitemp.dat
|
||||
@${RM} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKDIR}/mozilla-runtime/regxpcom
|
||||
@cd ${WRKDIR}/mozilla-runtime && ${FIND} . -type f \
|
||||
| ${ZIP} ${WRKDIR}/FREEBSDGCCIruntime.zip -@
|
||||
|
||||
mozilla:
|
||||
@${MAKE} extract-mozilla
|
||||
@${MAKE} patch-mozilla
|
||||
@${MAKE} build-mozilla
|
||||
@${MAKE} register-mozilla
|
||||
@${MAKE} install-mozilla
|
||||
|
||||
@ -1,21 +0,0 @@
|
||||
--- ../setup2/mow/source/loader/loader.c.orig Mon Jun 2 08:25:13 2003
|
||||
+++ ../setup2/mow/source/loader/loader.c Tue Jun 3 07:58:22 2003
|
||||
@@ -1069,6 +1069,7 @@
|
||||
|
||||
void KillSetupDir()
|
||||
{
|
||||
+#if 0
|
||||
DIR* pDir;
|
||||
struct dirent* pFile;
|
||||
|
||||
@@ -1088,6 +1089,10 @@
|
||||
closedir( pDir );
|
||||
chdir( strInitPath );
|
||||
rmdir( strTmpPath );
|
||||
+#else
|
||||
+ fprintf(stderr, "\nLeaving behind temporary directory: %s\n",
|
||||
+ strTmpPath);
|
||||
+#endif
|
||||
}
|
||||
|
||||
void makeSymLink( char* s )
|
||||
@ -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
|
||||
@ -1,290 +0,0 @@
|
||||
--- ../goodies/source/filter.vcl/egif/giflzwc.cxx Sun Apr 13 14:33:24 2003
|
||||
+++ /dev/null Mon Apr 14 06:10:35 2003
|
||||
@@ -1,287 +0,0 @@
|
||||
-/*************************************************************************
|
||||
- *
|
||||
- * $RCSfile: giflzwc.cxx,v $
|
||||
- *
|
||||
- * $Revision: 1.1.1.1 $
|
||||
- *
|
||||
- * last change: $Author: hr $ $Date: 2000/09/18 16:30:11 $
|
||||
- *
|
||||
- * The Contents of this file are made available subject to the terms of
|
||||
- * either of the following licenses
|
||||
- *
|
||||
- * - GNU Lesser General Public License Version 2.1
|
||||
- * - Sun Industry Standards Source License Version 1.1
|
||||
- *
|
||||
- * Sun Microsystems Inc., October, 2000
|
||||
- *
|
||||
- * GNU Lesser General Public License Version 2.1
|
||||
- * =============================================
|
||||
- * Copyright 2000 by Sun Microsystems, Inc.
|
||||
- * 901 San Antonio Road, Palo Alto, CA 94303, USA
|
||||
- *
|
||||
- * This library is free software; you can redistribute it and/or
|
||||
- * modify it under the terms of the GNU Lesser General Public
|
||||
- * License version 2.1, as published by the Free Software Foundation.
|
||||
- *
|
||||
- * This library is distributed in the hope that it will be useful,
|
||||
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
- * Lesser General Public License for more details.
|
||||
- *
|
||||
- * You should have received a copy of the GNU Lesser General Public
|
||||
- * License along with this library; if not, write to the Free Software
|
||||
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
|
||||
- * MA 02111-1307 USA
|
||||
- *
|
||||
- *
|
||||
- * Sun Industry Standards Source License Version 1.1
|
||||
- * =================================================
|
||||
- * The contents of this file are subject to the Sun Industry Standards
|
||||
- * Source License Version 1.1 (the "License"); You may not use this file
|
||||
- * except in compliance with the License. You may obtain a copy of the
|
||||
- * License at http://www.openoffice.org/license.html.
|
||||
- *
|
||||
- * Software provided under this License is provided on an "AS IS" basis,
|
||||
- * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
|
||||
- * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
|
||||
- * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
|
||||
- * See the License for the specific provisions governing your rights and
|
||||
- * obligations concerning the Software.
|
||||
- *
|
||||
- * The Initial Developer of the Original Code is: Sun Microsystems, Inc.
|
||||
- *
|
||||
- * Copyright: 2000 by Sun Microsystems, Inc.
|
||||
- *
|
||||
- * All Rights Reserved.
|
||||
- *
|
||||
- * Contributor(s): _______________________________________
|
||||
- *
|
||||
- *
|
||||
- ************************************************************************/
|
||||
-
|
||||
-#include <tools/stream.hxx>
|
||||
-#include "giflzwc.hxx"
|
||||
-
|
||||
-// ----------------------------
|
||||
-// - GIFImageDataOutputStream -
|
||||
-// ----------------------------
|
||||
-
|
||||
-class GIFImageDataOutputStream
|
||||
-{
|
||||
-private:
|
||||
-
|
||||
- void FlushBlockBuf();
|
||||
- inline void FlushBitsBufsFullBytes();
|
||||
-
|
||||
- SvStream& rStream;
|
||||
- BYTE* pBlockBuf;
|
||||
- BYTE nBlockBufSize;
|
||||
- ULONG nBitsBuf;
|
||||
- USHORT nBitsBufSize;
|
||||
-
|
||||
-public:
|
||||
-
|
||||
- GIFImageDataOutputStream( SvStream & rGIF, BYTE nLZWDataSize );
|
||||
- ~GIFImageDataOutputStream();
|
||||
-
|
||||
- inline void WriteBits( USHORT nCode, USHORT nCodeLen );
|
||||
-};
|
||||
-
|
||||
-// ------------------------------------------------------------------------
|
||||
-
|
||||
-inline void GIFImageDataOutputStream::FlushBitsBufsFullBytes()
|
||||
-{
|
||||
- while (nBitsBufSize>=8)
|
||||
- {
|
||||
- if( nBlockBufSize==255 )
|
||||
- FlushBlockBuf();
|
||||
-
|
||||
- pBlockBuf[nBlockBufSize++] = (BYTE) nBitsBuf;
|
||||
- nBitsBuf >>= 8;
|
||||
- nBitsBufSize -= 8;
|
||||
- }
|
||||
-}
|
||||
-
|
||||
-// ------------------------------------------------------------------------
|
||||
-
|
||||
-inline void GIFImageDataOutputStream::WriteBits( USHORT nCode, USHORT nCodeLen )
|
||||
-{
|
||||
- if( nBitsBufSize+nCodeLen>32 )
|
||||
- FlushBitsBufsFullBytes();
|
||||
-
|
||||
- nBitsBuf |= (ULONG) nCode << nBitsBufSize;
|
||||
- nBitsBufSize += nCodeLen;
|
||||
-}
|
||||
-
|
||||
-// ------------------------------------------------------------------------
|
||||
-
|
||||
-GIFImageDataOutputStream::GIFImageDataOutputStream( SvStream & rGIF, BYTE nLZWDataSize ) :
|
||||
- rStream(rGIF)
|
||||
-{
|
||||
- pBlockBuf = new BYTE[ 255 ];
|
||||
- nBlockBufSize = 0;
|
||||
- nBitsBufSize = 0;
|
||||
- nBitsBuf = 0;
|
||||
- rStream << nLZWDataSize;
|
||||
-}
|
||||
-
|
||||
-// ------------------------------------------------------------------------
|
||||
-
|
||||
-
|
||||
-GIFImageDataOutputStream::~GIFImageDataOutputStream()
|
||||
-{
|
||||
- WriteBits(0,7);
|
||||
- FlushBitsBufsFullBytes();
|
||||
- FlushBlockBuf();
|
||||
- rStream << (BYTE)0;
|
||||
- delete[] pBlockBuf;
|
||||
-}
|
||||
-
|
||||
-// ------------------------------------------------------------------------
|
||||
-
|
||||
-void GIFImageDataOutputStream::FlushBlockBuf()
|
||||
-{
|
||||
- if( nBlockBufSize )
|
||||
- {
|
||||
- rStream << (BYTE) nBlockBufSize;
|
||||
- rStream.Write( pBlockBuf,nBlockBufSize );
|
||||
- nBlockBufSize = 0;
|
||||
- }
|
||||
-}
|
||||
-
|
||||
-// -------------------
|
||||
-// - GIFLZWCTreeNode -
|
||||
-// -------------------
|
||||
-
|
||||
-struct GIFLZWCTreeNode
|
||||
-{
|
||||
-
|
||||
- GIFLZWCTreeNode* pBrother; // naechster Knoten, der den selben Vater hat
|
||||
- GIFLZWCTreeNode* pFirstChild; // erster Sohn
|
||||
- USHORT nCode; // Der Code fuer den String von Pixelwerten, der sich ergibt, wenn
|
||||
- USHORT nValue; // Der Pixelwert
|
||||
-};
|
||||
-
|
||||
-// --------------------
|
||||
-// - GIFLZWCompressor -
|
||||
-// --------------------
|
||||
-
|
||||
-GIFLZWCompressor::GIFLZWCompressor()
|
||||
-{
|
||||
- pIDOS=NULL;
|
||||
-}
|
||||
-
|
||||
-// ------------------------------------------------------------------------
|
||||
-
|
||||
-GIFLZWCompressor::~GIFLZWCompressor()
|
||||
-{
|
||||
- if (pIDOS!=NULL) EndCompression();
|
||||
-}
|
||||
-
|
||||
-// ------------------------------------------------------------------------
|
||||
-
|
||||
-void GIFLZWCompressor::StartCompression( SvStream& rGIF, USHORT nPixelSize )
|
||||
-{
|
||||
- if( !pIDOS )
|
||||
- {
|
||||
- USHORT i;
|
||||
-
|
||||
- nDataSize = nPixelSize;
|
||||
-
|
||||
- if( nDataSize < 2 )
|
||||
- nDataSize=2;
|
||||
-
|
||||
- nClearCode=1<<nDataSize;
|
||||
- nEOICode=nClearCode+1;
|
||||
- nTableSize=nEOICode+1;
|
||||
- nCodeSize=nDataSize+1;
|
||||
-
|
||||
- pIDOS=new GIFImageDataOutputStream(rGIF,(BYTE)nDataSize);
|
||||
- pTable=new GIFLZWCTreeNode[4096];
|
||||
-
|
||||
- for (i=0; i<4096; i++)
|
||||
- {
|
||||
- pTable[i].pBrother = pTable[i].pFirstChild = NULL;
|
||||
- pTable[i].nValue = (BYTE) ( pTable[i].nCode = i );
|
||||
- }
|
||||
-
|
||||
- pPrefix = NULL;
|
||||
- pIDOS->WriteBits( nClearCode,nCodeSize );
|
||||
- }
|
||||
-}
|
||||
-
|
||||
-// ------------------------------------------------------------------------
|
||||
-
|
||||
-void GIFLZWCompressor::Compress( HPBYTE pSrc, ULONG nSize )
|
||||
-{
|
||||
- if( pIDOS )
|
||||
- {
|
||||
- GIFLZWCTreeNode* p;
|
||||
- USHORT i;
|
||||
- BYTE nV;
|
||||
-
|
||||
- if( !pPrefix && nSize )
|
||||
- {
|
||||
- pPrefix=pTable+(*pSrc++);
|
||||
- nSize--;
|
||||
- }
|
||||
-
|
||||
- while( nSize )
|
||||
- {
|
||||
- nSize--;
|
||||
- nV=*pSrc++;
|
||||
- for( p=pPrefix->pFirstChild; p!=NULL; p=p->pBrother )
|
||||
- {
|
||||
- if (p->nValue==nV)
|
||||
- break;
|
||||
- }
|
||||
-
|
||||
- if( p)
|
||||
- pPrefix=p;
|
||||
- else
|
||||
- {
|
||||
- pIDOS->WriteBits(pPrefix->nCode,nCodeSize);
|
||||
-
|
||||
- if (nTableSize==4096)
|
||||
- {
|
||||
- pIDOS->WriteBits(nClearCode,nCodeSize);
|
||||
-
|
||||
- for (i=0; i<nClearCode; i++)
|
||||
- pTable[i].pFirstChild=NULL;
|
||||
-
|
||||
- nCodeSize=nDataSize+1;
|
||||
- nTableSize=nEOICode+1;
|
||||
- }
|
||||
- else
|
||||
- {
|
||||
- if(nTableSize==(USHORT)(1<<nCodeSize))
|
||||
- nCodeSize++;
|
||||
-
|
||||
- p=pTable+(nTableSize++);
|
||||
- p->pBrother=pPrefix->pFirstChild;
|
||||
- pPrefix->pFirstChild=p;
|
||||
- p->nValue=nV;
|
||||
- p->pFirstChild=NULL;
|
||||
- }
|
||||
-
|
||||
- pPrefix=pTable+nV;
|
||||
- }
|
||||
- }
|
||||
- }
|
||||
-}
|
||||
-
|
||||
-// ------------------------------------------------------------------------
|
||||
-
|
||||
-void GIFLZWCompressor::EndCompression()
|
||||
-{
|
||||
- if( pIDOS )
|
||||
- {
|
||||
- if( pPrefix )
|
||||
- pIDOS->WriteBits(pPrefix->nCode,nCodeSize);
|
||||
-
|
||||
- pIDOS->WriteBits( nEOICode,nCodeSize );
|
||||
- delete[] pTable;
|
||||
- delete pIDOS;
|
||||
- pIDOS=NULL;
|
||||
- }
|
||||
-}
|
||||
@ -1,45 +0,0 @@
|
||||
--- /dev/null 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ ../goodies/source/filter.vcl/egif/giflzwc_disabled.cxx 2002-08-15 15:09:47.000000000 +0200
|
||||
@@ -0,0 +1,42 @@
|
||||
+/**********************************
|
||||
+ * This code is copied from giflzwc.cxx, with the patented LZW compression code removed.
|
||||
+ **********************************/
|
||||
+
|
||||
+//#include <tools/stream.hxx>
|
||||
+#include "giflzwc.hxx"
|
||||
+
|
||||
+// --------------------
|
||||
+// - GIFLZWCompressor -
|
||||
+// --------------------
|
||||
+
|
||||
+GIFLZWCompressor::GIFLZWCompressor()
|
||||
+{
|
||||
+ pIDOS=NULL;
|
||||
+}
|
||||
+
|
||||
+// ------------------------------------------------------------------------
|
||||
+
|
||||
+GIFLZWCompressor::~GIFLZWCompressor()
|
||||
+{
|
||||
+}
|
||||
+
|
||||
+// ------------------------------------------------------------------------
|
||||
+
|
||||
+void GIFLZWCompressor::StartCompression( SvStream& rGIF, USHORT nPixelSize )
|
||||
+{
|
||||
+ /********************** DISABLED *************************/
|
||||
+}
|
||||
+
|
||||
+// ------------------------------------------------------------------------
|
||||
+
|
||||
+void GIFLZWCompressor::Compress( HPBYTE pSrc, ULONG nSize )
|
||||
+{
|
||||
+ /********************** DISABLED *************************/
|
||||
+}
|
||||
+
|
||||
+// ------------------------------------------------------------------------
|
||||
+
|
||||
+void GIFLZWCompressor::EndCompression()
|
||||
+{
|
||||
+ /********************** DISABLED *************************/
|
||||
+}
|
||||
@ -1,11 +0,0 @@
|
||||
--- ../goodies/source/filter.vcl/egif/makefile.mk.orig Tue Aug 14 23:22:54 2001
|
||||
+++ ../goodies/source/filter.vcl/egif/makefile.mk Mon Apr 14 06:04:55 2003
|
||||
@@ -89,7 +89,7 @@
|
||||
|
||||
SLOFILES= $(SLO)$/egif.obj \
|
||||
$(SLO)$/dlgegif.obj \
|
||||
- $(SLO)$/giflzwc.obj
|
||||
+ $(SLO)$/giflzwc_disabled.obj
|
||||
|
||||
|
||||
# ==========================================================================
|
||||
@ -1,17 +0,0 @@
|
||||
--- ../connectivity/prj/build.lst 2 Jun 2003 07:53:47 -0000 1.18
|
||||
+++ ../connectivity/prj/build.lst 8 Aug 2003 07:21:31 -0000
|
||||
@@ -1,4 +1,4 @@
|
||||
-cn connectivity : comphelper moz svtools unixODBC NULL
|
||||
+cn connectivity : comphelper svtools unixODBC NULL
|
||||
cn connectivity usr1 - all cn_mkout NULL
|
||||
cn connectivity\source\types nmake - all cn_types NULL
|
||||
cn connectivity\source\commontools nmake - all cn_cmtools cn_parse cn_types NULL
|
||||
@@ -7,8 +7,6 @@
|
||||
cn connectivity\source\resource nmake - all cn_res NULL
|
||||
cn connectivity\source\sdbcx nmake - all cn_sdbcx cn_types NULL
|
||||
cn connectivity\source\drivers\ado nmake - w cn_ado cn_dbtools NULL
|
||||
-cn connectivity\source\drivers\mozab\mozillasrc nmake - all cn_mozab_mozillasrc cn_file NULL
|
||||
-cn connectivity\source\drivers\mozab nmake - all cn_mozab cn_mozab_mozillasrc cn_dbtools NULL
|
||||
cn connectivity\source\drivers\evoab nmake - all cn_evoab cn_dbtools cn_file NULL
|
||||
cn connectivity\source\drivers\calc nmake - all cn_calc cn_file NULL
|
||||
cn connectivity\source\drivers\odbc nmake - all cn_odbc cn_dbtools NULL
|
||||
@ -1,34 +0,0 @@
|
||||
Index: scp/source/office/files.scp
|
||||
===================================================================
|
||||
RCS file: /cvs/installation/scp/source/office/files.scp,v
|
||||
retrieving revision 1.369.10.1
|
||||
diff -u -r1.369.10.1 files.scp
|
||||
--- scp/source/office/files.scp 1 Aug 2003 12:14:45 -0000 1.369.10.1
|
||||
+++ scp/source/office/files.scp 20 Aug 2003 11:45:05 -0000
|
||||
@@ -388,7 +388,7 @@
|
||||
Styles = (PACKED);
|
||||
End
|
||||
|
||||
-#ifndef MACOSX
|
||||
+#if !(defined(MACOSX) || defined(FREEBSD))
|
||||
File GID_FILE_LIB_MOZABDRV
|
||||
TXT_FILE_BODY;
|
||||
#ifdef UNX
|
||||
@@ -750,7 +750,7 @@
|
||||
#endif
|
||||
End
|
||||
|
||||
-#ifndef MACOSX
|
||||
+#if !(defined(MACOSX) || defined(FREEBSD))
|
||||
File GID_FILE_LIB_MOZAB_2
|
||||
TXT_FILE_BODY;
|
||||
Styles = (PACKED,UNO_COMPONENT);
|
||||
@@ -3184,7 +3184,7 @@
|
||||
|
||||
#endif
|
||||
// of #ifdef SOLAR_JAVA
|
||||
-#ifndef MACOSX
|
||||
+#if !(defined(MACOSX) || defined(FREEBSD))
|
||||
File GID_FILE_MOZILLA_RUNTIME
|
||||
TXT_FILE_BODY;
|
||||
Styles = (ARCHIVE);
|
||||
@ -0,0 +1,50 @@
|
||||
#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
|
||||
@ -0,0 +1,13 @@
|
||||
#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" );
|
||||
@ -0,0 +1,13 @@
|
||||
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:
|
||||
*;
|
||||
@ -0,0 +1,14 @@
|
||||
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
|
||||
|
||||
27
editors/openoffice-3-devel/files/patch-odk+setsdkenv_unix.in
Normal file
27
editors/openoffice-3-devel/files/patch-odk+setsdkenv_unix.in
Normal file
@ -0,0 +1,27 @@
|
||||
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.
|
||||
@ -0,0 +1,90 @@
|
||||
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
|
||||
+
|
||||
@ -0,0 +1,17 @@
|
||||
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
|
||||
@ -0,0 +1,16 @@
|
||||
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 );
|
||||
@ -0,0 +1,34 @@
|
||||
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);
|
||||
13
editors/openoffice-3-devel/files/patch-solenv+inc+ant.mk
Normal file
13
editors/openoffice-3-devel/files/patch-solenv+inc+ant.mk
Normal file
@ -0,0 +1,13 @@
|
||||
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)"==""
|
||||
@ -0,0 +1,15 @@
|
||||
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
|
||||
@ -0,0 +1,14 @@
|
||||
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
|
||||
@ -0,0 +1,14 @@
|
||||
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
|
||||
@ -0,0 +1,14 @@
|
||||
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
|
||||
@ -0,0 +1,24 @@
|
||||
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>
|
||||
30
editors/openoffice-3-devel/files/patch-vcl+util+makefile.mk
Normal file
30
editors/openoffice-3-devel/files/patch-vcl+util+makefile.mk
Normal file
@ -0,0 +1,30 @@
|
||||
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 ----------------------------------------------------------
|
||||
@ -1,5 +1,5 @@
|
||||
# New ports collection makefile for: OpenOffice.org
|
||||
# Date created: 28 Februar 2002
|
||||
# Date created: 28 February 2002
|
||||
# Whom: Martin Blapp
|
||||
#
|
||||
# $FreeBSD$
|
||||
@ -9,51 +9,73 @@ PORTNAME= openoffice
|
||||
PORTVERSION= 2.0
|
||||
CATEGORIES+= editors
|
||||
MASTER_SITES+= http://people.freebsd.org/~maho/ \
|
||||
ftp://openofficeorg.secsup.org/pub/software/openoffice/stable/%SUBDIR%/ \
|
||||
ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice.org/stable/%SUBDIR%/ \
|
||||
${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/stable/&,} \
|
||||
http://www.binarycode.org/openoffice/stable/%SUBDIR%/ \
|
||||
http://ftp.gwdg.de/pub/misc/openoffice/stable/%SUBDIR%/ \
|
||||
ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
|
||||
http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/:help \
|
||||
http://people.freebsd.org/~mbr/ooo/:moz
|
||||
MASTER_SITE_SUBDIR= ${PORTVERSION}
|
||||
DISTFILES+= cws_src680_ooo20031216_20031208.tar.bz2 gpc231.tar.Z:gpc \
|
||||
DISTFILES+= OOo_${BUILD_NR}${MILESTONE}_${SNAPDATE}_source.tar.bz2 gpc231.tar.Z:gpc \
|
||||
patch-openoffice-mozilla101-2002-10-14:moz mozilla-vendor-1.0.2a.tgz:moz
|
||||
.if defined(L10NHELP)
|
||||
DISTFILES+= ${L10NHELP:S/$/:help/}
|
||||
.endif
|
||||
|
||||
FIND?= /usr/bin/find
|
||||
CUT?= /usr/bin/cut
|
||||
AWK?= /usr/bin/awk
|
||||
GREP?= /usr/bin/grep
|
||||
ZIP?= ${PREFIX}/bin/zip
|
||||
UNZIP?= ${PREFIX}/bin/unzip
|
||||
ANT?= ${LOCALBASE}/bin/ant
|
||||
TCSH?= /bin/tcsh
|
||||
PASTE?= /usr/bin/paste
|
||||
MAINTAINER= openoffice@FreeBSD.org
|
||||
.if !defined(COMMENT)
|
||||
COMMENT= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
|
||||
.endif
|
||||
|
||||
WANT_GNOME= yes
|
||||
IGNORE= "Does not work yet, installation problems"
|
||||
|
||||
NO_LATEST_LINK= yes
|
||||
UNZIP?= ${LOCALBASE}/bin/unzip
|
||||
ZIP?= ${LOCALBASE}/bin/zip
|
||||
ANT?= ${LOCALBASE}/bin/ant
|
||||
TCSH?= /bin/tcsh
|
||||
DIST_SUBDIR= openoffice2.0
|
||||
BUILD_NR= 680
|
||||
MILESTONE= m30
|
||||
RELEASE_NR= 2.0
|
||||
FRELEASE_NR= 2.0
|
||||
SNAPDATE= 20040402
|
||||
INSTALLATION_BASEDIR= OpenOffice.org${RELEASE_NR}
|
||||
EXTRACT_ONLY= OOo_${BUILD_NR}${MILESTONE}_${SNAPDATE}_source.tar.bz2
|
||||
USE_GNOME= orbit gtk12
|
||||
USE_REINPLACE= yes
|
||||
USE_PERL5= yes
|
||||
USE_BZIP2= yes
|
||||
USE_BISON= yes
|
||||
USE_GMAKE= yes
|
||||
LANG_EXT?= 01
|
||||
LANG_CONFIGURE_ARG?= ENUS
|
||||
WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work
|
||||
WRKSRC= ${WRKDIR}/oo_${BUILD_NR}${MILESTONE}_src/config_office
|
||||
|
||||
#XXX dirty
|
||||
BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
|
||||
USE_GCC=3.2
|
||||
CC= gcc32
|
||||
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+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries
|
||||
BUILD_DEPENDS+= ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft
|
||||
.if !defined(DISPLAY)
|
||||
BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer
|
||||
.endif
|
||||
|
||||
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
|
||||
png.5:${PORTSDIR}/graphics/png \
|
||||
mng.1:${PORTSDIR}/graphics/libmng \
|
||||
freetype.9:${PORTSDIR}/print/freetype2
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
|
||||
BUILD_NR= 645
|
||||
RELEASE_NR= 1.1
|
||||
FRELEASE_NR= 1.1.0
|
||||
INSTALLATION_BASEDIR= OpenOffice.org${FRELEASE_NR}
|
||||
DIST_SUBDIR= openoffice1.1
|
||||
DICT_DIR= ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
|
||||
|
||||
#
|
||||
# configuration for language specific slave ports
|
||||
#
|
||||
.if !defined(LANG_EXT)
|
||||
LANG_EXT=01
|
||||
.else
|
||||
#
|
||||
# Add pkg-descr and pkg-message if available
|
||||
#
|
||||
.if exists(${.CURDIR}/pkg-descr)
|
||||
DESCR= ${.CURDIR}/pkg-descr
|
||||
.endif
|
||||
@ -69,13 +91,6 @@ PKGNAMEPREFIX= ${LANG_PKGNAME}-
|
||||
PKGNAMESUFFIX= -${LANG_SUFFIX}
|
||||
.endif
|
||||
.endif # if defined(LANG_PKGNAME)
|
||||
#
|
||||
# LANG_CONFIGURE_ARG is missing for the german port
|
||||
#
|
||||
.if defined(LANG_EXT)
|
||||
CONFIGURE_ARGS+= --with-lang=${LANG_CONFIGURE_ARG},ENUS
|
||||
.endif
|
||||
.endif
|
||||
|
||||
.if !defined (LANG) && !defined(USE_LANG)
|
||||
USE_LANG= en_US.ISO8859-15
|
||||
@ -88,62 +103,16 @@ USE_LANG= ${LANG}
|
||||
|
||||
LANG_SORTED=`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
|
||||
|
||||
.if ${OSVERSION} < 500000
|
||||
# OOo requires gcc 3.3 (not systems's gcc)
|
||||
BUILD_DEPENDS+= gcc33:${PORTSDIR}/lang/gcc33
|
||||
USE_GCC=3.3 # make no sense yet
|
||||
CC= gcc33
|
||||
CXX= g++33
|
||||
.endif
|
||||
|
||||
EXTRACT_ONLY= OOo_${PORTVERSION}_source.tar.bz2
|
||||
|
||||
MAINTAINER= openoffice@FreeBSD.org
|
||||
.if !defined(COMMENT)
|
||||
COMMENT= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
|
||||
.endif
|
||||
|
||||
BROKEN= "under construction"
|
||||
#
|
||||
# The JDK dependency needs to be at the first place, so all
|
||||
# following dependencies use the same JDK.
|
||||
#
|
||||
BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14
|
||||
BUILD_DEPENDS+= 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+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries
|
||||
BUILD_DEPENDS+= ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft
|
||||
.if !defined(DISPLAY)
|
||||
BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer
|
||||
.endif
|
||||
|
||||
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
|
||||
png.5:${PORTSDIR}/graphics/png \
|
||||
mng.1:${PORTSDIR}/graphics/libmng \
|
||||
freetype.9:${PORTSDIR}/print/freetype2
|
||||
|
||||
USE_PERL5= yes
|
||||
USE_BZIP2= yes
|
||||
USE_BISON= yes
|
||||
USE_GMAKE= yes
|
||||
USE_GNOME= orbit gtk12
|
||||
|
||||
EXTRACT_BEFORE_ARGS_R= -dc
|
||||
EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
|
||||
EXTRACT_CMD_R= ${GZIP_CMD}
|
||||
EXTRACT_REST= gpc231.tar.Z
|
||||
|
||||
JDKDIR?= ${LOCALBASE}/jdk1.4.1
|
||||
JDKDIR?= ${LOCALBASE}/jdk1.4.2
|
||||
JAVAVM= ${JDKDIR}/bin/java
|
||||
|
||||
GNU_CONFIGURE= yes
|
||||
USE_AUTOCONF_VER= 253
|
||||
WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work
|
||||
WRKSRC= ${WRKDIR}/oo_${RELEASE_NR}_src/config_office
|
||||
LD_PATH1= ${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
|
||||
LD_PATH= ${LD_PATH1}:${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/lib/
|
||||
.if defined(WITH_DEBUG)
|
||||
CFLAGS+= -g
|
||||
.if ${WITH_DEBUG} == 2
|
||||
@ -161,7 +130,8 @@ DISPLAYHACK=localhost:1001
|
||||
|
||||
CONFIGURE_ENV= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
|
||||
PTHREAD_LIBS=${PTHREAD_LIBS}
|
||||
CONFIGURE_ARGS+= --with-jdk-home=${JDKDIR}
|
||||
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
|
||||
|
||||
.if defined(WITH_DEBUG)
|
||||
.if ${WITH_DEBUG} == 2
|
||||
@ -194,15 +164,6 @@ pre-fetch:
|
||||
@${ECHO}
|
||||
.endif
|
||||
@${ECHO} "OPTIONS:"
|
||||
.if !defined(USE_GCC)
|
||||
@${ECHO}
|
||||
@${ECHO} "You can compile OO with different"
|
||||
@${ECHO} "gcc compiler versions:"
|
||||
@${ECHO}
|
||||
@${ECHO} "Add USE_GCC=2.95 or USE_GCC=3.2"
|
||||
@${ECHO} "to compile openoffice with your"
|
||||
@${ECHO} "preferred compiler."
|
||||
.endif
|
||||
.if !defined(WITH_DEBUG)
|
||||
@${ECHO}
|
||||
@${ECHO} "You can compile OO with debug symbols"
|
||||
@ -225,94 +186,9 @@ pre-fetch:
|
||||
@${ECHO} "quality of glyphs at small bitmap sizes."
|
||||
@${ECHO}
|
||||
.endif
|
||||
.if !defined(WITH_GIF_LZW_COMPRESSION)
|
||||
@${ECHO}
|
||||
@${ECHO} "You may set WITH_GIF_LZW_COMPRESSION=YES"
|
||||
@${ECHO} "If you want to make compressed gif images"
|
||||
@${ECHO}
|
||||
@${ECHO} "If must have license from the Unisys and IBM patents"
|
||||
@${ECHO} "to enable this option to get compressed GIF images."
|
||||
@${ECHO}
|
||||
.endif
|
||||
.if ${OSVERSION} < 450002
|
||||
@${ECHO}
|
||||
@${ECHO} "OS-VERSION ${OSVERSION} too low"
|
||||
@${ECHO}
|
||||
@${ECHO} "OO need some important libc_r and"
|
||||
@${ECHO} "gcc fixes to build. Please upgrade to 4.6"
|
||||
@${ECHO} "RELEASE or 4.6 STABLE."
|
||||
@${FALSE}
|
||||
.endif
|
||||
@${ECHO}
|
||||
@${ECHO} "NOTICE:"
|
||||
@${ECHO}
|
||||
@${ECHO} "To build Openoffice, you should have a lot"
|
||||
.if defined(WITH_DEBUG)
|
||||
@${ECHO} "of free diskspace (~ 8GB)."
|
||||
.else
|
||||
@${ECHO} "of free diskspace (~ 4GB)."
|
||||
.endif
|
||||
@${ECHO}
|
||||
.if (defined(USE_GCC) && ${USE_GCC} == 2.95) || \
|
||||
(${OSVERSION} < 500000 && !defined(USE_GCC))
|
||||
@${ECHO} "KERNEL CONFIGURATION:"
|
||||
@${ECHO}
|
||||
@${ECHO} "Openoffice needs a larger stack- and"
|
||||
@${ECHO} "datasize to build. Check your limit"
|
||||
@${ECHO} "settings and and put this in /boot/loader.conf"
|
||||
@${ECHO} "if neccessary:"
|
||||
@${ECHO}
|
||||
@${ECHO} "kern.maxdsiz=\"1073741824\""
|
||||
@${ECHO} "kern.maxssiz=\"268435456\""
|
||||
.endif
|
||||
@${ECHO}
|
||||
.if ${OSVERSION} < 460002
|
||||
@${ECHO} "REQUIRED SYSTEM PATCHES:"
|
||||
@${ECHO}
|
||||
.endif
|
||||
.if ${OSVERSION} < 500000
|
||||
@${ECHO} "OO.org can crash if you enter a non existing path"
|
||||
@${ECHO} "or URL in the location bar. To fix these crashes"
|
||||
@${ECHO} "you need a uncommitted system patch for rtld:"
|
||||
@${ECHO}
|
||||
@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-symlookup.diff"
|
||||
@${ECHO}
|
||||
.endif
|
||||
.if ${OSVERSION} < 460001
|
||||
@${ECHO}
|
||||
@${ECHO} "OO setup is broken on STABLE < 4.6"
|
||||
@${ECHO} "including 4.6 RELEASE."
|
||||
@${ECHO} "You'll need a system patch to solve"
|
||||
@${ECHO} "this problem:"
|
||||
@${ECHO}
|
||||
@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-alloca.diff"
|
||||
@${ECHO}
|
||||
.endif
|
||||
.if ${OSVERSION} < 460002
|
||||
@${ECHO}
|
||||
@${ECHO} "OO.org soffice binary can deadlock. You can work around"
|
||||
@${ECHO} "this problem with this patch:"
|
||||
@${ECHO}
|
||||
@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-deadlock.diff"
|
||||
@${ECHO}
|
||||
.endif
|
||||
.if ${OSVERSION} < 500000
|
||||
@${ECHO}
|
||||
@${ECHO} "OO.org build can deadlock in regmerge. You can work around"
|
||||
@${ECHO} "this problem with this patch:"
|
||||
@${ECHO}
|
||||
@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-builddeadlock.diff"
|
||||
@${ECHO}
|
||||
.endif
|
||||
.if !exists(/usr/include/langinfo.h)
|
||||
@${ECHO}
|
||||
@${ECHO} "langinfo.h is missing !"
|
||||
@${ECHO}
|
||||
@${ECHO} "Please upgrade to 4.6 RELEASE or"
|
||||
@${ECHO} "4.6 STABLE."
|
||||
@${ECHO}
|
||||
@${FALSE}
|
||||
.endif
|
||||
@${ECHO} "If you want SDK and/or solver, please type make sdk and/or make solver"
|
||||
|
||||
.include <${FILESDIR}/Makefile.mozilla>
|
||||
|
||||
post-extract:
|
||||
@for file in ${EXTRACT_REST}; do \
|
||||
@ -326,7 +202,6 @@ post-extract:
|
||||
@${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/../external/gpc/
|
||||
@${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/../external/gpc/
|
||||
@${MAKE} extract-mozilla
|
||||
@-${RM} -f ${WRKSRC}/../moz/zipped/*.zip
|
||||
@${CHMOD} +x ${WRKSRC}/../solenv/bin/zipdep.pl
|
||||
.if defined(L10NHELP)
|
||||
@${ECHO_MSG} "===> Extracting L10NHELP sub project"
|
||||
@ -336,9 +211,9 @@ 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
|
||||
@${MAKE} patch-mozilla
|
||||
@${MAKE} fix-kdewrappers
|
||||
@${MAKE} fix-gnomewrappers
|
||||
.if defined(WITH_TTF_BYTECODE_ENABLED)
|
||||
@if [ "`echo ${PATCHDIR}/optpatch-*`" != "${PATCHDIR}/optpatch-*" ]; then \
|
||||
${ECHO_MSG} "===> Applying additional TTF bytecode patches for ${PKGNAME}" ; \
|
||||
@ -348,116 +223,6 @@ post-patch:
|
||||
${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/optpatch-freetype+patch ; \
|
||||
fi
|
||||
.endif
|
||||
.if !defined(WITH_GIF_LZW_COMPRESSION)
|
||||
@if [ "`echo ${PATCHDIR}/gifpatch-*`" != "${PATCHDIR}/gifpatch-*" ]; then \
|
||||
${ECHO_MSG} "===> Removing GIF LZW compression for ${PKGNAME}" ; \
|
||||
if [ ${PATCH_DEBUG_TMP} = yes ]; then \
|
||||
${ECHO_MSG} "===> Applying GIF LZW compression ${OPSYS} patch" ; \
|
||||
fi; \
|
||||
${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx ; \
|
||||
${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx ; \
|
||||
${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/gifpatch-goodies+source+filter.vcl+egif+makefile.mk ; \
|
||||
fi
|
||||
.endif
|
||||
.if defined(WITH_DEBUG)
|
||||
@if [ "`echo ${PATCHDIR}/debugpatch-*`" != "${PATCHDIR}/debugpatch-*" ]; then \
|
||||
${ECHO_MSG} "===> Applying additional debug ${OPSYS} patches for ${PKGNAME}" ; \
|
||||
PATCHES_APPLIED="" ; \
|
||||
for i in ${PATCHDIR}/debugpatch-*; do \
|
||||
case $$i in \
|
||||
*.orig|*.rej|*~) \
|
||||
${ECHO_MSG} "===> Ignoring patchfile $$i" ; \
|
||||
;; \
|
||||
*) \
|
||||
if [ ${PATCH_DEBUG_TMP} = yes ]; then \
|
||||
${ECHO_MSG} "===> Applying ${OPSYS} patch $$i" ; \
|
||||
fi; \
|
||||
if ${PATCH} ${PATCH_ARGS} < $$i ; then \
|
||||
PATCHES_APPLIED="$$PATCHES_APPLIED $$i" ; \
|
||||
else \
|
||||
${ECHO_MSG} `${ECHO_CMD} ">> Patch $$i failed to apply cleanly." | ${SED} "s|${PATCHDIR}/||"` ; \
|
||||
if [ x"$$PATCHES_APPLIED" != x"" ]; then \
|
||||
${ECHO_MSG} `${ECHO_CMD} ">> Patch(es) $$PATCHES_APPLIED applied cleanly." | ${SED} "s|${PATCHDIR}/||g"` ; \
|
||||
fi; \
|
||||
${FALSE} ; \
|
||||
fi; \
|
||||
;; \
|
||||
esac; \
|
||||
done; \
|
||||
fi;
|
||||
.endif
|
||||
@${ECHO_MSG} "===> Find old malloc.h defines and fix them in ${PKGNAME} source"
|
||||
@${FIND} ${WRKSRC}/.. | ${EGREP} "\.(cxx|h|c)$$" | ${XARGS} \
|
||||
${PERL} -pi -e "s|<malloc.h>|<stdlib.h>|g"
|
||||
|
||||
fix-kdewrappers:
|
||||
# @${PERL} -pi -e 's|"Exec", "\\"\<progpath\>/program/|"Exec", "\\"${PREFIX}/bin/openoffice_${RELEASE_NR}-|' \
|
||||
# ${WRKSRC}/../sysui/oounix/office/kde2/kdeint
|
||||
|
||||
fix-gnomewrappers:
|
||||
# @${PERL} -pi -e 's|"Exec", "<progpath>/program/|"Exec", "${PREFIX}/bin/openoffice_${RELEASE_NR}-|' \
|
||||
# ${WRKSRC}/../sysui/oounix/office/gnome/gnomeint
|
||||
|
||||
extract-mozilla:
|
||||
.if ! exists(${WRKDIR}/mozilla/Makefile)
|
||||
@${ECHO_MSG} "===> Extracting mozilla sub project"
|
||||
@cd ${WRKDIR} && tar -xzf ${DISTDIR}/${DIST_SUBDIR}/mozilla-vendor-1.0.2a.tgz
|
||||
.endif
|
||||
@cd ${WRKDIR}/mozilla && ${MAKE} extract WRKDIRPREFIX=""
|
||||
|
||||
patch-mozilla:
|
||||
@${CP} ${DISTDIR}/${DIST_SUBDIR}/patch-openoffice-mozilla101-2002-10-14 \
|
||||
${WRKDIR}/mozilla/files/
|
||||
@cd ${WRKDIR}/mozilla && ${MAKE} patch WRKDIRPREFIX=""
|
||||
|
||||
build-mozilla:
|
||||
.if ! exists(${WRKDIR}/FREEBSDGCCIruntime.zip)
|
||||
@${ECHO_MSG} "===> Building mozilla sub project"
|
||||
.if defined(WITH_DEBUG)
|
||||
@${CP} ${WRKDIR}/mozilla/Makefile ${WRKDIR}/mozilla/Makefile.new
|
||||
@${SED} -e 's|--disable-debug||' \
|
||||
-e 's|--disable-cpp-rtti||' \
|
||||
-e 's|--enable-strip||' \
|
||||
< ${WRKDIR}/mozilla/Makefile.new > ${WRKDIR}/mozilla/Makefile
|
||||
.endif
|
||||
.if defined(USE_GCC)
|
||||
@cd ${WRKDIR}/mozilla && ${MAKE} CXX=${CXX} CC=${CC} CFLAGS="${CFLAGS}" USE_GCC=${USE_GCC} build WRKDIRPREFIX=""
|
||||
.else
|
||||
@cd ${WRKDIR}/mozilla && ${MAKE} CFLAGS="${CFLAGS}" build WRKDIRPREFIX=""
|
||||
.endif
|
||||
@${CP} ${FILESDIR}/zipmoz.sh ${WRKDIR}
|
||||
@${CHMOD} 755 ${WRKDIR}/zipmoz.sh
|
||||
@${WRKDIR}/zipmoz.sh ${WRKDIR}/mozilla/work/mozilla/dist FREEBSDGCCI ${WRKDIR}
|
||||
.endif
|
||||
|
||||
install-mozilla:
|
||||
@${CP} ${WRKDIR}/FREEBSDGCCIinc.zip ${WRKSRC}/../moz/zipped/
|
||||
@${CP} ${WRKDIR}/FREEBSDGCCIlib.zip ${WRKSRC}/../moz/zipped/
|
||||
@${CP} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKSRC}/../moz/zipped/
|
||||
|
||||
register-mozilla:
|
||||
.if exists(${WRKDIR}/mozilla-runtime)
|
||||
@${RM} -rf ${WRKDIR}/mozilla-runtime
|
||||
.endif
|
||||
@${MKDIR} ${WRKDIR}/mozilla-runtime
|
||||
@cd ${WRKDIR}/mozilla-runtime && ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIruntime.zip
|
||||
@cd ${WRKDIR}/mozilla-runtime && ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIlib.zip
|
||||
@${CP} ${WRKDIR}/mozilla/work/mozilla/dist/bin/regxpcom ${WRKDIR}/mozilla-runtime/
|
||||
@-${RM} ${WRKDIR}/mozilla-runtime/components/component.reg
|
||||
@cd ${WRKDIR}/mozilla-runtime && export MOZILLA_FIVE_HOME=. \
|
||||
&& export LD_LIBRARY_PATH=.:./lib && ./regxpcom
|
||||
@${CP} ${WRKDIR}/mozilla-runtime/components/xpti.dat \
|
||||
${WRKDIR}/mozilla-runtime/components/xptitemp.dat
|
||||
@${RM} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKDIR}/mozilla-runtime/regxpcom
|
||||
@cd ${WRKDIR}/mozilla-runtime && ${FIND} . -type f \
|
||||
| ${ZIP} ${WRKDIR}/FREEBSDGCCIruntime.zip -@
|
||||
|
||||
mozilla:
|
||||
@${MAKE} extract-mozilla
|
||||
@${MAKE} patch-mozilla
|
||||
@${MAKE} build-mozilla
|
||||
@${MAKE} register-mozilla
|
||||
@${MAKE} install-mozilla
|
||||
|
||||
do-build:
|
||||
.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIruntime.zip)
|
||||
@ -512,14 +277,12 @@ do-install:
|
||||
#
|
||||
${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
|
||||
@sleep 5
|
||||
@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \
|
||||
TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
|
||||
@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
|
||||
${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
|
||||
@-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
|
||||
@${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
|
||||
@${RM} -f ${WRKDIR}/.Xvfb.pid
|
||||
.else
|
||||
@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \
|
||||
TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
|
||||
@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
|
||||
${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
|
||||
.endif
|
||||
|
||||
@ -562,20 +325,24 @@ post-install:
|
||||
package-rename:
|
||||
@${ECHO_MSG} "===> Rename package for OO.org mirror upload";
|
||||
.if defined(LANG_SUFFIX)
|
||||
@${MV} ${WRKDIR}/../${PKGNAMEPREFIX}openoffice-${LANG_SUFFIX}-${PORTVERSION}_${PORTREVISION}.tbz2 \
|
||||
${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}Intel_install_${LANG_PKGNAME}-${LANG_SUFFIX}.tbz2
|
||||
@${MV} ${PKGFILE} \
|
||||
${WRKDIR}/../OOo_${BUILD_NR}${MILESTONE}_${OPSYS}${SIMPLEOSVER}Intel_install_${LANG_PKGNAME}-${LANG_SUFFIX}${PKG_SUFX}
|
||||
.elif defined(LANG_PKGNAME)
|
||||
@${MV} ${PKGFILE} \
|
||||
${WRKDIR}/../OOo_${BUILD_NR}${MILESTONE}_${OPSYS}${SIMPLEOSVER}Intel_install_${LANG_PKGNAME}${PKG_SUFX}
|
||||
.else
|
||||
@${MV} ${WRKDIR}/../${PKGNAMEPREFIX}openoffice-${PORTVERSION}_${PORTREVISION}.tbz2 \
|
||||
${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}Intel_install_${LANG_PKGNAME}.tbz2
|
||||
@${MV} ${PKGFILE} \
|
||||
${WRKDIR}/../OOo_${BUILD_NR}${MILESTONE}_${OPSYS}${SIMPLEOSVER}Intel_install${PKG_SUFX}
|
||||
.endif
|
||||
|
||||
update:
|
||||
@${MAKE} fetch
|
||||
@${MAKE} extract
|
||||
@cd ${WRKSRC}/.. && for dir in *; do \
|
||||
if [ -d $$dir ]; then \
|
||||
cd $$dir; cvs update -d; cd ..; \
|
||||
fi \
|
||||
done
|
||||
sdk:
|
||||
@${ECHO_MSG} "===> Make SDK of OpenOffice.org"
|
||||
@cd ${WRKSRC}/.. && DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
|
||||
${SH} -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_${BUILD_NR}${MILESTONE}_${OPSYS}${SIMPLEOSVER}Intel_sdk.tar.gz
|
||||
|
||||
solver:
|
||||
@${ECHO_MSG} "===> Make Solver of OpenOffice.org"
|
||||
@cd ${WRKSRC}/.. ; ${TAR} cfz ${WRKDIR}/../OOo_${BUILD_NR}${MILESTONE}_${OPSYS}${SIMPLEOSVER}Intel_solver.tar.gz solver
|
||||
|
||||
.include <bsd.port.post.mk>
|
||||
|
||||
@ -1,4 +1,8 @@
|
||||
MD5 (openoffice2.0/cws_src680_ooo20031216_20031208.tar.bz2) = d841d81ad9ca3b46dd49ae997854032b
|
||||
MD5 (openoffice2.0/OOo_680m30_20040402_source.tar.bz2) = 768b3d8246a12eff6bf83f098093fbee
|
||||
SIZE (openoffice2.0/OOo_680m30_20040402_source.tar.bz2) = 195378119
|
||||
MD5 (openoffice2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
|
||||
MD5 (openoffice2.0/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
|
||||
SIZE (openoffice2.0/gpc231.tar.Z) = 27917
|
||||
MD5 (openoffice2.0/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
|
||||
SIZE (openoffice2.0/patch-openoffice-mozilla101-2002-10-14) = 29105
|
||||
MD5 (openoffice2.0/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
|
||||
SIZE (openoffice2.0/mozilla-vendor-1.0.2a.tgz) = 7292
|
||||
|
||||
61
editors/openoffice-3/files/Makefile.mozilla
Normal file
61
editors/openoffice-3/files/Makefile.mozilla
Normal file
@ -0,0 +1,61 @@
|
||||
extract-mozilla:
|
||||
.if ! exists(${WRKDIR}/mozilla/Makefile)
|
||||
@${ECHO_MSG} "===> Extracting mozilla sub project"
|
||||
@cd ${WRKDIR} && tar -xzf ${DISTDIR}/${DIST_SUBDIR}/mozilla-vendor-1.0.2a.tgz
|
||||
.endif
|
||||
@cd ${WRKDIR}/mozilla && ${MAKE} extract WRKDIRPREFIX=""
|
||||
|
||||
patch-mozilla:
|
||||
@${CP} ${DISTDIR}/${DIST_SUBDIR}/patch-openoffice-mozilla101-2002-10-14 \
|
||||
${WRKDIR}/mozilla/files/
|
||||
@cd ${WRKDIR}/mozilla && ${MAKE} patch WRKDIRPREFIX=""
|
||||
|
||||
build-mozilla:
|
||||
.if ! exists(${WRKDIR}/FREEBSDGCCIruntime.zip)
|
||||
@${ECHO_MSG} "===> Building mozilla sub project"
|
||||
.if defined(WITH_DEBUG)
|
||||
@${CP} ${WRKDIR}/mozilla/Makefile ${WRKDIR}/mozilla/Makefile.new
|
||||
@${SED} -e 's|--disable-debug||' \
|
||||
-e 's|--disable-cpp-rtti||' \
|
||||
-e 's|--enable-strip||' \
|
||||
< ${WRKDIR}/mozilla/Makefile.new > ${WRKDIR}/mozilla/Makefile
|
||||
.endif
|
||||
.if defined(USE_GCC)
|
||||
@cd ${WRKDIR}/mozilla && ${MAKE} CXX="${CXX}" CC="${CC}" CFLAGS="${CFLAGS}" USE_GCC=${USE_GCC} build WRKDIRPREFIX=""
|
||||
.else
|
||||
@cd ${WRKDIR}/mozilla && ${MAKE} CFLAGS="${CFLAGS}" build WRKDIRPREFIX=""
|
||||
.endif
|
||||
@${CP} ${FILESDIR}/zipmoz.sh ${WRKDIR}
|
||||
@${CHMOD} 755 ${WRKDIR}/zipmoz.sh
|
||||
@${WRKDIR}/zipmoz.sh ${WRKDIR}/mozilla/work/mozilla/dist FREEBSDGCCI ${WRKDIR}
|
||||
.endif
|
||||
|
||||
install-mozilla:
|
||||
@${CP} ${WRKDIR}/FREEBSDGCCIinc.zip ${WRKSRC}/../moz/zipped/
|
||||
@${CP} ${WRKDIR}/FREEBSDGCCIlib.zip ${WRKSRC}/../moz/zipped/
|
||||
@${CP} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKSRC}/../moz/zipped/
|
||||
|
||||
register-mozilla:
|
||||
.if exists(${WRKDIR}/mozilla-runtime)
|
||||
@${RM} -rf ${WRKDIR}/mozilla-runtime
|
||||
.endif
|
||||
@${MKDIR} ${WRKDIR}/mozilla-runtime
|
||||
@cd ${WRKDIR}/mozilla-runtime && ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIruntime.zip
|
||||
@cd ${WRKDIR}/mozilla-runtime && ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIlib.zip
|
||||
@${CP} ${WRKDIR}/mozilla/work/mozilla/dist/bin/regxpcom ${WRKDIR}/mozilla-runtime/
|
||||
@-${RM} ${WRKDIR}/mozilla-runtime/components/component.reg
|
||||
@cd ${WRKDIR}/mozilla-runtime && export MOZILLA_FIVE_HOME=. \
|
||||
&& export LD_LIBRARY_PATH=.:./lib && ./regxpcom
|
||||
@${CP} ${WRKDIR}/mozilla-runtime/components/xpti.dat \
|
||||
${WRKDIR}/mozilla-runtime/components/xptitemp.dat
|
||||
@${RM} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKDIR}/mozilla-runtime/regxpcom
|
||||
@cd ${WRKDIR}/mozilla-runtime && ${FIND} . -type f \
|
||||
| ${ZIP} ${WRKDIR}/FREEBSDGCCIruntime.zip -@
|
||||
|
||||
mozilla:
|
||||
@${MAKE} extract-mozilla
|
||||
@${MAKE} patch-mozilla
|
||||
@${MAKE} build-mozilla
|
||||
@${MAKE} register-mozilla
|
||||
@${MAKE} install-mozilla
|
||||
|
||||
@ -1,21 +0,0 @@
|
||||
--- ../setup2/mow/source/loader/loader.c.orig Mon Jun 2 08:25:13 2003
|
||||
+++ ../setup2/mow/source/loader/loader.c Tue Jun 3 07:58:22 2003
|
||||
@@ -1069,6 +1069,7 @@
|
||||
|
||||
void KillSetupDir()
|
||||
{
|
||||
+#if 0
|
||||
DIR* pDir;
|
||||
struct dirent* pFile;
|
||||
|
||||
@@ -1088,6 +1089,10 @@
|
||||
closedir( pDir );
|
||||
chdir( strInitPath );
|
||||
rmdir( strTmpPath );
|
||||
+#else
|
||||
+ fprintf(stderr, "\nLeaving behind temporary directory: %s\n",
|
||||
+ strTmpPath);
|
||||
+#endif
|
||||
}
|
||||
|
||||
void makeSymLink( char* s )
|
||||
@ -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
|
||||
@ -1,290 +0,0 @@
|
||||
--- ../goodies/source/filter.vcl/egif/giflzwc.cxx Sun Apr 13 14:33:24 2003
|
||||
+++ /dev/null Mon Apr 14 06:10:35 2003
|
||||
@@ -1,287 +0,0 @@
|
||||
-/*************************************************************************
|
||||
- *
|
||||
- * $RCSfile: giflzwc.cxx,v $
|
||||
- *
|
||||
- * $Revision: 1.1.1.1 $
|
||||
- *
|
||||
- * last change: $Author: hr $ $Date: 2000/09/18 16:30:11 $
|
||||
- *
|
||||
- * The Contents of this file are made available subject to the terms of
|
||||
- * either of the following licenses
|
||||
- *
|
||||
- * - GNU Lesser General Public License Version 2.1
|
||||
- * - Sun Industry Standards Source License Version 1.1
|
||||
- *
|
||||
- * Sun Microsystems Inc., October, 2000
|
||||
- *
|
||||
- * GNU Lesser General Public License Version 2.1
|
||||
- * =============================================
|
||||
- * Copyright 2000 by Sun Microsystems, Inc.
|
||||
- * 901 San Antonio Road, Palo Alto, CA 94303, USA
|
||||
- *
|
||||
- * This library is free software; you can redistribute it and/or
|
||||
- * modify it under the terms of the GNU Lesser General Public
|
||||
- * License version 2.1, as published by the Free Software Foundation.
|
||||
- *
|
||||
- * This library is distributed in the hope that it will be useful,
|
||||
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
- * Lesser General Public License for more details.
|
||||
- *
|
||||
- * You should have received a copy of the GNU Lesser General Public
|
||||
- * License along with this library; if not, write to the Free Software
|
||||
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
|
||||
- * MA 02111-1307 USA
|
||||
- *
|
||||
- *
|
||||
- * Sun Industry Standards Source License Version 1.1
|
||||
- * =================================================
|
||||
- * The contents of this file are subject to the Sun Industry Standards
|
||||
- * Source License Version 1.1 (the "License"); You may not use this file
|
||||
- * except in compliance with the License. You may obtain a copy of the
|
||||
- * License at http://www.openoffice.org/license.html.
|
||||
- *
|
||||
- * Software provided under this License is provided on an "AS IS" basis,
|
||||
- * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
|
||||
- * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
|
||||
- * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
|
||||
- * See the License for the specific provisions governing your rights and
|
||||
- * obligations concerning the Software.
|
||||
- *
|
||||
- * The Initial Developer of the Original Code is: Sun Microsystems, Inc.
|
||||
- *
|
||||
- * Copyright: 2000 by Sun Microsystems, Inc.
|
||||
- *
|
||||
- * All Rights Reserved.
|
||||
- *
|
||||
- * Contributor(s): _______________________________________
|
||||
- *
|
||||
- *
|
||||
- ************************************************************************/
|
||||
-
|
||||
-#include <tools/stream.hxx>
|
||||
-#include "giflzwc.hxx"
|
||||
-
|
||||
-// ----------------------------
|
||||
-// - GIFImageDataOutputStream -
|
||||
-// ----------------------------
|
||||
-
|
||||
-class GIFImageDataOutputStream
|
||||
-{
|
||||
-private:
|
||||
-
|
||||
- void FlushBlockBuf();
|
||||
- inline void FlushBitsBufsFullBytes();
|
||||
-
|
||||
- SvStream& rStream;
|
||||
- BYTE* pBlockBuf;
|
||||
- BYTE nBlockBufSize;
|
||||
- ULONG nBitsBuf;
|
||||
- USHORT nBitsBufSize;
|
||||
-
|
||||
-public:
|
||||
-
|
||||
- GIFImageDataOutputStream( SvStream & rGIF, BYTE nLZWDataSize );
|
||||
- ~GIFImageDataOutputStream();
|
||||
-
|
||||
- inline void WriteBits( USHORT nCode, USHORT nCodeLen );
|
||||
-};
|
||||
-
|
||||
-// ------------------------------------------------------------------------
|
||||
-
|
||||
-inline void GIFImageDataOutputStream::FlushBitsBufsFullBytes()
|
||||
-{
|
||||
- while (nBitsBufSize>=8)
|
||||
- {
|
||||
- if( nBlockBufSize==255 )
|
||||
- FlushBlockBuf();
|
||||
-
|
||||
- pBlockBuf[nBlockBufSize++] = (BYTE) nBitsBuf;
|
||||
- nBitsBuf >>= 8;
|
||||
- nBitsBufSize -= 8;
|
||||
- }
|
||||
-}
|
||||
-
|
||||
-// ------------------------------------------------------------------------
|
||||
-
|
||||
-inline void GIFImageDataOutputStream::WriteBits( USHORT nCode, USHORT nCodeLen )
|
||||
-{
|
||||
- if( nBitsBufSize+nCodeLen>32 )
|
||||
- FlushBitsBufsFullBytes();
|
||||
-
|
||||
- nBitsBuf |= (ULONG) nCode << nBitsBufSize;
|
||||
- nBitsBufSize += nCodeLen;
|
||||
-}
|
||||
-
|
||||
-// ------------------------------------------------------------------------
|
||||
-
|
||||
-GIFImageDataOutputStream::GIFImageDataOutputStream( SvStream & rGIF, BYTE nLZWDataSize ) :
|
||||
- rStream(rGIF)
|
||||
-{
|
||||
- pBlockBuf = new BYTE[ 255 ];
|
||||
- nBlockBufSize = 0;
|
||||
- nBitsBufSize = 0;
|
||||
- nBitsBuf = 0;
|
||||
- rStream << nLZWDataSize;
|
||||
-}
|
||||
-
|
||||
-// ------------------------------------------------------------------------
|
||||
-
|
||||
-
|
||||
-GIFImageDataOutputStream::~GIFImageDataOutputStream()
|
||||
-{
|
||||
- WriteBits(0,7);
|
||||
- FlushBitsBufsFullBytes();
|
||||
- FlushBlockBuf();
|
||||
- rStream << (BYTE)0;
|
||||
- delete[] pBlockBuf;
|
||||
-}
|
||||
-
|
||||
-// ------------------------------------------------------------------------
|
||||
-
|
||||
-void GIFImageDataOutputStream::FlushBlockBuf()
|
||||
-{
|
||||
- if( nBlockBufSize )
|
||||
- {
|
||||
- rStream << (BYTE) nBlockBufSize;
|
||||
- rStream.Write( pBlockBuf,nBlockBufSize );
|
||||
- nBlockBufSize = 0;
|
||||
- }
|
||||
-}
|
||||
-
|
||||
-// -------------------
|
||||
-// - GIFLZWCTreeNode -
|
||||
-// -------------------
|
||||
-
|
||||
-struct GIFLZWCTreeNode
|
||||
-{
|
||||
-
|
||||
- GIFLZWCTreeNode* pBrother; // naechster Knoten, der den selben Vater hat
|
||||
- GIFLZWCTreeNode* pFirstChild; // erster Sohn
|
||||
- USHORT nCode; // Der Code fuer den String von Pixelwerten, der sich ergibt, wenn
|
||||
- USHORT nValue; // Der Pixelwert
|
||||
-};
|
||||
-
|
||||
-// --------------------
|
||||
-// - GIFLZWCompressor -
|
||||
-// --------------------
|
||||
-
|
||||
-GIFLZWCompressor::GIFLZWCompressor()
|
||||
-{
|
||||
- pIDOS=NULL;
|
||||
-}
|
||||
-
|
||||
-// ------------------------------------------------------------------------
|
||||
-
|
||||
-GIFLZWCompressor::~GIFLZWCompressor()
|
||||
-{
|
||||
- if (pIDOS!=NULL) EndCompression();
|
||||
-}
|
||||
-
|
||||
-// ------------------------------------------------------------------------
|
||||
-
|
||||
-void GIFLZWCompressor::StartCompression( SvStream& rGIF, USHORT nPixelSize )
|
||||
-{
|
||||
- if( !pIDOS )
|
||||
- {
|
||||
- USHORT i;
|
||||
-
|
||||
- nDataSize = nPixelSize;
|
||||
-
|
||||
- if( nDataSize < 2 )
|
||||
- nDataSize=2;
|
||||
-
|
||||
- nClearCode=1<<nDataSize;
|
||||
- nEOICode=nClearCode+1;
|
||||
- nTableSize=nEOICode+1;
|
||||
- nCodeSize=nDataSize+1;
|
||||
-
|
||||
- pIDOS=new GIFImageDataOutputStream(rGIF,(BYTE)nDataSize);
|
||||
- pTable=new GIFLZWCTreeNode[4096];
|
||||
-
|
||||
- for (i=0; i<4096; i++)
|
||||
- {
|
||||
- pTable[i].pBrother = pTable[i].pFirstChild = NULL;
|
||||
- pTable[i].nValue = (BYTE) ( pTable[i].nCode = i );
|
||||
- }
|
||||
-
|
||||
- pPrefix = NULL;
|
||||
- pIDOS->WriteBits( nClearCode,nCodeSize );
|
||||
- }
|
||||
-}
|
||||
-
|
||||
-// ------------------------------------------------------------------------
|
||||
-
|
||||
-void GIFLZWCompressor::Compress( HPBYTE pSrc, ULONG nSize )
|
||||
-{
|
||||
- if( pIDOS )
|
||||
- {
|
||||
- GIFLZWCTreeNode* p;
|
||||
- USHORT i;
|
||||
- BYTE nV;
|
||||
-
|
||||
- if( !pPrefix && nSize )
|
||||
- {
|
||||
- pPrefix=pTable+(*pSrc++);
|
||||
- nSize--;
|
||||
- }
|
||||
-
|
||||
- while( nSize )
|
||||
- {
|
||||
- nSize--;
|
||||
- nV=*pSrc++;
|
||||
- for( p=pPrefix->pFirstChild; p!=NULL; p=p->pBrother )
|
||||
- {
|
||||
- if (p->nValue==nV)
|
||||
- break;
|
||||
- }
|
||||
-
|
||||
- if( p)
|
||||
- pPrefix=p;
|
||||
- else
|
||||
- {
|
||||
- pIDOS->WriteBits(pPrefix->nCode,nCodeSize);
|
||||
-
|
||||
- if (nTableSize==4096)
|
||||
- {
|
||||
- pIDOS->WriteBits(nClearCode,nCodeSize);
|
||||
-
|
||||
- for (i=0; i<nClearCode; i++)
|
||||
- pTable[i].pFirstChild=NULL;
|
||||
-
|
||||
- nCodeSize=nDataSize+1;
|
||||
- nTableSize=nEOICode+1;
|
||||
- }
|
||||
- else
|
||||
- {
|
||||
- if(nTableSize==(USHORT)(1<<nCodeSize))
|
||||
- nCodeSize++;
|
||||
-
|
||||
- p=pTable+(nTableSize++);
|
||||
- p->pBrother=pPrefix->pFirstChild;
|
||||
- pPrefix->pFirstChild=p;
|
||||
- p->nValue=nV;
|
||||
- p->pFirstChild=NULL;
|
||||
- }
|
||||
-
|
||||
- pPrefix=pTable+nV;
|
||||
- }
|
||||
- }
|
||||
- }
|
||||
-}
|
||||
-
|
||||
-// ------------------------------------------------------------------------
|
||||
-
|
||||
-void GIFLZWCompressor::EndCompression()
|
||||
-{
|
||||
- if( pIDOS )
|
||||
- {
|
||||
- if( pPrefix )
|
||||
- pIDOS->WriteBits(pPrefix->nCode,nCodeSize);
|
||||
-
|
||||
- pIDOS->WriteBits( nEOICode,nCodeSize );
|
||||
- delete[] pTable;
|
||||
- delete pIDOS;
|
||||
- pIDOS=NULL;
|
||||
- }
|
||||
-}
|
||||
@ -1,45 +0,0 @@
|
||||
--- /dev/null 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ ../goodies/source/filter.vcl/egif/giflzwc_disabled.cxx 2002-08-15 15:09:47.000000000 +0200
|
||||
@@ -0,0 +1,42 @@
|
||||
+/**********************************
|
||||
+ * This code is copied from giflzwc.cxx, with the patented LZW compression code removed.
|
||||
+ **********************************/
|
||||
+
|
||||
+//#include <tools/stream.hxx>
|
||||
+#include "giflzwc.hxx"
|
||||
+
|
||||
+// --------------------
|
||||
+// - GIFLZWCompressor -
|
||||
+// --------------------
|
||||
+
|
||||
+GIFLZWCompressor::GIFLZWCompressor()
|
||||
+{
|
||||
+ pIDOS=NULL;
|
||||
+}
|
||||
+
|
||||
+// ------------------------------------------------------------------------
|
||||
+
|
||||
+GIFLZWCompressor::~GIFLZWCompressor()
|
||||
+{
|
||||
+}
|
||||
+
|
||||
+// ------------------------------------------------------------------------
|
||||
+
|
||||
+void GIFLZWCompressor::StartCompression( SvStream& rGIF, USHORT nPixelSize )
|
||||
+{
|
||||
+ /********************** DISABLED *************************/
|
||||
+}
|
||||
+
|
||||
+// ------------------------------------------------------------------------
|
||||
+
|
||||
+void GIFLZWCompressor::Compress( HPBYTE pSrc, ULONG nSize )
|
||||
+{
|
||||
+ /********************** DISABLED *************************/
|
||||
+}
|
||||
+
|
||||
+// ------------------------------------------------------------------------
|
||||
+
|
||||
+void GIFLZWCompressor::EndCompression()
|
||||
+{
|
||||
+ /********************** DISABLED *************************/
|
||||
+}
|
||||
@ -1,11 +0,0 @@
|
||||
--- ../goodies/source/filter.vcl/egif/makefile.mk.orig Tue Aug 14 23:22:54 2001
|
||||
+++ ../goodies/source/filter.vcl/egif/makefile.mk Mon Apr 14 06:04:55 2003
|
||||
@@ -89,7 +89,7 @@
|
||||
|
||||
SLOFILES= $(SLO)$/egif.obj \
|
||||
$(SLO)$/dlgegif.obj \
|
||||
- $(SLO)$/giflzwc.obj
|
||||
+ $(SLO)$/giflzwc_disabled.obj
|
||||
|
||||
|
||||
# ==========================================================================
|
||||
@ -1,17 +0,0 @@
|
||||
--- ../connectivity/prj/build.lst 2 Jun 2003 07:53:47 -0000 1.18
|
||||
+++ ../connectivity/prj/build.lst 8 Aug 2003 07:21:31 -0000
|
||||
@@ -1,4 +1,4 @@
|
||||
-cn connectivity : comphelper moz svtools unixODBC NULL
|
||||
+cn connectivity : comphelper svtools unixODBC NULL
|
||||
cn connectivity usr1 - all cn_mkout NULL
|
||||
cn connectivity\source\types nmake - all cn_types NULL
|
||||
cn connectivity\source\commontools nmake - all cn_cmtools cn_parse cn_types NULL
|
||||
@@ -7,8 +7,6 @@
|
||||
cn connectivity\source\resource nmake - all cn_res NULL
|
||||
cn connectivity\source\sdbcx nmake - all cn_sdbcx cn_types NULL
|
||||
cn connectivity\source\drivers\ado nmake - w cn_ado cn_dbtools NULL
|
||||
-cn connectivity\source\drivers\mozab\mozillasrc nmake - all cn_mozab_mozillasrc cn_file NULL
|
||||
-cn connectivity\source\drivers\mozab nmake - all cn_mozab cn_mozab_mozillasrc cn_dbtools NULL
|
||||
cn connectivity\source\drivers\evoab nmake - all cn_evoab cn_dbtools cn_file NULL
|
||||
cn connectivity\source\drivers\calc nmake - all cn_calc cn_file NULL
|
||||
cn connectivity\source\drivers\odbc nmake - all cn_odbc cn_dbtools NULL
|
||||
@ -1,34 +0,0 @@
|
||||
Index: scp/source/office/files.scp
|
||||
===================================================================
|
||||
RCS file: /cvs/installation/scp/source/office/files.scp,v
|
||||
retrieving revision 1.369.10.1
|
||||
diff -u -r1.369.10.1 files.scp
|
||||
--- scp/source/office/files.scp 1 Aug 2003 12:14:45 -0000 1.369.10.1
|
||||
+++ scp/source/office/files.scp 20 Aug 2003 11:45:05 -0000
|
||||
@@ -388,7 +388,7 @@
|
||||
Styles = (PACKED);
|
||||
End
|
||||
|
||||
-#ifndef MACOSX
|
||||
+#if !(defined(MACOSX) || defined(FREEBSD))
|
||||
File GID_FILE_LIB_MOZABDRV
|
||||
TXT_FILE_BODY;
|
||||
#ifdef UNX
|
||||
@@ -750,7 +750,7 @@
|
||||
#endif
|
||||
End
|
||||
|
||||
-#ifndef MACOSX
|
||||
+#if !(defined(MACOSX) || defined(FREEBSD))
|
||||
File GID_FILE_LIB_MOZAB_2
|
||||
TXT_FILE_BODY;
|
||||
Styles = (PACKED,UNO_COMPONENT);
|
||||
@@ -3184,7 +3184,7 @@
|
||||
|
||||
#endif
|
||||
// of #ifdef SOLAR_JAVA
|
||||
-#ifndef MACOSX
|
||||
+#if !(defined(MACOSX) || defined(FREEBSD))
|
||||
File GID_FILE_MOZILLA_RUNTIME
|
||||
TXT_FILE_BODY;
|
||||
Styles = (ARCHIVE);
|
||||
50
editors/openoffice-3/files/patch-config_office+configure.in
Normal file
50
editors/openoffice-3/files/patch-config_office+configure.in
Normal file
@ -0,0 +1,50 @@
|
||||
#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
|
||||
13
editors/openoffice-3/files/patch-config_office+set_soenv.in
Normal file
13
editors/openoffice-3/files/patch-config_office+set_soenv.in
Normal file
@ -0,0 +1,13 @@
|
||||
#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" );
|
||||
@ -0,0 +1,13 @@
|
||||
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:
|
||||
*;
|
||||
@ -0,0 +1,14 @@
|
||||
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
|
||||
|
||||
27
editors/openoffice-3/files/patch-odk+setsdkenv_unix.in
Normal file
27
editors/openoffice-3/files/patch-odk+setsdkenv_unix.in
Normal file
@ -0,0 +1,27 @@
|
||||
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.
|
||||
90
editors/openoffice-3/files/patch-odk+settings+settings.mk
Normal file
90
editors/openoffice-3/files/patch-odk+settings+settings.mk
Normal file
@ -0,0 +1,90 @@
|
||||
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
|
||||
+
|
||||
@ -0,0 +1,17 @@
|
||||
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
|
||||
@ -0,0 +1,16 @@
|
||||
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 );
|
||||
@ -0,0 +1,34 @@
|
||||
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);
|
||||
13
editors/openoffice-3/files/patch-solenv+inc+ant.mk
Normal file
13
editors/openoffice-3/files/patch-solenv+inc+ant.mk
Normal file
@ -0,0 +1,13 @@
|
||||
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)"==""
|
||||
15
editors/openoffice-3/files/patch-solenv+inc+settings.mk
Normal file
15
editors/openoffice-3/files/patch-solenv+inc+settings.mk
Normal file
@ -0,0 +1,15 @@
|
||||
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
|
||||
14
editors/openoffice-3/files/patch-vcl+source+gdi+outdev3.cxx
Normal file
14
editors/openoffice-3/files/patch-vcl+source+gdi+outdev3.cxx
Normal file
@ -0,0 +1,14 @@
|
||||
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
|
||||
@ -0,0 +1,14 @@
|
||||
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
|
||||
@ -0,0 +1,14 @@
|
||||
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
|
||||
@ -0,0 +1,24 @@
|
||||
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>
|
||||
30
editors/openoffice-3/files/patch-vcl+util+makefile.mk
Normal file
30
editors/openoffice-3/files/patch-vcl+util+makefile.mk
Normal file
@ -0,0 +1,30 @@
|
||||
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 ----------------------------------------------------------
|
||||
@ -1,5 +1,5 @@
|
||||
# New ports collection makefile for: OpenOffice.org
|
||||
# Date created: 28 Februar 2002
|
||||
# Date created: 28 February 2002
|
||||
# Whom: Martin Blapp
|
||||
#
|
||||
# $FreeBSD$
|
||||
@ -9,51 +9,73 @@ PORTNAME= openoffice
|
||||
PORTVERSION= 2.0
|
||||
CATEGORIES+= editors
|
||||
MASTER_SITES+= http://people.freebsd.org/~maho/ \
|
||||
ftp://openofficeorg.secsup.org/pub/software/openoffice/stable/%SUBDIR%/ \
|
||||
ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice.org/stable/%SUBDIR%/ \
|
||||
${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/stable/&,} \
|
||||
http://www.binarycode.org/openoffice/stable/%SUBDIR%/ \
|
||||
http://ftp.gwdg.de/pub/misc/openoffice/stable/%SUBDIR%/ \
|
||||
ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
|
||||
http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/:help \
|
||||
http://people.freebsd.org/~mbr/ooo/:moz
|
||||
MASTER_SITE_SUBDIR= ${PORTVERSION}
|
||||
DISTFILES+= cws_src680_ooo20031216_20031208.tar.bz2 gpc231.tar.Z:gpc \
|
||||
DISTFILES+= OOo_${BUILD_NR}${MILESTONE}_${SNAPDATE}_source.tar.bz2 gpc231.tar.Z:gpc \
|
||||
patch-openoffice-mozilla101-2002-10-14:moz mozilla-vendor-1.0.2a.tgz:moz
|
||||
.if defined(L10NHELP)
|
||||
DISTFILES+= ${L10NHELP:S/$/:help/}
|
||||
.endif
|
||||
|
||||
FIND?= /usr/bin/find
|
||||
CUT?= /usr/bin/cut
|
||||
AWK?= /usr/bin/awk
|
||||
GREP?= /usr/bin/grep
|
||||
ZIP?= ${PREFIX}/bin/zip
|
||||
UNZIP?= ${PREFIX}/bin/unzip
|
||||
ANT?= ${LOCALBASE}/bin/ant
|
||||
TCSH?= /bin/tcsh
|
||||
PASTE?= /usr/bin/paste
|
||||
MAINTAINER= openoffice@FreeBSD.org
|
||||
.if !defined(COMMENT)
|
||||
COMMENT= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
|
||||
.endif
|
||||
|
||||
WANT_GNOME= yes
|
||||
IGNORE= "Does not work yet, installation problems"
|
||||
|
||||
NO_LATEST_LINK= yes
|
||||
UNZIP?= ${LOCALBASE}/bin/unzip
|
||||
ZIP?= ${LOCALBASE}/bin/zip
|
||||
ANT?= ${LOCALBASE}/bin/ant
|
||||
TCSH?= /bin/tcsh
|
||||
DIST_SUBDIR= openoffice2.0
|
||||
BUILD_NR= 680
|
||||
MILESTONE= m30
|
||||
RELEASE_NR= 2.0
|
||||
FRELEASE_NR= 2.0
|
||||
SNAPDATE= 20040402
|
||||
INSTALLATION_BASEDIR= OpenOffice.org${RELEASE_NR}
|
||||
EXTRACT_ONLY= OOo_${BUILD_NR}${MILESTONE}_${SNAPDATE}_source.tar.bz2
|
||||
USE_GNOME= orbit gtk12
|
||||
USE_REINPLACE= yes
|
||||
USE_PERL5= yes
|
||||
USE_BZIP2= yes
|
||||
USE_BISON= yes
|
||||
USE_GMAKE= yes
|
||||
LANG_EXT?= 01
|
||||
LANG_CONFIGURE_ARG?= ENUS
|
||||
WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work
|
||||
WRKSRC= ${WRKDIR}/oo_${BUILD_NR}${MILESTONE}_src/config_office
|
||||
|
||||
#XXX dirty
|
||||
BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
|
||||
USE_GCC=3.2
|
||||
CC= gcc32
|
||||
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+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries
|
||||
BUILD_DEPENDS+= ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft
|
||||
.if !defined(DISPLAY)
|
||||
BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer
|
||||
.endif
|
||||
|
||||
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
|
||||
png.5:${PORTSDIR}/graphics/png \
|
||||
mng.1:${PORTSDIR}/graphics/libmng \
|
||||
freetype.9:${PORTSDIR}/print/freetype2
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
|
||||
BUILD_NR= 645
|
||||
RELEASE_NR= 1.1
|
||||
FRELEASE_NR= 1.1.0
|
||||
INSTALLATION_BASEDIR= OpenOffice.org${FRELEASE_NR}
|
||||
DIST_SUBDIR= openoffice1.1
|
||||
DICT_DIR= ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
|
||||
|
||||
#
|
||||
# configuration for language specific slave ports
|
||||
#
|
||||
.if !defined(LANG_EXT)
|
||||
LANG_EXT=01
|
||||
.else
|
||||
#
|
||||
# Add pkg-descr and pkg-message if available
|
||||
#
|
||||
.if exists(${.CURDIR}/pkg-descr)
|
||||
DESCR= ${.CURDIR}/pkg-descr
|
||||
.endif
|
||||
@ -69,13 +91,6 @@ PKGNAMEPREFIX= ${LANG_PKGNAME}-
|
||||
PKGNAMESUFFIX= -${LANG_SUFFIX}
|
||||
.endif
|
||||
.endif # if defined(LANG_PKGNAME)
|
||||
#
|
||||
# LANG_CONFIGURE_ARG is missing for the german port
|
||||
#
|
||||
.if defined(LANG_EXT)
|
||||
CONFIGURE_ARGS+= --with-lang=${LANG_CONFIGURE_ARG},ENUS
|
||||
.endif
|
||||
.endif
|
||||
|
||||
.if !defined (LANG) && !defined(USE_LANG)
|
||||
USE_LANG= en_US.ISO8859-15
|
||||
@ -88,62 +103,16 @@ USE_LANG= ${LANG}
|
||||
|
||||
LANG_SORTED=`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
|
||||
|
||||
.if ${OSVERSION} < 500000
|
||||
# OOo requires gcc 3.3 (not systems's gcc)
|
||||
BUILD_DEPENDS+= gcc33:${PORTSDIR}/lang/gcc33
|
||||
USE_GCC=3.3 # make no sense yet
|
||||
CC= gcc33
|
||||
CXX= g++33
|
||||
.endif
|
||||
|
||||
EXTRACT_ONLY= OOo_${PORTVERSION}_source.tar.bz2
|
||||
|
||||
MAINTAINER= openoffice@FreeBSD.org
|
||||
.if !defined(COMMENT)
|
||||
COMMENT= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
|
||||
.endif
|
||||
|
||||
BROKEN= "under construction"
|
||||
#
|
||||
# The JDK dependency needs to be at the first place, so all
|
||||
# following dependencies use the same JDK.
|
||||
#
|
||||
BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14
|
||||
BUILD_DEPENDS+= 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+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries
|
||||
BUILD_DEPENDS+= ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft
|
||||
.if !defined(DISPLAY)
|
||||
BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer
|
||||
.endif
|
||||
|
||||
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
|
||||
png.5:${PORTSDIR}/graphics/png \
|
||||
mng.1:${PORTSDIR}/graphics/libmng \
|
||||
freetype.9:${PORTSDIR}/print/freetype2
|
||||
|
||||
USE_PERL5= yes
|
||||
USE_BZIP2= yes
|
||||
USE_BISON= yes
|
||||
USE_GMAKE= yes
|
||||
USE_GNOME= orbit gtk12
|
||||
|
||||
EXTRACT_BEFORE_ARGS_R= -dc
|
||||
EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
|
||||
EXTRACT_CMD_R= ${GZIP_CMD}
|
||||
EXTRACT_REST= gpc231.tar.Z
|
||||
|
||||
JDKDIR?= ${LOCALBASE}/jdk1.4.1
|
||||
JDKDIR?= ${LOCALBASE}/jdk1.4.2
|
||||
JAVAVM= ${JDKDIR}/bin/java
|
||||
|
||||
GNU_CONFIGURE= yes
|
||||
USE_AUTOCONF_VER= 253
|
||||
WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work
|
||||
WRKSRC= ${WRKDIR}/oo_${RELEASE_NR}_src/config_office
|
||||
LD_PATH1= ${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
|
||||
LD_PATH= ${LD_PATH1}:${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/lib/
|
||||
.if defined(WITH_DEBUG)
|
||||
CFLAGS+= -g
|
||||
.if ${WITH_DEBUG} == 2
|
||||
@ -161,7 +130,8 @@ DISPLAYHACK=localhost:1001
|
||||
|
||||
CONFIGURE_ENV= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
|
||||
PTHREAD_LIBS=${PTHREAD_LIBS}
|
||||
CONFIGURE_ARGS+= --with-jdk-home=${JDKDIR}
|
||||
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
|
||||
|
||||
.if defined(WITH_DEBUG)
|
||||
.if ${WITH_DEBUG} == 2
|
||||
@ -194,15 +164,6 @@ pre-fetch:
|
||||
@${ECHO}
|
||||
.endif
|
||||
@${ECHO} "OPTIONS:"
|
||||
.if !defined(USE_GCC)
|
||||
@${ECHO}
|
||||
@${ECHO} "You can compile OO with different"
|
||||
@${ECHO} "gcc compiler versions:"
|
||||
@${ECHO}
|
||||
@${ECHO} "Add USE_GCC=2.95 or USE_GCC=3.2"
|
||||
@${ECHO} "to compile openoffice with your"
|
||||
@${ECHO} "preferred compiler."
|
||||
.endif
|
||||
.if !defined(WITH_DEBUG)
|
||||
@${ECHO}
|
||||
@${ECHO} "You can compile OO with debug symbols"
|
||||
@ -225,94 +186,9 @@ pre-fetch:
|
||||
@${ECHO} "quality of glyphs at small bitmap sizes."
|
||||
@${ECHO}
|
||||
.endif
|
||||
.if !defined(WITH_GIF_LZW_COMPRESSION)
|
||||
@${ECHO}
|
||||
@${ECHO} "You may set WITH_GIF_LZW_COMPRESSION=YES"
|
||||
@${ECHO} "If you want to make compressed gif images"
|
||||
@${ECHO}
|
||||
@${ECHO} "If must have license from the Unisys and IBM patents"
|
||||
@${ECHO} "to enable this option to get compressed GIF images."
|
||||
@${ECHO}
|
||||
.endif
|
||||
.if ${OSVERSION} < 450002
|
||||
@${ECHO}
|
||||
@${ECHO} "OS-VERSION ${OSVERSION} too low"
|
||||
@${ECHO}
|
||||
@${ECHO} "OO need some important libc_r and"
|
||||
@${ECHO} "gcc fixes to build. Please upgrade to 4.6"
|
||||
@${ECHO} "RELEASE or 4.6 STABLE."
|
||||
@${FALSE}
|
||||
.endif
|
||||
@${ECHO}
|
||||
@${ECHO} "NOTICE:"
|
||||
@${ECHO}
|
||||
@${ECHO} "To build Openoffice, you should have a lot"
|
||||
.if defined(WITH_DEBUG)
|
||||
@${ECHO} "of free diskspace (~ 8GB)."
|
||||
.else
|
||||
@${ECHO} "of free diskspace (~ 4GB)."
|
||||
.endif
|
||||
@${ECHO}
|
||||
.if (defined(USE_GCC) && ${USE_GCC} == 2.95) || \
|
||||
(${OSVERSION} < 500000 && !defined(USE_GCC))
|
||||
@${ECHO} "KERNEL CONFIGURATION:"
|
||||
@${ECHO}
|
||||
@${ECHO} "Openoffice needs a larger stack- and"
|
||||
@${ECHO} "datasize to build. Check your limit"
|
||||
@${ECHO} "settings and and put this in /boot/loader.conf"
|
||||
@${ECHO} "if neccessary:"
|
||||
@${ECHO}
|
||||
@${ECHO} "kern.maxdsiz=\"1073741824\""
|
||||
@${ECHO} "kern.maxssiz=\"268435456\""
|
||||
.endif
|
||||
@${ECHO}
|
||||
.if ${OSVERSION} < 460002
|
||||
@${ECHO} "REQUIRED SYSTEM PATCHES:"
|
||||
@${ECHO}
|
||||
.endif
|
||||
.if ${OSVERSION} < 500000
|
||||
@${ECHO} "OO.org can crash if you enter a non existing path"
|
||||
@${ECHO} "or URL in the location bar. To fix these crashes"
|
||||
@${ECHO} "you need a uncommitted system patch for rtld:"
|
||||
@${ECHO}
|
||||
@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-symlookup.diff"
|
||||
@${ECHO}
|
||||
.endif
|
||||
.if ${OSVERSION} < 460001
|
||||
@${ECHO}
|
||||
@${ECHO} "OO setup is broken on STABLE < 4.6"
|
||||
@${ECHO} "including 4.6 RELEASE."
|
||||
@${ECHO} "You'll need a system patch to solve"
|
||||
@${ECHO} "this problem:"
|
||||
@${ECHO}
|
||||
@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-alloca.diff"
|
||||
@${ECHO}
|
||||
.endif
|
||||
.if ${OSVERSION} < 460002
|
||||
@${ECHO}
|
||||
@${ECHO} "OO.org soffice binary can deadlock. You can work around"
|
||||
@${ECHO} "this problem with this patch:"
|
||||
@${ECHO}
|
||||
@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-deadlock.diff"
|
||||
@${ECHO}
|
||||
.endif
|
||||
.if ${OSVERSION} < 500000
|
||||
@${ECHO}
|
||||
@${ECHO} "OO.org build can deadlock in regmerge. You can work around"
|
||||
@${ECHO} "this problem with this patch:"
|
||||
@${ECHO}
|
||||
@${ECHO} "http://people.freebsd.org/~mbr/ooo/rtld-builddeadlock.diff"
|
||||
@${ECHO}
|
||||
.endif
|
||||
.if !exists(/usr/include/langinfo.h)
|
||||
@${ECHO}
|
||||
@${ECHO} "langinfo.h is missing !"
|
||||
@${ECHO}
|
||||
@${ECHO} "Please upgrade to 4.6 RELEASE or"
|
||||
@${ECHO} "4.6 STABLE."
|
||||
@${ECHO}
|
||||
@${FALSE}
|
||||
.endif
|
||||
@${ECHO} "If you want SDK and/or solver, please type make sdk and/or make solver"
|
||||
|
||||
.include <${FILESDIR}/Makefile.mozilla>
|
||||
|
||||
post-extract:
|
||||
@for file in ${EXTRACT_REST}; do \
|
||||
@ -326,7 +202,6 @@ post-extract:
|
||||
@${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/../external/gpc/
|
||||
@${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/../external/gpc/
|
||||
@${MAKE} extract-mozilla
|
||||
@-${RM} -f ${WRKSRC}/../moz/zipped/*.zip
|
||||
@${CHMOD} +x ${WRKSRC}/../solenv/bin/zipdep.pl
|
||||
.if defined(L10NHELP)
|
||||
@${ECHO_MSG} "===> Extracting L10NHELP sub project"
|
||||
@ -336,9 +211,9 @@ 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
|
||||
@${MAKE} patch-mozilla
|
||||
@${MAKE} fix-kdewrappers
|
||||
@${MAKE} fix-gnomewrappers
|
||||
.if defined(WITH_TTF_BYTECODE_ENABLED)
|
||||
@if [ "`echo ${PATCHDIR}/optpatch-*`" != "${PATCHDIR}/optpatch-*" ]; then \
|
||||
${ECHO_MSG} "===> Applying additional TTF bytecode patches for ${PKGNAME}" ; \
|
||||
@ -348,116 +223,6 @@ post-patch:
|
||||
${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/optpatch-freetype+patch ; \
|
||||
fi
|
||||
.endif
|
||||
.if !defined(WITH_GIF_LZW_COMPRESSION)
|
||||
@if [ "`echo ${PATCHDIR}/gifpatch-*`" != "${PATCHDIR}/gifpatch-*" ]; then \
|
||||
${ECHO_MSG} "===> Removing GIF LZW compression for ${PKGNAME}" ; \
|
||||
if [ ${PATCH_DEBUG_TMP} = yes ]; then \
|
||||
${ECHO_MSG} "===> Applying GIF LZW compression ${OPSYS} patch" ; \
|
||||
fi; \
|
||||
${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/gifpatch-goodies+source+filter.vcl+egif+giflzwc.cxx ; \
|
||||
${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/gifpatch-goodies+source+filter.vcl+egif+giflzwc_disabled.cxx ; \
|
||||
${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/gifpatch-goodies+source+filter.vcl+egif+makefile.mk ; \
|
||||
fi
|
||||
.endif
|
||||
.if defined(WITH_DEBUG)
|
||||
@if [ "`echo ${PATCHDIR}/debugpatch-*`" != "${PATCHDIR}/debugpatch-*" ]; then \
|
||||
${ECHO_MSG} "===> Applying additional debug ${OPSYS} patches for ${PKGNAME}" ; \
|
||||
PATCHES_APPLIED="" ; \
|
||||
for i in ${PATCHDIR}/debugpatch-*; do \
|
||||
case $$i in \
|
||||
*.orig|*.rej|*~) \
|
||||
${ECHO_MSG} "===> Ignoring patchfile $$i" ; \
|
||||
;; \
|
||||
*) \
|
||||
if [ ${PATCH_DEBUG_TMP} = yes ]; then \
|
||||
${ECHO_MSG} "===> Applying ${OPSYS} patch $$i" ; \
|
||||
fi; \
|
||||
if ${PATCH} ${PATCH_ARGS} < $$i ; then \
|
||||
PATCHES_APPLIED="$$PATCHES_APPLIED $$i" ; \
|
||||
else \
|
||||
${ECHO_MSG} `${ECHO_CMD} ">> Patch $$i failed to apply cleanly." | ${SED} "s|${PATCHDIR}/||"` ; \
|
||||
if [ x"$$PATCHES_APPLIED" != x"" ]; then \
|
||||
${ECHO_MSG} `${ECHO_CMD} ">> Patch(es) $$PATCHES_APPLIED applied cleanly." | ${SED} "s|${PATCHDIR}/||g"` ; \
|
||||
fi; \
|
||||
${FALSE} ; \
|
||||
fi; \
|
||||
;; \
|
||||
esac; \
|
||||
done; \
|
||||
fi;
|
||||
.endif
|
||||
@${ECHO_MSG} "===> Find old malloc.h defines and fix them in ${PKGNAME} source"
|
||||
@${FIND} ${WRKSRC}/.. | ${EGREP} "\.(cxx|h|c)$$" | ${XARGS} \
|
||||
${PERL} -pi -e "s|<malloc.h>|<stdlib.h>|g"
|
||||
|
||||
fix-kdewrappers:
|
||||
# @${PERL} -pi -e 's|"Exec", "\\"\<progpath\>/program/|"Exec", "\\"${PREFIX}/bin/openoffice_${RELEASE_NR}-|' \
|
||||
# ${WRKSRC}/../sysui/oounix/office/kde2/kdeint
|
||||
|
||||
fix-gnomewrappers:
|
||||
# @${PERL} -pi -e 's|"Exec", "<progpath>/program/|"Exec", "${PREFIX}/bin/openoffice_${RELEASE_NR}-|' \
|
||||
# ${WRKSRC}/../sysui/oounix/office/gnome/gnomeint
|
||||
|
||||
extract-mozilla:
|
||||
.if ! exists(${WRKDIR}/mozilla/Makefile)
|
||||
@${ECHO_MSG} "===> Extracting mozilla sub project"
|
||||
@cd ${WRKDIR} && tar -xzf ${DISTDIR}/${DIST_SUBDIR}/mozilla-vendor-1.0.2a.tgz
|
||||
.endif
|
||||
@cd ${WRKDIR}/mozilla && ${MAKE} extract WRKDIRPREFIX=""
|
||||
|
||||
patch-mozilla:
|
||||
@${CP} ${DISTDIR}/${DIST_SUBDIR}/patch-openoffice-mozilla101-2002-10-14 \
|
||||
${WRKDIR}/mozilla/files/
|
||||
@cd ${WRKDIR}/mozilla && ${MAKE} patch WRKDIRPREFIX=""
|
||||
|
||||
build-mozilla:
|
||||
.if ! exists(${WRKDIR}/FREEBSDGCCIruntime.zip)
|
||||
@${ECHO_MSG} "===> Building mozilla sub project"
|
||||
.if defined(WITH_DEBUG)
|
||||
@${CP} ${WRKDIR}/mozilla/Makefile ${WRKDIR}/mozilla/Makefile.new
|
||||
@${SED} -e 's|--disable-debug||' \
|
||||
-e 's|--disable-cpp-rtti||' \
|
||||
-e 's|--enable-strip||' \
|
||||
< ${WRKDIR}/mozilla/Makefile.new > ${WRKDIR}/mozilla/Makefile
|
||||
.endif
|
||||
.if defined(USE_GCC)
|
||||
@cd ${WRKDIR}/mozilla && ${MAKE} CXX=${CXX} CC=${CC} CFLAGS="${CFLAGS}" USE_GCC=${USE_GCC} build WRKDIRPREFIX=""
|
||||
.else
|
||||
@cd ${WRKDIR}/mozilla && ${MAKE} CFLAGS="${CFLAGS}" build WRKDIRPREFIX=""
|
||||
.endif
|
||||
@${CP} ${FILESDIR}/zipmoz.sh ${WRKDIR}
|
||||
@${CHMOD} 755 ${WRKDIR}/zipmoz.sh
|
||||
@${WRKDIR}/zipmoz.sh ${WRKDIR}/mozilla/work/mozilla/dist FREEBSDGCCI ${WRKDIR}
|
||||
.endif
|
||||
|
||||
install-mozilla:
|
||||
@${CP} ${WRKDIR}/FREEBSDGCCIinc.zip ${WRKSRC}/../moz/zipped/
|
||||
@${CP} ${WRKDIR}/FREEBSDGCCIlib.zip ${WRKSRC}/../moz/zipped/
|
||||
@${CP} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKSRC}/../moz/zipped/
|
||||
|
||||
register-mozilla:
|
||||
.if exists(${WRKDIR}/mozilla-runtime)
|
||||
@${RM} -rf ${WRKDIR}/mozilla-runtime
|
||||
.endif
|
||||
@${MKDIR} ${WRKDIR}/mozilla-runtime
|
||||
@cd ${WRKDIR}/mozilla-runtime && ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIruntime.zip
|
||||
@cd ${WRKDIR}/mozilla-runtime && ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIlib.zip
|
||||
@${CP} ${WRKDIR}/mozilla/work/mozilla/dist/bin/regxpcom ${WRKDIR}/mozilla-runtime/
|
||||
@-${RM} ${WRKDIR}/mozilla-runtime/components/component.reg
|
||||
@cd ${WRKDIR}/mozilla-runtime && export MOZILLA_FIVE_HOME=. \
|
||||
&& export LD_LIBRARY_PATH=.:./lib && ./regxpcom
|
||||
@${CP} ${WRKDIR}/mozilla-runtime/components/xpti.dat \
|
||||
${WRKDIR}/mozilla-runtime/components/xptitemp.dat
|
||||
@${RM} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKDIR}/mozilla-runtime/regxpcom
|
||||
@cd ${WRKDIR}/mozilla-runtime && ${FIND} . -type f \
|
||||
| ${ZIP} ${WRKDIR}/FREEBSDGCCIruntime.zip -@
|
||||
|
||||
mozilla:
|
||||
@${MAKE} extract-mozilla
|
||||
@${MAKE} patch-mozilla
|
||||
@${MAKE} build-mozilla
|
||||
@${MAKE} register-mozilla
|
||||
@${MAKE} install-mozilla
|
||||
|
||||
do-build:
|
||||
.if ! exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIruntime.zip)
|
||||
@ -512,14 +277,12 @@ do-install:
|
||||
#
|
||||
${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
|
||||
@sleep 5
|
||||
@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \
|
||||
TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
|
||||
@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \
|
||||
${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
|
||||
@-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
|
||||
@${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
|
||||
@${RM} -f ${WRKDIR}/.Xvfb.pid
|
||||
.else
|
||||
@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \
|
||||
TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
|
||||
@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" TEMP=${WRKDIR} DISPLAY=${DISPLAY} \
|
||||
${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp
|
||||
.endif
|
||||
|
||||
@ -562,20 +325,24 @@ post-install:
|
||||
package-rename:
|
||||
@${ECHO_MSG} "===> Rename package for OO.org mirror upload";
|
||||
.if defined(LANG_SUFFIX)
|
||||
@${MV} ${WRKDIR}/../${PKGNAMEPREFIX}openoffice-${LANG_SUFFIX}-${PORTVERSION}_${PORTREVISION}.tbz2 \
|
||||
${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}Intel_install_${LANG_PKGNAME}-${LANG_SUFFIX}.tbz2
|
||||
@${MV} ${PKGFILE} \
|
||||
${WRKDIR}/../OOo_${BUILD_NR}${MILESTONE}_${OPSYS}${SIMPLEOSVER}Intel_install_${LANG_PKGNAME}-${LANG_SUFFIX}${PKG_SUFX}
|
||||
.elif defined(LANG_PKGNAME)
|
||||
@${MV} ${PKGFILE} \
|
||||
${WRKDIR}/../OOo_${BUILD_NR}${MILESTONE}_${OPSYS}${SIMPLEOSVER}Intel_install_${LANG_PKGNAME}${PKG_SUFX}
|
||||
.else
|
||||
@${MV} ${WRKDIR}/../${PKGNAMEPREFIX}openoffice-${PORTVERSION}_${PORTREVISION}.tbz2 \
|
||||
${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}Intel_install_${LANG_PKGNAME}.tbz2
|
||||
@${MV} ${PKGFILE} \
|
||||
${WRKDIR}/../OOo_${BUILD_NR}${MILESTONE}_${OPSYS}${SIMPLEOSVER}Intel_install${PKG_SUFX}
|
||||
.endif
|
||||
|
||||
update:
|
||||
@${MAKE} fetch
|
||||
@${MAKE} extract
|
||||
@cd ${WRKSRC}/.. && for dir in *; do \
|
||||
if [ -d $$dir ]; then \
|
||||
cd $$dir; cvs update -d; cd ..; \
|
||||
fi \
|
||||
done
|
||||
sdk:
|
||||
@${ECHO_MSG} "===> Make SDK of OpenOffice.org"
|
||||
@cd ${WRKSRC}/.. && DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
|
||||
${SH} -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_${BUILD_NR}${MILESTONE}_${OPSYS}${SIMPLEOSVER}Intel_sdk.tar.gz
|
||||
|
||||
solver:
|
||||
@${ECHO_MSG} "===> Make Solver of OpenOffice.org"
|
||||
@cd ${WRKSRC}/.. ; ${TAR} cfz ${WRKDIR}/../OOo_${BUILD_NR}${MILESTONE}_${OPSYS}${SIMPLEOSVER}Intel_solver.tar.gz solver
|
||||
|
||||
.include <bsd.port.post.mk>
|
||||
|
||||
@ -1,4 +1,8 @@
|
||||
MD5 (openoffice2.0/cws_src680_ooo20031216_20031208.tar.bz2) = d841d81ad9ca3b46dd49ae997854032b
|
||||
MD5 (openoffice2.0/OOo_680m30_20040402_source.tar.bz2) = 768b3d8246a12eff6bf83f098093fbee
|
||||
SIZE (openoffice2.0/OOo_680m30_20040402_source.tar.bz2) = 195378119
|
||||
MD5 (openoffice2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
|
||||
MD5 (openoffice2.0/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
|
||||
SIZE (openoffice2.0/gpc231.tar.Z) = 27917
|
||||
MD5 (openoffice2.0/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
|
||||
SIZE (openoffice2.0/patch-openoffice-mozilla101-2002-10-14) = 29105
|
||||
MD5 (openoffice2.0/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
|
||||
SIZE (openoffice2.0/mozilla-vendor-1.0.2a.tgz) = 7292
|
||||
|
||||
61
editors/openoffice.org-2-RC/files/Makefile.mozilla
Normal file
61
editors/openoffice.org-2-RC/files/Makefile.mozilla
Normal file
@ -0,0 +1,61 @@
|
||||
extract-mozilla:
|
||||
.if ! exists(${WRKDIR}/mozilla/Makefile)
|
||||
@${ECHO_MSG} "===> Extracting mozilla sub project"
|
||||
@cd ${WRKDIR} && tar -xzf ${DISTDIR}/${DIST_SUBDIR}/mozilla-vendor-1.0.2a.tgz
|
||||
.endif
|
||||
@cd ${WRKDIR}/mozilla && ${MAKE} extract WRKDIRPREFIX=""
|
||||
|
||||
patch-mozilla:
|
||||
@${CP} ${DISTDIR}/${DIST_SUBDIR}/patch-openoffice-mozilla101-2002-10-14 \
|
||||
${WRKDIR}/mozilla/files/
|
||||
@cd ${WRKDIR}/mozilla && ${MAKE} patch WRKDIRPREFIX=""
|
||||
|
||||
build-mozilla:
|
||||
.if ! exists(${WRKDIR}/FREEBSDGCCIruntime.zip)
|
||||
@${ECHO_MSG} "===> Building mozilla sub project"
|
||||
.if defined(WITH_DEBUG)
|
||||
@${CP} ${WRKDIR}/mozilla/Makefile ${WRKDIR}/mozilla/Makefile.new
|
||||
@${SED} -e 's|--disable-debug||' \
|
||||
-e 's|--disable-cpp-rtti||' \
|
||||
-e 's|--enable-strip||' \
|
||||
< ${WRKDIR}/mozilla/Makefile.new > ${WRKDIR}/mozilla/Makefile
|
||||
.endif
|
||||
.if defined(USE_GCC)
|
||||
@cd ${WRKDIR}/mozilla && ${MAKE} CXX="${CXX}" CC="${CC}" CFLAGS="${CFLAGS}" USE_GCC=${USE_GCC} build WRKDIRPREFIX=""
|
||||
.else
|
||||
@cd ${WRKDIR}/mozilla && ${MAKE} CFLAGS="${CFLAGS}" build WRKDIRPREFIX=""
|
||||
.endif
|
||||
@${CP} ${FILESDIR}/zipmoz.sh ${WRKDIR}
|
||||
@${CHMOD} 755 ${WRKDIR}/zipmoz.sh
|
||||
@${WRKDIR}/zipmoz.sh ${WRKDIR}/mozilla/work/mozilla/dist FREEBSDGCCI ${WRKDIR}
|
||||
.endif
|
||||
|
||||
install-mozilla:
|
||||
@${CP} ${WRKDIR}/FREEBSDGCCIinc.zip ${WRKSRC}/../moz/zipped/
|
||||
@${CP} ${WRKDIR}/FREEBSDGCCIlib.zip ${WRKSRC}/../moz/zipped/
|
||||
@${CP} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKSRC}/../moz/zipped/
|
||||
|
||||
register-mozilla:
|
||||
.if exists(${WRKDIR}/mozilla-runtime)
|
||||
@${RM} -rf ${WRKDIR}/mozilla-runtime
|
||||
.endif
|
||||
@${MKDIR} ${WRKDIR}/mozilla-runtime
|
||||
@cd ${WRKDIR}/mozilla-runtime && ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIruntime.zip
|
||||
@cd ${WRKDIR}/mozilla-runtime && ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIlib.zip
|
||||
@${CP} ${WRKDIR}/mozilla/work/mozilla/dist/bin/regxpcom ${WRKDIR}/mozilla-runtime/
|
||||
@-${RM} ${WRKDIR}/mozilla-runtime/components/component.reg
|
||||
@cd ${WRKDIR}/mozilla-runtime && export MOZILLA_FIVE_HOME=. \
|
||||
&& export LD_LIBRARY_PATH=.:./lib && ./regxpcom
|
||||
@${CP} ${WRKDIR}/mozilla-runtime/components/xpti.dat \
|
||||
${WRKDIR}/mozilla-runtime/components/xptitemp.dat
|
||||
@${RM} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKDIR}/mozilla-runtime/regxpcom
|
||||
@cd ${WRKDIR}/mozilla-runtime && ${FIND} . -type f \
|
||||
| ${ZIP} ${WRKDIR}/FREEBSDGCCIruntime.zip -@
|
||||
|
||||
mozilla:
|
||||
@${MAKE} extract-mozilla
|
||||
@${MAKE} patch-mozilla
|
||||
@${MAKE} build-mozilla
|
||||
@${MAKE} register-mozilla
|
||||
@${MAKE} install-mozilla
|
||||
|
||||
@ -1,21 +0,0 @@
|
||||
--- ../setup2/mow/source/loader/loader.c.orig Mon Jun 2 08:25:13 2003
|
||||
+++ ../setup2/mow/source/loader/loader.c Tue Jun 3 07:58:22 2003
|
||||
@@ -1069,6 +1069,7 @@
|
||||
|
||||
void KillSetupDir()
|
||||
{
|
||||
+#if 0
|
||||
DIR* pDir;
|
||||
struct dirent* pFile;
|
||||
|
||||
@@ -1088,6 +1089,10 @@
|
||||
closedir( pDir );
|
||||
chdir( strInitPath );
|
||||
rmdir( strTmpPath );
|
||||
+#else
|
||||
+ fprintf(stderr, "\nLeaving behind temporary directory: %s\n",
|
||||
+ strTmpPath);
|
||||
+#endif
|
||||
}
|
||||
|
||||
void makeSymLink( char* s )
|
||||
@ -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
|
||||
@ -1,290 +0,0 @@
|
||||
--- ../goodies/source/filter.vcl/egif/giflzwc.cxx Sun Apr 13 14:33:24 2003
|
||||
+++ /dev/null Mon Apr 14 06:10:35 2003
|
||||
@@ -1,287 +0,0 @@
|
||||
-/*************************************************************************
|
||||
- *
|
||||
- * $RCSfile: giflzwc.cxx,v $
|
||||
- *
|
||||
- * $Revision: 1.1.1.1 $
|
||||
- *
|
||||
- * last change: $Author: hr $ $Date: 2000/09/18 16:30:11 $
|
||||
- *
|
||||
- * The Contents of this file are made available subject to the terms of
|
||||
- * either of the following licenses
|
||||
- *
|
||||
- * - GNU Lesser General Public License Version 2.1
|
||||
- * - Sun Industry Standards Source License Version 1.1
|
||||
- *
|
||||
- * Sun Microsystems Inc., October, 2000
|
||||
- *
|
||||
- * GNU Lesser General Public License Version 2.1
|
||||
- * =============================================
|
||||
- * Copyright 2000 by Sun Microsystems, Inc.
|
||||
- * 901 San Antonio Road, Palo Alto, CA 94303, USA
|
||||
- *
|
||||
- * This library is free software; you can redistribute it and/or
|
||||
- * modify it under the terms of the GNU Lesser General Public
|
||||
- * License version 2.1, as published by the Free Software Foundation.
|
||||
- *
|
||||
- * This library is distributed in the hope that it will be useful,
|
||||
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
- * Lesser General Public License for more details.
|
||||
- *
|
||||
- * You should have received a copy of the GNU Lesser General Public
|
||||
- * License along with this library; if not, write to the Free Software
|
||||
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
|
||||
- * MA 02111-1307 USA
|
||||
- *
|
||||
- *
|
||||
- * Sun Industry Standards Source License Version 1.1
|
||||
- * =================================================
|
||||
- * The contents of this file are subject to the Sun Industry Standards
|
||||
- * Source License Version 1.1 (the "License"); You may not use this file
|
||||
- * except in compliance with the License. You may obtain a copy of the
|
||||
- * License at http://www.openoffice.org/license.html.
|
||||
- *
|
||||
- * Software provided under this License is provided on an "AS IS" basis,
|
||||
- * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
|
||||
- * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
|
||||
- * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
|
||||
- * See the License for the specific provisions governing your rights and
|
||||
- * obligations concerning the Software.
|
||||
- *
|
||||
- * The Initial Developer of the Original Code is: Sun Microsystems, Inc.
|
||||
- *
|
||||
- * Copyright: 2000 by Sun Microsystems, Inc.
|
||||
- *
|
||||
- * All Rights Reserved.
|
||||
- *
|
||||
- * Contributor(s): _______________________________________
|
||||
- *
|
||||
- *
|
||||
- ************************************************************************/
|
||||
-
|
||||
-#include <tools/stream.hxx>
|
||||
-#include "giflzwc.hxx"
|
||||
-
|
||||
-// ----------------------------
|
||||
-// - GIFImageDataOutputStream -
|
||||
-// ----------------------------
|
||||
-
|
||||
-class GIFImageDataOutputStream
|
||||
-{
|
||||
-private:
|
||||
-
|
||||
- void FlushBlockBuf();
|
||||
- inline void FlushBitsBufsFullBytes();
|
||||
-
|
||||
- SvStream& rStream;
|
||||
- BYTE* pBlockBuf;
|
||||
- BYTE nBlockBufSize;
|
||||
- ULONG nBitsBuf;
|
||||
- USHORT nBitsBufSize;
|
||||
-
|
||||
-public:
|
||||
-
|
||||
- GIFImageDataOutputStream( SvStream & rGIF, BYTE nLZWDataSize );
|
||||
- ~GIFImageDataOutputStream();
|
||||
-
|
||||
- inline void WriteBits( USHORT nCode, USHORT nCodeLen );
|
||||
-};
|
||||
-
|
||||
-// ------------------------------------------------------------------------
|
||||
-
|
||||
-inline void GIFImageDataOutputStream::FlushBitsBufsFullBytes()
|
||||
-{
|
||||
- while (nBitsBufSize>=8)
|
||||
- {
|
||||
- if( nBlockBufSize==255 )
|
||||
- FlushBlockBuf();
|
||||
-
|
||||
- pBlockBuf[nBlockBufSize++] = (BYTE) nBitsBuf;
|
||||
- nBitsBuf >>= 8;
|
||||
- nBitsBufSize -= 8;
|
||||
- }
|
||||
-}
|
||||
-
|
||||
-// ------------------------------------------------------------------------
|
||||
-
|
||||
-inline void GIFImageDataOutputStream::WriteBits( USHORT nCode, USHORT nCodeLen )
|
||||
-{
|
||||
- if( nBitsBufSize+nCodeLen>32 )
|
||||
- FlushBitsBufsFullBytes();
|
||||
-
|
||||
- nBitsBuf |= (ULONG) nCode << nBitsBufSize;
|
||||
- nBitsBufSize += nCodeLen;
|
||||
-}
|
||||
-
|
||||
-// ------------------------------------------------------------------------
|
||||
-
|
||||
-GIFImageDataOutputStream::GIFImageDataOutputStream( SvStream & rGIF, BYTE nLZWDataSize ) :
|
||||
- rStream(rGIF)
|
||||
-{
|
||||
- pBlockBuf = new BYTE[ 255 ];
|
||||
- nBlockBufSize = 0;
|
||||
- nBitsBufSize = 0;
|
||||
- nBitsBuf = 0;
|
||||
- rStream << nLZWDataSize;
|
||||
-}
|
||||
-
|
||||
-// ------------------------------------------------------------------------
|
||||
-
|
||||
-
|
||||
-GIFImageDataOutputStream::~GIFImageDataOutputStream()
|
||||
-{
|
||||
- WriteBits(0,7);
|
||||
- FlushBitsBufsFullBytes();
|
||||
- FlushBlockBuf();
|
||||
- rStream << (BYTE)0;
|
||||
- delete[] pBlockBuf;
|
||||
-}
|
||||
-
|
||||
-// ------------------------------------------------------------------------
|
||||
-
|
||||
-void GIFImageDataOutputStream::FlushBlockBuf()
|
||||
-{
|
||||
- if( nBlockBufSize )
|
||||
- {
|
||||
- rStream << (BYTE) nBlockBufSize;
|
||||
- rStream.Write( pBlockBuf,nBlockBufSize );
|
||||
- nBlockBufSize = 0;
|
||||
- }
|
||||
-}
|
||||
-
|
||||
-// -------------------
|
||||
-// - GIFLZWCTreeNode -
|
||||
-// -------------------
|
||||
-
|
||||
-struct GIFLZWCTreeNode
|
||||
-{
|
||||
-
|
||||
- GIFLZWCTreeNode* pBrother; // naechster Knoten, der den selben Vater hat
|
||||
- GIFLZWCTreeNode* pFirstChild; // erster Sohn
|
||||
- USHORT nCode; // Der Code fuer den String von Pixelwerten, der sich ergibt, wenn
|
||||
- USHORT nValue; // Der Pixelwert
|
||||
-};
|
||||
-
|
||||
-// --------------------
|
||||
-// - GIFLZWCompressor -
|
||||
-// --------------------
|
||||
-
|
||||
-GIFLZWCompressor::GIFLZWCompressor()
|
||||
-{
|
||||
- pIDOS=NULL;
|
||||
-}
|
||||
-
|
||||
-// ------------------------------------------------------------------------
|
||||
-
|
||||
-GIFLZWCompressor::~GIFLZWCompressor()
|
||||
-{
|
||||
- if (pIDOS!=NULL) EndCompression();
|
||||
-}
|
||||
-
|
||||
-// ------------------------------------------------------------------------
|
||||
-
|
||||
-void GIFLZWCompressor::StartCompression( SvStream& rGIF, USHORT nPixelSize )
|
||||
-{
|
||||
- if( !pIDOS )
|
||||
- {
|
||||
- USHORT i;
|
||||
-
|
||||
- nDataSize = nPixelSize;
|
||||
-
|
||||
- if( nDataSize < 2 )
|
||||
- nDataSize=2;
|
||||
-
|
||||
- nClearCode=1<<nDataSize;
|
||||
- nEOICode=nClearCode+1;
|
||||
- nTableSize=nEOICode+1;
|
||||
- nCodeSize=nDataSize+1;
|
||||
-
|
||||
- pIDOS=new GIFImageDataOutputStream(rGIF,(BYTE)nDataSize);
|
||||
- pTable=new GIFLZWCTreeNode[4096];
|
||||
-
|
||||
- for (i=0; i<4096; i++)
|
||||
- {
|
||||
- pTable[i].pBrother = pTable[i].pFirstChild = NULL;
|
||||
- pTable[i].nValue = (BYTE) ( pTable[i].nCode = i );
|
||||
- }
|
||||
-
|
||||
- pPrefix = NULL;
|
||||
- pIDOS->WriteBits( nClearCode,nCodeSize );
|
||||
- }
|
||||
-}
|
||||
-
|
||||
-// ------------------------------------------------------------------------
|
||||
-
|
||||
-void GIFLZWCompressor::Compress( HPBYTE pSrc, ULONG nSize )
|
||||
-{
|
||||
- if( pIDOS )
|
||||
- {
|
||||
- GIFLZWCTreeNode* p;
|
||||
- USHORT i;
|
||||
- BYTE nV;
|
||||
-
|
||||
- if( !pPrefix && nSize )
|
||||
- {
|
||||
- pPrefix=pTable+(*pSrc++);
|
||||
- nSize--;
|
||||
- }
|
||||
-
|
||||
- while( nSize )
|
||||
- {
|
||||
- nSize--;
|
||||
- nV=*pSrc++;
|
||||
- for( p=pPrefix->pFirstChild; p!=NULL; p=p->pBrother )
|
||||
- {
|
||||
- if (p->nValue==nV)
|
||||
- break;
|
||||
- }
|
||||
-
|
||||
- if( p)
|
||||
- pPrefix=p;
|
||||
- else
|
||||
- {
|
||||
- pIDOS->WriteBits(pPrefix->nCode,nCodeSize);
|
||||
-
|
||||
- if (nTableSize==4096)
|
||||
- {
|
||||
- pIDOS->WriteBits(nClearCode,nCodeSize);
|
||||
-
|
||||
- for (i=0; i<nClearCode; i++)
|
||||
- pTable[i].pFirstChild=NULL;
|
||||
-
|
||||
- nCodeSize=nDataSize+1;
|
||||
- nTableSize=nEOICode+1;
|
||||
- }
|
||||
- else
|
||||
- {
|
||||
- if(nTableSize==(USHORT)(1<<nCodeSize))
|
||||
- nCodeSize++;
|
||||
-
|
||||
- p=pTable+(nTableSize++);
|
||||
- p->pBrother=pPrefix->pFirstChild;
|
||||
- pPrefix->pFirstChild=p;
|
||||
- p->nValue=nV;
|
||||
- p->pFirstChild=NULL;
|
||||
- }
|
||||
-
|
||||
- pPrefix=pTable+nV;
|
||||
- }
|
||||
- }
|
||||
- }
|
||||
-}
|
||||
-
|
||||
-// ------------------------------------------------------------------------
|
||||
-
|
||||
-void GIFLZWCompressor::EndCompression()
|
||||
-{
|
||||
- if( pIDOS )
|
||||
- {
|
||||
- if( pPrefix )
|
||||
- pIDOS->WriteBits(pPrefix->nCode,nCodeSize);
|
||||
-
|
||||
- pIDOS->WriteBits( nEOICode,nCodeSize );
|
||||
- delete[] pTable;
|
||||
- delete pIDOS;
|
||||
- pIDOS=NULL;
|
||||
- }
|
||||
-}
|
||||
@ -1,45 +0,0 @@
|
||||
--- /dev/null 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ ../goodies/source/filter.vcl/egif/giflzwc_disabled.cxx 2002-08-15 15:09:47.000000000 +0200
|
||||
@@ -0,0 +1,42 @@
|
||||
+/**********************************
|
||||
+ * This code is copied from giflzwc.cxx, with the patented LZW compression code removed.
|
||||
+ **********************************/
|
||||
+
|
||||
+//#include <tools/stream.hxx>
|
||||
+#include "giflzwc.hxx"
|
||||
+
|
||||
+// --------------------
|
||||
+// - GIFLZWCompressor -
|
||||
+// --------------------
|
||||
+
|
||||
+GIFLZWCompressor::GIFLZWCompressor()
|
||||
+{
|
||||
+ pIDOS=NULL;
|
||||
+}
|
||||
+
|
||||
+// ------------------------------------------------------------------------
|
||||
+
|
||||
+GIFLZWCompressor::~GIFLZWCompressor()
|
||||
+{
|
||||
+}
|
||||
+
|
||||
+// ------------------------------------------------------------------------
|
||||
+
|
||||
+void GIFLZWCompressor::StartCompression( SvStream& rGIF, USHORT nPixelSize )
|
||||
+{
|
||||
+ /********************** DISABLED *************************/
|
||||
+}
|
||||
+
|
||||
+// ------------------------------------------------------------------------
|
||||
+
|
||||
+void GIFLZWCompressor::Compress( HPBYTE pSrc, ULONG nSize )
|
||||
+{
|
||||
+ /********************** DISABLED *************************/
|
||||
+}
|
||||
+
|
||||
+// ------------------------------------------------------------------------
|
||||
+
|
||||
+void GIFLZWCompressor::EndCompression()
|
||||
+{
|
||||
+ /********************** DISABLED *************************/
|
||||
+}
|
||||
@ -1,11 +0,0 @@
|
||||
--- ../goodies/source/filter.vcl/egif/makefile.mk.orig Tue Aug 14 23:22:54 2001
|
||||
+++ ../goodies/source/filter.vcl/egif/makefile.mk Mon Apr 14 06:04:55 2003
|
||||
@@ -89,7 +89,7 @@
|
||||
|
||||
SLOFILES= $(SLO)$/egif.obj \
|
||||
$(SLO)$/dlgegif.obj \
|
||||
- $(SLO)$/giflzwc.obj
|
||||
+ $(SLO)$/giflzwc_disabled.obj
|
||||
|
||||
|
||||
# ==========================================================================
|
||||
@ -1,17 +0,0 @@
|
||||
--- ../connectivity/prj/build.lst 2 Jun 2003 07:53:47 -0000 1.18
|
||||
+++ ../connectivity/prj/build.lst 8 Aug 2003 07:21:31 -0000
|
||||
@@ -1,4 +1,4 @@
|
||||
-cn connectivity : comphelper moz svtools unixODBC NULL
|
||||
+cn connectivity : comphelper svtools unixODBC NULL
|
||||
cn connectivity usr1 - all cn_mkout NULL
|
||||
cn connectivity\source\types nmake - all cn_types NULL
|
||||
cn connectivity\source\commontools nmake - all cn_cmtools cn_parse cn_types NULL
|
||||
@@ -7,8 +7,6 @@
|
||||
cn connectivity\source\resource nmake - all cn_res NULL
|
||||
cn connectivity\source\sdbcx nmake - all cn_sdbcx cn_types NULL
|
||||
cn connectivity\source\drivers\ado nmake - w cn_ado cn_dbtools NULL
|
||||
-cn connectivity\source\drivers\mozab\mozillasrc nmake - all cn_mozab_mozillasrc cn_file NULL
|
||||
-cn connectivity\source\drivers\mozab nmake - all cn_mozab cn_mozab_mozillasrc cn_dbtools NULL
|
||||
cn connectivity\source\drivers\evoab nmake - all cn_evoab cn_dbtools cn_file NULL
|
||||
cn connectivity\source\drivers\calc nmake - all cn_calc cn_file NULL
|
||||
cn connectivity\source\drivers\odbc nmake - all cn_odbc cn_dbtools NULL
|
||||
@ -1,34 +0,0 @@
|
||||
Index: scp/source/office/files.scp
|
||||
===================================================================
|
||||
RCS file: /cvs/installation/scp/source/office/files.scp,v
|
||||
retrieving revision 1.369.10.1
|
||||
diff -u -r1.369.10.1 files.scp
|
||||
--- scp/source/office/files.scp 1 Aug 2003 12:14:45 -0000 1.369.10.1
|
||||
+++ scp/source/office/files.scp 20 Aug 2003 11:45:05 -0000
|
||||
@@ -388,7 +388,7 @@
|
||||
Styles = (PACKED);
|
||||
End
|
||||
|
||||
-#ifndef MACOSX
|
||||
+#if !(defined(MACOSX) || defined(FREEBSD))
|
||||
File GID_FILE_LIB_MOZABDRV
|
||||
TXT_FILE_BODY;
|
||||
#ifdef UNX
|
||||
@@ -750,7 +750,7 @@
|
||||
#endif
|
||||
End
|
||||
|
||||
-#ifndef MACOSX
|
||||
+#if !(defined(MACOSX) || defined(FREEBSD))
|
||||
File GID_FILE_LIB_MOZAB_2
|
||||
TXT_FILE_BODY;
|
||||
Styles = (PACKED,UNO_COMPONENT);
|
||||
@@ -3184,7 +3184,7 @@
|
||||
|
||||
#endif
|
||||
// of #ifdef SOLAR_JAVA
|
||||
-#ifndef MACOSX
|
||||
+#if !(defined(MACOSX) || defined(FREEBSD))
|
||||
File GID_FILE_MOZILLA_RUNTIME
|
||||
TXT_FILE_BODY;
|
||||
Styles = (ARCHIVE);
|
||||
@ -0,0 +1,50 @@
|
||||
#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
|
||||
@ -0,0 +1,13 @@
|
||||
#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" );
|
||||
@ -0,0 +1,13 @@
|
||||
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:
|
||||
*;
|
||||
@ -0,0 +1,14 @@
|
||||
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
|
||||
|
||||
@ -0,0 +1,27 @@
|
||||
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.
|
||||
@ -0,0 +1,90 @@
|
||||
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
|
||||
+
|
||||
@ -0,0 +1,17 @@
|
||||
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
|
||||
@ -0,0 +1,16 @@
|
||||
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 );
|
||||
@ -0,0 +1,34 @@
|
||||
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);
|
||||
13
editors/openoffice.org-2-RC/files/patch-solenv+inc+ant.mk
Normal file
13
editors/openoffice.org-2-RC/files/patch-solenv+inc+ant.mk
Normal file
@ -0,0 +1,13 @@
|
||||
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)"==""
|
||||
@ -0,0 +1,15 @@
|
||||
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
|
||||
@ -0,0 +1,14 @@
|
||||
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
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user